diff --git a/src/preprocessors/Stream5/snort_stream5_session.c b/src/preprocessors/Stream5/snort_stream5_session.c index 9b756fd..8b945f9 100644 --- a/src/preprocessors/Stream5/snort_stream5_session.c +++ b/src/preprocessors/Stream5/snort_stream5_session.c @@ -107,7 +107,7 @@ int GetLWSessionKeyFromIpPort( uint16_t srcPort, snort_ip_p dstIP, uint16_t dstPort, - char proto, + uint8_t proto, uint16_t vlan, uint32_t mplsId, uint16_t addressSpaceId, @@ -310,7 +310,7 @@ int GetLWSessionKeyFromIpPort( int GetLWSessionKey(Packet *p, SessionKey *key) { - char proto = GET_IPH_PROTO(p); + uint8_t proto = GET_IPH_PROTO(p); uint32_t mplsId = 0; uint16_t vlanId = 0; uint16_t sport = p->sp; diff --git a/src/preprocessors/Stream5/snort_stream5_session.h b/src/preprocessors/Stream5/snort_stream5_session.h index b31be42..e2993b1 100644 --- a/src/preprocessors/Stream5/snort_stream5_session.h +++ b/src/preprocessors/Stream5/snort_stream5_session.h @@ -70,7 +70,7 @@ int GetLWSessionKeyFromIpPort( uint16_t srcPort, snort_ip_p dstIP, uint16_t dstPort, - char proto, + uint8_t proto, uint16_t vlan, uint32_t mplsId, uint16_t addressSpaceId, diff --git a/src/preprocessors/Stream5/stream5_ha.c b/src/preprocessors/Stream5/stream5_ha.c index 861ef66..bba861e 100644 --- a/src/preprocessors/Stream5/stream5_ha.c +++ b/src/preprocessors/Stream5/stream5_ha.c @@ -754,7 +754,7 @@ void Stream5HAConfigFree(Stream5HAConfig *config) // This MUST have the exact same logic as GetLWSessionKeyFromIpPort() // TBD any alternative to this approach? static inline bool IsClientLower(const sfip_t *cltIP, uint16_t cltPort, - const sfip_t *srvIP, uint16_t srvPort, char proto) + const sfip_t *srvIP, uint16_t srvPort, uint8_t proto) { if (IS_IP4(cltIP)) { diff --git a/src/preprocessors/spp_stream5.c b/src/preprocessors/spp_stream5.c index a9c4bc3..448e510 100644 --- a/src/preprocessors/spp_stream5.c +++ b/src/preprocessors/spp_stream5.c @@ -256,7 +256,7 @@ static void *Stream5GetApplicationDataFromIpPort( uint16_t srcPort, snort_ip_p dstIP, uint16_t dstPort, - char ip_protocol, + uint8_t ip_protocol, uint16_t vlan, uint32_t mplsId, uint16_t addressSpaceId, @@ -336,7 +336,7 @@ static uint16_t s5GetPreprocessorStatusBit(void); static void s5SetPortFilterStatus( struct _SnortConfig *sc, - int protocol, + uint8_t protocol, uint16_t port, uint16_t status, tSfPolicyId policyId, @@ -345,7 +345,7 @@ static void s5SetPortFilterStatus( static void s5UnsetPortFilterStatus( struct _SnortConfig *sc, - int protocol, + uint8_t protocol, uint16_t port, uint16_t status, tSfPolicyId policyId, @@ -359,7 +359,7 @@ static void *Stream5GetSessionPtrFromIpPort( uint16_t srcPort, snort_ip_p dstIP, uint16_t dstPort, - char ip_protocol, + uint8_t ip_protocol, uint16_t vlan, uint32_t mplsId, uint16_t addressSpaceId); @@ -1937,7 +1937,7 @@ static void * Stream5GetSessionPtrFromIpPort( uint16_t srcPort, snort_ip_p dstIP, uint16_t dstPort, - char ip_protocol, + uint8_t ip_protocol, uint16_t vlan, uint32_t mplsId, uint16_t addressSpaceId) @@ -1998,7 +1998,7 @@ static void * Stream5GetApplicationDataFromIpPort( uint16_t srcPort, snort_ip_p dstIP, uint16_t dstPort, - char ip_protocol, + uint8_t ip_protocol, uint16_t vlan, uint32_t mplsId, uint16_t addressSpaceID, @@ -2656,7 +2656,7 @@ static uint16_t s5GetPreprocessorStatusBit(void) static void s5SetPortFilterStatus( struct _SnortConfig *sc, - int protocol, + uint8_t protocol, uint16_t port, uint16_t status, tSfPolicyId policyId, @@ -2680,7 +2680,7 @@ static void s5SetPortFilterStatus( static void s5UnsetPortFilterStatus( struct _SnortConfig *sc, - int protocol, + uint8_t protocol, uint16_t port, uint16_t status, tSfPolicyId policyId, diff --git a/src/preprocessors/stream_api.h b/src/preprocessors/stream_api.h index 2032838..09cd38e 100644 --- a/src/preprocessors/stream_api.h +++ b/src/preprocessors/stream_api.h @@ -552,7 +552,7 @@ typedef struct _stream_api * sure to set the parsing argument to 1. */ void (*set_port_filter_status)(struct _SnortConfig *sc, - int protocol, uint16_t port, uint16_t status, tSfPolicyId policyId, int parsing); + uint8_t protocol, uint16_t port, uint16_t status, tSfPolicyId policyId, int parsing); /** Unset port to maintain session state. This function can only * be used with independent bits acquired from @@ -561,7 +561,7 @@ typedef struct _stream_api * parsing argument to 1. */ void (*unset_port_filter_status)(struct _SnortConfig *sc, - int protocol, uint16_t port, uint16_t status, tSfPolicyId policyId, int parsing); + uint8_t protocol, uint16_t port, uint16_t status, tSfPolicyId policyId, int parsing); #ifdef ACTIVE_RESPONSE // initialize response count and expiration time @@ -713,7 +713,7 @@ typedef struct _stream_api * Returns * Application Data reference (pointer) */ - void *(*get_application_data_from_ip_port)(snort_ip_p, uint16_t, snort_ip_p, uint16_t, char, uint16_t, uint32_t, uint16_t, uint32_t); + void *(*get_application_data_from_ip_port)(snort_ip_p, uint16_t, snort_ip_p, uint16_t, uint8_t, uint16_t, uint32_t, uint16_t, uint32_t); //Register callbacks for extra data logging uint32_t (*reg_xtra_data_cb)(LogFunction ); @@ -751,7 +751,7 @@ typedef struct _stream_api * Returns * Stream session pointer */ - void *(*get_session_ptr_from_ip_port)(snort_ip_p, uint16_t, snort_ip_p, uint16_t, char, uint16_t, uint32_t, uint16_t); + void *(*get_session_ptr_from_ip_port)(snort_ip_p, uint16_t, snort_ip_p, uint16_t, uint8_t, uint16_t, uint32_t, uint16_t); /** Retrieve the session key given a stream session pointer. *