diff --git a/cmake/Package.cmake b/cmake/Package.cmake index f991933..93e18d9 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -26,13 +26,10 @@ 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 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 conf/gdev/gdev.conf DESTINATION ./etc) 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 DESTINATION ./etc/kni) +install(FILES conf/kni/kni.inf DESTINATION ./plug/business/kni) +install(FILES conf/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/gdev/gdev.conf b/conf/gdev/gdev.conf similarity index 100% rename from conf/sapp/gdev/gdev.conf rename to conf/gdev/gdev.conf diff --git a/conf/sapp/kni/kni.conf b/conf/kni/kni.conf similarity index 100% rename from conf/sapp/kni/kni.conf rename to conf/kni/kni.conf diff --git a/conf/sapp/kni/kni.inf b/conf/kni/kni.inf similarity index 100% rename from conf/sapp/kni/kni.inf rename to conf/kni/kni.inf diff --git a/conf/sapp/conflist.inf b/conf/sapp/conflist.inf deleted file mode 100644 index edb443f..0000000 --- a/conf/sapp/conflist.inf +++ /dev/null @@ -1,8 +0,0 @@ -[platform] -./plug/platform/g_device_plug/g_device_plug.inf - -[protocol] -./plug/protocol/http/http.inf - -[business] -./plug/business/kni/kni.inf diff --git a/conf/sapp/http/http.conf b/conf/sapp/http/http.conf deleted file mode 100644 index e604abc..0000000 --- a/conf/sapp/http/http.conf +++ /dev/null @@ -1,42 +0,0 @@ -#http_special -#all regions -1 HTTP_ALL -2 HTTP_OTHER_REGIONS -#http state -3 HTTP_STATE -4 HTTP_REQ_LINE -5 HTTP_RES_LINE -6 HTTP_CONTENT -7 HTTP_UNGZIP_CONTENT -8 HTTP_MESSAGE_URL -9 HTTP_URI -#http_request -10 HTTP_HOST -11 HTTP_REFERER -12 HTTP_USER_AGENT -13 HTTP_COOKIE -14 HTTP_PROXY_AUTHORIZATION -15 HTTP_AUTHORIZATION -#http_response -16 HTTP_LOCATION -17 HTTP_SERVER -18 HTTP_ETAG -#http_general -19 HTTP_DATE -20 HTTP_TRAILER -21 HTTP_TRANSFER_ENCODING -22 HTTP_VIA -23 HTTP_PRAGMA -24 HTTP_CONNECTION -#http_content -25 HTTP_CONT_ENCODING -26 HTTP_CONT_LANGUAGE -27 HTTP_CONT_LOCATION -28 HTTP_CONT_DISPOSITION -29 HTTP_CONT_RANGE -30 HTTP_CONT_LENGTH -31 HTTP_CONT_TYPE -32 HTTP_CHARSET -33 HTTP_EXPIRES -34 HTTP_X_FLASH_VERSION -35 HTTP_TRANSFER_LENGTH diff --git a/conf/sapp/http/http.inf b/conf/sapp/http/http.inf deleted file mode 100644 index 9485171..0000000 --- a/conf/sapp/http/http.inf +++ /dev/null @@ -1,15 +0,0 @@ -[PLUGINFO] -PLUGNAME=HTTP -SO_PATH=./plug/protocol/http/http.so -INIT_FUNC=HTTP_INIT -DESTROY_FUNC=HTTP_DESTROY -GETPLUGID_FUNC=HTTP_GETPLUGID -FLAGCHANGE_FUNC=HTTP_FLAG_CHANGE -FLAGSTATE_FUNC=HTTP_PROT_FUNSTAT - -[TCP] -FUNC_FLAG=ALL -FUNC_NAME=HTTP_ENTRY - - - diff --git a/conf/sapp/sapp.toml b/conf/sapp/sapp.toml deleted file mode 100644 index 14c2a35..0000000 --- a/conf/sapp/sapp.toml +++ /dev/null @@ -1,121 +0,0 @@ -################################################################################################### -# NOTE: -# The format of this file is toml (https://github.com/cktan/tomlc99) -# to make vim editor display colorful and human readable, -# you can create a symbolic links named sapp.ini to sapp.toml, ln -sf sapp.toml sapp.ini -################################################################################################### - -[SYSTEM] -instance_name = "sapp4" - -[CPU] -worker_threads=16 -### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as [] -bind_mask=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16] -#bind_mask=[] - -[PACKET_IO] -### note, BSD_packet_filter, if you do not want to set any filter rule, keep it empty as "" -BSD_packet_filter="" - -### note, depolyment.mode options: [mirror, inline, transparent] - [packet_io.depolyment] - mode=inline - -### note, interface.type options: [pag,pcap,marsio] - [packet_io.internal.interface] - type=marsio - name=vxlan_user - - [packet_io.external.interface] - type=pcap - name=lo - - [packet_io.polling] -### note, polling_priority = call sapp_recv_pkt every call polling_entry times, - polling_priority=1 - -[STREAM] - [stream.tcp] - max=200000 - timeout=30 - syn_mandatory=1 - reorder_pkt_max=5 - analyse_option_enabled=1 - [stream.tcp.inject] - link_mss=1460 - - [stream.tcp.inject.rst] - number=3 - signature_enabled=1 - signature_seed1=65535 - signature_seed2=13 - - [stream.udp] - max=10000 - timeout=60 - -[PROFILING] - [profiling.pkt_latency] - enabled=0 -### note, threshold unit is microseconds (us) - threshold=1000000 - - [profiling.sanity_check] - raw_pkt_broken_enabled=0 - symbol_conflict_enabled=0 - - [profiling.log] - level=20 - interval=5 - - [profiling.log.local] - enabled=1 -### note, if "file_truncate_open_enabled=1", file will be truncated, otherwise open the file for appending. - file_truncate_enabled = 1 - log_file_name = "fs2_sysinfo.log" - - [profiling.log.remote] - enabled=1 - server_ip="192.168.11.90" - server_port=8126 - - [profiling.log.remote.field_stat2] -### note, is valid when "remote_send_out_type=field_stat2" -### note, metric_type option value: [default, json] - metric_type = default - app_name=sapp - -[TOOLS] - [tools.pkt_dump] - enabled=0 -### note, mode options value:[storage, udp_socket] - mode=udp_socket - BSD_packet_filter="" - - [tools.pkt_dump.threads] -### note, if you want enable pkt dump in all thread, set dump_thread_all_enabled=1, then 'dump_thread_id' is obsoleted. -### if dump_thread_all_enabled=0, then use dump_thread_id to specify separate specified thread index. - all_threads_enabled=1 - -### note, dump_thread_id start from 0, max is CPU.worker_threads-1 - dump_thread_id=[0,1,2,3,4] - - [tools.pkt_dump.udp] - command_port=12345 - - [tools.pkt_dump.storage] -### note, file path must be double quotation mark extension, for example, path="/dev/shm/pkt_dump" - path="/dev/shm/pkt_dump" -### note, file size unit: MB - file_size_max_per_thread=10000 - -### note: -### These configurations format is complex and difficult to describe with toml grammar, -### so, create a Independent config file to description specific information. -[SPECIAL_CONFIG_LINK] - project_list_path="./etc/project_list.conf" - plugin_path="./etc/plugin.conf" - entrylist_path="./etc/entrylist.conf" - send_raw_pkt_path="./etc/send_raw_pkt.conf" - vxlan_sport_service_map_path="./etc/vxlan_sport_service_map.conf" diff --git a/vendor/http.so b/vendor/http.so deleted file mode 100755 index c822ee3..0000000 Binary files a/vendor/http.so and /dev/null differ