修改打包脚本v2.1.4-20191122

5 files changed, 14 insertions, 31 deletions

diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 2e74af6..f991933 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -26,14 +26,13 @@ set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreInstall.in)
 #set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
 #set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
 
-install(FILES build/entry/libkni.so DESTINATION ./plug/business/kni)
-install(FILES vendor/http.so DESTINATION ./plug/protocol/http)
 install(FILES conf/sapp/gdev/gdev.conf DESTINATION ./etc)
+install(FILES vendor/http.so DESTINATION ./plug/protocol/http)
 install(FILES conf/sapp/http/http.conf DESTINATION ./conf/http)
 install(FILES conf/sapp/http/http.inf DESTINATION ./plug/protocol/http)
+install(FILES build/entry/libkni.so DESTINATION ./plug/business/kni)
 install(FILES conf/sapp/kni/kni.inf DESTINATION ./plug/business/kni)
-install(FILES conf/sapp/kni/kni.conf conf/maat/static_maat_tableinfo.conf conf/maat/dynamic_maat_tableinfo.conf
-            conf/maat/maat_test.json DESTINATION ./etc/kni)
+install(FILES conf/sapp/kni/kni.conf DESTINATION ./etc/kni)
 
 # Must uninstall the debug package before install release package
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
diff --git a/conf/sapp/conflist.inf b/conf/sapp/conflist.inf
index e8d3c80..edb443f 100644
--- a/conf/sapp/conflist.inf
+++ b/conf/sapp/conflist.inf
@@ -6,13 +6,3 @@
 
 [business]
 ./plug/business/kni/kni.inf
-#./plug/business/test_app/test_app.inf
-#./plug/business/http_hijack/http_hijack.inf
-#./plug/business/gtest_sapp/gtest_sapp.inf
-#./plug/business/anti_flood/anti_flood.inf
-#./plug/business/test_http/test_http.inf
-#./plug/business/ipsec_biz_sample/ipsec_biz_sample.inf
-#./plug/business/l2tp_biz_sample/l2tp_biz_sample.inf
-#./plug/business/pptp_biz_sample/pptp_biz_sample.inf
-#./plug/business/terminal_tag/terminal_tag.inf
-#./plug/business/ntc_ip_comm/ntc_ip_comm.inf
diff --git a/conf/sapp/kni/kni.conf b/conf/sapp/kni/kni.conf
index 9a8506e..91d2c25 100644
--- a/conf/sapp/kni/kni.conf
+++ b/conf/sapp/kni/kni.conf
@@ -1,9 +1,8 @@
 [global]
 log_path = ./log/kni/kni.log
-log_level = 30
+log_level = 10
 tfe_node_count = 1
-manage_eth = eth0
-#normal or tun
+manage_eth = enp6s0
 deploy_mode = normal
 tun_name = tun_kni
 src_mac_addr = 00:0e:c6:d6:72:c1
@@ -11,26 +10,26 @@ dst_mac_addr = fe:65:b7:03:50:bd
 
 [tfe0]
 enabled = 1
-dev_eth_symbol = eth7
+dev_eth_symbol = ens1f5
 ip_addr = 192.168.100.2
 
 [tfe1]
 enabled = 1
-dev_eth_symbol = eth8
+dev_eth_symbol = ens1f6
 ip_addr = 192.168.100.3
 
 [tfe2]
 enabled = 1
-dev_eth_symbol = eth9
+dev_eth_symbol = ens1f7
 ip_addr = 192.168.100.4
 
 [tfe_cmsg_receiver]
-listen_eth = eth2.100
+listen_eth = ens1.100
 listen_port = 2475
 
 [watch_dog]
 switch = 1
-listen_eth = eth2.100
+listen_eth = ens1.100
 listen_port = 2476
 keepalive_idle = 2
 keepalive_intvl = 1
@@ -39,7 +38,6 @@ keepalive_cnt = 3
 [marsio]
 appsym = knifw
 
-#128:bypass, 2: intercept
 [dup_traffic]
 switch = 1
 action = 2
@@ -56,7 +54,7 @@ mho_hash_max_element_num = 2560000
 mho_expire_time = 30
 mho_eliminate_type = LRU
 
-//per thread
+#per thread
 [tuple2stream_htable]
 mho_screen_print_ctrl = 0
 mho_thread_safe = 0
@@ -68,8 +66,8 @@ mho_eliminate_type = LRU
 
 [field_stat]
 remote_switch = 1
-remote_ip = 192.168.10.152
+remote_ip = 192.168.100.1
 remote_port = 8125
 local_path = ./fs2_kni.status
-stat_cycle = 2 
+stat_cycle = 1
 print_mode = 1
\ No newline at end of file
diff --git a/conf/sapp/kni/kni.inf b/conf/sapp/kni/kni.inf
index 944a91a..7c34f88 100644
--- a/conf/sapp/kni/kni.inf
+++ b/conf/sapp/kni/kni.inf
@@ -8,10 +8,6 @@ DESTROY_FUNC = kni_destroy
 FUNC_FLAG = all 
 FUNC_NAME = kni_tcpall_entry 
 
-[HTTP]
-FUNC_FLAG = HTTP_HOST 
-FUNC_NAME = kni_http_entry 
-
 [POLLING]
 FUNC_FLAG=ALL
 FUNC_NAME=kni_polling_all_entry
\ No newline at end of file
diff --git a/conf/sapp/project_list.conf b/conf/sapp/project_list.conf
index 04c8cd5..f03a375 100644
--- a/conf/sapp/project_list.conf
+++ b/conf/sapp/project_list.conf
@@ -19,4 +19,4 @@
 tcp_flow_stat		struct
 udp_flow_stat		struct
 tcp_deduce_flow_stat	struct
-kni_http_tag            struct
+kni_http_tag            struct
\ No newline at end of file