删除多余文件

common/include/kni_utils.h

@@ -11,9 +11,9 @@
 #include "MESA/MESA_handle_logger.h"
 #include "MESA/MESA_htable.h"
 #include "MESA/MESA_prof_load.h"
-#include "field_stat2.h"
-#include "Maat_rule.h"
-#include "Maat_command.h"
+#include "MESA/field_stat2.h"
+#include "MESA/Maat_rule.h"
+#include "MESA/Maat_command.h"
 #include "mrtunnat.h"
 #include <sys/ioctl.h>
 #include <netinet/ip6.h>

conf/sapp/project_list.conf

@@ -1,22 +0,0 @@
-#project_requirement_name	value_type	
-#current requirement definitions:
-#    terminal_tag,
-#    ipv4_frag_list,
-#    ipv6_frag_list,
-#    stream_id,
-# value type definitions
-#    char,
-#    short,
-#    int,
-#    long,
-#    struct     
-
-#terminal_tag		struct
-#ipv4_frag_list		struct
-#ipv6_frag_list		struct
-#stream_id		struct
-#test_project		struct
-tcp_flow_stat		struct
-udp_flow_stat		struct
-tcp_deduce_flow_stat	struct
-kni_http_tag            struct

entry/CMakeLists.txt

@@ -1,3 +1,3 @@
 add_library(kni SHARED src/kni_entry.cpp src/tfe_mgr.cpp src/kni_tun.cpp)
 target_include_directories(kni PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
-target_link_libraries(kni common MESA_prof_load MESA_htable MESA_field_stat maatframe marsio uuid cjson rdkafka dabloom)
+target_link_libraries(kni common MESA_prof_load MESA_htable MESA_field_stat maatframe marsio dabloom)

entry/include/tsg_rule.h

@@ -1,61 +0,0 @@
-#ifndef	__TSG_RULE_H__
-#define	__TSG_RULE_H__
-
-#include <MESA/Maat_rule.h>
-
-typedef enum _tsg_protocol
-{
-   PROTO_UNKONWN=0,
-   PROTO_IPv4=1,
-   PROTO_IPv6,
-   PROTO_TCP,
-   PROTO_UDP,
-   PROTO_HTTP,
-   PROTO_MAIL,
-   PROTO_DNS,
-   PROTO_FTP,
-   PROTO_SSL,
-   PROTO_SIP,
-   PROTO_BGP,
-   PROTO_STREAMING_MEDIA,
-   PROTO_MAX
-}tsg_protocol_t;
-
-
-#define	MAX_RESULT_NUM	8
-#define	MAX_DOAMIN_LEN	2048
-
-struct _identify_info
-{
-	tsg_protocol_t proto;	//enum _tsg_protocol (tsg_types.h)
-	int domain_len;
-	char domain[MAX_DOAMIN_LEN];
-};
-
-typedef	enum _PULL_RESULT_TYPE
-{
-	PULL_KNI_RESULT,
-	PULL_FW_RESULT
-}PULL_RESULT_TYPE;
-
-#define TSG_DOMAIN_MAX 	256
-
-extern Maat_feather_t g_tsg_maat_feather;
-
-int tsg_rule_init(const char *conffile, void *logger);
-
-int tsg_scan_nesting_addr(Maat_feather_t maat_feather, const struct streaminfo *a_stream, tsg_protocol_t proto, scan_status_t *mid, Maat_rule_t*result, int result_num);
-
-//return 0 if failed, return >0 on success;
-int tsg_pull_policy_result(struct streaminfo *a_stream, PULL_RESULT_TYPE pull_result_type, Maat_rule_t *result, int result_num, struct _identify_info *identify_info);
-
-//return -1 if failed, return 0 on success;
-int tsg_shared_table_init(const char *conffile, Maat_feather_t maat_feather, void *logger);
-
-//return value: -1: failed, 0: not hit, >0: hit count 
-int tsg_scan_shared_policy(Maat_feather_t maat_feather, void *pkt, int pkt_len, Maat_rule_t *result, int result_num, struct _identify_info *identify_info, scan_status_t *mid, void *logger, int thread_seq);
-
-//return NULL if none exists, otherwise return one deny rule;
-Maat_rule_t *tsg_fetch_deny_rule(Maat_rule_t *result, int result_num);
-
-#endif

entry/include/tsg_send_log.h

@@ -1,38 +0,0 @@
-#ifndef	__TSG_SEND_LOG_H__
-#define	__TSG_SEND_LOG_H__
-
-#include <MESA/Maat_rule.h>
-
-
-typedef	struct _tsg_log
-{
-	int result_num;
-	Maat_rule_t *result;
-	struct streaminfo *a_stream;
-}tsg_log_t;
-
-typedef enum _tld_type
-{
-	TLD_TYPE_UNKNOWN=0,
-	TLD_TYPE_LONG=1,
-	TLD_TYPE_STRING,
-	TLD_TYPE_FILE,
-	TLD_TYPE_MAX
-}TLD_TYPE;
-
-
-typedef	void* TLD_handle_t;
-typedef	void* tsg_log_instance_t;
-
-extern tsg_log_instance_t g_tsg_log_instance;
-
-TLD_handle_t TLD_create(int thread_id);
-int TLD_append(TLD_handle_t handle, char *key, void *value, TLD_TYPE type);
-int TLD_cancel(TLD_handle_t handle);
-
-int tsg_send_log(tsg_log_instance_t instance, TLD_handle_t handle, tsg_log_t *log_msg, int thread_id);
-
-unsigned long long tsg_get_stream_id(struct streaminfo *a_stream);
-
-
-#endif

entry/src/kni_entry.cpp

@@ -17,9 +17,8 @@ bypass: drome:  pme_new_fail:    destroy_pme
 #include <signal.h>
 #include <inttypes.h>
 #include "tfe_mgr.h"
-#include "tsg_rule.h"
-#include "tsg_send_log.h"
-//#include "tsg_rule.h"
+#include "tsg/tsg_rule.h"
+#include "tsg/tsg_send_log.h"
 
 #ifdef __cplusplus
 extern "C" {

script/run.sh

@@ -5,6 +5,4 @@ rm -f $SAPP_RUN/plug/business/kni/kni2.so && /bin/cp -f ../build/entry/libkni.so
 mkdir -p $SAPP_RUN/etc/kni
 /bin/cp -f ../conf/kni.conf $SAPP_RUN/etc/kni/kni.conf
 /bin/cp -f ../conf/maat/maat_test.json $SAPP_RUN/etc/kni/maat_test.json
-/bin/cp -f ../conf/maat/maat_tableinfo.conf $SAPP_RUN/etc/kni/maat_tableinfo.conf
-cat $SAPP_RUN/etc/project_list.conf | grep "kni_http_tag" >/dev/null 2>&1 && exit
-echo "kni_http_tag            struct" >> $SAPP_RUN/etc/project_list.conf
+/bin/cp -f ../conf/maat/maat_tableinfo.conf $SAPP_RUN/etc/kni/maat_tableinfo.conf