Snort mailing list archives
Re: Snort 2.8 compile error
From: Adam Keeton <akeeton () sourcefire com>
Date: Fri, 28 Sep 2007 11:55:39 -0400
../../src/ipv6_port.h:71: error: conflicting types for 'ip_t' /usr/include/dnet/ip.h:411: error: previous declaration of 'ip_t' was here In file included from sp_respond2.c:99: ../../src/decode.h:948:1: warning: "IP_PROTO_HOPOPTS" redefined In file included from /usr/include/dnet.h:15, from sp_respond2.c:97: /usr/include/dnet/ip.h:97:1: warning: this is the location of the previous definition sp_respond2.c: In function `Respond2Init': sp_respond2.c:260: warning: assignment from incompatible pointer type sp_respond2.c: In function `Respond2Restart': sp_respond2.c:299: warning: passing arg 1 of `ip_close' from incompatible pointer type sp_respond2.c:299: warning: assignment from incompatible pointer type sp_respond2.c: In function `SendReset': sp_respond2.c:682: warning: passing arg 1 of `ip_send' from incompatible pointer type sp_respond2.c: In function `SendUnreach': sp_respond2.c:806: warning: passing arg 1 of `ip_send' from incompatible pointer type make[3]: *** [sp_respond2.o] Error 1 make[3]: Leaving directory `/home/jlay/snort-2.8.0/src/detection-plugins' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/home/jlay/snort-2.8.0/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jlay/snort-2.8.0' make: *** [all] Error 2 Any hints on how to fixie this? JamesThanks for the report. I'm working on a fix right now. As as work around, you can rerun configure without --enable-flexresp2 and recompile.Excellent...thank you :) James
Check out a fresh copy of 2.8 from CVS (Or update your copy if you have already checked out 2.8): cvs -d:pserver:anonymous () cvs snort org:/cvsroot co -r SNORT_2_8_0 snort And apply the attached patch. Let us know if that fixes the problem. Thanks, Adam -- Adam Keeton Software Engineer Snort Team Sourcefire,Inc www.snort.org www.sourcefire.com
Index: src/detect.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/detect.c,v retrieving revision 1.67 diff -u -r1.67 detect.c --- src/detect.c 20 Aug 2007 17:14:14 -0000 1.67 +++ src/detect.c 28 Sep 2007 15:19:20 -0000 @@ -536,7 +536,7 @@ Packet *p, u_int32_t flags, int mode) { - ip_p pkt_addr; /* packet IP address */ + snort_ip_p pkt_addr; /* packet IP address */ u_short pkt_port; /* packet port */ int global_except_addr_flag = 0; /* global exception flag is set */ int any_port_flag = 0; /* any port flag set */ @@ -2251,7 +2251,7 @@ void ObfuscatePacket(Packet *p) { - ip_t cleared; + snort_ip cleared; IP_CLEAR(cleared); /* only obfuscate once */ Index: src/fpdetect.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/fpdetect.c,v retrieving revision 1.36 diff -u -r1.36 fpdetect.c --- src/fpdetect.c 20 Aug 2007 17:14:13 -0000 1.36 +++ src/fpdetect.c 28 Sep 2007 15:19:20 -0000 @@ -285,7 +285,7 @@ #else #define CLEARED cleared #endif - ip_t cleared; + snort_ip cleared; IP_CLEAR(cleared); if( !sfthreshold_test( otn->event_data.sig_generator, Index: src/ipv6_port.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/ipv6_port.h,v retrieving revision 1.1 diff -u -r1.1 ipv6_port.h --- src/ipv6_port.h 20 Aug 2007 17:28:41 -0000 1.1 +++ src/ipv6_port.h 28 Sep 2007 15:19:20 -0000 @@ -7,8 +7,8 @@ #include "sf_ip.h" -typedef sfip_t ip_t; -typedef sfip_t *ip_p; +typedef sfip_t snort_ip; +typedef sfip_t *snort_ip_p; #define IpAddrNode sfip_node_t #define IpAddrSet sfip_var_t @@ -68,8 +68,8 @@ #include <config.h> #endif -typedef u_int32_t ip_t; /* 32 bits only -- don't use unsigned long */ -typedef u_int32_t ip_p; /* 32 bits only -- don't use unsigned long */ +typedef u_int32_t snort_ip; /* 32 bits only -- don't use unsigned long */ +typedef u_int32_t snort_ip_p; /* 32 bits only -- don't use unsigned long */ #define IP_SRC_EQUALITY(x,y) (x->ip_addr == (y->iph->ip_src.s_addr & x->netmask)) #define IP_DST_EQUALITY(x,y) (x->ip_addr == (y->iph->ip_dst.s_addr & x->netmask)) Index: src/sfthreshold.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/sfthreshold.c,v retrieving revision 1.22 diff -u -r1.22 sfthreshold.c --- src/sfthreshold.c 20 Aug 2007 17:39:53 -0000 1.22 +++ src/sfthreshold.c 28 Sep 2007 15:19:20 -0000 @@ -587,7 +587,7 @@ * DEBUGGING ONLY */ #ifdef SUP_IP6 -void print_netip(ip_p ip) +void print_netip(snort_ip_p ip) { printf("%s", sfip_ntoa(ip)); } @@ -645,7 +645,7 @@ static #ifdef SUP_IP6 -void ntoa( char * buff, int blen, ip_p ip ) +void ntoa( char * buff, int blen, snort_ip_p ip ) { SnortSnprintf(buff,blen,"%s", sfip_ntoa(ip)); @@ -945,7 +945,7 @@ */ -int sfthreshold_test( unsigned gen_id, unsigned sig_id, ip_p sip, ip_p dip, long curtime ) +int sfthreshold_test( unsigned gen_id, unsigned sig_id, snort_ip_p sip, snort_ip_p dip, long curtime ) { if( !s_enabled ) { Index: src/sfthreshold.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/sfthreshold.h,v retrieving revision 1.7 diff -u -r1.7 sfthreshold.h --- src/sfthreshold.h 20 Aug 2007 17:39:53 -0000 1.7 +++ src/sfthreshold.h 28 Sep 2007 15:19:20 -0000 @@ -34,7 +34,7 @@ void sfthreshold_reset(void); int sfthreshold_create( THDX_STRUCT * thdx ); -int sfthreshold_test( unsigned gen_id,unsigned sig_id, ip_p sip, ip_p dip, long curtime ); +int sfthreshold_test( unsigned gen_id,unsigned sig_id, snort_ip_p sip, snort_ip_p dip, long curtime ); void print_thresholding(); Index: src/tag.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/tag.c,v retrieving revision 1.46 diff -u -r1.46 tag.c --- src/tag.c 7 Sep 2007 17:57:26 -0000 1.46 +++ src/tag.c 28 Sep 2007 15:19:20 -0000 @@ -77,8 +77,8 @@ ubi_trNode Node; /* ip addrs */ - ip_t sip; - ip_t dip; + snort_ip sip; + snort_ip dip; /* ports */ u_int16_t sp; @@ -256,7 +256,7 @@ */ static INLINE void SwapTag(TagNode *np) { - ip_t tip; + snort_ip tip; u_int16_t tport; tip = np->sip; Index: src/detection-plugins/sp_respond.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/detection-plugins/sp_respond.c,v retrieving revision 1.34 diff -u -r1.34 sp_respond.c --- src/detection-plugins/sp_respond.c 20 Aug 2007 17:06:53 -0000 1.34 +++ src/detection-plugins/sp_respond.c 28 Sep 2007 15:19:20 -0000 @@ -55,8 +55,8 @@ void RespondInit(char *, OptTreeNode *, int ); void RespondRestartFunction(int, void *); int ParseResponse(char *); -int SendICMP_UNREACH(int, ip_p, ip_p, Packet *); -int SendTCPRST(ip_p, ip_p, u_short, u_short, u_long, u_long, u_short); +int SendICMP_UNREACH(int, snort_ip_p, snort_ip_p, Packet *); +int SendTCPRST(snort_ip_p, snort_ip_p, u_short, u_short, u_long, u_long, u_short); int Respond(Packet *, RspFpList *); @@ -393,7 +393,7 @@ } -int SendICMP_UNREACH(int code, ip_p saddr, ip_p daddr, Packet * p) +int SendICMP_UNREACH(int code, snort_ip_p saddr, snort_ip_p daddr, Packet * p) { int payload_len, sz; IPHdr *iph; @@ -450,7 +450,7 @@ } -int SendTCPRST(ip_p saddr, ip_p daddr, u_short sport, u_short dport, +int SendTCPRST(snort_ip_p saddr, snort_ip_p daddr, u_short sport, u_short dport, u_long seq, u_long ack, u_short win) { int sz = IP_H + TCP_H; Index: src/detection-plugins/sp_respond2.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/detection-plugins/sp_respond2.c,v retrieving revision 1.8 diff -u -r1.8 sp_respond2.c --- src/detection-plugins/sp_respond2.c 20 Aug 2007 17:06:53 -0000 1.8 +++ src/detection-plugins/sp_respond2.c 28 Sep 2007 15:19:20 -0000 @@ -137,7 +137,7 @@ int rows; /* response cache size (in rows) */ int memcap; /* response cache memcap */ u_int8_t respond_attempts; /* respond attempts per trigger */ - ip_t *rawdev; /* dnet(3) raw IP handle */ + snort_ip *rawdev; /* dnet(3) raw IP handle */ eth_t *ethdev; /* dnet(3) ethernet device handle */ rand_t *randh; /* dnet(3) rand handle */ } RESPOND2_CONFIG; Index: src/dynamic-plugins/sf_dynamic_preprocessor.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/dynamic-plugins/sf_dynamic_preprocessor.h,v retrieving revision 1.11 diff -u -r1.11 sf_dynamic_preprocessor.h --- src/dynamic-plugins/sf_dynamic_preprocessor.h 20 Aug 2007 17:34:25 -0000 1.11 +++ src/dynamic-plugins/sf_dynamic_preprocessor.h 28 Sep 2007 15:19:20 -0000 @@ -68,7 +68,7 @@ typedef int (*AlertQueueAdd)(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, char *, void *); typedef void (*PreprocRegisterFunc)(char *, PreprocessorInitFunc); -typedef int (*ThresholdCheckFunc)(unsigned int, unsigned int, ip_p, ip_p, long); +typedef int (*ThresholdCheckFunc)(unsigned int, unsigned int, snort_ip_p, snort_ip_p, long); typedef int (*InlineFunc)(); typedef int (*InlineDropFunc)(void *); typedef void (*DisableDetectFunc)(void *); Index: src/dynamic-preprocessors/ftptelnet/ftpp_si.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/dynamic-preprocessors/ftptelnet/ftpp_si.h,v retrieving revision 1.5 diff -u -r1.5 ftpp_si.h --- src/dynamic-preprocessors/ftptelnet/ftpp_si.h 20 Aug 2007 17:32:22 -0000 1.5 +++ src/dynamic-preprocessors/ftptelnet/ftpp_si.h 28 Sep 2007 15:19:20 -0000 @@ -148,9 +148,9 @@ int data_chan_state; int data_chan_index; int data_xfer_index; - ip_t clientIP; + snort_ip clientIP; u_int16_t clientPort; - ip_t serverIP; + snort_ip serverIP; u_int16_t serverPort; /* @@ -177,8 +177,8 @@ */ typedef struct s_FTPP_SI_INPUT { - ip_t sip; - ip_t dip; + snort_ip sip; + snort_ip dip; unsigned short sport; unsigned short dport; unsigned char pdir; Index: src/dynamic-preprocessors/ftptelnet/ftpp_ui_client_lookup.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/dynamic-preprocessors/ftptelnet/ftpp_ui_client_lookup.c,v retrieving revision 1.5 diff -u -r1.5 ftpp_ui_client_lookup.c --- src/dynamic-preprocessors/ftptelnet/ftpp_ui_client_lookup.c 20 Aug 2007 17:32:22 -0000 1.5 +++ src/dynamic-preprocessors/ftptelnet/ftpp_ui_client_lookup.c 28 Sep 2007 15:19:20 -0000 @@ -168,7 +168,7 @@ * */ FTP_CLIENT_PROTO_CONF *ftpp_ui_client_lookup_find(CLIENT_LOOKUP *ClientLookup, - ip_p Ip, int *iError) + snort_ip_p Ip, int *iError) { FTP_CLIENT_PROTO_CONF *ClientConf = NULL; Index: src/dynamic-preprocessors/ftptelnet/ftpp_ui_client_lookup.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/dynamic-preprocessors/ftptelnet/ftpp_ui_client_lookup.h,v retrieving revision 1.3 diff -u -r1.3 ftpp_ui_client_lookup.h --- src/dynamic-preprocessors/ftptelnet/ftpp_ui_client_lookup.h 20 Aug 2007 17:32:22 -0000 1.3 +++ src/dynamic-preprocessors/ftptelnet/ftpp_ui_client_lookup.h 28 Sep 2007 15:19:20 -0000 @@ -37,11 +37,11 @@ int ftpp_ui_client_lookup_init(CLIENT_LOOKUP **ClientLookup); int ftpp_ui_client_lookup_cleanup(CLIENT_LOOKUP **ClientLookup); -int ftpp_ui_client_lookup_add(CLIENT_LOOKUP *ClientLookup, ip_p IP, +int ftpp_ui_client_lookup_add(CLIENT_LOOKUP *ClientLookup, snort_ip_p IP, FTP_CLIENT_PROTO_CONF *ClientConf); FTP_CLIENT_PROTO_CONF *ftpp_ui_client_lookup_find(CLIENT_LOOKUP *ClientLookup, - ip_p Ip, int *iError); + snort_ip_p Ip, int *iError); FTP_CLIENT_PROTO_CONF *ftpp_ui_client_lookup_first(CLIENT_LOOKUP *ClientLookup, int *iError); FTP_CLIENT_PROTO_CONF *ftpp_ui_client_lookup_next(CLIENT_LOOKUP *ClientLookup, Index: src/dynamic-preprocessors/ftptelnet/ftpp_ui_config.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/dynamic-preprocessors/ftptelnet/ftpp_ui_config.c,v retrieving revision 1.7 diff -u -r1.7 ftpp_ui_config.c --- src/dynamic-preprocessors/ftptelnet/ftpp_ui_config.c 20 Aug 2007 17:32:22 -0000 1.7 +++ src/dynamic-preprocessors/ftptelnet/ftpp_ui_config.c 28 Sep 2007 15:19:20 -0000 @@ -325,7 +325,7 @@ * */ int ftpp_ui_config_add_ftp_server(FTPTELNET_GLOBAL_CONF *GlobalConf, - ip_p ServerIP, FTP_SERVER_PROTO_CONF *ServerConf) + snort_ip_p ServerIP, FTP_SERVER_PROTO_CONF *ServerConf) { int iRet; @@ -398,7 +398,7 @@ * */ int ftpp_ui_config_add_ftp_client(FTPTELNET_GLOBAL_CONF *GlobalConf, - ip_p ClientIP, FTP_CLIENT_PROTO_CONF *ClientConf) + snort_ip_p ClientIP, FTP_CLIENT_PROTO_CONF *ClientConf) { int iRet; Index: src/dynamic-preprocessors/ftptelnet/ftpp_ui_config.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/dynamic-preprocessors/ftptelnet/ftpp_ui_config.h,v retrieving revision 1.6 diff -u -r1.6 ftpp_ui_config.h --- src/dynamic-preprocessors/ftptelnet/ftpp_ui_config.h 20 Aug 2007 17:32:22 -0000 1.6 +++ src/dynamic-preprocessors/ftptelnet/ftpp_ui_config.h 28 Sep 2007 15:19:20 -0000 @@ -218,7 +218,7 @@ typedef struct s_FTP_BOUNCE_TO { - ip_t ip; + snort_ip ip; int relevant_bits; unsigned short portlo; unsigned short porthi; @@ -299,8 +299,8 @@ int ftpp_ui_config_reset_telnet_proto(TELNET_PROTO_CONF *ClientConf); int ftpp_ui_config_add_ftp_client(FTPTELNET_GLOBAL_CONF *GlobalConf, - ip_p ClientIP, FTP_CLIENT_PROTO_CONF *ClientConf); + snort_ip_p ClientIP, FTP_CLIENT_PROTO_CONF *ClientConf); int ftpp_ui_config_add_ftp_server(FTPTELNET_GLOBAL_CONF *GlobalConf, - ip_p ClientIP, FTP_SERVER_PROTO_CONF *ClientConf); + snort_ip_p ClientIP, FTP_SERVER_PROTO_CONF *ClientConf); #endif Index: src/dynamic-preprocessors/ftptelnet/ftpp_ui_server_lookup.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/dynamic-preprocessors/ftptelnet/ftpp_ui_server_lookup.h,v retrieving revision 1.3 diff -u -r1.3 ftpp_ui_server_lookup.h --- src/dynamic-preprocessors/ftptelnet/ftpp_ui_server_lookup.h 20 Aug 2007 17:32:22 -0000 1.3 +++ src/dynamic-preprocessors/ftptelnet/ftpp_ui_server_lookup.h 28 Sep 2007 15:19:20 -0000 @@ -35,11 +35,11 @@ int ftpp_ui_server_lookup_init(SERVER_LOOKUP **ServerLookup); int ftpp_ui_server_lookup_cleanup(SERVER_LOOKUP **ServerLookup); -int ftpp_ui_server_lookup_add(SERVER_LOOKUP *ServerLookup, ip_p IP, +int ftpp_ui_server_lookup_add(SERVER_LOOKUP *ServerLookup, snort_ip_p IP, FTP_SERVER_PROTO_CONF *ServerConf); FTP_SERVER_PROTO_CONF *ftpp_ui_server_lookup_find(SERVER_LOOKUP *ServerLookup, - ip_p Ip, int *iError); + snort_ip_p Ip, int *iError); FTP_SERVER_PROTO_CONF *ftpp_ui_server_lookup_first(SERVER_LOOKUP *ServerLookup, int *iError); FTP_SERVER_PROTO_CONF *ftpp_ui_server_lookup_next(SERVER_LOOKUP *ServerLookup, Index: src/dynamic-preprocessors/ftptelnet/pp_ftp.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/dynamic-preprocessors/ftptelnet/pp_ftp.c,v retrieving revision 1.14 diff -u -r1.14 pp_ftp.c --- src/dynamic-preprocessors/ftptelnet/pp_ftp.c 7 Sep 2007 17:58:20 -0000 1.14 +++ src/dynamic-preprocessors/ftptelnet/pp_ftp.c 28 Sep 2007 15:19:20 -0000 @@ -102,7 +102,7 @@ * */ int getIP(const char **ip_start, const char *last_char, char term_char, - ip_t *ipRet, u_int16_t *portRet) + snort_ip *ipRet, u_int16_t *portRet) { u_int32_t ip=0; u_int16_t port=0; @@ -468,7 +468,7 @@ case e_host_port: /* check that this_param is #,#,#,#,#,# */ { - ip_t ip; + snort_ip ip; u_int16_t port=0; int ret = getIP(&this_param, end, ' ', &ip, &port); @@ -772,7 +772,7 @@ Session->data_chan_index = -1; if (rsp_code == 227) { - ip_t ip; + snort_ip ip; u_int16_t port=0; const char *ip_begin = req->param_begin; IP_CLEAR(ip); Index: src/dynamic-preprocessors/ftptelnet/snort_ftptelnet.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/dynamic-preprocessors/ftptelnet/snort_ftptelnet.c,v retrieving revision 1.22 diff -u -r1.22 snort_ftptelnet.c --- src/dynamic-preprocessors/ftptelnet/snort_ftptelnet.c 31 Aug 2007 18:23:23 -0000 1.22 +++ src/dynamic-preprocessors/ftptelnet/snort_ftptelnet.c 28 Sep 2007 15:19:20 -0000 @@ -852,7 +852,7 @@ #ifndef INADDR_NONE #define INADDR_NONE -1 #endif -int GetIPAddr(char *addrString, ip_t *ipAddr, +int GetIPAddr(char *addrString, snort_ip *ipAddr, char *ErrorString, int ErrStrLen) { #ifdef SUP_IP6 @@ -2254,11 +2254,11 @@ while ((pcToken = NextToken(CONF_SEPARATORS)) != NULL) { FTP_BOUNCE_TO *newBounce; - ip_t ipaddr; + snort_ip ipaddr; int bits; u_int16_t portlow; u_int16_t porthigh; - ip_t *ipPtr; + snort_ip *ipPtr; if(!strcmp(END_PORT_LIST, pcToken)) { @@ -2301,13 +2301,13 @@ newBounce->porthi = porthigh; #ifdef SUP_IP6 IP_COPY_VALUE(newBounce->ip, &ipaddr); - ipPtr = (ip_t *)&ipaddr; + ipPtr = (snort_ip *)&ipaddr; #else newBounce->ip = ipaddr; - ipPtr = (ip_t *)&ipaddr; + ipPtr = (snort_ip *)&ipaddr; #endif iRet = ftp_bounce_lookup_add(ClientConf->bounce_lookup, (char *)ipPtr, - sizeof(ip_t), newBounce); + sizeof(snort_ip), newBounce); if (iRet) { free(newBounce); @@ -2380,7 +2380,7 @@ while (FTPBounce) { #ifdef SUP_IP6 - ip_p addr; + snort_ip_p addr; addr = &FTPBounce->ip; #else struct in_addr addr; @@ -2541,7 +2541,7 @@ client = NextToken(CONF_SEPARATORS); if(strcmp(DEFAULT, client)) { - ip_t ipAddr; + snort_ip ipAddr; IP_CLEAR(ipAddr); iRet = GetIPAddr(client, &ipAddr, ErrorString, ErrStrLen); if (iRet) @@ -2932,7 +2932,7 @@ server = NextToken(CONF_SEPARATORS); if(strcmp(DEFAULT, server)) { - ip_t ipAddr; + snort_ip ipAddr; IP_CLEAR(ipAddr); iRet = GetIPAddr(server, &ipAddr, ErrorString, ErrStrLen); if (iRet) Index: src/output-plugins/spo_alert_sf_socket.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/output-plugins/spo_alert_sf_socket.c,v retrieving revision 1.8 diff -u -r1.8 spo_alert_sf_socket.c --- src/output-plugins/spo_alert_sf_socket.c 7 Sep 2007 18:02:31 -0000 1.8 +++ src/output-plugins/spo_alert_sf_socket.c 28 Sep 2007 15:19:20 -0000 @@ -59,8 +59,8 @@ u_int32_t tv_sec; u_int32_t generator; u_int32_t sid; - ip_t src_ip; - ip_t dest_ip; + snort_ip src_ip; + snort_ip dest_ip; u_int16_t sport; u_int16_t dport; u_int8_t protocol; Index: src/output-plugins/spo_log_ascii.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/output-plugins/spo_log_ascii.c,v retrieving revision 1.19 diff -u -r1.19 spo_log_ascii.c --- src/output-plugins/spo_log_ascii.c 20 Aug 2007 17:26:05 -0000 1.19 +++ src/output-plugins/spo_log_ascii.c 28 Sep 2007 15:19:20 -0000 @@ -187,7 +187,7 @@ char suffix[5]; /* filename suffix */ FILE *log_ptr = NULL; #ifdef SUP_IP6 - ip_p ip; + snort_ip_p ip; #endif #ifdef WIN32 Index: src/output-plugins/spo_unified.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/output-plugins/spo_unified.c,v retrieving revision 1.60 diff -u -r1.60 spo_unified.c --- src/output-plugins/spo_unified.c 20 Aug 2007 17:25:25 -0000 1.60 +++ src/output-plugins/spo_unified.c 28 Sep 2007 15:19:20 -0000 @@ -139,8 +139,8 @@ { Event event; struct timeval32 ts; /* event timestamp */ - ip_t sip; /* src ip */ - ip_t dip; /* dest ip */ + snort_ip sip; /* src ip */ + snort_ip dip; /* dest ip */ u_int16_t sp; /* src port */ u_int16_t dp; /* dest port */ u_int32_t protocol; /* protocol id */ Index: src/output-plugins/spo_unified2.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/output-plugins/spo_unified2.c,v retrieving revision 1.3 diff -u -r1.3 spo_unified2.c --- src/output-plugins/spo_unified2.c 7 Sep 2007 18:00:24 -0000 1.3 +++ src/output-plugins/spo_unified2.c 28 Sep 2007 15:19:20 -0000 @@ -430,7 +430,7 @@ if(IPH_IS_VALID(p)) { - ip_p ip; + snort_ip_p ip; ip = GET_SRC_IP(p); alertdata.ip_source = *(struct in6_addr*)ip->ip32; ip = GET_DST_IP(p); Index: src/preprocessors/portscan.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/portscan.c,v retrieving revision 1.13 diff -u -r1.13 portscan.c --- src/preprocessors/portscan.c 7 Sep 2007 17:59:20 -0000 1.13 +++ src/preprocessors/portscan.c 28 Sep 2007 15:19:20 -0000 @@ -134,8 +134,8 @@ typedef struct s_PS_HASH_KEY { - ip_t scanner; - ip_t scanned; + snort_ip scanner; + snort_ip scanned; } PS_HASH_KEY; @@ -343,7 +343,7 @@ */ #ifdef SUP_IP6 static int ps_ignore_ip(ip_p scanner, unsigned short scanner_port, - ip_p scanned, unsigned short scanned_port) + snort_ip_p scanned, unsigned short scanned_port) #else static int ps_ignore_ip(unsigned long scanner, unsigned short scanner_port, unsigned long scanned, unsigned short scanned_port) @@ -396,7 +396,7 @@ FLOW *flow; int reverse_pkt = 0; #ifdef SUP_IP6 - ip_p scanner, scanned; + snort_ip_p scanner, scanned; #else unsigned long scanner; unsigned long scanned; @@ -800,7 +800,7 @@ ** @param u_short port/ip_proto to track ** @param time_t time the packet was received. update windows. */ -static int ps_proto_update(PS_PROTO *proto, int ps_cnt, int pri_cnt, ip_p ip, +static int ps_proto_update(PS_PROTO *proto, int ps_cnt, int pri_cnt, snort_ip_p ip, u_short port, time_t pkt_time) { if(!proto) @@ -970,7 +970,7 @@ time_t pkt_time; FLOW *flow; u_int32_t session_flags; - ip_t cleared; + snort_ip cleared; IP_CLEAR(cleared); p = (Packet *)ps_pkt->pkt; @@ -1192,7 +1192,7 @@ Packet *p; time_t pkt_time; FLOW *flow; - ip_t cleared; + snort_ip cleared; IP_CLEAR(cleared); p = (Packet *)ps_pkt->pkt; @@ -1258,7 +1258,7 @@ Packet *p; time_t pkt_time; FLOW *flow; - ip_t cleared; + snort_ip cleared; IP_CLEAR(cleared); p = (Packet *)ps_pkt->pkt; @@ -1373,7 +1373,7 @@ { Packet *p; time_t pkt_time; - ip_t cleared; + snort_ip cleared; IP_CLEAR(cleared); p = (Packet *)ps_pkt->pkt; Index: src/preprocessors/portscan.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/portscan.h,v retrieving revision 1.8 diff -u -r1.8 portscan.h --- src/preprocessors/portscan.h 7 Sep 2007 17:59:20 -0000 1.8 +++ src/preprocessors/portscan.h 28 Sep 2007 15:19:20 -0000 @@ -48,9 +48,9 @@ unsigned short low_p; unsigned short u_ports; - ip_t high_ip; - ip_t low_ip; - ip_t u_ips; + snort_ip high_ip; + snort_ip low_ip; + snort_ip u_ips; unsigned short open_ports[PS_OPEN_PORTS]; unsigned char open_ports_cnt; Index: src/preprocessors/snort_httpinspect.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/snort_httpinspect.c,v retrieving revision 1.27 diff -u -r1.27 snort_httpinspect.c --- src/preprocessors/snort_httpinspect.c 20 Aug 2007 17:30:19 -0000 1.27 +++ src/preprocessors/snort_httpinspect.c 28 Sep 2007 15:19:20 -0000 @@ -1881,7 +1881,7 @@ { char *pcToken; #ifdef SUP_IP6 - ip_p Ip; + snort_ip_p Ip; #else unsigned long Ip; struct in_addr ip_addr; Index: src/preprocessors/snort_stream4_session.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/snort_stream4_session.c,v retrieving revision 1.18 diff -u -r1.18 snort_stream4_session.c --- src/preprocessors/snort_stream4_session.c 20 Aug 2007 17:30:19 -0000 1.18 +++ src/preprocessors/snort_stream4_session.c 28 Sep 2007 15:19:20 -0000 @@ -88,7 +88,7 @@ int GetSessionKey(Packet *p, SessionHashKey *key) { - ip_p srcIp, dstIp; + snort_ip_p srcIp, dstIp; u_int16_t srcPort, dstPort; if (!key) Index: src/preprocessors/spp_sfportscan.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/spp_sfportscan.c,v retrieving revision 1.23 diff -u -r1.23 spp_sfportscan.c --- src/preprocessors/spp_sfportscan.c 7 Sep 2007 17:59:20 -0000 1.23 +++ src/preprocessors/spp_sfportscan.c 28 Sep 2007 15:19:20 -0000 @@ -232,8 +232,8 @@ u_int32_t event_ref, u_int32_t gen_id, u_int32_t sig_id) { char timebuf[TIMEBUF_SIZE]; - ip_p src_addr; - ip_p dst_addr; + snort_ip_p src_addr; + snort_ip_p dst_addr; if(!p->iph) return -1; Index: src/preprocessors/spp_stream4.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/spp_stream4.c,v retrieving revision 1.221 diff -u -r1.221 spp_stream4.c --- src/preprocessors/spp_stream4.c 20 Aug 2007 17:15:54 -0000 1.221 +++ src/preprocessors/spp_stream4.c 28 Sep 2007 15:19:20 -0000 @@ -286,8 +286,8 @@ { u_int32_t start_time; u_int32_t end_time; - ip_t sip; - ip_t cip; + snort_ip sip; + snort_ip cip; u_int16_t sport; u_int16_t cport; u_int32_t spackets; @@ -442,7 +442,7 @@ static void Stream4UpdateDirection( void * ssnptr, char dir, - ip_p ip, + snort_ip_p ip, u_int16_t port) { } static u_int32_t Stream4GetPacketDirection( Packet *p) { return 0;} @@ -453,9 +453,9 @@ int32_t bytes, int response); static int Stream4IgnoreChannel( - ip_p srcIP, + snort_ip_p srcIP, u_int16_t srcPort, - ip_p dstIP, + snort_ip_p dstIP, u_int16_t dstPort, char protocol, char direction, @@ -7049,8 +7049,8 @@ PREPROC_PROFILE_END(stream4ActionAsyncPerfStats); } -int Stream4IgnoreChannel(ip_p cliIP, u_int16_t cliPort, - ip_p srvIP, u_int16_t srvPort, +int Stream4IgnoreChannel(snort_ip_p cliIP, u_int16_t cliPort, + snort_ip_p srvIP, u_int16_t srvPort, char protocol, char direction, char flags) { return IgnoreChannel(cliIP, cliPort, Index: src/preprocessors/spp_stream5.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/spp_stream5.c,v retrieving revision 1.14 diff -u -r1.14 spp_stream5.c --- src/preprocessors/spp_stream5.c 7 Sep 2007 18:03:49 -0000 1.14 +++ src/preprocessors/spp_stream5.c 28 Sep 2007 15:19:20 -0000 @@ -134,7 +134,7 @@ static void Stream5UpdateDirection( void * ssnptr, char dir, - ip_p ip, + snort_ip_p ip, u_int16_t port); static u_int32_t Stream5GetPacketDirection( Packet *p); @@ -145,9 +145,9 @@ int32_t bytes, int response); static int Stream5IgnoreChannel( - ip_p srcIP, + snort_ip_p srcIP, u_int16_t srcPort, - ip_p dstIP, + snort_ip_p dstIP, u_int16_t dstPort, char protocol, char direction, @@ -1111,9 +1111,9 @@ } static int Stream5IgnoreChannel( - ip_p srcIP, + snort_ip_p srcIP, u_int16_t srcPort, - ip_p dstIP, + snort_ip_p dstIP, u_int16_t dstPort, char protocol, char direction, @@ -1210,7 +1210,7 @@ static void Stream5UpdateDirection( void * ssnptr, char dir, - ip_p ip, + snort_ip_p ip, u_int16_t port) { Stream5LWSession *ssn = (Stream5LWSession *)ssnptr; Index: src/preprocessors/stream.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/stream.h,v retrieving revision 1.24 diff -u -r1.24 stream.h --- src/preprocessors/stream.h 20 Aug 2007 17:30:19 -0000 1.24 +++ src/preprocessors/stream.h 28 Sep 2007 15:19:20 -0000 @@ -65,7 +65,7 @@ typedef struct _Stream { - ip_t ip; /* IP addr */ + snort_ip ip; /* IP addr */ u_int16_t port; /* port number */ u_int8_t state; /* stream state */ u_int32_t isn; /* initial sequence number */ @@ -98,8 +98,8 @@ typedef struct _SessionHashKey { - ip_t lowIP; - ip_t highIP; + snort_ip lowIP; + snort_ip highIP; u_int16_t port; /* If IPs are the same, this will be the lower of * the two ports. Otherwise, it will be the port * corresponding to lowIP. */ Index: src/preprocessors/stream_api.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/stream_api.h,v retrieving revision 1.13 diff -u -r1.13 stream_api.h --- src/preprocessors/stream_api.h 7 Sep 2007 18:04:05 -0000 1.13 +++ src/preprocessors/stream_api.h 28 Sep 2007 15:19:20 -0000 @@ -135,7 +135,7 @@ * IP * Port */ - void (*update_direction)(void *, char, ip_p, u_int16_t ); + void (*update_direction)(void *, char, snort_ip_p, u_int16_t ); /* Get direction of packet * @@ -178,7 +178,7 @@ * 0 on success * -1 on failure */ - int (*ignore_session)(ip_p, u_int16_t, ip_p, u_int16_t, + int (*ignore_session)(snort_ip_p, u_int16_t, snort_ip_p, u_int16_t, char, char, char); /* Resume inspection for session. Index: src/preprocessors/stream_ignore.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/stream_ignore.c,v retrieving revision 1.5 diff -u -r1.5 stream_ignore.c --- src/preprocessors/stream_ignore.c 20 Aug 2007 17:30:19 -0000 1.5 +++ src/preprocessors/stream_ignore.c 28 Sep 2007 15:19:20 -0000 @@ -56,9 +56,9 @@ #define IGNORE_HASH_SIZE 1021 typedef struct _IgnoreNode { - ip_t ip1; + snort_ip ip1; short port1; - ip_t ip2; + snort_ip ip2; short port2; char protocol; time_t expires; @@ -68,8 +68,8 @@ typedef struct _IgnoreHashKey { - ip_t ip1; - ip_t ip2; + snort_ip ip1; + snort_ip ip2; short port; char protocol; char pad; @@ -78,8 +78,8 @@ /* The hash table of ignored channels */ static SFGHASH *channelHash = NULL; -int IgnoreChannel(ip_p cliIP, u_int16_t cliPort, - ip_p srvIP, u_int16_t srvPort, +int IgnoreChannel(snort_ip_p cliIP, u_int16_t cliPort, + snort_ip_p srvIP, u_int16_t srvPort, char protocol, char direction, char flags, u_int32_t timeout) { @@ -87,8 +87,8 @@ time_t now; IgnoreNode *node = NULL; short portToHash = cliPort != UNKNOWN_PORT ? cliPort : srvPort; - ip_p ip1, ip2; - ip_t zeroed, oned; + snort_ip_p ip1, ip2; + snort_ip zeroed, oned; IP_CLEAR(zeroed); #ifdef SUP_IP6 memset(oned.ip8, 1, 16); @@ -231,7 +231,7 @@ char CheckIgnoreChannel(Packet *p) { - ip_p srcIP, dstIP; + snort_ip_p srcIP, dstIP; short srcPort, dstPort; char protocol; Index: src/preprocessors/stream_ignore.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/stream_ignore.h,v retrieving revision 1.3 diff -u -r1.3 stream_ignore.h --- src/preprocessors/stream_ignore.h 20 Aug 2007 17:30:20 -0000 1.3 +++ src/preprocessors/stream_ignore.h 28 Sep 2007 15:19:20 -0000 @@ -40,8 +40,8 @@ #include "ipv6_port.h" -int IgnoreChannel(ip_p cliIP, u_int16_t cliPort, - ip_p srvIP, u_int16_t srvPort, +int IgnoreChannel(snort_ip_p cliIP, u_int16_t cliPort, + snort_ip_p srvIP, u_int16_t srvPort, char protocol, char direction, char flags, u_int32_t timeout); Index: src/preprocessors/HttpInspect/include/hi_si.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/HttpInspect/include/hi_si.h,v retrieving revision 1.7 diff -u -r1.7 hi_si.h --- src/preprocessors/HttpInspect/include/hi_si.h 20 Aug 2007 17:30:21 -0000 1.7 +++ src/preprocessors/HttpInspect/include/hi_si.h 28 Sep 2007 15:19:20 -0000 @@ -115,8 +115,8 @@ */ typedef struct s_HI_SI_INPUT { - ip_t sip; - ip_t dip; + snort_ip sip; + snort_ip dip; unsigned short sport; unsigned short dport; unsigned char pdir; Index: src/preprocessors/HttpInspect/include/hi_ui_config.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/HttpInspect/include/hi_ui_config.h,v retrieving revision 1.12 diff -u -r1.12 hi_ui_config.h --- src/preprocessors/HttpInspect/include/hi_ui_config.h 20 Aug 2007 17:30:21 -0000 1.12 +++ src/preprocessors/HttpInspect/include/hi_ui_config.h 28 Sep 2007 15:19:20 -0000 @@ -199,7 +199,7 @@ int hi_ui_config_reset_server(HTTPINSPECT_CONF *ServerConf); int hi_ui_config_add_server(HTTPINSPECT_GLOBAL_CONF *GlobalConf, - ip_p ServerIP, + snort_ip_p ServerIP, HTTPINSPECT_CONF *ServerConf); int hi_ui_config_set_profile_apache(HTTPINSPECT_CONF *GlobalConf); Index: src/preprocessors/HttpInspect/include/hi_ui_server_lookup.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/HttpInspect/include/hi_ui_server_lookup.h,v retrieving revision 1.4 diff -u -r1.4 hi_ui_server_lookup.h --- src/preprocessors/HttpInspect/include/hi_ui_server_lookup.h 20 Aug 2007 17:30:21 -0000 1.4 +++ src/preprocessors/HttpInspect/include/hi_ui_server_lookup.h 28 Sep 2007 15:19:20 -0000 @@ -26,11 +26,11 @@ #include "hi_ui_config.h" int hi_ui_server_lookup_init(SERVER_LOOKUP **ServerLookup); -int hi_ui_server_lookup_add(SERVER_LOOKUP *ServerLookup, ip_p IP, +int hi_ui_server_lookup_add(SERVER_LOOKUP *ServerLookup, snort_ip_p IP, HTTPINSPECT_CONF *ServerConf); HTTPINSPECT_CONF *hi_ui_server_lookup_find(SERVER_LOOKUP *ServerLookup, - ip_p Ip, int *iError); + snort_ip_p Ip, int *iError); HTTPINSPECT_CONF *hi_ui_server_lookup_first(SERVER_LOOKUP *ServerLookup, int *iError); HTTPINSPECT_CONF *hi_ui_server_lookup_next(SERVER_LOOKUP *ServerLookup, Index: src/preprocessors/HttpInspect/user_interface/hi_ui_config.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/HttpInspect/user_interface/hi_ui_config.c,v retrieving revision 1.17 diff -u -r1.17 hi_ui_config.c --- src/preprocessors/HttpInspect/user_interface/hi_ui_config.c 20 Aug 2007 17:30:22 -0000 1.17 +++ src/preprocessors/HttpInspect/user_interface/hi_ui_config.c 28 Sep 2007 15:19:20 -0000 @@ -438,7 +438,7 @@ ** @retval HI_NON_FATAL_ERR server has already been added */ int hi_ui_config_add_server(HTTPINSPECT_GLOBAL_CONF *GlobalConf, - ip_p ServerIP, HTTPINSPECT_CONF *ServerConf) + snort_ip_p ServerIP, HTTPINSPECT_CONF *ServerConf) { int iRet; Index: src/preprocessors/HttpInspect/user_interface/hi_ui_server_lookup.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/HttpInspect/user_interface/hi_ui_server_lookup.c,v retrieving revision 1.6 diff -u -r1.6 hi_ui_server_lookup.c --- src/preprocessors/HttpInspect/user_interface/hi_ui_server_lookup.c 20 Aug 2007 17:30:22 -0000 1.6 +++ src/preprocessors/HttpInspect/user_interface/hi_ui_server_lookup.c 28 Sep 2007 15:19:20 -0000 @@ -97,7 +97,7 @@ ** @retval HI_NONFATAL_ERR key is already in table, don't overwrite ** configuration. */ -int hi_ui_server_lookup_add(SERVER_LOOKUP *ServerLookup, ip_p Ip, +int hi_ui_server_lookup_add(SERVER_LOOKUP *ServerLookup, snort_ip_p Ip, HTTPINSPECT_CONF *ServerConf) { int iRet; @@ -108,9 +108,9 @@ } #ifdef SUP_IP6 - iRet = KMapAdd(ServerLookup, (void *)Ip, sizeof(ip_t), (void *)ServerConf); + iRet = KMapAdd(ServerLookup, (void *)Ip, sizeof(snort_ip), (void *)ServerConf); #else - iRet = KMapAdd(ServerLookup, (void *)&Ip, sizeof(ip_t), (void *)ServerConf); + iRet = KMapAdd(ServerLookup, (void *)&Ip, sizeof(snort_ip), (void *)ServerConf); #endif if (iRet) { @@ -151,7 +151,7 @@ ** @retval HI_NOT_FOUND IP not found */ HTTPINSPECT_CONF *hi_ui_server_lookup_find(SERVER_LOOKUP *ServerLookup, - ip_p Ip, int *iError) + snort_ip_p Ip, int *iError) { HTTPINSPECT_CONF *ServerConf; @@ -169,7 +169,7 @@ *iError = HI_SUCCESS; #ifdef SUP_IP6 - ServerConf = (HTTPINSPECT_CONF *)KMapFind(ServerLookup,(void *)Ip,sizeof(ip_t)); + ServerConf = (HTTPINSPECT_CONF *)KMapFind(ServerLookup,(void *)Ip,sizeof(snort_ip)); #else ServerConf = (HTTPINSPECT_CONF *)KMapFind(ServerLookup,(void *)&Ip,4); #endif Index: src/preprocessors/Stream5/snort_stream5_icmp.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/Stream5/snort_stream5_icmp.c,v retrieving revision 1.10 diff -u -r1.10 snort_stream5_icmp.c --- src/preprocessors/Stream5/snort_stream5_icmp.c 7 Sep 2007 18:04:05 -0000 1.10 +++ src/preprocessors/Stream5/snort_stream5_icmp.c 28 Sep 2007 15:19:20 -0000 @@ -373,10 +373,10 @@ } void IcmpUpdateDirection(Stream5LWSession *ssn, char dir, - ip_p ip, u_int16_t port) + snort_ip_p ip, u_int16_t port) { IcmpSession *icmpssn = ssn->proto_specific_data->data; - ip_t tmpIp; + snort_ip tmpIp; if (!icmpssn) { Index: src/preprocessors/Stream5/snort_stream5_icmp.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/Stream5/snort_stream5_icmp.h,v retrieving revision 1.6 diff -u -r1.6 snort_stream5_icmp.h --- src/preprocessors/Stream5/snort_stream5_icmp.h 20 Aug 2007 17:00:00 -0000 1.6 +++ src/preprocessors/Stream5/snort_stream5_icmp.h 28 Sep 2007 15:19:20 -0000 @@ -28,6 +28,6 @@ void Stream5IcmpPolicyInit(char *); int Stream5ProcessIcmp(Packet *p); void IcmpUpdateDirection(Stream5LWSession *ssn, char dir, - ip_p ip, u_int16_t port); + snort_ip_p ip, u_int16_t port); #endif /* STREAM5_ICMP_H_ */ Index: src/preprocessors/Stream5/snort_stream5_tcp.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/Stream5/snort_stream5_tcp.c,v retrieving revision 1.24 diff -u -r1.24 snort_stream5_tcp.c --- src/preprocessors/Stream5/snort_stream5_tcp.c 7 Sep 2007 18:04:05 -0000 1.24 +++ src/preprocessors/Stream5/snort_stream5_tcp.c 28 Sep 2007 15:19:20 -0000 @@ -213,8 +213,8 @@ /* D A T A S T R U C T U R E S ***********************************/ typedef struct _TcpDataBlock { - ip_t sip; - ip_t dip; + snort_ip sip; + snort_ip dip; u_int32_t seq; u_int32_t ack; u_int16_t win; @@ -2484,7 +2484,7 @@ #ifdef SUP_IP6 INLINE int _flush_ackd_4(TcpSession *tcpssn, StreamTracker *st, Packet *p, - ip_p sip, ip_p dip, u_int16_t sp, u_int16_t dp, u_int32_t dir) + snort_ip_p sip, snort_ip_p dip, u_int16_t sp, u_int16_t dp, u_int32_t dir) { u_int32_t base_seq; u_int32_t footprint = 0; @@ -2667,7 +2667,7 @@ INLINE int _flush_ackd_6(TcpSession *tcpssn, StreamTracker *st, Packet *p, - ip_p sip, ip_p dip, u_int16_t sp, u_int16_t dp, u_int32_t dir) + snort_ip_p sip, snort_ip_p dip, u_int16_t sp, u_int16_t dp, u_int32_t dir) { u_int32_t base_seq; u_int32_t footprint = 0; @@ -2852,7 +2852,7 @@ * and fire it thru the system */ INLINE int flush_ackd(TcpSession *tcpssn, StreamTracker *st, Packet *p, - ip_p sip, ip_p dip, u_int16_t sp, u_int16_t dp, u_int32_t dir) + snort_ip_p sip, snort_ip_p dip, u_int16_t sp, u_int16_t dp, u_int32_t dir) { #ifndef SUP_IP6 u_int32_t base_seq; @@ -7115,10 +7115,10 @@ } void TcpUpdateDirection(Stream5LWSession *ssn, char dir, - ip_p ip, u_int16_t port) + snort_ip_p ip, u_int16_t port) { TcpSession *tcpssn = (TcpSession *)ssn->proto_specific_data->data; - ip_t tmpIp; + snort_ip tmpIp; u_int16_t tmpPort; StreamTracker tmpTracker; Index: src/preprocessors/Stream5/snort_stream5_tcp.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/Stream5/snort_stream5_tcp.h,v retrieving revision 1.6 diff -u -r1.6 snort_stream5_tcp.h --- src/preprocessors/Stream5/snort_stream5_tcp.h 20 Aug 2007 17:00:01 -0000 1.6 +++ src/preprocessors/Stream5/snort_stream5_tcp.h 28 Sep 2007 15:19:20 -0000 @@ -32,7 +32,7 @@ int Stream5FlushClient(Packet *p, Stream5LWSession *lwssn); int Stream5FlushServer(Packet *p, Stream5LWSession *lwssn); void TcpUpdateDirection(Stream5LWSession *ssn, char dir, - ip_p ip, u_int16_t port); + snort_ip_p ip, u_int16_t port); void Stream5TcpBlockPacket(Packet *p); Stream5LWSession *GetLWTcpSession(SessionKey *key); int GetTcpRebuiltPackets(Packet *p, Stream5LWSession *ssn, Index: src/preprocessors/Stream5/snort_stream5_udp.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/Stream5/snort_stream5_udp.c,v retrieving revision 1.11 diff -u -r1.11 snort_stream5_udp.c --- src/preprocessors/Stream5/snort_stream5_udp.c 7 Sep 2007 18:04:05 -0000 1.11 +++ src/preprocessors/Stream5/snort_stream5_udp.c 28 Sep 2007 15:19:20 -0000 @@ -918,10 +918,10 @@ } void UdpUpdateDirection(Stream5LWSession *ssn, char dir, - ip_p ip, u_int16_t port) + snort_ip_p ip, u_int16_t port) { UdpSession *udpssn = (UdpSession *)ssn->proto_specific_data; - ip_t tmpIp; + snort_ip tmpIp; u_int16_t tmpPort; #ifdef SUP_IP6 Index: src/preprocessors/Stream5/snort_stream5_udp.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/Stream5/snort_stream5_udp.h,v retrieving revision 1.5 diff -u -r1.5 snort_stream5_udp.h --- src/preprocessors/Stream5/snort_stream5_udp.h 20 Aug 2007 17:00:01 -0000 1.5 +++ src/preprocessors/Stream5/snort_stream5_udp.h 28 Sep 2007 15:19:20 -0000 @@ -30,7 +30,7 @@ void Stream5UdpPolicyInit(char *); int Stream5ProcessUdp(Packet *p); void UdpUpdateDirection(Stream5LWSession *ssn, char dir, - ip_p ip, u_int16_t port); + snort_ip_p ip, u_int16_t port); Stream5LWSession *GetLWUdpSession(SessionKey *key); #endif /* STREAM5_UDP_H_ */ Index: src/preprocessors/Stream5/stream5_common.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/preprocessors/Stream5/stream5_common.h,v retrieving revision 1.10 diff -u -r1.10 stream5_common.h --- src/preprocessors/Stream5/stream5_common.h 20 Aug 2007 17:00:01 -0000 1.10 +++ src/preprocessors/Stream5/stream5_common.h 28 Sep 2007 15:19:20 -0000 @@ -155,8 +155,8 @@ { SessionKey key; - ip_t client_ip; - ip_t server_ip; + snort_ip client_ip; + snort_ip server_ip; u_int16_t client_port; u_int16_t server_port; char protocol; Index: src/sfutil/sfthd.c =================================================================== RCS file: /usr/cvsroot-snort/snort/src/sfutil/sfthd.c,v retrieving revision 1.9 diff -u -r1.9 sfthd.c --- src/sfutil/sfthd.c 20 Aug 2007 17:28:41 -0000 1.9 +++ src/sfutil/sfthd.c 28 Sep 2007 15:19:20 -0000 @@ -169,7 +169,7 @@ int priority, int count, int seconds, - ip_p ip_address, + snort_ip_p ip_address, #ifndef SUP_IP6 unsigned ip_mask, #endif @@ -399,7 +399,7 @@ int priority, int count, int seconds, - ip_p ip_address + snort_ip_p ip_address #ifndef SUP_IP6 ,unsigned ip_mask #endif @@ -526,7 +526,7 @@ int priority, int count, int seconds, - ip_p ip_address, + snort_ip_p ip_address, #ifndef SUP_IP6 unsigned ip_mask, #endif @@ -601,14 +601,14 @@ static int sfthd_test_object( THD_STRUCT * thd, THD_NODE * sfthd_node, - ip_p sip, - ip_p dip, + snort_ip_p sip, + snort_ip_p dip, time_t curtime ) { THD_IP_NODE_KEY key; THD_IP_NODE data,*sfthd_ip_node; int status=0; - ip_p ip; + snort_ip_p ip; unsigned dt; #ifdef THD_DEBUG @@ -819,14 +819,14 @@ THD_NODE * sfthd_node, unsigned gen_id, /* from current event */ unsigned sig_id, /* from current event */ - ip_p sip, /* " */ - ip_p dip, /* " */ + snort_ip_p sip, /* " */ + snort_ip_p dip, /* " */ time_t curtime ) { THD_IP_GNODE_KEY key; THD_IP_GNODE data, *sfthd_ip_node; int status=0; - ip_p ip; + snort_ip_p ip; unsigned dt; #ifdef THD_DEBUG @@ -1039,8 +1039,8 @@ int sfthd_test_threshold( THD_STRUCT * thd, unsigned gen_id, unsigned sig_id, - ip_p sip, - ip_p dip, + snort_ip_p sip, + snort_ip_p dip, long curtime ) { SFGHASH * sfthd_hash; Index: src/sfutil/sfthd.h =================================================================== RCS file: /usr/cvsroot-snort/snort/src/sfutil/sfthd.h,v retrieving revision 1.5 diff -u -r1.5 sfthd.h --- src/sfutil/sfthd.h 20 Aug 2007 17:28:41 -0000 1.5 +++ src/sfutil/sfthd.h 28 Sep 2007 15:19:20 -0000 @@ -78,7 +78,7 @@ */ typedef struct { - ip_t ip; + snort_ip ip; unsigned count; time_t tstart; @@ -100,7 +100,7 @@ typedef struct{ int thd_id; - ip_t ip; + snort_ip ip; } THD_IP_NODE_KEY ; @@ -108,7 +108,7 @@ unsigned gen_id; unsigned sig_id; - ip_t ip; + snort_ip ip; } THD_IP_GNODE_KEY ; @@ -132,7 +132,7 @@ unsigned count; unsigned seconds; - ip_t ip_address; + snort_ip ip_address; #ifndef SUP_IP6 unsigned ip_mask; #endif @@ -177,7 +177,7 @@ int priority; int count; int seconds; - ip_t ip_address; + snort_ip ip_address; #ifndef SUP_IP6 int ip_mask; #endif @@ -223,7 +223,7 @@ int priority, int count, int seconds, - ip_p ip_address, + snort_ip_p ip_address, #ifndef SUP_IP6 unsigned ip_mask, #endif @@ -232,8 +232,8 @@ int sfthd_test_threshold( THD_STRUCT * thd, unsigned gen_id, unsigned sig_id, - ip_p sip, - ip_p dip, + snort_ip_p sip, + snort_ip_p dip, long curtime ) ; int sfthd_show_objects( THD_STRUCT * thd );
------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________ Snort-users mailing list Snort-users () lists sourceforge net Go to this URL to change user options or unsubscribe: https://lists.sourceforge.net/lists/listinfo/snort-users Snort-users list archive: http://www.geocrawler.com/redir-sf.php3?list=snort-users
Current thread:
- Snort 2.8 Now Available Snort Releases (Sep 27)
- Snort 2.8 compile error James Lay (Sep 27)
- Re: Snort 2.8 compile error J. Jefferson Gray (Sep 27)
- Re: Snort 2.8 compile error M. Shirk (Sep 27)
- Re: Snort 2.8 compile error J. Jefferson Gray (Sep 27)
- Re: Snort 2.8 compile error J. Jefferson Gray (Sep 27)
- Re: Snort 2.8 compile error Adam Keeton (Sep 28)
- Re: Snort 2.8 compile error James Lay (Sep 28)
- Re: Snort 2.8 compile error Adam Keeton (Sep 28)
- Snort 2.8 compile error James Lay (Sep 27)