diff --git a/src/preprocessors/Stream5/snort_stream5_session.c b/src/preprocessors/Stream5/snort_stream5_session.c index bd3d90d..47f3097 100644 --- a/src/preprocessors/Stream5/snort_stream5_session.c +++ b/src/preprocessors/Stream5/snort_stream5_session.c @@ -1150,7 +1150,7 @@ void PrintLWSessionCache(Stream5SessionCache *sessionCache) int Stream5SetRuntimeConfiguration( Stream5LWSession *lwssn, - char protocol + uint8_t protocol ) { Stream5Config *pPolicyConfig; diff --git a/src/preprocessors/Stream5/snort_stream5_session.h b/src/preprocessors/Stream5/snort_stream5_session.h index c388eed..29be798 100644 --- a/src/preprocessors/Stream5/snort_stream5_session.h +++ b/src/preprocessors/Stream5/snort_stream5_session.h @@ -90,7 +90,7 @@ void s5PrintPortFilter( int Stream5SetRuntimeConfiguration( Stream5LWSession *lwssn, - char protocol + uint8_t protocol ); #endif /* SNORT_STREAM5_SESSION_H_ */ diff --git a/src/preprocessors/Stream5/stream5_common.h b/src/preprocessors/Stream5/stream5_common.h index 76e6181..e098968 100644 --- a/src/preprocessors/Stream5/stream5_common.h +++ b/src/preprocessors/Stream5/stream5_common.h @@ -217,7 +217,7 @@ typedef struct _Stream5LWSession int16_t application_protocol; #endif - char protocol; + uint8_t protocol; char direction; char ignore_direction; /* flag to ignore traffic on this session */ diff --git a/src/preprocessors/spp_stream5.c b/src/preprocessors/spp_stream5.c index 1252de0..968542e 100644 --- a/src/preprocessors/spp_stream5.c +++ b/src/preprocessors/spp_stream5.c @@ -196,7 +196,7 @@ static int Stream5IgnoreChannel( uint16_t srcPort, snort_ip_p dstIP, uint16_t dstPort, - char protocol, + uint8_t protocol, char direction, char flags); static int Stream5GetIgnoreDirection( @@ -280,7 +280,7 @@ static int Stream5SetApplicationProtocolIdExpected( uint16_t srcPort, snort_ip_p dstIP, uint16_t dstPort, - char protocol, + uint8_t protocol, int16_t protoId); #endif static void s5SetPortFilterStatus( @@ -1577,7 +1577,7 @@ static int Stream5IgnoreChannel( uint16_t srcPort, snort_ip_p dstIP, uint16_t dstPort, - char protocol, + uint8_t protocol, char direction, char flags) { @@ -2189,7 +2189,7 @@ static int Stream5SetApplicationProtocolIdExpected( uint16_t srcPort, snort_ip_p dstIP, uint16_t dstPort, - char protocol, + uint8_t protocol, int16_t protoId) { return IgnoreChannel(srcIP, srcPort, dstIP, dstPort, diff --git a/src/preprocessors/stream_api.h b/src/preprocessors/stream_api.h index 380ad5f..ae79204 100644 --- a/src/preprocessors/stream_api.h +++ b/src/preprocessors/stream_api.h @@ -223,7 +223,7 @@ typedef struct _stream_api * -1 on failure */ int (*ignore_session)(snort_ip_p, uint16_t, snort_ip_p, uint16_t, - char, char, char); + uint8_t, char, char); /* Get direction that data is being ignored. * @@ -551,7 +551,7 @@ typedef struct _stream_api * -1 on failure */ int (*set_application_protocol_id_expected)(snort_ip_p, uint16_t, snort_ip_p, uint16_t, - char, int16_t); + uint8_t, int16_t); #endif // register for stateful scanning of in-order payload to determine flush points diff --git a/src/preprocessors/stream_ignore.c b/src/preprocessors/stream_ignore.c index f70f797..af0da32 100644 --- a/src/preprocessors/stream_ignore.c +++ b/src/preprocessors/stream_ignore.c @@ -66,7 +66,7 @@ typedef struct _IgnoreNode short port1; snort_ip ip2; short port2; - char protocol; + uint8_t protocol; time_t expires; int direction; int numOccurances; @@ -80,7 +80,7 @@ typedef struct _IgnoreHashKey snort_ip ip2; tSfPolicyId policyId; short port; - char protocol; + uint8_t protocol; char pad; } IgnoreHashKey; @@ -89,7 +89,7 @@ static SFGHASH *channelHash = NULL; int IgnoreChannel(snort_ip_p cliIP, uint16_t cliPort, snort_ip_p srvIP, uint16_t srvPort, - char protocol, char direction, char flags, + uint8_t protocol, char direction, char flags, uint32_t timeout, int16_t appId) { IgnoreHashKey hashKey; @@ -242,7 +242,7 @@ int isIgnored(Packet *p) { snort_ip_p srcIP, dstIP; short srcPort, dstPort; - char protocol; + uint8_t protocol; IgnoreHashKey hashKey; int retVal = 0; @@ -290,7 +290,7 @@ char CheckIgnoreChannel(Packet *p, int16_t *appId) { snort_ip_p srcIP, dstIP; short srcPort, dstPort; - char protocol; + uint8_t protocol; IgnoreHashKey hashKey; time_t now; diff --git a/src/preprocessors/stream_ignore.h b/src/preprocessors/stream_ignore.h index 38a341a..e67241e 100644 --- a/src/preprocessors/stream_ignore.h +++ b/src/preprocessors/stream_ignore.h @@ -42,7 +42,7 @@ int IgnoreChannel(snort_ip_p cliIP, uint16_t cliPort, snort_ip_p srvIP, uint16_t srvPort, - char protocol, char direction, char flags, + uint8_t protocol, char direction, char flags, uint32_t timeout, int16_t appId); char CheckIgnoreChannel(Packet *, int16_t *appId);