]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1272 in SNORT/snort3 from appid_httpMetaArray to master
authorMike Stepanek (mstepane) <mstepane@cisco.com>
Mon, 18 Jun 2018 18:40:04 +0000 (14:40 -0400)
committerMike Stepanek (mstepane) <mstepane@cisco.com>
Mon, 18 Jun 2018 18:40:04 +0000 (14:40 -0400)
commite072f28785aec2fe6f4d0c54b5a8a035aa68e0b0
tree7171a884ca4b052df7754543ffc78b26c9cdca51
parent921ac13b7efb1d335a5927d69e1082c927695def
Merge pull request #1272 in SNORT/snort3 from appid_httpMetaArray to master

Squashed commit of the following:

commit 8cf36b098955d12fed86df29ff29c654be8249f9
Author: Silviu Minut <sminut@cisco.com>
Date:   Wed Jun 13 18:33:15 2018 -0400

    appid: consolidate http metadata by removing the string pointers and keeping an array of pointers and offsets.

    appid: add convenience get_cfield function returning a char* rather than string*

    appid: add back get_xff_addr(), which was mistakenly removed.

    appid: use the convenince get_cfield function

    appid: code clean-up

    appid: reduce the size of the meta_offset array and add comments to the HttpFieldIds enum.

    appid: nit pick fixes and temporary static friend function inside the AppIdHttpSession class.

    appid: revert the static friend experiment and make the meta_offset array protected in AppIdHttpSession, with public set/get functions.

    appid: uncrustify

    appid: provide separate get/set functions for offsets, do away with MAX_PATTERN_TYPE and rename MAX_HTTP_FIELD_ID to NUM_HTTP_FIELDS

    appid: uncrustify appid_http_session.h

commit ef1aedfc90c2e25db192f5ead615f9d36f6c9757
Author: Silviu Minut <sminut@cisco.com>
Date:   Fri Jun 8 23:04:48 2018 -0400

    appid: remove http_fields array from AppIdHttpSession

    appid: consolidate http metadata in appid by removing the http_fields array from http session. Needs clean-up.

    appid: code clean-up for removing duplicate http metadata and unit test fix.

    appid: clean-up after rebase to master

    appid: remove commented out http_fields array

    appid: do not delete metadata string pointers in AppIdHttpSession::process_http_packet
16 files changed:
src/network_inspectors/appid/appid_detector.cc
src/network_inspectors/appid/appid_discovery.cc
src/network_inspectors/appid/appid_http_event_handler.cc
src/network_inspectors/appid/appid_http_session.cc
src/network_inspectors/appid/appid_http_session.h
src/network_inspectors/appid/appid_session.cc
src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
src/network_inspectors/appid/detector_plugins/http_url_patterns.h
src/network_inspectors/appid/detector_plugins/test/detector_plugins_mock.h
src/network_inspectors/appid/detector_plugins/test/http_url_patterns_test.cc
src/network_inspectors/appid/lua_detector_api.cc
src/network_inspectors/appid/service_plugins/service_rtmp.cc
src/network_inspectors/appid/test/appid_detector_test.cc
src/network_inspectors/appid/test/appid_http_event_test.cc
src/network_inspectors/appid/test/appid_mock_http_session.h
src/network_inspectors/appid/tp_appid_utils.cc