ipfilter-cvs Mailing List for ipfilter (Page 3)
Brought to you by:
darren_r
You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(121) |
Oct
(125) |
Nov
(15) |
Dec
(11) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(6) |
Feb
(39) |
Mar
(27) |
Apr
(19) |
May
(12) |
Jun
(24) |
Jul
(58) |
Aug
(73) |
Sep
(18) |
Oct
(13) |
Nov
(28) |
Dec
(52) |
2009 |
Jan
(61) |
Feb
(20) |
Mar
(99) |
Apr
(4) |
May
(20) |
Jun
(16) |
Jul
(80) |
Aug
(16) |
Sep
|
Oct
|
Nov
(11) |
Dec
(33) |
2010 |
Jan
(21) |
Feb
(40) |
Mar
(6) |
Apr
(1) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(22) |
Sep
|
Oct
(91) |
Nov
(85) |
Dec
(26) |
2012 |
Jan
(102) |
Feb
(15) |
Mar
|
Apr
|
May
(37) |
Jun
(72) |
Jul
(111) |
Aug
(17) |
Sep
|
Oct
|
Nov
|
Dec
|
2013 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(48) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Darren <dar...@us...> - 2013-01-12 02:34:20
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25133 Modified Files: Tag: v5-1-RELEASE ip_nat.c ip_nat6.c ip_nat.h ip_state.c Log Message: 3600459 NAT bucket count wrong Index: ip_state.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_state.c,v retrieving revision 1.48.2.25 retrieving revision 1.48.2.26 diff -C2 -d -r1.48.2.25 -r1.48.2.26 *** ip_state.c 13 Aug 2012 11:44:15 -0000 1.48.2.25 --- ip_state.c 12 Jan 2013 02:34:17 -0000 1.48.2.26 *************** *** 3648,3655 **** is->is_ref--; } ! if (is->is_ref > 1) { int refs; - is->is_ref--; refs = is->is_ref; MUTEX_EXIT(&is->is_lock); --- 3648,3655 ---- is->is_ref--; } ! is->is_ref--; ! if (is->is_ref > 0) { int refs; refs = is->is_ref; MUTEX_EXIT(&is->is_lock); *************** *** 3669,3673 **** } ! is->is_ref = 0; if (is->is_tqehead[0] != NULL) { --- 3669,3673 ---- } ! ASSERT(is->is_ref == 0); if (is->is_tqehead[0] != NULL) { Index: ip_nat6.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat6.c,v retrieving revision 1.22.2.22 retrieving revision 1.22.2.23 diff -C2 -d -r1.22.2.22 -r1.22.2.23 *** ip_nat6.c 25 Aug 2012 14:53:46 -0000 1.22.2.22 --- ip_nat6.c 12 Jan 2013 02:34:17 -0000 1.22.2.23 *************** *** 1286,1290 **** nat_t *nat; { ! u_int hv1, hv2; u_32_t sp, dp; ipnat_t *in; --- 1286,1290 ---- nat_t *nat; { ! u_int hv0, hv1; u_32_t sp, dp; ipnat_t *in; *************** *** 1305,1315 **** dp = 0; } ! hv1 = NAT_HASH_FN6(&nat->nat_osrc6, sp, 0xffffffff); ! hv1 = NAT_HASH_FN6(&nat->nat_odst6, hv1 + dp, softn->ipf_nat_table_sz); /* * TRACE nat6_osrc6, nat6_osport, nat6_odst6, ! * nat6_odport, hv1 */ --- 1305,1315 ---- dp = 0; } ! hv0 = NAT_HASH_FN6(&nat->nat_osrc6, sp, 0xffffffff); ! hv0 = NAT_HASH_FN6(&nat->nat_odst6, hv0 + dp, softn->ipf_nat_table_sz); /* * TRACE nat6_osrc6, nat6_osport, nat6_odst6, ! * nat6_odport, hv0 */ *************** *** 1324,1348 **** dp = 0; } ! hv2 = NAT_HASH_FN6(&nat->nat_nsrc6, sp, 0xffffffff); ! hv2 = NAT_HASH_FN6(&nat->nat_ndst6, hv2 + dp, softn->ipf_nat_table_sz); /* * TRACE nat6_nsrcaddr, nat6_nsport, nat6_ndstaddr, ! * nat6_ndport, hv1 */ } else { ! hv1 = NAT_HASH_FN6(&nat->nat_osrc6, 0, 0xffffffff); ! hv1 = NAT_HASH_FN6(&nat->nat_odst6, hv1, softn->ipf_nat_table_sz); ! /* TRACE nat6_osrcip6, nat6_odstip6, hv1 */ ! hv2 = NAT_HASH_FN6(&nat->nat_nsrc6, 0, 0xffffffff); ! hv2 = NAT_HASH_FN6(&nat->nat_ndst6, hv2, softn->ipf_nat_table_sz); ! /* TRACE nat6_nsrcip6, nat6_ndstip6, hv2 */ } ! nat->nat_hv[0] = hv1; ! nat->nat_hv[1] = hv2; MUTEX_INIT(&nat->nat_lock, "nat entry lock"); --- 1324,1353 ---- dp = 0; } ! hv1 = NAT_HASH_FN6(&nat->nat_nsrc6, sp, 0xffffffff); ! hv1 = NAT_HASH_FN6(&nat->nat_ndst6, hv1 + dp, softn->ipf_nat_table_sz); /* * TRACE nat6_nsrcaddr, nat6_nsport, nat6_ndstaddr, ! * nat6_ndport, hv0 */ } else { ! hv0 = NAT_HASH_FN6(&nat->nat_osrc6, 0, 0xffffffff); ! hv0 = NAT_HASH_FN6(&nat->nat_odst6, hv0, softn->ipf_nat_table_sz); ! /* TRACE nat6_osrcip6, nat6_odstip6, hv0 */ ! hv1 = NAT_HASH_FN6(&nat->nat_nsrc6, 0, 0xffffffff); ! hv1 = NAT_HASH_FN6(&nat->nat_ndst6, hv1, softn->ipf_nat_table_sz); ! /* TRACE nat6_nsrcip6, nat6_ndstip6, hv1 */ } ! if ((nat->nat_dir & NAT_OUTBOUND) == NAT_OUTBOUND) { ! nat->nat_hv[0] = hv0; ! nat->nat_hv[1] = hv1; ! } else { ! nat->nat_hv[0] = hv1; ! nat->nat_hv[1] = hv0; ! } MUTEX_INIT(&nat->nat_lock, "nat entry lock"); *************** *** 2138,2143 **** nat_t *nat; { nat_t **natp; - u_int hv0, hv1; if (nat->nat_flags & SI_CLONE) --- 2143,2148 ---- nat_t *nat; { + u_int rhv0, rhv1, hv0, hv1; nat_t **natp; if (nat->nat_flags & SI_CLONE) *************** *** 2160,2182 **** * Add into the NAT table in the new position */ ! hv0 = NAT_HASH_FN6(&nat->nat_osrc6, nat->nat_osport, 0xffffffff); ! hv0 = NAT_HASH_FN6(&nat->nat_odst6, hv0 + nat->nat_odport, ! softn->ipf_nat_table_sz); ! hv1 = NAT_HASH_FN6(&nat->nat_nsrc6, nat->nat_nsport, 0xffffffff); ! hv1 = NAT_HASH_FN6(&nat->nat_ndst6, hv1 + nat->nat_ndport, ! softn->ipf_nat_table_sz); ! ! if (nat->nat_dir == NAT_INBOUND || nat->nat_dir == NAT_DIVERTIN) { ! u_int swap; ! swap = hv0; ! hv0 = hv1; ! hv1 = swap; } /* TRACE nat_osrc6, nat_osport, nat_odst6, nat_odport, hv0 */ /* TRACE nat_nsrc6, nat_nsport, nat_ndst6, nat_ndport, hv1 */ - nat->nat_hv[0] = hv0; natp = &softn->ipf_nat_table[0][hv0]; if (*natp) --- 2165,2189 ---- * Add into the NAT table in the new position */ ! rhv0 = NAT_HASH_FN6(&nat->nat_osrc6, nat->nat_osport, 0xffffffff); ! rhv0 = NAT_HASH_FN6(&nat->nat_odst6, rhv0 + nat->nat_odport, ! softn->ipf_nat_table_sz); ! rhv1 = NAT_HASH_FN6(&nat->nat_nsrc6, nat->nat_nsport, 0xffffffff); ! rhv1 = NAT_HASH_FN6(&nat->nat_ndst6, rhv1 + nat->nat_ndport, ! softn->ipf_nat_table_sz); ! if ((nat->nat_dir & NAT_OUTBOUND) == NAT_OUTBOUND) { ! nat->nat_hv[0] = rhv0; ! nat->nat_hv[1] = rhv1; ! } else { ! nat->nat_hv[0] = rhv1; ! nat->nat_hv[1] = rhv0; } + hv0 = nat->nat_hv[0] % softn->ipf_nat_table_sz; + hv1 = nat->nat_hv[1] % softn->ipf_nat_table_sz; + /* TRACE nat_osrc6, nat_osport, nat_odst6, nat_odport, hv0 */ /* TRACE nat_nsrc6, nat_nsport, nat_ndst6, nat_ndport, hv1 */ natp = &softn->ipf_nat_table[0][hv0]; if (*natp) *************** *** 2187,2191 **** softn->ipf_nat_stats.ns_side[0].ns_bucketlen[hv0]++; - nat->nat_hv[1] = hv1; natp = &softn->ipf_nat_table[1][hv1]; if (*natp) --- 2194,2197 ---- Index: ip_nat.h =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat.h,v retrieving revision 1.18.2.14 retrieving revision 1.18.2.15 diff -C2 -d -r1.18.2.14 -r1.18.2.15 *** ip_nat.h 25 Aug 2012 14:53:46 -0000 1.18.2.14 --- ip_nat.h 12 Jan 2013 02:34:17 -0000 1.18.2.15 *************** *** 89,92 **** --- 89,107 ---- * This structure is used in the active NAT table and represents an * active NAT session. + * + * Generally nat_t structures have references from at least two places. + * The first place gives them a position in a linked list of NAT sessions + * per instace of IPFilter. In this linked list, nat_next always points to + * the next entry in the list and nat_pnext points to the pointer that + * introduces the structure. That may be either the top of the list pointer + * or simply the nat_next of the previous link in the list. The second place + * that a nat_t structure is generally referenced from is the NAT hash table. + * Two references from this table are required, one for supporting the of + * matching packets being transmitted and one for supporting the matching of + * packets being received. The hash table is comprised of buckets, each one + * having its own chain of nat_t structures. To support these chains, + * nat_hnext is used to point to the next member of the chain and nat_phnext + * points back to the pointer that is pointing to the nat_t in the chain, + * be it the bucket at the top or simply the previous nat_t chain entry. */ typedef struct nat { Index: ip_nat.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat.c,v retrieving revision 1.60.2.42 retrieving revision 1.60.2.43 diff -C2 -d -r1.60.2.42 -r1.60.2.43 *** ip_nat.c 25 Aug 2012 14:53:46 -0000 1.60.2.42 --- ip_nat.c 12 Jan 2013 02:34:17 -0000 1.60.2.43 *************** *** 2323,2326 **** --- 2323,2327 ---- bkt = nat->nat_hv[0] % softn->ipf_nat_table_sz; nss = &softn->ipf_nat_stats.ns_side[0]; + ASSERT(nss->ns_bucketlen[bkt] > 0); nss->ns_bucketlen[bkt]--; if (nss->ns_bucketlen[bkt] == 0) { *************** *** 2330,2333 **** --- 2331,2335 ---- bkt = nat->nat_hv[1] % softn->ipf_nat_table_sz; nss = &softn->ipf_nat_stats.ns_side[1]; + ASSERT(nss->ns_bucketlen[bkt] > 0); nss->ns_bucketlen[bkt]--; if (nss->ns_bucketlen[bkt] == 0) { *************** *** 3472,3477 **** } ! nat->nat_hv[0] = hv0; ! nat->nat_hv[1] = hv1; MUTEX_INIT(&nat->nat_lock, "nat entry lock"); --- 3474,3484 ---- } ! if ((nat->nat_dir & NAT_OUTBOUND) == NAT_OUTBOUND) { ! nat->nat_hv[0] = hv0; ! nat->nat_hv[1] = hv1; ! } else { ! nat->nat_hv[0] = hv1; ! nat->nat_hv[1] = hv0; ! } MUTEX_INIT(&nat->nat_lock, "nat entry lock"); *************** *** 3511,3517 **** --- 3518,3526 ---- /* ------------------------------------------------------------------------ */ /* Function: ipf_nat_hashtab_add */ + /* Returns: int - 0 == sucess, -1 == failure */ /* Parameters: softc(I) - pointer to soft context main structure */ /* softn(I) - pointer to NAT context structure */ /* nat(I) - pointer to NAT structure */ + /* Write Lock: ipf_nat */ /* */ /* Handle the insertion of a NAT entry into the table/list. */ *************** *** 3530,3541 **** hv1 = nat->nat_hv[1] % softn->ipf_nat_table_sz; - if (nat->nat_dir == NAT_INBOUND || nat->nat_dir == NAT_DIVERTIN) { - u_int swap; - - swap = hv0; - hv0 = hv1; - hv1 = swap; - } - if (softn->ipf_nat_stats.ns_side[0].ns_bucketlen[hv0] >= softn->ipf_nat_maxbucket) { --- 3539,3542 ---- *************** *** 4342,4353 **** nat->nat_hnext[0]->nat_phnext[0] = nat->nat_phnext[0]; *nat->nat_phnext[0] = nat->nat_hnext[0]; ! nsp->ns_side[0].ns_bucketlen[nat->nat_hv[0] % ! softn->ipf_nat_table_sz]--; if (nat->nat_hnext[1]) nat->nat_hnext[1]->nat_phnext[1] = nat->nat_phnext[1]; *nat->nat_phnext[1] = nat->nat_hnext[1]; ! nsp->ns_side[1].ns_bucketlen[nat->nat_hv[1] % ! softn->ipf_nat_table_sz]--; /* --- 4343,4357 ---- nat->nat_hnext[0]->nat_phnext[0] = nat->nat_phnext[0]; *nat->nat_phnext[0] = nat->nat_hnext[0]; ! hv0 = nat->nat_hv[0] % softn->ipf_nat_table_sz; ! hv1 = nat->nat_hv[1] % softn->ipf_nat_table_sz; ! ! ASSERT(nsp->ns_side[0].ns_bucketlen[hv0] > 0); ! nsp->ns_side[0].ns_bucketlen[hv0]--; if (nat->nat_hnext[1]) nat->nat_hnext[1]->nat_phnext[1] = nat->nat_phnext[1]; *nat->nat_phnext[1] = nat->nat_hnext[1]; ! ASSERT(nsp->ns_side[1].ns_bucketlen[hv1] > 0); ! nsp->ns_side[1].ns_bucketlen[hv1]--; /* *************** *** 4361,4379 **** 0xffffffff); ! hv0 = rhv0 % softn->ipf_nat_table_sz; ! hv1 = rhv1 % softn->ipf_nat_table_sz; ! ! if (nat->nat_dir == NAT_INBOUND || nat->nat_dir == NAT_DIVERTIN) { ! u_int swap; ! ! swap = hv0; ! hv0 = hv1; ! hv1 = swap; } /* TRACE nat_osrcaddr, nat_osport, nat_odstaddr, nat_odport, hv0 */ /* TRACE nat_nsrcaddr, nat_nsport, nat_ndstaddr, nat_ndport, hv1 */ - nat->nat_hv[0] = rhv0; natp = &softn->ipf_nat_table[0][hv0]; if (*natp) --- 4365,4382 ---- 0xffffffff); ! if ((nat->nat_dir & NAT_OUTBOUND) == NAT_OUTBOUND) { ! nat->nat_hv[0] = rhv0; ! nat->nat_hv[1] = rhv1; ! } else { ! nat->nat_hv[0] = rhv1; ! nat->nat_hv[1] = rhv0; } + hv0 = nat->nat_hv[0] % softn->ipf_nat_table_sz; + hv1 = nat->nat_hv[1] % softn->ipf_nat_table_sz; + /* TRACE nat_osrcaddr, nat_osport, nat_odstaddr, nat_odport, hv0 */ /* TRACE nat_nsrcaddr, nat_nsport, nat_ndstaddr, nat_ndport, hv1 */ natp = &softn->ipf_nat_table[0][hv0]; if (*natp) *************** *** 4384,4388 **** nsp->ns_side[0].ns_bucketlen[hv0]++; - nat->nat_hv[1] = rhv1; natp = &softn->ipf_nat_table[1][hv1]; if (*natp) --- 4387,4390 ---- |
From: Darren <dar...@us...> - 2013-01-12 02:33:11
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25092 Modified Files: ip_nat.c ip_nat6.c ip_nat.h ip_state.c Log Message: 3600459 NAT bucket count wrong Index: ip_state.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_state.c,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** ip_state.c 13 Aug 2012 11:42:01 -0000 1.72 --- ip_state.c 12 Jan 2013 02:33:08 -0000 1.73 *************** *** 3835,3842 **** is->is_ref--; } ! if (is->is_ref > 1) { int refs; - is->is_ref--; refs = is->is_ref; MUTEX_EXIT(&is->is_lock); --- 3835,3842 ---- is->is_ref--; } ! is->is_ref--; ! if (is->is_ref > 0) { int refs; refs = is->is_ref; MUTEX_EXIT(&is->is_lock); *************** *** 3856,3860 **** } ! is->is_ref = 0; if (is->is_tqehead[0] != NULL) { --- 3856,3860 ---- } ! ASSERT(is->is_ref == 0); if (is->is_tqehead[0] != NULL) { Index: ip_nat6.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat6.c,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** ip_nat6.c 25 Aug 2012 14:46:06 -0000 1.42 --- ip_nat6.c 12 Jan 2013 02:33:08 -0000 1.43 *************** *** 1285,1289 **** nat_t *nat; { ! u_int hv1, hv2; u_32_t sp, dp; ipnat_t *in; --- 1285,1289 ---- nat_t *nat; { ! u_int hv0, hv1; u_32_t sp, dp; ipnat_t *in; *************** *** 1304,1314 **** dp = 0; } ! hv1 = NAT_HASH_FN6(&nat->nat_osrc6, sp, 0xffffffff); ! hv1 = NAT_HASH_FN6(&nat->nat_odst6, hv1 + dp, softn->ipf_nat_table_sz); /* * TRACE nat6_osrc6, nat6_osport, nat6_odst6, ! * nat6_odport, hv1 */ --- 1304,1314 ---- dp = 0; } ! hv0 = NAT_HASH_FN6(&nat->nat_osrc6, sp, 0xffffffff); ! hv0 = NAT_HASH_FN6(&nat->nat_odst6, hv0 + dp, softn->ipf_nat_table_sz); /* * TRACE nat6_osrc6, nat6_osport, nat6_odst6, ! * nat6_odport, hv0 */ *************** *** 1323,1347 **** dp = 0; } ! hv2 = NAT_HASH_FN6(&nat->nat_nsrc6, sp, 0xffffffff); ! hv2 = NAT_HASH_FN6(&nat->nat_ndst6, hv2 + dp, softn->ipf_nat_table_sz); /* * TRACE nat6_nsrcaddr, nat6_nsport, nat6_ndstaddr, ! * nat6_ndport, hv1 */ } else { ! hv1 = NAT_HASH_FN6(&nat->nat_osrc6, 0, 0xffffffff); ! hv1 = NAT_HASH_FN6(&nat->nat_odst6, hv1, softn->ipf_nat_table_sz); ! /* TRACE nat6_osrcip6, nat6_odstip6, hv1 */ ! hv2 = NAT_HASH_FN6(&nat->nat_nsrc6, 0, 0xffffffff); ! hv2 = NAT_HASH_FN6(&nat->nat_ndst6, hv2, softn->ipf_nat_table_sz); ! /* TRACE nat6_nsrcip6, nat6_ndstip6, hv2 */ } ! nat->nat_hv[0] = hv1; ! nat->nat_hv[1] = hv2; MUTEX_INIT(&nat->nat_lock, "nat entry lock"); --- 1323,1352 ---- dp = 0; } ! hv1 = NAT_HASH_FN6(&nat->nat_nsrc6, sp, 0xffffffff); ! hv1 = NAT_HASH_FN6(&nat->nat_ndst6, hv1 + dp, softn->ipf_nat_table_sz); /* * TRACE nat6_nsrcaddr, nat6_nsport, nat6_ndstaddr, ! * nat6_ndport, hv0 */ } else { ! hv0 = NAT_HASH_FN6(&nat->nat_osrc6, 0, 0xffffffff); ! hv0 = NAT_HASH_FN6(&nat->nat_odst6, hv0, softn->ipf_nat_table_sz); ! /* TRACE nat6_osrcip6, nat6_odstip6, hv0 */ ! hv1 = NAT_HASH_FN6(&nat->nat_nsrc6, 0, 0xffffffff); ! hv1 = NAT_HASH_FN6(&nat->nat_ndst6, hv1, softn->ipf_nat_table_sz); ! /* TRACE nat6_nsrcip6, nat6_ndstip6, hv1 */ } ! if ((nat->nat_dir & NAT_OUTBOUND) == NAT_OUTBOUND) { ! nat->nat_hv[0] = hv0; ! nat->nat_hv[1] = hv1; ! } else { ! nat->nat_hv[0] = hv1; ! nat->nat_hv[1] = hv0; ! } MUTEX_INIT(&nat->nat_lock, "nat entry lock"); *************** *** 2137,2142 **** nat_t *nat; { nat_t **natp; - u_int hv0, hv1; if (nat->nat_flags & SI_CLONE) --- 2142,2147 ---- nat_t *nat; { + u_int rhv0, rhv1, hv0, hv1; nat_t **natp; if (nat->nat_flags & SI_CLONE) *************** *** 2159,2181 **** * Add into the NAT table in the new position */ ! hv0 = NAT_HASH_FN6(&nat->nat_osrc6, nat->nat_osport, 0xffffffff); ! hv0 = NAT_HASH_FN6(&nat->nat_odst6, hv0 + nat->nat_odport, ! softn->ipf_nat_table_sz); ! hv1 = NAT_HASH_FN6(&nat->nat_nsrc6, nat->nat_nsport, 0xffffffff); ! hv1 = NAT_HASH_FN6(&nat->nat_ndst6, hv1 + nat->nat_ndport, ! softn->ipf_nat_table_sz); ! ! if (nat->nat_dir == NAT_INBOUND || nat->nat_dir == NAT_DIVERTIN) { ! u_int swap; ! swap = hv0; ! hv0 = hv1; ! hv1 = swap; } /* TRACE nat_osrc6, nat_osport, nat_odst6, nat_odport, hv0 */ /* TRACE nat_nsrc6, nat_nsport, nat_ndst6, nat_ndport, hv1 */ - nat->nat_hv[0] = hv0; natp = &softn->ipf_nat_table[0][hv0]; if (*natp) --- 2164,2188 ---- * Add into the NAT table in the new position */ ! rhv0 = NAT_HASH_FN6(&nat->nat_osrc6, nat->nat_osport, 0xffffffff); ! rhv0 = NAT_HASH_FN6(&nat->nat_odst6, rhv0 + nat->nat_odport, ! softn->ipf_nat_table_sz); ! rhv1 = NAT_HASH_FN6(&nat->nat_nsrc6, nat->nat_nsport, 0xffffffff); ! rhv1 = NAT_HASH_FN6(&nat->nat_ndst6, rhv1 + nat->nat_ndport, ! softn->ipf_nat_table_sz); ! if ((nat->nat_dir & NAT_OUTBOUND) == NAT_OUTBOUND) { ! nat->nat_hv[0] = rhv0; ! nat->nat_hv[1] = rhv1; ! } else { ! nat->nat_hv[0] = rhv1; ! nat->nat_hv[1] = rhv0; } + hv0 = nat->nat_hv[0] % softn->ipf_nat_table_sz; + hv1 = nat->nat_hv[1] % softn->ipf_nat_table_sz; + /* TRACE nat_osrc6, nat_osport, nat_odst6, nat_odport, hv0 */ /* TRACE nat_nsrc6, nat_nsport, nat_ndst6, nat_ndport, hv1 */ natp = &softn->ipf_nat_table[0][hv0]; if (*natp) *************** *** 2186,2190 **** softn->ipf_nat_stats.ns_side[0].ns_bucketlen[hv0]++; - nat->nat_hv[1] = hv1; natp = &softn->ipf_nat_table[1][hv1]; if (*natp) --- 2193,2196 ---- Index: ip_nat.h =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** ip_nat.h 25 Aug 2012 14:46:06 -0000 1.29 --- ip_nat.h 12 Jan 2013 02:33:08 -0000 1.30 *************** *** 89,92 **** --- 89,107 ---- * This structure is used in the active NAT table and represents an * active NAT session. + * + * Generally nat_t structures have references from at least two places. + * The first place gives them a position in a linked list of NAT sessions + * per instace of IPFilter. In this linked list, nat_next always points to + * the next entry in the list and nat_pnext points to the pointer that + * introduces the structure. That may be either the top of the list pointer + * or simply the nat_next of the previous link in the list. The second place + * that a nat_t structure is generally referenced from is the NAT hash table. + * Two references from this table are required, one for supporting the of + * matching packets being transmitted and one for supporting the matching of + * packets being received. The hash table is comprised of buckets, each one + * having its own chain of nat_t structures. To support these chains, + * nat_hnext is used to point to the next member of the chain and nat_phnext + * points back to the pointer that is pointing to the nat_t in the chain, + * be it the bucket at the top or simply the previous nat_t chain entry. */ typedef struct nat { Index: ip_nat.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat.c,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** ip_nat.c 25 Aug 2012 14:46:06 -0000 1.99 --- ip_nat.c 12 Jan 2013 02:33:08 -0000 1.100 *************** *** 2322,2325 **** --- 2322,2326 ---- bkt = nat->nat_hv[0] % softn->ipf_nat_table_sz; nss = &softn->ipf_nat_stats.ns_side[0]; + ASSERT(nss->ns_bucketlen[bkt] > 0); nss->ns_bucketlen[bkt]--; if (nss->ns_bucketlen[bkt] == 0) { *************** *** 2329,2332 **** --- 2330,2334 ---- bkt = nat->nat_hv[1] % softn->ipf_nat_table_sz; nss = &softn->ipf_nat_stats.ns_side[1]; + ASSERT(nss->ns_bucketlen[bkt] > 0); nss->ns_bucketlen[bkt]--; if (nss->ns_bucketlen[bkt] == 0) { *************** *** 3473,3478 **** } ! nat->nat_hv[0] = hv0; ! nat->nat_hv[1] = hv1; MUTEX_INIT(&nat->nat_lock, "nat entry lock"); --- 3475,3485 ---- } ! if ((nat->nat_dir & NAT_OUTBOUND) == NAT_OUTBOUND) { ! nat->nat_hv[0] = hv0; ! nat->nat_hv[1] = hv1; ! } else { ! nat->nat_hv[0] = hv1; ! nat->nat_hv[1] = hv0; ! } MUTEX_INIT(&nat->nat_lock, "nat entry lock"); *************** *** 3512,3518 **** --- 3519,3527 ---- /* ------------------------------------------------------------------------ */ /* Function: ipf_nat_hashtab_add */ + /* Returns: int - 0 == sucess, -1 == failure */ /* Parameters: softc(I) - pointer to soft context main structure */ /* softn(I) - pointer to NAT context structure */ /* nat(I) - pointer to NAT structure */ + /* Write Lock: ipf_nat */ /* */ /* Handle the insertion of a NAT entry into the table/list. */ *************** *** 3531,3542 **** hv1 = nat->nat_hv[1] % softn->ipf_nat_table_sz; - if (nat->nat_dir == NAT_INBOUND || nat->nat_dir == NAT_DIVERTIN) { - u_int swap; - - swap = hv0; - hv0 = hv1; - hv1 = swap; - } - if (softn->ipf_nat_stats.ns_side[0].ns_bucketlen[hv0] >= softn->ipf_nat_maxbucket) { --- 3540,3543 ---- *************** *** 4343,4354 **** nat->nat_hnext[0]->nat_phnext[0] = nat->nat_phnext[0]; *nat->nat_phnext[0] = nat->nat_hnext[0]; ! nsp->ns_side[0].ns_bucketlen[nat->nat_hv[0] % ! softn->ipf_nat_table_sz]--; if (nat->nat_hnext[1]) nat->nat_hnext[1]->nat_phnext[1] = nat->nat_phnext[1]; *nat->nat_phnext[1] = nat->nat_hnext[1]; ! nsp->ns_side[1].ns_bucketlen[nat->nat_hv[1] % ! softn->ipf_nat_table_sz]--; /* --- 4344,4358 ---- nat->nat_hnext[0]->nat_phnext[0] = nat->nat_phnext[0]; *nat->nat_phnext[0] = nat->nat_hnext[0]; ! hv0 = nat->nat_hv[0] % softn->ipf_nat_table_sz; ! hv1 = nat->nat_hv[1] % softn->ipf_nat_table_sz; ! ! ASSERT(nsp->ns_side[0].ns_bucketlen[hv0] > 0); ! nsp->ns_side[0].ns_bucketlen[hv0]--; if (nat->nat_hnext[1]) nat->nat_hnext[1]->nat_phnext[1] = nat->nat_phnext[1]; *nat->nat_phnext[1] = nat->nat_hnext[1]; ! ASSERT(nsp->ns_side[1].ns_bucketlen[hv1] > 0); ! nsp->ns_side[1].ns_bucketlen[hv1]--; /* *************** *** 4362,4380 **** 0xffffffff); ! hv0 = rhv0 % softn->ipf_nat_table_sz; ! hv1 = rhv1 % softn->ipf_nat_table_sz; ! ! if (nat->nat_dir == NAT_INBOUND || nat->nat_dir == NAT_DIVERTIN) { ! u_int swap; ! ! swap = hv0; ! hv0 = hv1; ! hv1 = swap; } /* TRACE nat_osrcaddr, nat_osport, nat_odstaddr, nat_odport, hv0 */ /* TRACE nat_nsrcaddr, nat_nsport, nat_ndstaddr, nat_ndport, hv1 */ - nat->nat_hv[0] = rhv0; natp = &softn->ipf_nat_table[0][hv0]; if (*natp) --- 4366,4383 ---- 0xffffffff); ! if ((nat->nat_dir & NAT_OUTBOUND) == NAT_OUTBOUND) { ! nat->nat_hv[0] = rhv0; ! nat->nat_hv[1] = rhv1; ! } else { ! nat->nat_hv[0] = rhv1; ! nat->nat_hv[1] = rhv0; } + hv0 = nat->nat_hv[0] % softn->ipf_nat_table_sz; + hv1 = nat->nat_hv[1] % softn->ipf_nat_table_sz; + /* TRACE nat_osrcaddr, nat_osport, nat_odstaddr, nat_odport, hv0 */ /* TRACE nat_nsrcaddr, nat_nsport, nat_ndstaddr, nat_ndport, hv1 */ natp = &softn->ipf_nat_table[0][hv0]; if (*natp) *************** *** 4385,4389 **** nsp->ns_side[0].ns_bucketlen[hv0]++; - nat->nat_hv[1] = rhv1; natp = &softn->ipf_nat_table[1][hv1]; if (*natp) --- 4388,4391 ---- |
From: Darren <dar...@us...> - 2012-08-25 14:53:49
|
Update of /cvsroot/ipfilter/ipfilter In directory vz-cvs-4.sog:/tmp/cvs-serv26310 Modified Files: Tag: v5-1-RELEASE ip_nat.c ip_nat.h ip_nat6.c Log Message: 3561248 nat rules with icmpid do not work as advertised Index: ip_nat6.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat6.c,v retrieving revision 1.22.2.21 retrieving revision 1.22.2.22 diff -C2 -d -r1.22.2.21 -r1.22.2.22 *** ip_nat6.c 13 Aug 2012 11:44:15 -0000 1.22.2.21 --- ip_nat6.c 25 Aug 2012 14:53:46 -0000 1.22.2.22 *************** *** 332,337 **** n->in_use--; } ! ! /* ------------------------------------------------------------------------ */ /* Function: ipf_nat6_delmap */ --- 332,337 ---- n->in_use--; } ! ! /* ------------------------------------------------------------------------ */ /* Function: ipf_nat6_delmap */ *************** *** 672,676 **** } ! if ((port == 0) && (flags & (IPN_TCPUDPICMP|IPN_ICMPQUERY))) port = sport; --- 672,676 ---- } ! if ((port == 0) && (flags & IPN_TCPUDPICMP)) port = sport; *************** *** 1976,1980 **** } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_osport != dport) { continue; } --- 1976,1980 ---- } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_oicmpid != dport) { continue; } *************** *** 1994,1998 **** } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_osport != dport) { continue; } --- 1994,1998 ---- } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_nicmpid != dport) { continue; } *************** *** 2290,2294 **** } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_osport != dport) { continue; } --- 2290,2294 ---- } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_nicmpid != dport) { continue; } *************** *** 2309,2313 **** } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_osport != dport) { continue; } --- 2309,2313 ---- } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_oicmpid != dport) { continue; } *************** *** 2932,2938 **** } ! if ((nat->nat_nsport != 0) && (nflags & IPN_ICMPQUERY)) { icmp6 = fin->fin_dp; ! icmp6->icmp6_id = nat->nat_nicmpid; } --- 2932,2947 ---- } ! if ((nat->nat_nicmpid != 0) && (nflags & IPN_ICMPQUERY)) { icmp6 = fin->fin_dp; ! ! switch (nat->nat_dir) ! { ! case NAT_OUTBOUND : ! icmp6->icmp6_id = nat->nat_nicmpid; ! break; ! case NAT_INBOUND : ! icmp6->icmp6_id = nat->nat_oicmpid; ! break; ! } } *************** *** 3357,3364 **** ! if ((nat->nat_odport != 0) && (nflags & IPN_ICMPQUERY)) { icmp6 = fin->fin_dp; ! icmp6->icmp6_id = nat->nat_nicmpid; } --- 3366,3381 ---- ! if ((nat->nat_nicmpid != 0) && (nflags & IPN_ICMPQUERY)) { icmp6 = fin->fin_dp; ! switch (nat->nat_dir) ! { ! case NAT_INBOUND : ! icmp6->icmp6_id = nat->nat_nicmpid; ! break; ! case NAT_OUTBOUND : ! icmp6->icmp6_id = nat->nat_oicmpid; ! break; ! } } Index: ip_nat.h =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat.h,v retrieving revision 1.18.2.13 retrieving revision 1.18.2.14 diff -C2 -d -r1.18.2.13 -r1.18.2.14 *** ip_nat.h 22 Jul 2012 08:04:23 -0000 1.18.2.13 --- ip_nat.h 25 Aug 2012 14:53:46 -0000 1.18.2.14 *************** *** 342,348 **** #define IPN_TCPUDP (IPN_TCP|IPN_UDP) #define IPN_ICMPERR 0x00004 ! #define IPN_TCPUDPICMP (IPN_TCP|IPN_UDP|IPN_ICMPERR) #define IPN_ICMPQUERY 0x00008 - #define IPN_TCPUDPICMPQ (IPN_TCP|IPN_UDP|IPN_ICMPQUERY) #define IPN_RF (IPN_TCPUDP|IPN_DELETE|IPN_ICMPERR) #define IPN_AUTOPORTMAP 0x00010 --- 342,347 ---- #define IPN_TCPUDP (IPN_TCP|IPN_UDP) #define IPN_ICMPERR 0x00004 ! #define IPN_TCPUDPICMP (IPN_TCP|IPN_UDP|IPN_ICMPQUERY) #define IPN_ICMPQUERY 0x00008 #define IPN_RF (IPN_TCPUDP|IPN_DELETE|IPN_ICMPERR) #define IPN_AUTOPORTMAP 0x00010 Index: ip_nat.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat.c,v retrieving revision 1.60.2.41 retrieving revision 1.60.2.42 diff -C2 -d -r1.60.2.41 -r1.60.2.42 *** ip_nat.c 13 Aug 2012 11:44:15 -0000 1.60.2.41 --- ip_nat.c 25 Aug 2012 14:53:46 -0000 1.60.2.42 *************** *** 2821,2825 **** } ! if ((port == 0) && (flags & (IPN_TCPUDPICMP|IPN_ICMPQUERY))) port = sport; --- 2821,2825 ---- } ! if ((port == 0) && (flags & (IPN_TCPUDPICMP|IPN_ICMPERR))) port = sport; *************** *** 4157,4161 **** } else if (p == IPPROTO_ICMP) { ! if (nat->nat_osport != dport) { continue; } --- 4157,4161 ---- } else if (p == IPPROTO_ICMP) { ! if (nat->nat_oicmpid != dport) { continue; } *************** *** 4183,4187 **** } else if (p == IPPROTO_ICMP) { ! if (nat->nat_osport != dport) { continue; } --- 4183,4187 ---- } else if (p == IPPROTO_ICMP) { ! if (nat->nat_nicmpid != dport) { continue; } *************** *** 4488,4492 **** } else if (p == IPPROTO_ICMP) { ! if (nat->nat_osport != dport) { continue; } --- 4488,4492 ---- } else if (p == IPPROTO_ICMP) { ! if (nat->nat_nicmpid != dport) { continue; } *************** *** 4508,4512 **** } else if (p == IPPROTO_ICMP) { ! if (nat->nat_osport != dport) { continue; } --- 4508,4512 ---- } else if (p == IPPROTO_ICMP) { ! if (nat->nat_oicmpid != dport) { continue; } *************** *** 5275,5281 **** } ! if ((nat->nat_nsport != 0) && (nflags & IPN_ICMPQUERY)) { icmp = fin->fin_dp; ! icmp->icmp_id = nat->nat_nicmpid; } --- 5275,5291 ---- } ! ! if ((nat->nat_oicmpid != 0) && (nflags & IPN_ICMPQUERY)) { icmp = fin->fin_dp; ! ! switch (nat->nat_dir) ! { ! case NAT_OUTBOUND : ! icmp->icmp_id = nat->nat_nicmpid; ! break; ! case NAT_INBOUND : ! icmp->icmp_id = nat->nat_oicmpid; ! break; ! } } *************** *** 5749,5756 **** ! if ((nat->nat_odport != 0) && (nflags & IPN_ICMPQUERY)) { icmp = fin->fin_dp; ! icmp->icmp_id = nat->nat_nicmpid; } --- 5759,5774 ---- ! if ((nat->nat_oicmpid != 0) && (nflags & IPN_ICMPQUERY)) { icmp = fin->fin_dp; ! switch (nat->nat_dir) ! { ! case NAT_INBOUND : ! icmp->icmp_id = nat->nat_nicmpid; ! break; ! case NAT_OUTBOUND : ! icmp->icmp_id = nat->nat_oicmpid; ! break; ! } } |
From: Darren <dar...@us...> - 2012-08-25 14:53:48
|
Update of /cvsroot/ipfilter/ipfilter/test In directory vz-cvs-4.sog:/tmp/cvs-serv26310/test Modified Files: Tag: v5-1-RELEASE test.format Log Message: 3561248 nat rules with icmpid do not work as advertised Index: test.format =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/test.format,v retrieving revision 1.17.2.5 retrieving revision 1.17.2.6 diff -C2 -d -r1.17.2.5 -r1.17.2.6 *** test.format 25 Aug 2012 14:30:34 -0000 1.17.2.5 --- test.format 25 Aug 2012 14:53:46 -0000 1.17.2.6 *************** *** 158,159 **** --- 158,161 ---- in101_6 text text -6 in102_6 text text -6 + n20 hex hex + n20_6 hex hex -6 |
From: Darren <dar...@us...> - 2012-08-25 14:49:41
|
Update of /cvsroot/ipfilter/ipfilter/BSDOS In directory vz-cvs-4.sog:/tmp/cvs-serv26157/BSDOS Removed Files: Tag: v5-1-RELEASE files.diffs ioconf.c.i386.diffs ip_input.c.diffs ip_output.c.diffs kinstall Log Message: 3561708 old platform support files can go --- ioconf.c.i386.diffs DELETED --- --- ip_input.c.diffs DELETED --- --- kinstall DELETED --- --- files.diffs DELETED --- --- ip_output.c.diffs DELETED --- |
From: Darren <dar...@us...> - 2012-08-25 14:49:28
|
Update of /cvsroot/ipfilter/ipfilter/BSDOS In directory vz-cvs-4.sog:/tmp/cvs-serv26110/BSDOS Removed Files: files.diffs ioconf.c.i386.diffs ip_input.c.diffs ip_output.c.diffs kinstall Log Message: 3561708 old platform support files can go --- ioconf.c.i386.diffs DELETED --- --- ip_input.c.diffs DELETED --- --- kinstall DELETED --- --- files.diffs DELETED --- --- ip_output.c.diffs DELETED --- |
From: Darren <dar...@us...> - 2012-08-25 14:46:08
|
Update of /cvsroot/ipfilter/ipfilter In directory vz-cvs-4.sog:/tmp/cvs-serv25813 Modified Files: ip_nat.c ip_nat.h ip_nat6.c Log Message: 3561248 nat rules with icmpid do not work as advertised Index: ip_nat6.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat6.c,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ip_nat6.c 13 Aug 2012 11:42:01 -0000 1.41 --- ip_nat6.c 25 Aug 2012 14:46:06 -0000 1.42 *************** *** 671,675 **** } ! if ((port == 0) && (flags & (IPN_TCPUDPICMP|IPN_ICMPQUERY))) port = sport; --- 671,675 ---- } ! if ((port == 0) && (flags & IPN_TCPUDPICMP)) port = sport; *************** *** 1975,1979 **** } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_osport != dport) { continue; } --- 1975,1979 ---- } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_oicmpid != dport) { continue; } *************** *** 1993,1997 **** } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_osport != dport) { continue; } --- 1993,1997 ---- } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_nicmpid != dport) { continue; } *************** *** 2289,2293 **** } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_osport != dport) { continue; } --- 2289,2293 ---- } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_nicmpid != dport) { continue; } *************** *** 2308,2312 **** } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_osport != dport) { continue; } --- 2308,2312 ---- } else if (p == IPPROTO_ICMPV6) { ! if (nat->nat_oicmpid != dport) { continue; } *************** *** 2931,2937 **** } ! if ((nat->nat_nsport != 0) && (nflags & IPN_ICMPQUERY)) { icmp6 = fin->fin_dp; ! icmp6->icmp6_id = nat->nat_nicmpid; } --- 2931,2946 ---- } ! if ((nat->nat_nicmpid != 0) && (nflags & IPN_ICMPQUERY)) { icmp6 = fin->fin_dp; ! ! switch (nat->nat_dir) ! { ! case NAT_OUTBOUND : ! icmp6->icmp6_id = nat->nat_nicmpid; ! break; ! case NAT_INBOUND : ! icmp6->icmp6_id = nat->nat_oicmpid; ! break; ! } } *************** *** 3356,3363 **** ! if ((nat->nat_odport != 0) && (nflags & IPN_ICMPQUERY)) { icmp6 = fin->fin_dp; ! icmp6->icmp6_id = nat->nat_nicmpid; } --- 3365,3380 ---- ! if ((nat->nat_nicmpid != 0) && (nflags & IPN_ICMPQUERY)) { icmp6 = fin->fin_dp; ! switch (nat->nat_dir) ! { ! case NAT_INBOUND : ! icmp6->icmp6_id = nat->nat_nicmpid; ! break; ! case NAT_OUTBOUND : ! icmp6->icmp6_id = nat->nat_oicmpid; ! break; ! } } Index: ip_nat.h =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** ip_nat.h 22 Jul 2012 08:02:22 -0000 1.28 --- ip_nat.h 25 Aug 2012 14:46:06 -0000 1.29 *************** *** 342,348 **** #define IPN_TCPUDP (IPN_TCP|IPN_UDP) #define IPN_ICMPERR 0x00004 ! #define IPN_TCPUDPICMP (IPN_TCP|IPN_UDP|IPN_ICMPERR) #define IPN_ICMPQUERY 0x00008 - #define IPN_TCPUDPICMPQ (IPN_TCP|IPN_UDP|IPN_ICMPQUERY) #define IPN_RF (IPN_TCPUDP|IPN_DELETE|IPN_ICMPERR) #define IPN_AUTOPORTMAP 0x00010 --- 342,347 ---- #define IPN_TCPUDP (IPN_TCP|IPN_UDP) #define IPN_ICMPERR 0x00004 ! #define IPN_TCPUDPICMP (IPN_TCP|IPN_UDP|IPN_ICMPQUERY) #define IPN_ICMPQUERY 0x00008 #define IPN_RF (IPN_TCPUDP|IPN_DELETE|IPN_ICMPERR) #define IPN_AUTOPORTMAP 0x00010 Index: ip_nat.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_nat.c,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** ip_nat.c 13 Aug 2012 11:42:01 -0000 1.98 --- ip_nat.c 25 Aug 2012 14:46:06 -0000 1.99 *************** *** 2822,2826 **** } ! if ((port == 0) && (flags & (IPN_TCPUDPICMP|IPN_ICMPQUERY))) port = sport; --- 2822,2826 ---- } ! if ((port == 0) && (flags & (IPN_TCPUDPICMP|IPN_ICMPERR))) port = sport; *************** *** 4158,4162 **** } else if (p == IPPROTO_ICMP) { ! if (nat->nat_osport != dport) { continue; } --- 4158,4162 ---- } else if (p == IPPROTO_ICMP) { ! if (nat->nat_oicmpid != dport) { continue; } *************** *** 4184,4188 **** } else if (p == IPPROTO_ICMP) { ! if (nat->nat_osport != dport) { continue; } --- 4184,4188 ---- } else if (p == IPPROTO_ICMP) { ! if (nat->nat_nicmpid != dport) { continue; } *************** *** 4489,4493 **** } else if (p == IPPROTO_ICMP) { ! if (nat->nat_osport != dport) { continue; } --- 4489,4493 ---- } else if (p == IPPROTO_ICMP) { ! if (nat->nat_nicmpid != dport) { continue; } *************** *** 4509,4513 **** } else if (p == IPPROTO_ICMP) { ! if (nat->nat_osport != dport) { continue; } --- 4509,4513 ---- } else if (p == IPPROTO_ICMP) { ! if (nat->nat_oicmpid != dport) { continue; } *************** *** 5276,5282 **** } ! if ((nat->nat_nsport != 0) && (nflags & IPN_ICMPQUERY)) { icmp = fin->fin_dp; ! icmp->icmp_id = nat->nat_nicmpid; } --- 5276,5292 ---- } ! ! if ((nat->nat_oicmpid != 0) && (nflags & IPN_ICMPQUERY)) { icmp = fin->fin_dp; ! ! switch (nat->nat_dir) ! { ! case NAT_OUTBOUND : ! icmp->icmp_id = nat->nat_nicmpid; ! break; ! case NAT_INBOUND : ! icmp->icmp_id = nat->nat_oicmpid; ! break; ! } } *************** *** 5750,5757 **** ! if ((nat->nat_odport != 0) && (nflags & IPN_ICMPQUERY)) { icmp = fin->fin_dp; ! icmp->icmp_id = nat->nat_nicmpid; } --- 5760,5775 ---- ! if ((nat->nat_oicmpid != 0) && (nflags & IPN_ICMPQUERY)) { icmp = fin->fin_dp; ! switch (nat->nat_dir) ! { ! case NAT_INBOUND : ! icmp->icmp_id = nat->nat_nicmpid; ! break; ! case NAT_OUTBOUND : ! icmp->icmp_id = nat->nat_oicmpid; ! break; ! } } |
Update of /cvsroot/ipfilter/ipfilter/test/regress In directory vz-cvs-4.sog:/tmp/cvs-serv24069/regress Added Files: Tag: v5-1-RELEASE in100_6 in101_6 in102_6 in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6 Log Message: 3561650 no testing of ipv6 nat parsing --- NEW FILE: in102_6 --- rewrite in on bge0 inet6 proto tcp from any to any -> src 0/0 dst dstlist/a; rewrite in on bge0 inet6 proto tcp from 1:1:1::1 to any -> src 0/0 dst dstlist/bee; rewrite in on bge0 inet6 proto tcp from 1:1:1::1 to 2:2::2:2 -> src 0/0 dst dstlist/cat; rewrite in on bge0 inet6 proto tcp from pool/a to 2:2::2:2 -> src 0/0 dst dstlist/bat; rewrite in on bge0 inet6 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant; --- NEW FILE: in3_6 --- bimap le0 inet6 0/0 -> 0/128 bimap le0 inet6 1/128 -> 1/128 bimap le0 inet6 128::/1 -> 0/0 bimap le0 inet6 10::/16 -> 1:2:3::0/96 bimap le0 inet6 10:0:5::6/96 -> 1:2:3::4/96 --- NEW FILE: in4_6 --- map-block le0 inet6 10::/96 -> 203:1:1::/96 map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 0 map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 256 map-block le0 inet6 10::/96 -> 203:1:1::/96 ports auto map-block le0 inet6 10::/16 -> 203:1:1::/96 ports auto --- NEW FILE: in1_6 --- map le0 inet6 0/0 -> 0/128 map le0 inet6 1/128 -> 1/128 map le0 inet6 128::/1 -> 0/0 map le0 inet6 10::0/16 -> 1:2:3::0/96 map le0 inet6 10::5/16 -> 1:2:3::4/96 map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999 map ppp0 inet6 192:168::/32 -> 0/128 portmap udp 20000:29999 map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp/udp 30000:39999 map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp auto map ppp0 inet6 192:168::/32 -> 0/128 portmap udp auto map ppp0 inet6 192:168::/32 -> 0/128 portmap tcpudp auto map ppp0 inet6 192:168::/32 -> 0/128 proxy port ftp ftp/6 map ppp0 inet6 192:168::/32 -> 0/128 proxy port 1010 ftp/tcp map le0 inet6 0/0 -> 0/128 frag map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999 frag map ppp0 inet6 192:168::/32 -> 0/128 proxy port ftp ftp/tcp frag map le0 inet6 0/0 -> 0/128 age 10 map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 age 10/20 map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999 age 30 map le0 inet6 0/0 -> 0/128 frag age 10 map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag age 10/20 map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999 frag age 30 map fxp0 inet6 from 192:168::/18 to 0/0 port = 21 -> 1:2:3::4/128 proxy port 21 ftp/tcp map thisisalonginte inet6 0/0 -> 0/128 mssclamp 1452 tag freddyliveshere map bar0 inet6 0/0 -> 0/128 icmpidmap ipv6-icmp 1000:2000 map ppp0,adsl0 inet6 0/0 -> 0/128 map ppp0 inet6 from 192:168::/32 to any port = 123 -> 0/128 age 30/1 udp --- NEW FILE: in8_6 --- map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 purge map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 tcp purge map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 mssclamp 1000 purge map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 purge map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge --- NEW FILE: in5_6 --- map le0 inet6 from 9:8:7::6/128 port > 1024 to any -> 1.1.1.1 portmap 10000:20000 tcp map le0 inet6 from 9:8:7::6/128 port > 1024 to ! 1.2.3.4 -> 1.1.1.1 portmap 10000:20000 tcp rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1.1.1.1 port 0 tcp rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1.1.1.1 port 0 ip rdr le0 inet6 ! from 1.2.3.4 to 9:8:7::6 port = 8888 -> 1.1.1.1 port 888 tcp rdr le0 inet6 from any to 9:8:7::6/255.255.255.255 port = 8888 -> 1.1.1.1 port 888 ip rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1 port 888 tcp rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1 port 888 udp rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1 port 888 tcp/udp rdr le0 inet6 from any to 9:8:7::6/128 -> 1.1.1.1 port 888 icmp rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1 port 888 tcp round-robin rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin rdr le0 inet6 from any to 9:8:7::6/128 -> 1.1.1.1 port 0 ip frag rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1 port 888 icmp frag rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1 port 888 tcp round-robin frag rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag rdr le0 inet6 from any to 9:8:7::6/128 -> 1.1.1.1 port 0 ip frag age 10 rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1.1.1.1 port 0 ip frag age 10/20 rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1 port 888 icmp frag age 10 rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag age 20 rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1 port 888 tcp round-robin frag age 30 rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag age 40 --- NEW FILE: in101_6 --- rewrite in on bge0 proto icmp from 1:1:1::1 to 2:2::2:2 -> src 3:3:3::3 dst 4::4:4:4; rewrite in on bge0 proto udp from 1:1:1::1 to 2:2::2:2 -> src 3:3:3::3 dst 4::4:4:4; rewrite out on bge0 proto tcp from 1:1:1::1/128 to 2:2::2:2 -> src 3:3:3::0/24 dst 4::4:4:4; rewrite in on bge0 proto tcp/udp from 1:1:1::1/128 to 2:2::2:2/32 -> src 3:3:3::0/24,20202 dst 4::4:4:4/24,10101; --- NEW FILE: in2_6 --- rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 tcp rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 255 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1 ip rdr le0 inet6 9:8:7::6/32 -> 1:1:1::1 ip rdr le0 inet6 9:8:7::6/64 -> 1:1:1::1 ip rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp rdr le0 inet6 9:8:7::6/128 port 80 -> 0/0 port 80 tcp rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 udp rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp/udp rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcpudp frag rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1 ip frag age 10 rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40 rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip sticky rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10 sticky rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20 sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10 sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20 sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30 sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40 sticky rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10 sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20 sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10 sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20 sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10 sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20 sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10 sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20 sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000 tag nattagcacheline rdr ge0 9:8:7::6/128 -> 1:1:1::1 proxy port 21 ftp/tcp rdr ge0 9:8:7::6/128 port 21 -> 1:1:1::1 port 21 tcp proxy ftp rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1 port 5555 tcp rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1 port = 5555 tcp rdr le0 inet6 0/0 -> test.host.dots rdr le0 inet6 any -> test.host.dots,test.host.dots rdr adsl0,ppp0 9:8:7::6/128 port 1000-2000 -> 1:1:1::1 port 5555-7777 tcp --- NEW FILE: in100_6 --- rewrite in on bge0 inet6 from 1:1:1::1 to 2:2::2:2 -> src 3:3:3::3 dst 4::4:4:4; rewrite out on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2 -> src 3:3:3::0/96 dst 4::4:4:4; rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::0/96 dst 4::4:4:4/96; --- NEW FILE: in6_6 --- map foo0 inet6 from any port = 1 to any port != 0 -> 0/32 udp map foo0 inet6 from any port eq 1 to any port ne 0 -> 0/32 udp map foo0 inet6 from any port < 1 to any port > 0 -> 0/32 tcp map foo0 inet6 from any port lt 1 to any port gt 0 -> 0/32 tcp map foo0 inet6 from any port <= 1 to any port >= 0 -> 0/32 tcp/udp map foo0 inet6 from any port le 1 to any port ge 0 -> 0/32 tcp/udp map foo0 inet6 from any port 1 >< 20 to any port 20 <> 40 -> 0/32 tcp/udp map foo0 inet6 from any port 10:20 to any port 30:40 -> 0/32 tcp/udp |
From: Darren <dar...@us...> - 2012-08-25 14:32:43
|
Update of /cvsroot/ipfilter/ipfilter/test In directory vz-cvs-4.sog:/tmp/cvs-serv23635 Modified Files: Tag: v5-1-RELEASE Makefile Log Message: 3561650 no testing of ipv6 nat parsing Index: Makefile =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/Makefile,v retrieving revision 1.19.2.6 retrieving revision 1.19.2.7 diff -C2 -d -r1.19.2.6 -r1.19.2.7 *** Makefile 25 Aug 2012 14:30:34 -0000 1.19.2.6 --- Makefile 25 Aug 2012 14:32:41 -0000 1.19.2.7 *************** *** 1,4 **** # ! # (C)opyright 1993-1996 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- # ! # (C)opyright 2012 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. *************** *** 34,40 **** i20 i21 i22 i23 ! ntests: n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n15 n16 n17 n18 n100 n101 n102 n103 n104 n105 n106 n200 ! ntests6: n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6 nitests: ni1 ni2 ni3 ni4 ni5 ni6 ni7 ni8 ni9 ni10 ni11 ni12 ni13 ni14 ni15 \ --- 34,40 ---- i20 i21 i22 i23 ! ntests: n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n15 n16 n17 n18 n20 n100 n101 n102 n103 n104 n105 n106 n200 ! ntests6: n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6 n20_6 nitests: ni1 ni2 ni3 ni4 ni5 ni6 ni7 ni8 ni9 ni10 ni11 ni12 ni13 ni14 ni15 \ *************** *** 266,269 **** --- 266,272 ---- @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` + n20: expected/n20 regress/n20 input/n20 + @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` + n100: expected/n100 regress/n100 input/n100 @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` *************** *** 323,326 **** --- 326,332 ---- @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` + n20_6: expected/n20_6 regress/n20_6 input/n20_6 + @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` + ni2: expected/ni2 input/ni2 regress/ni2.nat regress/ni2.ipf @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` *************** *** 528,533 **** /bin/rm -f i18 i19 i20 i21 i22 i23 /bin/rm -f in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6 in100_6 in101_6 in102_6 ! /bin/rm -f n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n15 n16 n17 n18 n100 n101 n102 n103 n104 n105 n106 n200 ! /bin/rm -f n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6 /bin/rm -f ni1 ni2 ni3 ni4 ni5 ni6 ni7 ni8 ni9 /bin/rm -f ni10 ni11 ni12 ni13 ni14 ni15 ni16 ni17 ni18 ni19 ni20 ni21 ni23 --- 534,539 ---- /bin/rm -f i18 i19 i20 i21 i22 i23 /bin/rm -f in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6 in100_6 in101_6 in102_6 ! /bin/rm -f n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n15 n16 n17 n18 n20 n100 n101 n102 n103 n104 n105 n106 n200 ! /bin/rm -f n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6 n20_6 /bin/rm -f ni1 ni2 ni3 ni4 ni5 ni6 ni7 ni8 ni9 /bin/rm -f ni10 ni11 ni12 ni13 ni14 ni15 ni16 ni17 ni18 ni19 ni20 ni21 ni23 |
From: Darren <dar...@us...> - 2012-08-25 14:30:37
|
Update of /cvsroot/ipfilter/ipfilter/test In directory vz-cvs-4.sog:/tmp/cvs-serv22423 Modified Files: Tag: v5-1-RELEASE test.format Makefile Log Message: 3561650 no testing of ipv6 nat parsing Index: test.format =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/test.format,v retrieving revision 1.17.2.4 retrieving revision 1.17.2.5 diff -C2 -d -r1.17.2.4 -r1.17.2.5 *** test.format 20 Jul 2012 08:10:50 -0000 1.17.2.4 --- test.format 25 Aug 2012 14:30:34 -0000 1.17.2.5 *************** *** 117,120 **** --- 117,121 ---- p6 text text p7 text text + p8 text text p9 text text p10 text text *************** *** 147,148 **** --- 148,159 ---- f29 text text f30 text text + in1_6 text text -6 + in2_6 text text -6 + in3_6 text text -6 + in4_6 text text -6 + in5_6 text text -6 + in6_6 text text -6 + in8_6 text text -6 + in100_6 text text -6 + in101_6 text text -6 + in102_6 text text -6 Index: Makefile =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/Makefile,v retrieving revision 1.19.2.5 retrieving revision 1.19.2.6 diff -C2 -d -r1.19.2.5 -r1.19.2.6 *** Makefile 20 Jul 2012 08:10:50 -0000 1.19.2.5 --- Makefile 25 Aug 2012 14:30:34 -0000 1.19.2.6 *************** *** 43,51 **** intests: in1 in2 in3 in4 in5 in6 in7 in8 in100 in101 in102 logtests: l1 pools: p1 p2 p3 p4 p5 p6 p7 p9 p10 p11 p12 p13 ip1 ip2 ip3 ! ipv6: ipv6.1 ipv6.2 ipv6.3 ipv6.4 ipv6.5 ipv6.6 ntests6 bpf: bpf1 bpf-f1 --- 43,53 ---- intests: in1 in2 in3 in4 in5 in6 in7 in8 in100 in101 in102 + intests6: in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6 in100_6 in101_6 in102_6 + logtests: l1 pools: p1 p2 p3 p4 p5 p6 p7 p9 p10 p11 p12 p13 ip1 ip2 ip3 ! ipv6: ipv6.1 ipv6.2 ipv6.3 ipv6.4 ipv6.5 ipv6.6 ntests6 intests6 bpf: bpf1 bpf-f1 *************** *** 420,423 **** --- 422,456 ---- @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + in1_6: expected/in1_6 regress/in1_6 + @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + + in2_6: expected/in2_6 regress/in2_6 + @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + + in3_6: expected/in3_6 regress/in3_6 + @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + + in4_6: expected/in4_6 regress/in4_6 + @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + + in5_6: expected/in5_6 regress/in5_6 + @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + + in6_6: expected/in6_6 regress/in6_6 + @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + + in8_6: expected/in8_6 regress/in8_6 + @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + + in100_6: expected/in100_6 regress/in100_6 + @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + + in101_6: expected/in101_6 regress/in101_6 + @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + + in102_6: expected/in102_6 regress/in102_6 + @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` + + l1: l1: @/bin/sh ./logtest `awk "/^$@ / { print; } " test.format` *************** *** 494,497 **** --- 527,531 ---- /bin/rm -f i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 i12 i13 i14 i15 i16 i17 /bin/rm -f i18 i19 i20 i21 i22 i23 + /bin/rm -f in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6 in100_6 in101_6 in102_6 /bin/rm -f n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n15 n16 n17 n18 n100 n101 n102 n103 n104 n105 n106 n200 /bin/rm -f n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6 |
From: Darren <dar...@us...> - 2012-08-25 14:28:09
|
Update of /cvsroot/ipfilter/ipfilter/test In directory vz-cvs-4.sog:/tmp/cvs-serv22219 Modified Files: test.format Makefile Log Message: 3561650 no testing of ipv6 nat parsing Index: test.format =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/test.format,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** test.format 20 Jul 2012 08:07:00 -0000 1.23 --- test.format 25 Aug 2012 14:28:07 -0000 1.24 *************** *** 92,96 **** ni3 hex hex update_ipid=1 ni4 hex hex update_ipid=1 ! ni5 hex hex update_ipid=1 ni6 hex text update_ipid=1 -D ni7 hex hex update_ipid=1 --- 92,96 ---- ni3 hex hex update_ipid=1 ni4 hex hex update_ipid=1 ! ni5 hex hex update_ipid=1,ftp_debug=8 ni6 hex text update_ipid=1 -D ni7 hex hex update_ipid=1 *************** *** 148,149 **** --- 148,159 ---- f29 text text f30 text text + in1_6 text text -6 + in2_6 text text -6 + in3_6 text text -6 + in4_6 text text -6 + in5_6 text text -6 + in6_6 text text -6 + in8_6 text text -6 + in100_6 text text -6 + in101_6 text text -6 + in102_6 text text -6 Index: Makefile =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/Makefile,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Makefile 20 Jul 2012 08:06:58 -0000 1.25 --- Makefile 25 Aug 2012 14:28:07 -0000 1.26 *************** *** 141,144 **** --- 141,156 ---- # Basic IPv6 NAT tests # + intests6: \ + $(RESDIR)/in1_6 \ + $(RESDIR)/in2_6 \ + $(RESDIR)/in3_6 \ + $(RESDIR)/in4_6 \ + $(RESDIR)/in5_6 \ + $(RESDIR)/in6_6 \ + $(RESDIR)/in8_6 \ + $(RESDIR)/in100_6 \ + $(RESDIR)/in101_6 \ + $(RESDIR)/in102_6 + ntests6: \ $(RESDIR)/n1_6 \ *************** *** 224,227 **** --- 236,240 ---- $(RESDIR)/ipv6_5 \ $(RESDIR)/ipv6_6 \ + intests6 \ ntests6 *************** *** 598,601 **** --- 611,644 ---- @/bin/sh ./logtest $@ $(TESTMODE) + $(RESDIR)/in1_6: expected/in1_6 regress/in1_6 + @/bin/sh ./in_test $@ $(TESTMODE) + + $(RESDIR)/in2_6: expected/in2_6 regress/in2_6 + @/bin/sh ./in_test $@ $(TESTMODE) + + $(RESDIR)/in3_6: expected/in3_6 regress/in3_6 + @/bin/sh ./in_test $@ $(TESTMODE) + + $(RESDIR)/in4_6: expected/in4_6 regress/in4_6 + @/bin/sh ./in_test $@ $(TESTMODE) + + $(RESDIR)/in5_6: expected/in5_6 regress/in5_6 + @/bin/sh ./in_test $@ $(TESTMODE) + + $(RESDIR)/in6_6: expected/in6_6 regress/in6_6 + @/bin/sh ./in_test $@ $(TESTMODE) + + $(RESDIR)/in8_6: expected/in8_6 regress/in8_6 + @/bin/sh ./in_test $@ $(TESTMODE) + + $(RESDIR)/in100_6: expected/in100_6 regress/in100_6 + @/bin/sh ./in_test $@ $(TESTMODE) + + $(RESDIR)/in101_6: expected/in101_6 regress/in101_6 + @/bin/sh ./in_test $@ $(TESTMODE) + + $(RESDIR)/in102_6: expected/in102_6 regress/in102_6 + @/bin/sh ./in_test $@ $(TESTMODE) + $(RESDIR)/ipv6_1: expected/ipv6_1 input/$(RESDIR)/ipv6_1 regress/$(RESDIR)/ipv6_1 @/bin/sh ./ipv6_test $@ $(TESTMODE) |
From: Darren <dar...@us...> - 2012-08-25 14:19:22
|
Update of /cvsroot/ipfilter/ipfilter/test/expected In directory vz-cvs-4.sog:/tmp/cvs-serv20435/expected Modified Files: in2_6 Log Message: 3561690 ipv6 address for test.hosts.dots in wrong byte order Index: in2_6 =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/in2_6,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** in2_6 25 Aug 2012 11:50:45 -0000 1.1 --- in2_6 25 Aug 2012 14:19:20 -0000 1.2 *************** *** 67,71 **** rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port 5555 tcp rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port = 5555 tcp ! rdr le0 inet6 any -> fedc:ba98:7200:0:a072:1c28:700:0/32 ip ! rdr le0 inet6 any -> fedc:ba98:7200:0:a072:1c28:700:0,fedc:ba98:7200:0:a072:1c28:700:0 ip rdr adsl0,ppp0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port 5555-7777 tcp --- 67,71 ---- rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port 5555 tcp rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port = 5555 tcp ! rdr le0 inet6 any -> fe80:aa55:1234:5678:5a5a:a5a5:fedc:ba98/128 ip ! rdr le0 inet6 any -> fe80:aa55:1234:5678:5a5a:a5a5:fedc:ba98,fe80:aa55:1234:5678:5a5a:a5a5:fedc:ba98 ip rdr adsl0,ppp0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port 5555-7777 tcp |
From: Darren <dar...@us...> - 2012-08-25 14:16:43
|
Update of /cvsroot/ipfilter/ipfilter/lib In directory vz-cvs-4.sog:/tmp/cvs-serv20303/lib Modified Files: Tag: v5-1-RELEASE gethost.c Log Message: 3561690 ipv6 address for test.hosts.dots in wrong byte order Index: gethost.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/gethost.c,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** gethost.c 22 Jul 2012 08:04:24 -0000 1.8.2.2 --- gethost.c 25 Aug 2012 14:16:41 -0000 1.8.2.3 *************** *** 24,31 **** #ifdef USE_INET6 if (family == AF_INET6) { ! hostp->i6[0] = 0xfe80aa55; ! hostp->i6[1] = 0x12345678; ! hostp->i6[2] = 0x5a5aa5a5; ! hostp->i6[3] = 0xfedcba98; } #endif --- 24,31 ---- #ifdef USE_INET6 if (family == AF_INET6) { ! hostp->i6[0] = htonl(0xfe80aa55); ! hostp->i6[1] = htonl(0x12345678); ! hostp->i6[2] = htonl(0x5a5aa5a5); ! hostp->i6[3] = htonl(0xfedcba98); } #endif |
From: Darren <dar...@us...> - 2012-08-25 14:16:29
|
Update of /cvsroot/ipfilter/ipfilter/lib In directory vz-cvs-4.sog:/tmp/cvs-serv20290/lib Modified Files: gethost.c Log Message: 3561690 ipv6 address for test.hosts.dots in wrong byte order Index: gethost.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/gethost.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gethost.c 22 Jul 2012 08:02:23 -0000 1.9 --- gethost.c 25 Aug 2012 14:16:27 -0000 1.10 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. *************** *** 24,31 **** #ifdef USE_INET6 if (family == AF_INET6) { ! hostp->i6[0] = 0xfe80aa55; ! hostp->i6[1] = 0x12345678; ! hostp->i6[2] = 0x5a5aa5a5; ! hostp->i6[3] = 0xfedcba98; } #endif --- 24,31 ---- #ifdef USE_INET6 if (family == AF_INET6) { ! hostp->i6[0] = htonl(0xfe80aa55); ! hostp->i6[1] = htonl(0x12345678); ! hostp->i6[2] = htonl(0x5a5aa5a5); ! hostp->i6[3] = htonl(0xfedcba98); } #endif |
From: Darren <dar...@us...> - 2012-08-25 14:14:10
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory vz-cvs-4.sog:/tmp/cvs-serv20246/tools Modified Files: Tag: v5-1-RELEASE ipnat_y.y Log Message: 3561691 gethost never returns an ipv6 address Index: ipnat_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipnat_y.y,v retrieving revision 1.19.2.13 retrieving revision 1.19.2.14 diff -C2 -d -r1.19.2.13 -r1.19.2.14 *** ipnat_y.y 20 Jul 2012 08:14:05 -0000 1.19.2.13 --- ipnat_y.y 25 Aug 2012 14:14:08 -0000 1.19.2.14 *************** *** 870,876 **** free($2); if ($3.p1 < 0 || $3.p1 > 65535) ! yyerror("invalid ICMP Id number"); if ($3.p2 < 0 || $3.p2 > 65535) ! yyerror("invalid ICMP Id number"); if (strcmp($2, "ipv6-icmp") == 0) { nat->in_pr[0] = IPPROTO_ICMPV6; --- 870,876 ---- free($2); if ($3.p1 < 0 || $3.p1 > 65535) ! yyerror("invalid 1st ICMP Id number"); if ($3.p2 < 0 || $3.p2 > 65535) ! yyerror("invalid 2nd ICMP Id number"); if (strcmp($2, "ipv6-icmp") == 0) { nat->in_pr[0] = IPPROTO_ICMPV6; *************** *** 1163,1177 **** hostname: YY_STR { i6addr_t addr; bzero(&$$, sizeof($$)); ! if (gethost(AF_INET, $1, ! &addr) == 0) { ! $$.a = addr; ! $$.f = AF_INET; ! } else ! if (gethost(AF_INET6, $1, &addr) == 0) { $$.a = addr; - $$.f = AF_INET6; } else { FPRINTF(stderr, --- 1163,1179 ---- hostname: YY_STR { i6addr_t addr; + int family; + #ifdef USE_INET6 + if (nat->in_v[0] == 6) + family = AF_INET6; + else + #endif + family = AF_INET; bzero(&$$, sizeof($$)); ! $$.f = family; ! if (gethost(family, $1, &addr) == 0) { $$.a = addr; } else { FPRINTF(stderr, *************** *** 1426,1429 **** --- 1428,1434 ---- nat->in_flags &= ~IPN_TCP; break; + #ifdef USE_INET6 + case IPPROTO_ICMPV6 : + #endif case IPPROTO_ICMP : nat->in_flags &= ~IPN_TCPUDP; |
From: Darren <dar...@us...> - 2012-08-25 14:11:22
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory vz-cvs-4.sog:/tmp/cvs-serv20197/tools Modified Files: ipnat_y.y Log Message: 3561691 gethost never returns an ipv6 address Index: ipnat_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipnat_y.y,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** ipnat_y.y 22 Jul 2012 08:02:23 -0000 1.33 --- ipnat_y.y 25 Aug 2012 14:11:19 -0000 1.34 *************** *** 1163,1177 **** hostname: YY_STR { i6addr_t addr; bzero(&$$, sizeof($$)); ! if (gethost(AF_INET, $1, ! &addr) == 0) { ! $$.a = addr; ! $$.f = AF_INET; ! } else ! if (gethost(AF_INET6, $1, &addr) == 0) { $$.a = addr; - $$.f = AF_INET6; } else { FPRINTF(stderr, --- 1163,1179 ---- hostname: YY_STR { i6addr_t addr; + int family; + #ifdef USE_INET6 + if (nat->in_v[0] == 6) + family = AF_INET6; + else + #endif + family = AF_INET; bzero(&$$, sizeof($$)); ! $$.f = family; ! if (gethost(family, $1, &addr) == 0) { $$.a = addr; } else { FPRINTF(stderr, |
From: Darren <dar...@us...> - 2012-08-25 11:50:48
|
Update of /cvsroot/ipfilter/ipfilter/test/expected In directory vz-cvs-4.sog:/tmp/cvs-serv15407/expected Added Files: in100_6 in101_6 in102_6 in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6 Log Message: 3561650 no testing of ipv6 nat parsing --- NEW FILE: in102_6 --- rewrite in on bge0 inet6 proto tcp from any to any -> src any dst dstlist/a; rewrite in on bge0 inet6 proto tcp from 1:1:1::1/128 to any -> src any dst dstlist/bee; rewrite in on bge0 inet6 proto tcp from 1:1:1::1/128 to 2:2::2:2/128 -> src any dst dstlist/cat; rewrite in on bge0 inet6 proto tcp from pool/a to 2:2::2:2/128 -> src any dst dstlist/bat; rewrite in on bge0 inet6 proto tcp from pool/a to pool/1 -> src any dst dstlist/ant; --- NEW FILE: in3_6 --- bimap le0 inet6 any -> ::/128 bimap le0 inet6 any -> any bimap le0 inet6 ::/1 -> any bimap le0 inet6 10::/16 -> 1:2:3::/96 bimap le0 inet6 10:0:5::/96 -> 1:2:3::/96 --- NEW FILE: in4_6 --- map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 0 map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 0 map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 256 map-block le0 inet6 10::/96 -> 203:1:1::/96 ports auto map-block le0 inet6 10::/16 -> 203:1:1::/96 ports auto --- NEW FILE: in1_6 --- map le0 inet6 any -> ::/128 map le0 inet6 any -> any map le0 inet6 ::/1 -> any map le0 inet6 10::/16 -> 1:2:3::/96 map le0 inet6 10::/16 -> 1:2:3::/96 map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999 map ppp0 inet6 192:168::/32 -> ::/128 portmap udp 20000:29999 map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp/udp 30000:39999 map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp auto map ppp0 inet6 192:168::/32 -> ::/128 portmap udp auto map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp/udp auto map ppp0 inet6 192:168::/32 -> ::/128 proxy port 21 ftp/tcp map ppp0 inet6 192:168::/32 -> ::/128 proxy port 1010 ftp/tcp map le0 inet6 any -> ::/128 frag map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999 frag map ppp0 inet6 192:168::/32 -> ::/128 proxy port 21 ftp/tcp frag map le0 inet6 any -> ::/128 age 10/10 map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 age 10/20 map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999 age 30/30 map le0 inet6 any -> ::/128 frag age 10/10 map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag age 10/20 map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999 frag age 30/30 map fxp0 inet6 from 192::/18 to any port = 21 -> 1:2:3::4/128 proxy port 21 ftp/tcp map thisisalonginte inet6 any -> ::/128 mssclamp 1452 tag freddyliveshere map bar0 inet6 any -> ::/128 icmpidmap icmp 1000:2000 map ppp0,adsl0 inet6 any -> ::/128 map ppp0 inet6 from 192:168::/32 to any port = 123 -> ::/128 age 30/1 udp --- NEW FILE: in8_6 --- map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 purge map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 tcp purge map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 mssclamp 1000 purge map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 purge map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge --- NEW FILE: in5_6 --- --- NEW FILE: in101_6 --- rewrite in on bge0 inet6 proto icmp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128; rewrite in on bge0 inet6 proto udp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128; rewrite out on bge0 inet6 proto tcp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3::/24 dst 4::4:4:4/128; rewrite in on bge0 inet6 proto tcp/udp from 1:1:1::1/128 to 2:2::/32 -> src 3::/24,20202 dst 4::/24,10101; --- NEW FILE: in2_6 --- rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1/128 port 0 tcp rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 255 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip rdr le0 inet6 9:8::/32 -> 1:1:1::1/128 ip rdr le0 inet6 9:8:7::/64 -> 1:1:1::1/128 ip rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp rdr le0 inet6 9:8:7::6/128 port 80 -> any port 80 tcp rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 udp rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp/udp rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp/udp frag rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20 sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30 sticky rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40 sticky rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag mssclamp 1000 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10 mssclamp 1000 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20 mssclamp 1000 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10 mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20 sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip tag nattagcacheline rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10 mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20 mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10 mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20 sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000 tag nattagcacheline rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000 tag nattagcacheline rdr ge0 inet6 9:8:7::6/128 port 21 -> 1:1:1::1/128 port 21 tcp proxy ftp rdr ge0 inet6 9:8:7::6/128 port 21 -> 1:1:1::1/128 port 21 tcp proxy ftp rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port 5555 tcp rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port = 5555 tcp rdr le0 inet6 any -> fedc:ba98:7200:0:a072:1c28:700:0/32 ip rdr le0 inet6 any -> fedc:ba98:7200:0:a072:1c28:700:0,fedc:ba98:7200:0:a072:1c28:700:0 ip rdr adsl0,ppp0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port 5555-7777 tcp --- NEW FILE: in100_6 --- rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128; rewrite out on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::/96 dst 4::4:4:4/128; rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::/96 dst 4::4:0:0/96; --- NEW FILE: in6_6 --- map foo0 inet6 from any port = 1 to any port != 0 -> ::/32 udp map foo0 inet6 from any port = 1 to any port != 0 -> ::/32 udp map foo0 inet6 from any port < 1 to any port > 0 -> ::/32 tcp map foo0 inet6 from any port < 1 to any port > 0 -> ::/32 tcp map foo0 inet6 from any port <= 1 to any port >= 0 -> ::/32 tcp/udp map foo0 inet6 from any port <= 1 to any port >= 0 -> ::/32 tcp/udp map foo0 inet6 from any port 1 >< 20 to any port 20 <> 40 -> ::/32 tcp/udp map foo0 inet6 from any port 10:20 to any port 30:40 -> ::/32 tcp/udp |
Update of /cvsroot/ipfilter/ipfilter In directory vz-cvs-4.sog:/tmp/cvs-serv1804 Modified Files: Tag: v5-1-RELEASE fil.c ip_auth.c ip_compat.h ip_dstlist.c ip_fil.h ip_fil_solaris.c ip_frag.c ip_ftp_pxy.c ip_htable.c ip_ipsec_pxy.c ip_irc_pxy.c ip_log.c ip_lookup.c ip_lookup.h ip_nat.c ip_nat6.c ip_netbios_pxy.c ip_pool.c ip_pptp_pxy.c ip_proxy.c ip_proxy.h ip_raudio_pxy.c ip_rcmd_pxy.c ip_rpcb_pxy.c ip_state.c ip_sync.c ip_sync.h ip_tftp_pxy.c ipf_rb.h radix_ipf.c radix_ipf.h solaris.c Log Message: 3556683 lint cleanup Index: ip_auth.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_auth.c,v retrieving revision 1.21.2.10 retrieving revision 1.21.2.11 diff -C2 -d -r1.21.2.10 -r1.21.2.11 *** ip_auth.c 15 Jun 2012 08:33:37 -0000 1.21.2.10 --- ip_auth.c 13 Aug 2012 11:44:14 -0000 1.21.2.11 *************** *** 203,206 **** --- 203,207 ---- /* and initialise some fields to their defaults. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ void * ipf_auth_soft_create(softc) *************** *** 236,239 **** --- 237,241 ---- /* rules. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_auth_soft_init(softc, arg) *************** *** 275,278 **** --- 277,281 ---- /* is free'd by _destroy(). */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_auth_soft_fini(softc, arg) *************** *** 335,338 **** --- 338,342 ---- /* Undo what was done in _create() - i.e. free the soft context data. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ void ipf_auth_soft_destroy(softc, arg) *************** *** 625,629 **** else { WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); IPFERROR(10001); --- 629,633 ---- else { WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); IPFERROR(10001); Index: ip_tftp_pxy.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_tftp_pxy.c,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** ip_tftp_pxy.c 22 Jul 2012 08:04:23 -0000 1.1.2.9 --- ip_tftp_pxy.c 13 Aug 2012 11:44:15 -0000 1.1.2.10 *************** *** 14,18 **** } ipf_tftp_softc_t; ! int ipf_p_tftp_backchannel __P((fr_info_t *, ap_session_t *, nat_t *)); int ipf_p_tftp_client __P((ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, nat_t *)); --- 14,18 ---- } ipf_tftp_softc_t; ! void ipf_p_tftp_backchannel __P((fr_info_t *, ap_session_t *, nat_t *)); int ipf_p_tftp_client __P((ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, nat_t *)); *************** *** 23,28 **** void ipf_p_tftp_del __P((ipf_main_softc_t *, ap_session_t *)); int ipf_p_tftp_out __P((void *, fr_info_t *, ap_session_t *, nat_t *)); ! int ipf_p_tftp_server __P((ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, ! nat_t *)); void *ipf_p_tftp_soft_create __P((ipf_main_softc_t *)); void ipf_p_tftp_soft_destroy __P((ipf_main_softc_t *, void *)); --- 23,27 ---- void ipf_p_tftp_del __P((ipf_main_softc_t *, ap_session_t *)); int ipf_p_tftp_out __P((void *, fr_info_t *, ap_session_t *, nat_t *)); ! int ipf_p_tftp_server __P((fr_info_t *, ap_session_t *)); void *ipf_p_tftp_soft_create __P((ipf_main_softc_t *)); void ipf_p_tftp_soft_destroy __P((ipf_main_softc_t *, void *)); *************** *** 121,125 **** if (softt->ipf_p_tftp_tune != NULL) { ! ipf_tune_array_unlink(softc, softt->ipf_p_tftp_tune); KFREES(softt->ipf_p_tftp_tune, sizeof(ipf_tftp_tuneables)); softt->ipf_p_tftp_tune = NULL; --- 120,124 ---- if (softt->ipf_p_tftp_tune != NULL) { ! (void) ipf_tune_array_unlink(softc, softt->ipf_p_tftp_tune); KFREES(softt->ipf_p_tftp_tune, sizeof(ipf_tftp_tuneables)); softt->ipf_p_tftp_tune = NULL; *************** *** 142,146 **** if (nat->nat_dir == NAT_OUTBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(softt, fin, aps, nat); } --- 141,145 ---- if (nat->nat_dir == NAT_OUTBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(fin, aps); } *************** *** 158,165 **** if (nat->nat_dir == NAT_INBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(softt, fin, aps, nat); } int ipf_p_tftp_new(arg, fin, aps, nat) --- 157,165 ---- if (nat->nat_dir == NAT_INBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(fin, aps); } + /*ARGSUSED*/ int ipf_p_tftp_new(arg, fin, aps, nat) *************** *** 280,284 **** * Setup for a new TFTP proxy. */ ! int ipf_p_tftp_backchannel(fin, aps, nat) fr_info_t *fin; --- 280,284 ---- * Setup for a new TFTP proxy. */ ! void ipf_p_tftp_backchannel(fin, aps, nat) fr_info_t *fin; *************** *** 304,307 **** --- 304,309 ---- int dir; + slen = 0; + nat2 = NULL; ti = aps->aps_data; /* *************** *** 366,371 **** --- 368,375 ---- if (nat->nat_v[0] == 4) nat2 = ipf_nat_add(&fi, ti->ti_rule, NULL, nflags, dir); + #ifdef USE_INET6 else nat2 = ipf_nat6_add(&fi, ti->ti_rule, NULL, nflags, dir); + #endif MUTEX_EXIT(&softn->ipf_nat_new); if (nat2 != NULL) { *************** *** 413,417 **** #endif } - return 0; } --- 417,420 ---- *************** *** 427,431 **** tftpinfo_t *ti; u_short opcode; - udphdr_t *udp; int len; --- 430,433 ---- *************** *** 446,450 **** /* FALLTHROUGH */ case TFTP_CMD_READ : ! len = fin->fin_dlen - sizeof(*udp) - 2; if (len > sizeof(ti->ti_filename) - 1) len = sizeof(ti->ti_filename) - 1; --- 448,452 ---- /* FALLTHROUGH */ case TFTP_CMD_READ : ! len = fin->fin_dlen - sizeof(udphdr_t) - 2; if (len > sizeof(ti->ti_filename) - 1) len = sizeof(ti->ti_filename) - 1; *************** *** 467,476 **** int ! ipf_p_tftp_server(softt, fin, aps, nat) ! ipf_tftp_softc_t *softt; fr_info_t *fin; ap_session_t *aps; - nat_t *nat; { tftpinfo_t *ti; --- 469,477 ---- + /*ARGSUSED*/ int ! ipf_p_tftp_server(fin, aps) fr_info_t *fin; ap_session_t *aps; { tftpinfo_t *ti; Index: ip_pool.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_pool.c,v retrieving revision 1.21.2.20 retrieving revision 1.21.2.21 diff -C2 -d -r1.21.2.20 -r1.21.2.21 *** ip_pool.c 22 Jul 2012 08:03:39 -0000 1.21.2.20 --- ip_pool.c 13 Aug 2012 11:44:15 -0000 1.21.2.21 *************** *** 296,299 **** --- 296,300 ---- /* Initialise the routing table data structures where required. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_pool_soft_init(softc, arg) *************** *** 349,352 **** --- 350,354 ---- /* up the pool context too. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_pool_soft_destroy(softc, arg) *************** *** 373,376 **** --- 375,379 ---- /* the address prior to calling for the pair to be added. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_pool_node_add(softc, arg, op, uid) *************** *** 739,743 **** /* Searches for an exact match of an entry in the pool. */ /* ------------------------------------------------------------------------ */ ! extern void printhostmask __P((int, u_32_t *, u_32_t *)); static ip_pool_node_t * ipf_pool_findeq(softp, ipo, addr, mask) --- 742,746 ---- /* Searches for an exact match of an entry in the pool. */ /* ------------------------------------------------------------------------ */ ! /*ARGSUSED*/ static ip_pool_node_t * ipf_pool_findeq(softp, ipo, addr, mask) *************** *** 1213,1217 **** for (next = &ipo->ipo_list; (n = *next) != NULL; ) ! ipf_pool_remove_node(softc, softp, ipo, n); ipo->ipo_list = NULL; --- 1216,1220 ---- for (next = &ipo->ipo_list; (n = *next) != NULL; ) ! (void) ipf_pool_remove_node(softc, softp, ipo, n); ipo->ipo_list = NULL; *************** *** 1243,1247 **** else if ((ipo->ipo_ref == 1) && (ipo->ipo_flags & IPOOL_DELETE)) ! ipf_pool_destroy(softc, arg, ipo->ipo_unit, ipo->ipo_name); return 0; --- 1246,1251 ---- else if ((ipo->ipo_ref == 1) && (ipo->ipo_flags & IPOOL_DELETE)) ! (void) ipf_pool_destroy(softc, arg, ipo->ipo_unit, ! ipo->ipo_name); return 0; *************** *** 1373,1377 **** if (ipo != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! ipf_pool_deref(softc, softp, ipo); RWLOCK_EXIT(&softc->ipf_poolrw); } --- 1377,1381 ---- if (ipo != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! (void) ipf_pool_deref(softc, softp, ipo); RWLOCK_EXIT(&softc->ipf_poolrw); } *************** *** 1426,1430 **** { case IPFLOOKUPITER_LIST : ! ipf_pool_deref(softc, softp, (ip_pool_t *)data); break; --- 1430,1434 ---- { case IPFLOOKUPITER_LIST : ! (void) ipf_pool_deref(softc, softp, (ip_pool_t *)data); break; *************** *** 1464,1468 **** if (n->ipn_die > softc->ipf_ticks) break; ! ipf_pool_remove_node(softc, softp, n->ipn_owner, n); } } --- 1468,1472 ---- if (n->ipn_die > softc->ipf_ticks) break; ! (void) ipf_pool_remove_node(softc, softp, n->ipn_owner, n); } } Index: solaris.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/solaris.c,v retrieving revision 1.22.2.16 retrieving revision 1.22.2.17 diff -C2 -d -r1.22.2.16 -r1.22.2.17 *** solaris.c 29 May 2012 10:52:08 -0000 1.22.2.16 --- solaris.c 13 Aug 2012 11:44:15 -0000 1.22.2.17 *************** *** 234,239 **** #endif if (rval == 0) { ! ipf_unload_all(); ! ipf_stack_fini(); } return rval; --- 234,242 ---- #endif if (rval == 0) { ! rval = ipf_unload_all(); ! if (rval == 0) ! ipf_stack_fini(); ! else ! (void) mod_install(&modlink1); } return rval; *************** *** 440,444 **** rval = ipf_stack_init(); if (rval != 0) { ! ipf_unload_all(); return rval; } --- 443,447 ---- rval = ipf_stack_init(); if (rval != 0) { ! rval = ipf_unload_all(); return rval; } *************** *** 564,568 **** int revents = 0; ! if (xmin < 0 || xmin > IPL_LOGMAX) return ENXIO; --- 567,571 ---- int revents = 0; ! if (xmin > IPL_LOGMAX) return ENXIO; *************** *** 805,808 **** --- 808,812 ---- + /*ARGSUSED*/ int ipf_hk_v4_in(tok, data, arg) *************** *** 839,842 **** --- 843,847 ---- + /*ARGSUSED*/ int ipf_hk_v4_out(tok, data, arg) *************** *** 873,876 **** --- 878,882 ---- + /*ARGSUSED*/ int ipf_hk_v4_nic(tok, data, arg) *************** *** 908,911 **** --- 914,918 ---- + /*ARGSUSED*/ int ipf_hk_v6_in(tok, data, arg) *************** *** 941,944 **** --- 948,952 ---- + /*ARGSUSED*/ int ipf_hk_v6_out(tok, data, arg) *************** *** 974,977 **** --- 982,986 ---- + /*ARGSUSED*/ int ipf_hk_v6_nic(tok, data, arg) *************** *** 981,985 **** { hook_nic_event_t *nic = (hook_nic_event_t *)data; - ipf_main_softc_t *softc = (ipf_main_softc_t *)arg; switch (nic->hne_event) --- 990,993 ---- *************** *** 1029,1032 **** --- 1037,1041 ---- + /*ARGSUSED*/ static void ipf_instance_shutdown(netid_t id, void *arg) *************** *** 1038,1041 **** --- 1047,1051 ---- + /*ARGSUSED*/ static void ipf_instance_destroy(netid_t id, void *arg) *************** *** 1071,1075 **** ipf_stack_fini() { ! net_instance_unregister(ipf_inst); net_instance_free(ipf_inst); ipf_inst = NULL; --- 1081,1085 ---- ipf_stack_fini() { ! (void) net_instance_unregister(ipf_inst); net_instance_free(ipf_inst); ipf_inst = NULL; *************** *** 1143,1147 **** hook_free(softc->ipf_hk_v4_nic); ! net_protocol_release(softc->ipf_nd_v4); softc->ipf_nd_v4 = NULL; } --- 1153,1157 ---- hook_free(softc->ipf_hk_v4_nic); ! (void) net_protocol_release(softc->ipf_nd_v4); softc->ipf_nd_v4 = NULL; } *************** *** 1163,1167 **** hook_free(softc->ipf_hk_v6_nic); ! net_protocol_release(softc->ipf_nd_v6); softc->ipf_nd_v6 = NULL; } --- 1173,1177 ---- hook_free(softc->ipf_hk_v6_nic); ! (void) net_protocol_release(softc->ipf_nd_v6); softc->ipf_nd_v6 = NULL; } Index: ip_ipsec_pxy.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_ipsec_pxy.c,v retrieving revision 1.14.2.8 retrieving revision 1.14.2.9 diff -C2 -d -r1.14.2.8 -r1.14.2.9 *** ip_ipsec_pxy.c 22 Jul 2012 08:04:23 -0000 1.14.2.8 --- ip_ipsec_pxy.c 13 Aug 2012 11:44:15 -0000 1.14.2.9 *************** *** 41,44 **** --- 41,45 ---- * IPSec application proxy initialization. */ + /*ARGSUSED*/ void * ipf_p_ipsec_soft_create(softc) *************** *** 88,91 **** --- 89,93 ---- + /*ARGSUSED*/ void ipf_p_ipsec_soft_fini(softc, arg) *************** *** 111,114 **** --- 113,117 ---- + /*ARGSUSED*/ void ipf_p_ipsec_soft_destroy(softc, arg) Index: ip_dstlist.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_dstlist.c,v retrieving revision 1.13.2.12 retrieving revision 1.13.2.13 diff -C2 -d -r1.13.2.12 -r1.13.2.13 *** ip_dstlist.c 20 Jul 2012 08:40:19 -0000 1.13.2.12 --- ip_dstlist.c 13 Aug 2012 11:44:14 -0000 1.13.2.13 *************** *** 180,183 **** --- 180,184 ---- /* soft context is free it! */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_dstlist_soft_destroy(softc, arg) *************** *** 199,202 **** --- 200,204 ---- /* There is currently no soft context for destination list management. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_dstlist_soft_init(softc, arg) *************** *** 216,219 **** --- 218,222 ---- /* There is currently no soft context for destination list management. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_dstlist_soft_fini(softc, arg) *************** *** 335,343 **** { case IPFLOOKUPITER_LIST : ! ipf_dstlist_table_deref(softc, arg, (ippool_dst_t *)data); break; case IPFLOOKUPITER_NODE : ! ipf_dstlist_node_deref(arg, (ipf_dstnode_t *)data); break; } --- 338,346 ---- { case IPFLOOKUPITER_LIST : ! (void) ipf_dstlist_table_deref(softc, arg,(ippool_dst_t *)data); break; case IPFLOOKUPITER_NODE : ! (void) ipf_dstlist_node_deref(arg, (ipf_dstnode_t *)data); break; } *************** *** 440,444 **** case IPFLOOKUPITER_LIST : if (dsttab != NULL) ! ipf_dstlist_table_deref(softc, arg, dsttab); err = COPYOUT(next, iter->ili_data, sizeof(*next)); if (err != 0) { --- 443,447 ---- case IPFLOOKUPITER_LIST : if (dsttab != NULL) ! (void) ipf_dstlist_table_deref(softc, arg, dsttab); err = COPYOUT(next, iter->ili_data, sizeof(*next)); if (err != 0) { *************** *** 450,454 **** case IPFLOOKUPITER_NODE : if (node != NULL) ! ipf_dstlist_node_deref(arg, node); err = COPYOUT(nextnode, iter->ili_data, sizeof(*nextnode)); if (err != 0) { --- 453,457 ---- case IPFLOOKUPITER_NODE : if (node != NULL) ! (void) ipf_dstlist_node_deref(arg, node); err = COPYOUT(nextnode, iter->ili_data, sizeof(*nextnode)); if (err != 0) { *************** *** 608,612 **** /* ------------------------------------------------------------------------ */ /* Function: ipf_dstlist_node_deref */ ! /* Returns: int - 0 = success, else error */ /* Parameters: arg(I) - pointer to local context to use */ /* node(I) - pointer to destionation node to free */ --- 611,615 ---- /* ------------------------------------------------------------------------ */ /* Function: ipf_dstlist_node_deref */ ! /* Returns: int - 0 = success, else current reference count */ /* Parameters: arg(I) - pointer to local context to use */ /* node(I) - pointer to destionation node to free */ *************** *** 630,634 **** if (ref > 0) ! return 0; if ((node->ipfd_flags & IPDST_DELETE) != 0) --- 633,637 ---- if (ref > 0) ! return ref; if ((node->ipfd_flags & IPDST_DELETE) != 0) *************** *** 761,765 **** } ! ipf_dstlist_node_deref(softd, node); } --- 764,768 ---- } ! (void) ipf_dstlist_node_deref(softd, node); } *************** *** 864,868 **** MUTEX_INIT(&new->ipld_lock, "ipf dst table lock"); ! strncpy(new->ipld_name, op->iplo_name, FR_GROUPLEN); unit = op->iplo_unit; new->ipld_unit = unit; --- 867,871 ---- MUTEX_INIT(&new->ipld_lock, "ipf dst table lock"); ! (void) strncpy(new->ipld_name, op->iplo_name, FR_GROUPLEN); unit = op->iplo_unit; new->ipld_unit = unit; *************** *** 951,955 **** d->ipld_flags |= IPDST_DELETE; ! ipf_dstlist_table_deref(softc, softd, d); } --- 954,958 ---- d->ipld_flags |= IPDST_DELETE; ! (void) ipf_dstlist_table_deref(softc, softd, d); } *************** *** 996,999 **** --- 999,1003 ---- /* it if 0 has been reached. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_dstlist_table_deref(softc, arg, table) *************** *** 1303,1306 **** --- 1307,1311 ---- /* There are currently no objects to expire in destination lists. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_dstlist_expire(softc, arg) Index: fil.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v retrieving revision 1.68.2.57 retrieving revision 1.68.2.58 diff -C2 -d -r1.68.2.57 -r1.68.2.58 *** fil.c 20 Jul 2012 08:36:49 -0000 1.68.2.57 --- fil.c 13 Aug 2012 11:44:14 -0000 1.68.2.58 *************** *** 149,158 **** #define LBUMP(x) softc->x++ ! #define LBUMPD(x, y) do { softc->x.y++; DT(y); } while (0) static INLINE int ipf_check_ipf __P((fr_info_t *, frentry_t *, int)); static u_32_t ipf_checkcipso __P((fr_info_t *, u_char *, int)); static u_32_t ipf_checkripso __P((u_char *)); ! static u_32_t ipf_decaps __P((fr_info_t *, u_32_t, int)); #ifdef IPFILTER_LOG static frentry_t *ipf_dolog __P((fr_info_t *, u_32_t *)); --- 149,162 ---- #define LBUMP(x) softc->x++ ! #define LBUMPD(x, y) do { \ ! softc->x.y++; \ ! DT(y); \ ! _NOTE(CONSTCOND) \ ! } while(0) static INLINE int ipf_check_ipf __P((fr_info_t *, frentry_t *, int)); static u_32_t ipf_checkcipso __P((fr_info_t *, u_char *, int)); static u_32_t ipf_checkripso __P((u_char *)); ! static u_32_t ipf_decaps __P((fr_info_t *, u_32_t)); #ifdef IPFILTER_LOG static frentry_t *ipf_dolog __P((fr_info_t *, u_32_t *)); *************** *** 195,200 **** static INLINE int ipf_pr_tcpcommon __P((fr_info_t *)); static INLINE int ipf_pr_udpcommon __P((fr_info_t *)); ! static void ipf_rule_delete __P((ipf_main_softc_t *, frentry_t *f, ! int, int)); static void ipf_rule_expire_insert __P((ipf_main_softc_t *, frentry_t *, int)); --- 199,203 ---- static INLINE int ipf_pr_tcpcommon __P((fr_info_t *)); static INLINE int ipf_pr_udpcommon __P((fr_info_t *)); ! static void ipf_rule_delete __P((ipf_main_softc_t *, frentry_t *f)); static void ipf_rule_expire_insert __P((ipf_main_softc_t *, frentry_t *, int)); *************** *** 981,985 **** fin->fin_p = IPPROTO_ICMPV6; ! ipf_checkv6sum(fin); fin->fin_p = p; } --- 984,988 ---- fin->fin_p = IPPROTO_ICMPV6; ! (void) ipf_checkv6sum(fin); fin->fin_p = p; } *************** *** 1005,1009 **** fin->fin_p = IPPROTO_UDP; ! ipf_checkv6sum(fin); fin->fin_p = p; } --- 1008,1012 ---- fin->fin_p = IPPROTO_UDP; ! (void) ipf_checkv6sum(fin); fin->fin_p = p; } *************** *** 1029,1033 **** fin->fin_p = IPPROTO_TCP; ! ipf_checkv6sum(fin); fin->fin_p = p; } --- 1032,1036 ---- fin->fin_p = IPPROTO_TCP; ! (void) ipf_checkv6sum(fin); fin->fin_p = p; } *************** *** 1284,1287 **** --- 1287,1291 ---- fin->fin_flx |= FI_BAD; } + /*FALLTHROUGH*/ #endif case ICMP_SOURCEQUENCH : *************** *** 1318,1322 **** ipf_pr_short(fin, minicmpsz); ! ipf_checkv4sum(fin); } --- 1322,1326 ---- ipf_pr_short(fin, minicmpsz); ! (void) ipf_checkv4sum(fin); } *************** *** 1421,1424 **** --- 1425,1429 ---- */ /*fin->fin_flx |= FI_BAD*/; + fin->fin_flx = fin->fin_flx; /* LINT */ } else if (!(flags & (TH_RST|TH_SYN))) { fin->fin_flx |= FI_BAD; *************** *** 1544,1548 **** if (ipf_pr_tcpcommon(fin) == 0) ! ipf_checkv4sum(fin); } --- 1549,1553 ---- if (ipf_pr_tcpcommon(fin) == 0) ! (void) ipf_checkv4sum(fin); } *************** *** 1564,1568 **** if (ipf_pr_udpcommon(fin) == 0) ! ipf_checkv4sum(fin); } --- 1569,1573 ---- if (ipf_pr_udpcommon(fin) == 0) ! (void) ipf_checkv4sum(fin); } *************** *** 2001,2005 **** } else if (tag > 127) { /* Custom defined DOI */ ! ; } else { fin->fin_flx |= FI_BAD; --- 2006,2010 ---- } else if (tag > 127) { /* Custom defined DOI */ ! fin->fin_flx = fin->fin_flx; /* LINT */ } else { fin->fin_flx |= FI_BAD; *************** *** 2575,2579 **** if (FR_ISDECAPS(passt)) ! passt = ipf_decaps(fin, pass, fr->fr_icode); else passt = ipf_scanlist(fin, pass); --- 2580,2584 ---- if (FR_ISDECAPS(passt)) ! passt = ipf_decaps(fin, pass); else passt = ipf_scanlist(fin, pass); *************** *** 3066,3070 **** case 4 : if (ipf_nat_checkout(fin, &pass) == -1) { ! ; } else if ((softc->ipf_update_ipid != 0) && (v == 4)) { if (ipf_updateipid(fin) == -1) { --- 3071,3075 ---- case 4 : if (ipf_nat_checkout(fin, &pass) == -1) { ! pass = pass; /* LINT */ } else if ((softc->ipf_update_ipid != 0) && (v == 4)) { if (ipf_updateipid(fin) == -1) { *************** *** 3192,3196 **** mc = M_COPY(fin->fin_m); if (mc != NULL) ! ipf_fastroute(mc, &mc, fin, fdp); } --- 3197,3201 ---- mc = M_COPY(fin->fin_m); if (mc != NULL) ! (void) ipf_fastroute(mc, &mc, fin, fdp); } *************** *** 3206,3210 **** (fdp->fd_ptr != (struct ifnet *)-1)) { /* this is for to rules: */ ! ipf_fastroute(fin->fin_m, mp, fin, fdp); m = *mp = NULL; } --- 3211,3215 ---- (fdp->fd_ptr != (struct ifnet *)-1)) { /* this is for to rules: */ ! (void) ipf_fastroute(fin->fin_m, mp, fin, fdp); m = *mp = NULL; } *************** *** 3600,3605 **** /* Function: ipf_group_del */ /* Returns: int - number of rules deleted */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* group(I) - group name to delete */ /* fr(I) - filter rule from which group is referenced */ /* Write Locks: ipf_mutex */ --- 3605,3609 ---- /* Function: ipf_group_del */ /* Returns: int - number of rules deleted */ ! /* Parameters: group(I) - group name to delete */ /* fr(I) - filter rule from which group is referenced */ /* Write Locks: ipf_mutex */ *************** *** 3611,3616 **** /* ------------------------------------------------------------------------ */ void ! ipf_group_del(softc, group, fr) ! ipf_main_softc_t *softc; frgroup_t *group; frentry_t *fr; --- 3615,3619 ---- /* ------------------------------------------------------------------------ */ void ! ipf_group_del(group, fr) frgroup_t *group; frentry_t *fr; *************** *** 3789,3798 **** if (flags & FR_OUTQUE) { ! ipf_flushlist(softc, &flushed, &softc->ipf_rules[1][set]); ! ipf_flushlist(softc, &flushed, &softc->ipf_acct[1][set]); } if (flags & FR_INQUE) { ! ipf_flushlist(softc, &flushed, &softc->ipf_rules[0][set]); ! ipf_flushlist(softc, &flushed, &softc->ipf_acct[0][set]); } --- 3792,3801 ---- if (flags & FR_OUTQUE) { ! (void) ipf_flushlist(softc, &flushed,&softc->ipf_rules[1][set]); ! (void) ipf_flushlist(softc, &flushed, &softc->ipf_acct[1][set]); } if (flags & FR_INQUE) { ! (void) ipf_flushlist(softc, &flushed,&softc->ipf_rules[0][set]); ! (void) ipf_flushlist(softc, &flushed, &softc->ipf_acct[0][set]); } *************** *** 4050,4055 **** ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! ipf_ifpaddr(softc, v, fr->fr_satype, ifa, ! &fr->fr_src6, &fr->fr_smsk6); } if (fr->fr_datype != FRI_NORMAL && --- 4053,4058 ---- ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! (void) ipf_ifpaddr(softc, v, fr->fr_satype, ifa, ! &fr->fr_src6, &fr->fr_smsk6); } if (fr->fr_datype != FRI_NORMAL && *************** *** 4057,4062 **** ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! ipf_ifpaddr(softc, v, fr->fr_datype, ifa, ! &fr->fr_dst6, &fr->fr_dmsk6); } } --- 4060,4065 ---- ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! (void) ipf_ifpaddr(softc, v, fr->fr_datype, ifa, ! &fr->fr_dst6, &fr->fr_dmsk6); } } *************** *** 4127,4131 **** /* needs to be changed/updated. */ /* ------------------------------------------------------------------------ */ ! int ipf_sync(softc, ifp) ipf_main_softc_t *softc; --- 4130,4134 ---- /* needs to be changed/updated. */ /* ------------------------------------------------------------------------ */ ! void ipf_sync(softc, ifp) ipf_main_softc_t *softc; *************** *** 4155,4160 **** } RWLOCK_EXIT(&softc->ipf_mutex); - - return 0; } --- 4158,4161 ---- *************** *** 4460,4464 **** int error = 0, in, family, addrem, need_free = 0; frentry_t frd, *fp, *f, **fprev, **ftail; ! void *ptr, *uptr, *cptr; u_int *p, *pp; frgroup_t *fg; --- 4461,4465 ---- int error = 0, in, family, addrem, need_free = 0; frentry_t frd, *fp, *f, **fprev, **ftail; ! void *ptr, *uptr; u_int *p, *pp; frgroup_t *fg; *************** *** 4466,4470 **** ptr = NULL; - cptr = NULL; fg = NULL; fp = &frd; --- 4467,4470 ---- *************** *** 4576,4580 **** ptr = NULL; - cptr = NULL; if (FR_ISACCOUNT(fp->fr_flags)) --- 4576,4579 ---- *************** *** 5061,5065 **** } ! ipf_rule_delete(softc, f, unit, set); need_free = makecopy; --- 5060,5064 ---- } ! ipf_rule_delete(softc, f); need_free = makecopy; *************** *** 5124,5128 **** if (fp->fr_grp != NULL) { WRITE_ENTER(&softc->ipf_mutex); ! ipf_group_del(softc, fp->fr_grp, fp); RWLOCK_EXIT(&softc->ipf_mutex); } --- 5123,5127 ---- if (fp->fr_grp != NULL) { WRITE_ENTER(&softc->ipf_mutex); ! ipf_group_del(fp->fr_grp, fp); RWLOCK_EXIT(&softc->ipf_mutex); } *************** *** 5142,5147 **** /* f(I) - pointer to the rule being deleted */ /* ftail(I) - pointer to the pointer to f */ - /* unit(I) - device for which this is for */ - /* set(I) - 1 or 0 (filter set) */ /* */ /* This function attempts to do what it can to delete a filter rule: remove */ --- 5141,5144 ---- *************** *** 5151,5158 **** /* ------------------------------------------------------------------------ */ static void ! ipf_rule_delete(softc, f, unit, set) ipf_main_softc_t *softc; frentry_t *f; - int unit, set; { --- 5148,5154 ---- /* ------------------------------------------------------------------------ */ static void ! ipf_rule_delete(softc, f) ipf_main_softc_t *softc; frentry_t *f; { *************** *** 5511,5521 **** if (fr->fr_grp != NULL) ! ipf_group_del(softc, fr->fr_grp, fr); if (fr->fr_grphead != NULL) ! ipf_group_del(softc, fr->fr_grphead, fr); if (fr->fr_icmpgrp != NULL) ! ipf_group_del(softc, fr->fr_icmpgrp, fr); if ((fr->fr_flags & FR_COPIED) != 0) { --- 5507,5517 ---- if (fr->fr_grp != NULL) ! ipf_group_del(fr->fr_grp, fr); if (fr->fr_grphead != NULL) ! ipf_group_del(fr->fr_grphead, fr); if (fr->fr_icmpgrp != NULL) ! ipf_group_del(fr->fr_icmpgrp, fr); if ((fr->fr_flags & FR_COPIED) != 0) { *************** *** 6202,6207 **** case IPL_LOGSYNC : if (softc->ipf_running > 0) { ! error = ipf_sync_ioctl(softc, data, cmd, mode, ! uid, ctx); } else { error = EIO; --- 6198,6202 ---- case IPL_LOGSYNC : if (softc->ipf_running > 0) { ! error = ipf_sync_ioctl(softc, data, cmd); } else { error = EIO; *************** *** 6223,6228 **** case IPL_LOGLOOKUP : if (softc->ipf_running > 0) { ! error = ipf_lookup_ioctl(softc, data, cmd, mode, ! uid, ctx); } else { error = EIO; --- 6218,6222 ---- case IPL_LOGLOOKUP : if (softc->ipf_running > 0) { ! error = ipf_lookup_ioctl(softc, data, cmd, uid, ctx); } else { error = EIO; *************** *** 7519,7523 **** break; ! ipf_token_deref(softc, it); } RWLOCK_EXIT(&softc->ipf_tokens); --- 7513,7517 ---- break; ! (void) ipf_token_deref(softc, it); } RWLOCK_EXIT(&softc->ipf_tokens); *************** *** 7583,7587 **** uid == it->ipt_uid) { it->ipt_complete = 2; ! ipf_token_deref(softc, it); error = 0; break; --- 7577,7581 ---- uid == it->ipt_uid) { it->ipt_complete = 2; ! (void) ipf_token_deref(softc, it); error = 0; break; *************** *** 8000,8004 **** error = ipf_getnextrule(softc, token, data); WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { --- 7994,7998 ---- error = ipf_getnextrule(softc, token, data); WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { *************** *** 8076,8080 **** error = ipf_geniter(softc, token, &iter); WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { --- 8070,8074 ---- error = ipf_geniter(softc, token, &iter); WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { *************** *** 8391,8395 **** /* Parameters: fin(I) - pointer to packet information */ /* pass(I) - IP protocol version to match */ - /* l5proto(I) - layer 5 protocol to decode UDP data as. */ /* */ /* This function is called for packets that are wrapt up in other packets, */ --- 8385,8388 ---- *************** *** 8400,8407 **** /* ------------------------------------------------------------------------ */ u_32_t ! ipf_decaps(fin, pass, l5proto) fr_info_t *fin; u_32_t pass; - int l5proto; { fr_info_t fin2, *fino = NULL; --- 8393,8399 ---- /* ------------------------------------------------------------------------ */ u_32_t ! ipf_decaps(fin, pass) fr_info_t *fin; u_32_t pass; { fr_info_t fin2, *fino = NULL; *************** *** 8554,8558 **** pass |= FR_BLOCK|FR_QUICK; fin->fin_reason = FRB_DECAPFRIP; ! return -1; } --- 8546,8550 ---- pass |= FR_BLOCK|FR_QUICK; fin->fin_reason = FRB_DECAPFRIP; ! return pass; } *************** *** 8789,8794 **** rv |= ((fin->fin_saddr & e->ipfe_arg0[i * 2 + 1]) == ! e->ipfe_arg0[i * 2]) || ! ((fin->fin_daddr & e->ipfe_arg0[i * 2 + 1]) == e->ipfe_arg0[i * 2]); --- 8781,8786 ---- rv |= ((fin->fin_saddr & e->ipfe_arg0[i * 2 + 1]) == ! e->ipfe_arg0[i * 2]); ! rv |= ((fin->fin_daddr & e->ipfe_arg0[i * 2 + 1]) == e->ipfe_arg0[i * 2]); *************** *** 8823,8828 **** rv |= IP6_MASKEQ(&fin->fin_src6, &e->ipfe_arg0[i * 8 + 4], ! &e->ipfe_arg0[i * 8]) || ! IP6_MASKEQ(&fin->fin_dst6, &e->ipfe_arg0[i * 8 + 4], &e->ipfe_arg0[i * 8]); --- 8815,8820 ---- rv |= IP6_MASKEQ(&fin->fin_src6, &e->ipfe_arg0[i * 8 + 4], ! &e->ipfe_arg0[i * 8]); ! rv |= IP6_MASKEQ(&fin->fin_dst6, &e->ipfe_arg0[i * 8 + 4], &e->ipfe_arg0[i * 8]); *************** *** 8834,8839 **** case IPF_EXP_TCP_PORT : for (i = 0; !rv && i < e->ipfe_narg; i++) { ! rv |= (fin->fin_sport == e->ipfe_arg0[i]) || ! (fin->fin_dport == e->ipfe_arg0[i]); } break; --- 8826,8831 ---- case IPF_EXP_TCP_PORT : for (i = 0; !rv && i < e->ipfe_narg; i++) { ! rv |= ((fin->fin_sport == e->ipfe_arg0[i]) || ! (fin->fin_dport == e->ipfe_arg0[i])); } break; *************** *** 9723,9727 **** if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr, IPL_LOGIPF, 0); } --- 9715,9719 ---- if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr); } *************** *** 9733,9737 **** if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr, IPL_LOGIPF, 1); } --- 9725,9729 ---- if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr); } *************** *** 9992,9995 **** --- 9984,9988 ---- /* Free an actual host_node_t structure. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ void ipf_rb_ht_freenode(node, arg) Index: ip_netbios_pxy.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_netbios_pxy.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** ip_netbios_pxy.c 27 Dec 2009 07:34:34 -0000 1.4.2.2 --- ip_netbios_pxy.c 13 Aug 2012 11:44:15 -0000 1.4.2.3 *************** *** 67,70 **** --- 67,71 ---- + /*ARGSUSED*/ int ipf_p_netbios_out(arg, fin, aps, nat) Index: ip_htable.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_htable.c,v retrieving revision 1.17.2.16 retrieving revision 1.17.2.17 diff -C2 -d -r1.17.2.16 -r1.17.2.17 *** ip_htable.c 6 Jul 2012 14:35:36 -0000 1.17.2.16 --- ip_htable.c 13 Aug 2012 11:44:15 -0000 1.17.2.17 *************** *** 60,64 **** static iphtent_t *ipf_iphmfind __P((iphtable_t *, struct in_addr *)); static int ipf_iphmfindip __P((ipf_main_softc_t *, void *, int, void *, u_int)); ! static int ipf_htable_clear __P((ipf_main_softc_t *, void *, iphtable_t *)); static int ipf_htable_create __P((ipf_main_softc_t *, void *, iplookupop_t *)); static int ipf_htable_deref __P((ipf_main_softc_t *, void *, void *)); --- 60,64 ---- static iphtent_t *ipf_iphmfind __P((iphtable_t *, struct in_addr *)); static int ipf_iphmfindip __P((ipf_main_softc_t *, void *, int, void *, u_int)); ! static int ipf_htable_clear __P((void *, iphtable_t *)); static int ipf_htable_create __P((ipf_main_softc_t *, void *, iplookupop_t *)); static int ipf_htable_deref __P((ipf_main_softc_t *, void *, void *)); *************** *** 91,96 **** static int ipf_htent_insert __P((ipf_main_softc_t *, void *, iphtable_t *, iphtent_t *)); ! static int ipf_htent_remove __P((ipf_main_softc_t *, void *, iphtable_t *, ! iphtent_t *)); static void *ipf_htable_select_add_ref __P((void *, int, char *)); static void ipf_htable_expire __P((ipf_main_softc_t *, void *)); --- 91,95 ---- static int ipf_htent_insert __P((ipf_main_softc_t *, void *, iphtable_t *, iphtent_t *)); ! static int ipf_htent_remove __P((void *, iphtable_t *, iphtent_t *)); static void *ipf_htable_select_add_ref __P((void *, int, char *)); static void ipf_htable_expire __P((ipf_main_softc_t *, void *)); *************** *** 163,166 **** --- 162,166 ---- /* up the pool context too. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_htable_soft_destroy(softc, arg) *************** *** 182,185 **** --- 182,186 ---- /* Initialise the hash table ready for use. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_htable_soft_init(softc, arg) *************** *** 218,222 **** fop.iplf_count = 0; *fop.iplf_name = '\0'; ! ipf_htable_flush(softc, arg, &fop); } --- 219,223 ---- fop.iplf_count = 0; *fop.iplf_name = '\0'; ! (void) ipf_htable_flush(softc, arg, &fop); } *************** *** 430,439 **** if (iph->iph_ref != 0) { ! ipf_htable_clear(softc, arg, iph); iph->iph_flags |= IPHASH_DELETE; return 0; } ! ipf_htable_remove(softc, arg, iph); return 0; --- 431,440 ---- if (iph->iph_ref != 0) { ! (void) ipf_htable_clear(arg, iph); iph->iph_flags |= IPHASH_DELETE; return 0; } ! (void) ipf_htable_remove(softc, arg, iph); return 0; *************** *** 444,449 **** /* Function: ipf_htable_clear */ /* Returns: int - 0 = success, else error */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table to destroy */ /* */ --- 445,449 ---- /* Function: ipf_htable_clear */ /* Returns: int - 0 = success, else error */ ! /* Parameters: arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table to destroy */ /* */ *************** *** 452,457 **** /* ------------------------------------------------------------------------ */ static int ! ipf_htable_clear(softc, arg, iph) ! ipf_main_softc_t *softc; void *arg; iphtable_t *iph; --- 452,456 ---- /* ------------------------------------------------------------------------ */ static int ! ipf_htable_clear(arg, iph) void *arg; iphtable_t *iph; *************** *** 460,464 **** while ((ipe = iph->iph_list) != NULL) ! if (ipf_htent_remove(softc, arg, iph, ipe) != 0) return 1; return 0; --- 459,463 ---- while ((ipe = iph->iph_list) != NULL) ! if (ipf_htent_remove(arg, iph, ipe) != 0) return 1; return 0; *************** *** 511,515 **** { ! if (ipf_htable_clear(softc, arg, iph) != 0) return 1; --- 510,514 ---- { ! if (ipf_htable_clear(arg, iph) != 0) return 1; *************** *** 573,577 **** } ! err = ipf_htent_remove(softc, arg, iph, ent); return err; --- 572,576 ---- } ! err = ipf_htent_remove(arg, iph, ent); return err; *************** *** 609,614 **** /* Function: ipf_htent_remove */ /* Returns: int - 0 = success, else error */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table */ /* ipe(I) - pointer to hash table entry to remove */ --- 608,612 ---- /* Function: ipf_htent_remove */ /* Returns: int - 0 = success, else error */ ! /* Parameters: arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table */ /* ipe(I) - pointer to hash table entry to remove */ *************** *** 617,622 **** /* ------------------------------------------------------------------------ */ static int ! ipf_htent_remove(softc, arg, iph, ipe) ! ipf_main_softc_t *softc; void *arg; iphtable_t *iph; --- 615,619 ---- /* ------------------------------------------------------------------------ */ static int ! ipf_htent_remove(arg, iph, ipe) void *arg; iphtable_t *iph; *************** *** 652,656 **** case IPHASH_GROUPMAP : if (ipe->ipe_group != NULL) ! ipf_group_del(softc, ipe->ipe_ptr, NULL); break; --- 649,653 ---- case IPHASH_GROUPMAP : if (ipe->ipe_group != NULL) ! ipf_group_del(ipe->ipe_ptr, NULL); break; *************** *** 673,676 **** --- 670,674 ---- /* */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_htable_deref(softc, arg, object) *************** *** 1045,1049 **** iphtent_t ipe, *ent; u_int hv; - int bits; bcopy((char *)ipeo, (char *)&ipe, sizeof(ipe)); --- 1043,1046 ---- *************** *** 1053,1057 **** ipe.ipe_addr.i6[3] &= ipe.ipe_mask.i6[3]; if (ipe.ipe_family == AF_INET) { - bits = count4bits(ipe.ipe_mask.in4_addr); ipe.ipe_addr.i6[1] = 0; ipe.ipe_addr.i6[2] = 0; --- 1050,1053 ---- *************** *** 1065,1069 **** #ifdef USE_INET6 if (ipe.ipe_family == AF_INET6) { - bits = count6bits(ipe.ipe_mask.i6); hv = IPE_V6_HASH_FN(ipe.ipe_addr.i6, ipe.ipe_mask.i6, iph->iph_size); --- 1061,1064 ---- *************** *** 1312,1316 **** if (iph != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! ipf_htable_deref(softc, softh, iph); RWLOCK_EXIT(&softc->ipf_poolrw); } --- 1307,1311 ---- if (iph != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! (void) ipf_htable_deref(softc, softh, iph); RWLOCK_EXIT(&softc->ipf_poolrw); } *************** *** 1325,1329 **** if (node != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! ipf_htent_deref(softc, node); RWLOCK_EXIT(&softc->ipf_poolrw); } --- 1320,1324 ---- if (node != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! (void) ipf_htent_deref(softc, node); RWLOCK_EXIT(&softc->ipf_poolrw); } *************** *** 1366,1374 **** { case IPFLOOKUPITER_LIST : ! ipf_htable_deref(softc, arg, (iphtable_t *)data); break; case IPFLOOKUPITER_NODE : ! ipf_htent_deref(arg, (iphtent_t *)data); break; default : --- 1361,1369 ---- { case IPFLOOKUPITER_LIST : ! (void) ipf_htable_deref(softc, arg, (iphtable_t *)data); break; case IPFLOOKUPITER_NODE : ! (void) ipf_htent_deref(arg, (iphtent_t *)data); break; default : *************** *** 1437,1441 **** break; ! ipf_htent_remove(softc, softh, n->ipe_owner, n); } } --- 1432,1436 ---- break; ! (void) ipf_htent_remove(softh, n->ipe_owner, n); } } Index: ip_sync.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_sync.c,v retrieving revision 1.19.2.9 retrieving revision 1.19.2.10 diff -C2 -d -r1.19.2.9 -r1.19.2.10 *** ip_sync.c 22 Jul 2012 08:04:23 -0000 1.19.2.9 --- ip_sync.c 13 Aug 2012 11:44:15 -0000 1.19.2.10 *************** *** 182,185 **** --- 182,186 ---- /* any data structures, as required. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_sync_soft_init(softc, arg) *************** *** 249,252 **** --- 250,254 ---- /* with the synchronisation tables. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_sync_soft_fini(softc, arg) *************** *** 257,262 **** if (softs->syncnattab != NULL) { ! ipf_sync_flush_table(softs, softs->ipf_sync_nat_tab_sz, ! softs->syncnattab); KFREES(softs->syncnattab, softs->ipf_sync_nat_tab_sz * sizeof(*softs->syncnattab)); --- 259,264 ---- if (softs->syncnattab != NULL) { ! (void) ipf_sync_flush_table(softs, softs->ipf_sync_nat_tab_sz, ! softs->syncnattab); KFREES(softs->syncnattab, softs->ipf_sync_nat_tab_sz * sizeof(*softs->syncnattab)); *************** *** 265,270 **** if (softs->syncstatetab != NULL) { ! ipf_sync_flush_table(softs, softs->ipf_sync_state_tab_sz, ! softs->syncstatetab); KFREES(softs->syncstatetab, softs->ipf_sync_state_tab_sz * --- 267,272 ---- if (softs->syncstatetab != NULL) { ! (void) ipf_sync_flush_table(softs, softs->ipf_sync_state_tab_sz, ! softs->syncstatetab); KFREES(softs->syncstatetab, softs->ipf_sync_state_tab_sz * *************** *** 296,299 **** --- 298,302 ---- } + /*ARGSUSED*/ void ipf_sync_soft_destroy(softc, arg) *************** *** 568,572 **** /* no more data */ ! return 0; } --- 571,575 ---- /* no more data */ ! return err; } *************** *** 746,750 **** if (softs->ipf_sync_debug > 4) ! printf("[%d] Filter rules = %p\n", sp->sm_num, fr); is->is_rule = fr; --- 749,753 ---- if (softs->ipf_sync_debug > 4) ! printf("[%d] Filter rule = %p\n", sp->sm_num,(void*)fr); is->is_rule = fr; *************** *** 764,768 **** softs->syncstatetab[hv] = sl; MUTEX_DOWNGRADE(&softs->ipf_syncstate); ! ipf_state_insert(softc, is, sp->sm_rev); /* * Do not initialise the interface pointers for the state --- 767,771 ---- softs->syncstatetab[hv] = sl; MUTEX_DOWNGRADE(&softs->ipf_syncstate); ! (void) ipf_state_insert(softc, is, sp->sm_rev); /* * Do not initialise the interface pointers for the state *************** *** 938,942 **** synclist_t *sl; u_int hv = 0; ! int err; READ_ENTER(&softs->ipf_syncnat); --- 941,945 ---- synclist_t *sl; u_int hv = 0; ! int err = 0; READ_ENTER(&softs->ipf_syncnat); *************** *** 1015,1019 **** RWLOCK_EXIT(&softs->ipf_syncnat); ! return 0; } --- 1018,1022 ---- RWLOCK_EXIT(&softs->ipf_syncnat); ! return err; } *************** *** 1299,1308 **** /* ------------------------------------------------------------------------ */ int ! ipf_sync_ioctl(softc, data, cmd, mode, uid, ctx) ipf_main_softc_t *softc; caddr_t data; ioctlcmd_t cmd; - int mode, uid; - void *ctx; { ipf_sync_softc_t *softs = softc->ipf_sync_soft; --- 1302,1309 ---- /* ------------------------------------------------------------------------ */ int ! ipf_sync_ioctl(softc, data, cmd) ipf_main_softc_t *softc; caddr_t data; ioctlcmd_t cmd; { ipf_sync_softc_t *softs = softc->ipf_sync_soft; *************** *** 1398,1401 **** --- 1399,1403 ---- /* XXX Maybe this should return false if the sync table is full? */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_sync_canwrite(arg) Index: ip_fil_solaris.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_fil_solaris.c,v retrieving revision 1.27.2.22 retrieving revision 1.27.2.23 diff -C2 -d -r1.27.2.22 -r1.27.2.23 *** ip_fil_solaris.c 22 Jul 2012 08:04:23 -0000 1.27.2.22 --- ip_fil_solaris.c 13 Aug 2012 11:44:14 -0000 1.27.2.23 *************** *** 147,151 **** --- 147,153 ---- ipf_main_softc_t *softc; { + #if SOLARIS2 <= 8 int i; + #endif #ifdef IPFDEBUG *************** *** 243,246 **** --- 245,249 ---- dev, cmd, data, mode, cp, rp); #endif + softc = GET_SOFTC(crgetzoneid(cp)); unit = getminor(dev); if (IPL_LOGMAX < unit) { *************** *** 249,254 **** } - softc = GET_SOFTC(crgetzoneid(cp)); - if (softc->ipf_running <= 0) { if (unit != IPL_LOGIPF && cmd != SIOCIPFINTERROR) { --- 252,255 ---- *************** *** 722,726 **** struct sockaddr_in sin[2]; net_ifaddr_t types[2]; - void *array; int error; --- 723,726 ---- *************** *** 745,749 **** int logical = 0; - array = sin; do { error = net_getlifaddr(softc->ipf_nd_v4, --- 745,748 ---- *************** *** 756,762 **** return error; } else { ! array = sin6; ! net_getlifaddr(softc->ipf_nd_v6, (phy_if_t)qifptr, 0, ! 2, types, sin6); } --- 755,762 ---- return error; } else { ! error = net_getlifaddr(softc->ipf_nd_v6, (phy_if_t)qifptr, 0, ! 2, types, sin6); ! if (error != 0) ! return error; } *************** *** 822,827 **** { ipf_main_softc_t *softc = fin->fin_main_soft; - ipstate_t *is; - nat_t *nat; u_short id; --- 822,825 ---- *************** *** 1136,1139 **** --- 1134,1138 ---- else dst6 = fin->fin_dst6.in6; + dstp = &dst6; } #endif *************** *** 1239,1243 **** { qpktinfo_t *qpi = fin->fin_qpi; ! int out = fin->fin_out, dpoff; char *ip; mb_t *m; --- 1238,1242 ---- { qpktinfo_t *qpi = fin->fin_qpi; ! int dpoff; char *ip; mb_t *m; *************** *** 1331,1335 **** } ! qp->qp_mb = *fin->fin_mp; if (fin->fin_v == 4) qp->qp_sap = 0x800; --- 1330,1337 ---- } ! if (m == fin->fin_m) ! qp->qp_mb = *fin->fin_mp; ! else ! qp->qp_mb = m; if (fin->fin_v == 4) qp->qp_sap = 0x800; *************** *** 1345,1349 **** net_inject_t inject; inject.ni_physical = (phy_if_t)fin->fin_ifp; ! inject.ni_packet = *fin->fin_mp; if (fin->fin_v == 4) { sin = (struct sockaddr_in *)&inject.ni_addr; --- 1347,1354 ---- net_inject_t inject; inject.ni_physical = (phy_if_t)fin->fin_ifp; ! if (m == fin->fin_m) ! inject.ni_packet = *fin->fin_mp; ! else ! inject.ni_packet = m; if (fin->fin_v == 4) { sin = (struct sockaddr_in *)&inject.ni_addr; *************** *** 1358,1362 **** sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! memcpy(&sin6->sin6_addr, &fin->fin_dst6, sizeof(fin->fin_dst6)); if (fin->fin_out == 0) return net_inject(softc->ipf_nd_v6, NI_QUEUE_IN, &inject); --- 1363,1367 ---- sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! (void) memcpy(&sin6->sin6_addr, &fin->fin_dst6, sizeof(fin->fin_dst6)); if (fin->fin_out == 0) return net_inject(softc->ipf_nd_v6, NI_QUEUE_IN, &inject); *************** *** 1366,1369 **** --- 1371,1375 ---- + /*ARGSUSED*/ static int ipf_sendpkt(softc, v, ifp, mb, ip, dstp) *************** *** 1388,1392 **** sin = (struct sockaddr_in *)&inject.ni_addr; sin->sin_family = AF_INET; ! memcpy(&sin->sin_addr, dstp, sizeof(sin->sin_addr)); return net_inject(softc->ipf_nd_v4, NI_DIRECT_OUT, &inject); } --- 1394,1398 ---- sin = (struct sockaddr_in *)&inject.ni_addr; sin->sin_family = AF_INET; ! (void) memcpy(&sin->sin_addr, dstp, sizeof(sin->sin_addr)); return net_inject(softc->ipf_nd_v4, NI_DIRECT_OUT, &inject); } *************** *** 1394,1398 **** sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! memcpy(&sin6->sin6_addr, dstp, sizeof(sin6->sin6_addr)); return net_inject(softc->ipf_nd_v6, NI_DIRECT_OUT, &inject); #endif --- 1400,1404 ---- sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! (void) memcpy(&sin6->sin6_addr, dstp, sizeof(sin6->sin6_addr)); return net_inject(softc->ipf_nd_v6, NI_DIRECT_OUT, &inject); #endif *************** *** 1453,1457 **** ipf_prependmbt(fr_info_t *fin, mblk_t *m) { ! mblk_t *o = NULL, *top; mblk_t *n = *fin->fin_mp; qpktinfo_t *qpi; --- 1459,1463 ---- ipf_prependmbt(fr_info_t *fin, mblk_t *m) { ! mblk_t *o = NULL; mblk_t *n = *fin->fin_mp; qpktinfo_t *qpi; *************** *** 1497,1500 **** --- 1503,1507 ---- + /*ARGSUSED*/ static void * ipf_routeto(fin, v, dstip) *************** *** 1509,1513 **** struct sockaddr *sock; net_handle_t proto; - int result; switch (fin->fin_v) --- 1516,1519 ---- Index: ip_state.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_state.c,v retrieving revision 1.48.2.24 retrieving revision 1.48.2.25 diff -C2 -d -r1.48.2.24 -r1.48.2.25 *** ip_state.c 20 Jul 2012 07:39:10 -0000 1.48.2.24 --- ip_state.c 13 Aug 2012 11:44:15 -0000 1.48.2.25 *************** *** 145,150 **** #define SINCL(x) ATOMIC_INCL(softs->x) #define SBUMP(x) (softs->x)++ ! #define SBUMPD(x, y) do { (softs->x.y)++; DT(y); } while (0) ! #define SBUMPDX(x, y, z)do { (softs->x.y)++; DT(z); } while (0) #ifdef USE_INET6 --- 145,159 ---- #define SINCL(x) ATOMIC_INCL(softs->x) #define SBUMP(x) (softs->x)++ ! #define SBUMPD(x, y) do { \ ! (softs->x.y)++; \ ! DT(y); \ ! _NOTE(CONSTCOND) \ ! } while (0) ! #define SBUMPDX(x, y, z) \ ! do { \ ! (softs->x.y)++; \ ! DT(z); \ ! _NOTE(CONSTCOND) \ ! } while (0) #ifdef USE_INET6 *************** *** 292,296 **** if (softs->ipf_state_tune != NULL) { ! ipf_tune_array_unlink(softc, softs->ipf_state_tune); KFREES(softs->ipf_state_tune, sizeof(ipf_state_tuneables)); softs->ipf_state_tune = NULL; --- 301,305 ---- if (softs->ipf_state_tune != NULL) { ! (void) ipf_tune_array_unlink(softc, softs->ipf_state_tune); KFREES(softs->ipf_state_tune, sizeof(ipf_state_tuneables)); softs->ipf_state_tune = NULL; *************** *** 427,431 **** while ((is = softs->ipf_state_list) != NULL) ! ipf_state_del(softc, is, ISL_UNLOAD); /* --- 436,440 ---- while ((is = softs->ipf_state_list) != NULL) ! (void) ipf_state_del(softc, is, ISL_UNLOAD); /* *************** *** 563,567 **** !bcmp((caddr_t)&sp->is_ps, (caddr_t)&st.is_ps, sizeof(st.is_ps))) { ! ipf_state_del(softc, sp, ISL_REMOVE); RWLOCK_EXIT(&softc->ipf_state); return 0; --- 572,576 ---- !bcmp((caddr_t)&sp->is_ps, (caddr_t)&st.is_ps, sizeof(st.is_ps))) { ! (void) ipf_state_del(softc, sp, ISL_REMOVE); RWLOCK_EXIT(&softc->ipf_state); return 0; *************** *** 790,794 **** error = ipf_state_iter(softc, token, &iter, &obj); WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { --- 799,803 ---- error = ipf_state_iter(softc, token, &iter, &obj); WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { *************** *** 916,921 **** ipstate_t *is, *isn; ipstate_save_t ips; - int error, out, i; frentry_t *fr; char *name; --- 925,930 ---- ipstate_t *is, *isn; ipstate_save_t ips; frentry_t *fr; + int error, i; char *name; *************** *** 962,966 **** } bcopy((char *)&ips.ips_fr, (char *)fr, sizeof(*fr)); - out = fr->fr_flags & FR_OUTQUE ? 1 : 0; isn->is_rule = fr; ips.ips_is.is_rule = fr; --- 971,974 ---- *************** *** 1783,1789 **** fr->fr_names[fr->fr_ifnames[out << 1] + 1] == '\0')) { is->is_ifp[out << 1] = fr->fr_ifas[0]; ! strncpy(is->is_ifname[out << 1], ! fr->fr_names + fr->fr_ifnames[0], ! sizeof(fr->fr_ifnames[0])); } else { is->is_ifp[out << 1] = fin->fin_ifp; --- 1791,1797 ---- fr->fr_names[fr->fr_ifnames[out << 1] + 1] == '\0')) { is->is_ifp[out << 1] = fr->fr_ifas[0]; ! (void) strncpy(is->is_ifname[out << 1], ! fr->fr_names + fr->fr_ifnames[0], ! sizeof(fr->fr_ifnames[0])); } else { is->is_ifp[out << 1] = fin->fin_ifp; *************** *** 1794,1814 **** is->is_ifp[(out << 1) + 1] = fr->fr_ifas[1]; if (fr->fr_ifnames[1] != -1) { ! strncpy(is->is_ifname[(out << 1) + 1], ! fr->fr_names + fr->fr_ifnames[1], ! sizeof(fr->fr_ifnames[1])); } is->is_ifp[(1 - out) << 1] = fr->fr_ifas[2]; if (fr->fr_ifnames[2] != -1) { ! strncpy(is->is_ifname[((1 - out) << 1)], ! fr->fr_names + fr->fr_ifnames[2], ! sizeof(fr->fr_ifnames[2])); } is->is_ifp[((1 - out) << 1) + 1] = fr->fr_ifas[3]; if (fr->fr_ifnames[3] != -1) { ! strncpy(is->is_ifname[((1 - out) << 1) + 1], ! fr->fr_names + fr->fr_ifnames[3], ! sizeof(fr->fr_ifnames[3])); } } else { --- 1802,1822 ---- is->is_ifp[(out << 1) + 1] = fr->fr_ifas[1]; if (fr->fr_ifnames[1] != -1) { ! (void) strncpy(is->is_ifname[(out << 1) + 1], ! fr->fr_names + fr->fr_ifnames[1], ! sizeof(fr->fr_ifnames[1])); } is->is_ifp[(1 - out) << 1] = fr->fr_ifas[2]; if (fr->fr_ifnames[2] != -1) { ! (void) strncpy(is->is_ifname[((1 - out) << 1)], ! fr->fr_names + fr->fr_ifnames[2], ! sizeof(fr->fr_ifnames[2])); } is->is_ifp[((1 - out) << 1) + 1] = fr->fr_ifas[3]; if (fr->fr_ifnames[3] != -1) { ! (void) strncpy(is->is_ifname[((1 - out) << 1) + 1], ! fr->fr_names + fr->fr_ifnames[3], ! sizeof(fr->fr_ifnames[3])); } } else { *************** *** 1843,1848 **** fdp = &fr->fr_tifs[0]; if (fdp->fd_type == FRD_DSTLIST) { ! ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[0]); } else { bcopy(fdp, &is->is_tifs[0], sizeof(*fdp)); --- 1851,1856 ---- fdp = &fr->fr_tifs[0]; if (fdp->fd_type == FRD_DSTLIST) { ! (void) ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[0]); } else { bcopy(fdp, &is->is_tifs[0], sizeof(*fdp)); *************** *** 1851,1856 **** fdp = &fr->fr_tifs[1]; if (fdp->fd_type == FRD_DSTLIST) { ! ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[1]); } else { bcopy(fdp, &is->is_tifs[1], sizeof(*fdp)); --- 1859,1864 ---- fdp = &fr->fr_tifs[1]; if (fdp->fd_type == FRD_DSTLIST) { ! (void) ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[1]); } else { bcopy(fdp, &is->is_tifs[1], sizeof(*fdp)); *************** *** 1860,1865 **** fdp = &fr->fr_dif; if (fdp->fd_type == FRD_DSTLIST) { ! ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_dif); } else { bcopy(fdp, &is->is_dif, sizeof(*fdp)); --- 1868,1873 ---- fdp = &fr->fr_dif; if (fdp->fd_type == FRD_DSTLIST) { ! (void) ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[1]); } else { bcopy(fdp, &is->is_dif, sizeof(*fdp)); *************** *** 2254,2262 **** inseq = 1; } else if (!(flags & IS_TCPFSM)) { int i; i = (fin->fin_rev << 1) + fin->fin_out; ... [truncated message content] |
From: Darren <dar...@us...> - 2012-08-13 11:42:04
|
Update of /cvsroot/ipfilter/ipfilter In directory vz-cvs-4.sog:/tmp/cvs-serv1746 Modified Files: fil.c ip_auth.c ip_compat.h ip_dstlist.c ip_fil.h ip_fil_solaris.c ip_frag.c ip_ftp_pxy.c ip_htable.c ip_ipsec_pxy.c ip_irc_pxy.c ip_log.c ip_lookup.c ip_lookup.h ip_nat.c ip_nat6.c ip_netbios_pxy.c ip_pool.c ip_pptp_pxy.c ip_proxy.c ip_proxy.h ip_raudio_pxy.c ip_rcmd_pxy.c ip_rpcb_pxy.c ip_state.c ip_sync.c ip_sync.h ip_tftp_pxy.c ipf_rb.h radix_ipf.c radix_ipf.h solaris.c Log Message: 3556683 lint cleanup Index: ip_auth.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_auth.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ip_auth.c 22 Jul 2012 08:02:22 -0000 1.31 --- ip_auth.c 13 Aug 2012 11:42:00 -0000 1.32 *************** *** 203,206 **** --- 203,207 ---- /* and initialise some fields to their defaults. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ void * ipf_auth_soft_create(softc) *************** *** 236,239 **** --- 237,241 ---- /* rules. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_auth_soft_init(softc, arg) *************** *** 275,278 **** --- 277,281 ---- /* is free'd by _destroy(). */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_auth_soft_fini(softc, arg) *************** *** 335,338 **** --- 338,342 ---- /* Undo what was done in _create() - i.e. free the soft context data. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ void ipf_auth_soft_destroy(softc, arg) *************** *** 624,628 **** else { WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); IPFERROR(10001); --- 628,632 ---- else { WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); IPFERROR(10001); Index: ip_tftp_pxy.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_tftp_pxy.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ip_tftp_pxy.c 22 Jul 2012 08:02:22 -0000 1.9 --- ip_tftp_pxy.c 13 Aug 2012 11:42:01 -0000 1.10 *************** *** 14,18 **** } ipf_tftp_softc_t; ! int ipf_p_tftp_backchannel(fr_info_t *, ap_session_t *, nat_t *); int ipf_p_tftp_client(ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, nat_t *); void ipf_p_tftp_del(ipf_main_softc_t *, ap_session_t *); --- 14,18 ---- } ipf_tftp_softc_t; ! void ipf_p_tftp_backchannel(fr_info_t *, ap_session_t *, nat_t *); int ipf_p_tftp_client(ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, nat_t *); void ipf_p_tftp_del(ipf_main_softc_t *, ap_session_t *); *************** *** 22,26 **** int ipf_p_tftp_new(void *, fr_info_t *, ap_session_t *, nat_t *); int ipf_p_tftp_out(void *, fr_info_t *, ap_session_t *, nat_t *); ! int ipf_p_tftp_server(ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, nat_t *); void *ipf_p_tftp_soft_create(ipf_main_softc_t *); void ipf_p_tftp_soft_destroy(ipf_main_softc_t *, void *); --- 22,26 ---- int ipf_p_tftp_new(void *, fr_info_t *, ap_session_t *, nat_t *); int ipf_p_tftp_out(void *, fr_info_t *, ap_session_t *, nat_t *); ! int ipf_p_tftp_server(fr_info_t *, ap_session_t *); void *ipf_p_tftp_soft_create(ipf_main_softc_t *); void ipf_p_tftp_soft_destroy(ipf_main_softc_t *, void *); *************** *** 120,124 **** if (softt->ipf_p_tftp_tune != NULL) { ! ipf_tune_array_unlink(softc, softt->ipf_p_tftp_tune); KFREES(softt->ipf_p_tftp_tune, sizeof(ipf_tftp_tuneables)); softt->ipf_p_tftp_tune = NULL; --- 120,124 ---- if (softt->ipf_p_tftp_tune != NULL) { ! (void) ipf_tune_array_unlink(softc, softt->ipf_p_tftp_tune); KFREES(softt->ipf_p_tftp_tune, sizeof(ipf_tftp_tuneables)); softt->ipf_p_tftp_tune = NULL; *************** *** 141,145 **** if (nat->nat_dir == NAT_OUTBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(softt, fin, aps, nat); } --- 141,145 ---- if (nat->nat_dir == NAT_OUTBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(fin, aps); } *************** *** 157,164 **** if (nat->nat_dir == NAT_INBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(softt, fin, aps, nat); } int ipf_p_tftp_new(arg, fin, aps, nat) --- 157,165 ---- if (nat->nat_dir == NAT_INBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(fin, aps); } + /*ARGSUSED*/ int ipf_p_tftp_new(arg, fin, aps, nat) *************** *** 279,283 **** * Setup for a new TFTP proxy. */ ! int ipf_p_tftp_backchannel(fin, aps, nat) fr_info_t *fin; --- 280,284 ---- * Setup for a new TFTP proxy. */ ! void ipf_p_tftp_backchannel(fin, aps, nat) fr_info_t *fin; *************** *** 303,306 **** --- 304,309 ---- int dir; + slen = 0; + nat2 = NULL; ti = aps->aps_data; /* *************** *** 365,370 **** --- 368,375 ---- if (nat->nat_v[0] == 4) nat2 = ipf_nat_add(&fi, ti->ti_rule, NULL, nflags, dir); + #ifdef USE_INET6 else nat2 = ipf_nat6_add(&fi, ti->ti_rule, NULL, nflags, dir); + #endif MUTEX_EXIT(&softn->ipf_nat_new); if (nat2 != NULL) { *************** *** 412,416 **** #endif } - return 0; } --- 417,420 ---- *************** *** 426,430 **** tftpinfo_t *ti; u_short opcode; - udphdr_t *udp; int len; --- 430,433 ---- *************** *** 445,449 **** /* FALLTHROUGH */ case TFTP_CMD_READ : ! len = fin->fin_dlen - sizeof(*udp) - 2; if (len > sizeof(ti->ti_filename) - 1) len = sizeof(ti->ti_filename) - 1; --- 448,452 ---- /* FALLTHROUGH */ case TFTP_CMD_READ : ! len = fin->fin_dlen - sizeof(udphdr_t) - 2; if (len > sizeof(ti->ti_filename) - 1) len = sizeof(ti->ti_filename) - 1; *************** *** 466,475 **** int ! ipf_p_tftp_server(softt, fin, aps, nat) ! ipf_tftp_softc_t *softt; fr_info_t *fin; ap_session_t *aps; - nat_t *nat; { tftpinfo_t *ti; --- 469,477 ---- + /*ARGSUSED*/ int ! ipf_p_tftp_server(fin, aps) fr_info_t *fin; ap_session_t *aps; { tftpinfo_t *ti; Index: ip_pool.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_pool.c,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ip_pool.c 22 Jul 2012 07:58:03 -0000 1.41 --- ip_pool.c 13 Aug 2012 11:42:01 -0000 1.42 *************** *** 294,297 **** --- 294,298 ---- /* Initialise the routing table data structures where required. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_pool_soft_init(softc, arg) *************** *** 347,350 **** --- 348,352 ---- /* up the pool context too. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_pool_soft_destroy(softc, arg) *************** *** 371,374 **** --- 373,377 ---- /* the address prior to calling for the pair to be added. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_pool_node_add(softc, arg, op, uid) *************** *** 738,742 **** /* Searches for an exact match of an entry in the pool. */ /* ------------------------------------------------------------------------ */ ! extern void printhostmask(int, u_32_t *, u_32_t *); static ip_pool_node_t * ipf_pool_findeq(softp, ipo, addr, mask) --- 741,745 ---- /* Searches for an exact match of an entry in the pool. */ /* ------------------------------------------------------------------------ */ ! /*ARGSUSED*/ static ip_pool_node_t * ipf_pool_findeq(softp, ipo, addr, mask) *************** *** 1212,1216 **** for (next = &ipo->ipo_list; (n = *next) != NULL; ) ! ipf_pool_remove_node(softc, softp, ipo, n); ipo->ipo_list = NULL; --- 1215,1219 ---- for (next = &ipo->ipo_list; (n = *next) != NULL; ) ! (void) ipf_pool_remove_node(softc, softp, ipo, n); ipo->ipo_list = NULL; *************** *** 1242,1246 **** else if ((ipo->ipo_ref == 1) && (ipo->ipo_flags & IPOOL_DELETE)) ! ipf_pool_destroy(softc, arg, ipo->ipo_unit, ipo->ipo_name); return 0; --- 1245,1250 ---- else if ((ipo->ipo_ref == 1) && (ipo->ipo_flags & IPOOL_DELETE)) ! (void) ipf_pool_destroy(softc, arg, ipo->ipo_unit, ! ipo->ipo_name); return 0; *************** *** 1372,1376 **** if (ipo != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! ipf_pool_deref(softc, softp, ipo); RWLOCK_EXIT(&softc->ipf_poolrw); } --- 1376,1380 ---- if (ipo != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! (void) ipf_pool_deref(softc, softp, ipo); RWLOCK_EXIT(&softc->ipf_poolrw); } *************** *** 1425,1429 **** { case IPFLOOKUPITER_LIST : ! ipf_pool_deref(softc, softp, (ip_pool_t *)data); break; --- 1429,1433 ---- { case IPFLOOKUPITER_LIST : ! (void) ipf_pool_deref(softc, softp, (ip_pool_t *)data); break; *************** *** 1463,1467 **** if (n->ipn_die > softc->ipf_ticks) break; ! ipf_pool_remove_node(softc, softp, n->ipn_owner, n); } } --- 1467,1471 ---- if (n->ipn_die > softc->ipf_ticks) break; ! (void) ipf_pool_remove_node(softc, softp, n->ipn_owner, n); } } Index: solaris.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/solaris.c,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** solaris.c 22 Jul 2012 08:02:22 -0000 1.38 --- solaris.c 13 Aug 2012 11:42:01 -0000 1.39 *************** *** 233,238 **** #endif if (rval == 0) { ! ipf_unload_all(); ! ipf_stack_fini(); } return rval; --- 233,241 ---- #endif if (rval == 0) { ! rval = ipf_unload_all(); ! if (rval == 0) ! ipf_stack_fini(); ! else ! (void) mod_install(&modlink1); } return rval; *************** *** 439,443 **** rval = ipf_stack_init(); if (rval != 0) { ! ipf_unload_all(); return rval; } --- 442,446 ---- rval = ipf_stack_init(); if (rval != 0) { ! rval = ipf_unload_all(); return rval; } *************** *** 563,567 **** int revents = 0; ! if (xmin < 0 || xmin > IPL_LOGMAX) return ENXIO; --- 566,570 ---- int revents = 0; ! if (xmin > IPL_LOGMAX) return ENXIO; *************** *** 814,817 **** --- 817,821 ---- + /*ARGSUSED*/ int ipf_hk_v4_in(tok, data, arg) *************** *** 852,855 **** --- 856,860 ---- + /*ARGSUSED*/ int ipf_hk_v4_out(tok, data, arg) *************** *** 890,893 **** --- 895,899 ---- + /*ARGSUSED*/ int ipf_hk_v4_nic(tok, data, arg) *************** *** 925,928 **** --- 931,935 ---- + /*ARGSUSED*/ int ipf_hk_v6_in(tok, data, arg) *************** *** 962,965 **** --- 969,973 ---- + /*ARGSUSED*/ int ipf_hk_v6_out(tok, data, arg) *************** *** 999,1002 **** --- 1007,1011 ---- + /*ARGSUSED*/ int ipf_hk_v6_nic(tok, data, arg) *************** *** 1006,1010 **** { hook_nic_event_t *nic = (hook_nic_event_t *)data; - ipf_main_softc_t *softc = (ipf_main_softc_t *)arg; switch (nic->hne_event) --- 1015,1018 ---- *************** *** 1054,1057 **** --- 1062,1066 ---- + /*ARGSUSED*/ static void ipf_instance_shutdown(netid_t id, void *arg) *************** *** 1063,1066 **** --- 1072,1076 ---- + /*ARGSUSED*/ static void ipf_instance_destroy(netid_t id, void *arg) *************** *** 1096,1100 **** ipf_stack_fini() { ! net_instance_unregister(ipf_inst); net_instance_free(ipf_inst); ipf_inst = NULL; --- 1106,1110 ---- ipf_stack_fini() { ! (void) net_instance_unregister(ipf_inst); net_instance_free(ipf_inst); ipf_inst = NULL; *************** *** 1168,1172 **** hook_free(softc->ipf_hk_v4_nic); ! net_protocol_release(softc->ipf_nd_v4); softc->ipf_nd_v4 = NULL; } --- 1178,1182 ---- hook_free(softc->ipf_hk_v4_nic); ! (void) net_protocol_release(softc->ipf_nd_v4); softc->ipf_nd_v4 = NULL; } *************** *** 1188,1192 **** hook_free(softc->ipf_hk_v6_nic); ! net_protocol_release(softc->ipf_nd_v6); softc->ipf_nd_v6 = NULL; } --- 1198,1202 ---- hook_free(softc->ipf_hk_v6_nic); ! (void) net_protocol_release(softc->ipf_nd_v6); softc->ipf_nd_v6 = NULL; } Index: ip_ipsec_pxy.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_ipsec_pxy.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ip_ipsec_pxy.c 22 Jul 2012 08:02:22 -0000 1.20 --- ip_ipsec_pxy.c 13 Aug 2012 11:42:01 -0000 1.21 *************** *** 41,44 **** --- 41,45 ---- * IPSec application proxy initialization. */ + /*ARGSUSED*/ void * ipf_p_ipsec_soft_create(softc) *************** *** 88,91 **** --- 89,93 ---- + /*ARGSUSED*/ void ipf_p_ipsec_soft_fini(softc, arg) *************** *** 111,114 **** --- 113,117 ---- + /*ARGSUSED*/ void ipf_p_ipsec_soft_destroy(softc, arg) Index: ip_dstlist.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_dstlist.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ip_dstlist.c 22 Jul 2012 08:02:22 -0000 1.24 --- ip_dstlist.c 13 Aug 2012 11:42:00 -0000 1.25 *************** *** 174,177 **** --- 174,178 ---- /* soft context is free it! */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_dstlist_soft_destroy(softc, arg) *************** *** 193,196 **** --- 194,198 ---- /* There is currently no soft context for destination list management. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_dstlist_soft_init(softc, arg) *************** *** 210,213 **** --- 212,216 ---- /* There is currently no soft context for destination list management. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_dstlist_soft_fini(softc, arg) *************** *** 329,337 **** { case IPFLOOKUPITER_LIST : ! ipf_dstlist_table_deref(softc, arg, (ippool_dst_t *)data); break; case IPFLOOKUPITER_NODE : ! ipf_dstlist_node_deref(arg, (ipf_dstnode_t *)data); break; } --- 332,340 ---- { case IPFLOOKUPITER_LIST : ! (void) ipf_dstlist_table_deref(softc, arg,(ippool_dst_t *)data); break; case IPFLOOKUPITER_NODE : ! (void) ipf_dstlist_node_deref(arg, (ipf_dstnode_t *)data); break; } *************** *** 434,438 **** case IPFLOOKUPITER_LIST : if (dsttab != NULL) ! ipf_dstlist_table_deref(softc, arg, dsttab); err = COPYOUT(next, iter->ili_data, sizeof(*next)); if (err != 0) { --- 437,441 ---- case IPFLOOKUPITER_LIST : if (dsttab != NULL) ! (void) ipf_dstlist_table_deref(softc, arg, dsttab); err = COPYOUT(next, iter->ili_data, sizeof(*next)); if (err != 0) { *************** *** 444,448 **** case IPFLOOKUPITER_NODE : if (node != NULL) ! ipf_dstlist_node_deref(arg, node); err = COPYOUT(nextnode, iter->ili_data, sizeof(*nextnode)); if (err != 0) { --- 447,451 ---- case IPFLOOKUPITER_NODE : if (node != NULL) ! (void) ipf_dstlist_node_deref(arg, node); err = COPYOUT(nextnode, iter->ili_data, sizeof(*nextnode)); if (err != 0) { *************** *** 602,606 **** /* ------------------------------------------------------------------------ */ /* Function: ipf_dstlist_node_deref */ ! /* Returns: int - 0 = success, else error */ /* Parameters: arg(I) - pointer to local context to use */ /* node(I) - pointer to destionation node to free */ --- 605,609 ---- /* ------------------------------------------------------------------------ */ /* Function: ipf_dstlist_node_deref */ ! /* Returns: int - 0 = success, else current reference count */ /* Parameters: arg(I) - pointer to local context to use */ /* node(I) - pointer to destionation node to free */ *************** *** 624,628 **** if (ref > 0) ! return 0; if ((node->ipfd_flags & IPDST_DELETE) != 0) --- 627,631 ---- if (ref > 0) ! return ref; if ((node->ipfd_flags & IPDST_DELETE) != 0) *************** *** 755,759 **** } ! ipf_dstlist_node_deref(softd, node); } --- 758,762 ---- } ! (void) ipf_dstlist_node_deref(softd, node); } *************** *** 858,862 **** MUTEX_INIT(&new->ipld_lock, "ipf dst table lock"); ! strncpy(new->ipld_name, op->iplo_name, FR_GROUPLEN); unit = op->iplo_unit; new->ipld_unit = unit; --- 861,865 ---- MUTEX_INIT(&new->ipld_lock, "ipf dst table lock"); ! (void) strncpy(new->ipld_name, op->iplo_name, FR_GROUPLEN); unit = op->iplo_unit; new->ipld_unit = unit; *************** *** 945,949 **** d->ipld_flags |= IPDST_DELETE; ! ipf_dstlist_table_deref(softc, softd, d); } --- 948,952 ---- d->ipld_flags |= IPDST_DELETE; ! (void) ipf_dstlist_table_deref(softc, softd, d); } *************** *** 990,993 **** --- 993,997 ---- /* it if 0 has been reached. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_dstlist_table_deref(softc, arg, table) *************** *** 1297,1300 **** --- 1301,1305 ---- /* There are currently no objects to expire in destination lists. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_dstlist_expire(softc, arg) Index: fil.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -d -r1.126 -r1.127 *** fil.c 22 Jul 2012 08:02:22 -0000 1.126 --- fil.c 13 Aug 2012 11:42:00 -0000 1.127 *************** *** 147,156 **** #define LBUMP(x) softc->x++ ! #define LBUMPD(x, y) do { softc->x.y++; DT(y); } while (0) static INLINE int ipf_check_ipf(fr_info_t *, frentry_t *, int); static u_32_t ipf_checkcipso(fr_info_t *, u_char *, int); static u_32_t ipf_checkripso(u_char *); ! static u_32_t ipf_decaps(fr_info_t *, u_32_t, int); #ifdef IPFILTER_LOG static frentry_t *ipf_dolog(fr_info_t *, u_32_t *); --- 147,160 ---- #define LBUMP(x) softc->x++ ! #define LBUMPD(x, y) do { \ ! softc->x.y++; \ ! DT(y); \ ! _NOTE(CONSTCOND) \ ! } while (0) static INLINE int ipf_check_ipf(fr_info_t *, frentry_t *, int); static u_32_t ipf_checkcipso(fr_info_t *, u_char *, int); static u_32_t ipf_checkripso(u_char *); ! static u_32_t ipf_decaps(fr_info_t *, u_32_t); #ifdef IPFILTER_LOG static frentry_t *ipf_dolog(fr_info_t *, u_32_t *); *************** *** 188,193 **** static INLINE int ipf_pr_tcpcommon(fr_info_t *); static INLINE int ipf_pr_udpcommon(fr_info_t *); ! static void ipf_rule_delete(ipf_main_softc_t *, frentry_t *f, ! int, int); static void ipf_rule_expire_insert(ipf_main_softc_t *, frentry_t *, int); --- 192,196 ---- static INLINE int ipf_pr_tcpcommon(fr_info_t *); static INLINE int ipf_pr_udpcommon(fr_info_t *); ! static void ipf_rule_delete(ipf_main_softc_t *, frentry_t *f); static void ipf_rule_expire_insert(ipf_main_softc_t *, frentry_t *, int); *************** *** 968,972 **** fin->fin_p = IPPROTO_ICMPV6; ! ipf_checkv6sum(fin); fin->fin_p = p; } --- 971,975 ---- fin->fin_p = IPPROTO_ICMPV6; ! (void) ipf_checkv6sum(fin); fin->fin_p = p; } *************** *** 992,996 **** fin->fin_p = IPPROTO_UDP; ! ipf_checkv6sum(fin); fin->fin_p = p; } --- 995,999 ---- fin->fin_p = IPPROTO_UDP; ! (void) ipf_checkv6sum(fin); fin->fin_p = p; } *************** *** 1016,1020 **** fin->fin_p = IPPROTO_TCP; ! ipf_checkv6sum(fin); fin->fin_p = p; } --- 1019,1023 ---- fin->fin_p = IPPROTO_TCP; ! (void) ipf_checkv6sum(fin); fin->fin_p = p; } *************** *** 1260,1263 **** --- 1263,1267 ---- fin->fin_flx |= FI_BAD; } + /*FALLTHROUGH*/ #endif case ICMP_SOURCEQUENCH : *************** *** 1294,1298 **** ipf_pr_short(fin, minicmpsz); ! ipf_checkv4sum(fin); } --- 1298,1302 ---- ipf_pr_short(fin, minicmpsz); ! (void) ipf_checkv4sum(fin); } *************** *** 1455,1458 **** --- 1459,1463 ---- */ /*fin->fin_flx |= FI_BAD*/; + fin->fin_flx = fin->fin_flx; /* LINT */ } else if (!(flags & (TH_RST|TH_SYN))) { fin->fin_flx |= FI_BAD; *************** *** 1611,1615 **** if (ipf_pr_tcpcommon(fin) == 0) ! ipf_checkv4sum(fin); } --- 1616,1620 ---- if (ipf_pr_tcpcommon(fin) == 0) ! (void) ipf_checkv4sum(fin); } *************** *** 1631,1635 **** if (ipf_pr_udpcommon(fin) == 0) ! ipf_checkv4sum(fin); } --- 1636,1640 ---- if (ipf_pr_udpcommon(fin) == 0) ! (void) ipf_checkv4sum(fin); } *************** *** 2068,2072 **** } else if (tag > 127) { /* Custom defined DOI */ ! ; } else { fin->fin_flx |= FI_BAD; --- 2073,2077 ---- } else if (tag > 127) { /* Custom defined DOI */ ! fin->fin_flx = fin->fin_flx; /* LINT */ } else { fin->fin_flx |= FI_BAD; *************** *** 2633,2637 **** if (FR_ISDECAPS(passt)) ! passt = ipf_decaps(fin, pass, fr->fr_icode); else passt = ipf_scanlist(fin, pass); --- 2638,2642 ---- if (FR_ISDECAPS(passt)) ! passt = ipf_decaps(fin, pass); else passt = ipf_scanlist(fin, pass); *************** *** 3124,3128 **** case 4 : if (ipf_nat_checkout(fin, &pass) == -1) { ! ; } else if ((softc->ipf_update_ipid != 0) && (v == 4)) { if (ipf_updateipid(fin) == -1) { --- 3129,3133 ---- case 4 : if (ipf_nat_checkout(fin, &pass) == -1) { ! pass = pass; /* LINT */ } else if ((softc->ipf_update_ipid != 0) && (v == 4)) { if (ipf_updateipid(fin) == -1) { *************** *** 3250,3254 **** mc = M_COPY(fin->fin_m); if (mc != NULL) ! ipf_fastroute(mc, &mc, fin, fdp); } --- 3255,3259 ---- mc = M_COPY(fin->fin_m); if (mc != NULL) ! (void) ipf_fastroute(mc, &mc, fin, fdp); } *************** *** 3264,3268 **** (fdp->fd_ptr != (struct ifnet *)-1)) { /* this is for to rules: */ ! ipf_fastroute(fin->fin_m, mp, fin, fdp); m = *mp = NULL; } --- 3269,3273 ---- (fdp->fd_ptr != (struct ifnet *)-1)) { /* this is for to rules: */ ! (void) ipf_fastroute(fin->fin_m, mp, fin, fdp); m = *mp = NULL; } *************** *** 3625,3630 **** /* Function: ipf_group_del */ /* Returns: int - number of rules deleted */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* group(I) - group name to delete */ /* fr(I) - filter rule from which group is referenced */ /* Write Locks: ipf_mutex */ --- 3630,3634 ---- /* Function: ipf_group_del */ /* Returns: int - number of rules deleted */ ! /* Parameters: group(I) - group name to delete */ /* fr(I) - filter rule from which group is referenced */ /* Write Locks: ipf_mutex */ *************** *** 3636,3641 **** /* ------------------------------------------------------------------------ */ void ! ipf_group_del(softc, group, fr) ! ipf_main_softc_t *softc; frgroup_t *group; frentry_t *fr; --- 3640,3644 ---- /* ------------------------------------------------------------------------ */ void ! ipf_group_del(group, fr) frgroup_t *group; frentry_t *fr; *************** *** 3814,3823 **** if (flags & FR_OUTQUE) { ! ipf_flushlist(softc, &flushed, &softc->ipf_rules[1][set]); ! ipf_flushlist(softc, &flushed, &softc->ipf_acct[1][set]); } if (flags & FR_INQUE) { ! ipf_flushlist(softc, &flushed, &softc->ipf_rules[0][set]); ! ipf_flushlist(softc, &flushed, &softc->ipf_acct[0][set]); } --- 3817,3826 ---- if (flags & FR_OUTQUE) { ! (void) ipf_flushlist(softc, &flushed,&softc->ipf_rules[1][set]); ! (void) ipf_flushlist(softc, &flushed, &softc->ipf_acct[1][set]); } if (flags & FR_INQUE) { ! (void) ipf_flushlist(softc, &flushed,&softc->ipf_rules[0][set]); ! (void) ipf_flushlist(softc, &flushed, &softc->ipf_acct[0][set]); } *************** *** 4044,4049 **** ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! ipf_ifpaddr(softc, v, fr->fr_satype, ifa, ! &fr->fr_src6, &fr->fr_smsk6); } if (fr->fr_datype != FRI_NORMAL && --- 4047,4052 ---- ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! (void) ipf_ifpaddr(softc, v, fr->fr_satype, ifa, ! &fr->fr_src6, &fr->fr_smsk6); } if (fr->fr_datype != FRI_NORMAL && *************** *** 4051,4056 **** ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! ipf_ifpaddr(softc, v, fr->fr_datype, ifa, ! &fr->fr_dst6, &fr->fr_dmsk6); } } --- 4054,4059 ---- ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! (void) ipf_ifpaddr(softc, v, fr->fr_datype, ifa, ! &fr->fr_dst6, &fr->fr_dmsk6); } } *************** *** 4121,4125 **** /* needs to be changed/updated. */ /* ------------------------------------------------------------------------ */ ! int ipf_sync(softc, ifp) ipf_main_softc_t *softc; --- 4124,4128 ---- /* needs to be changed/updated. */ /* ------------------------------------------------------------------------ */ ! void ipf_sync(softc, ifp) ipf_main_softc_t *softc; *************** *** 4149,4154 **** } RWLOCK_EXIT(&softc->ipf_mutex); - - return 0; } --- 4152,4155 ---- *************** *** 4454,4458 **** int error = 0, in, family, addrem, need_free = 0; frentry_t frd, *fp, *f, **fprev, **ftail; ! void *ptr, *uptr, *cptr; u_int *p, *pp; frgroup_t *fg; --- 4455,4459 ---- int error = 0, in, family, addrem, need_free = 0; frentry_t frd, *fp, *f, **fprev, **ftail; ! void *ptr, *uptr; u_int *p, *pp; frgroup_t *fg; *************** *** 4460,4464 **** ptr = NULL; - cptr = NULL; fg = NULL; fp = &frd; --- 4461,4464 ---- *************** *** 4570,4574 **** ptr = NULL; - cptr = NULL; if (FR_ISACCOUNT(fp->fr_flags)) --- 4570,4573 ---- *************** *** 5055,5059 **** } ! ipf_rule_delete(softc, f, unit, set); need_free = makecopy; --- 5054,5058 ---- } ! ipf_rule_delete(softc, f); need_free = makecopy; *************** *** 5116,5120 **** if (fp->fr_grp != NULL) { WRITE_ENTER(&softc->ipf_mutex); ! ipf_group_del(softc, fp->fr_grp, fp); RWLOCK_EXIT(&softc->ipf_mutex); } --- 5115,5119 ---- if (fp->fr_grp != NULL) { WRITE_ENTER(&softc->ipf_mutex); ! ipf_group_del(fp->fr_grp, fp); RWLOCK_EXIT(&softc->ipf_mutex); } *************** *** 5134,5139 **** /* f(I) - pointer to the rule being deleted */ /* ftail(I) - pointer to the pointer to f */ - /* unit(I) - device for which this is for */ - /* set(I) - 1 or 0 (filter set) */ /* */ /* This function attempts to do what it can to delete a filter rule: remove */ --- 5133,5136 ---- *************** *** 5143,5150 **** /* ------------------------------------------------------------------------ */ static void ! ipf_rule_delete(softc, f, unit, set) ipf_main_softc_t *softc; frentry_t *f; - int unit, set; { --- 5140,5146 ---- /* ------------------------------------------------------------------------ */ static void ! ipf_rule_delete(softc, f) ipf_main_softc_t *softc; frentry_t *f; { *************** *** 5502,5512 **** if (fr->fr_grp != NULL) ! ipf_group_del(softc, fr->fr_grp, fr); if (fr->fr_grphead != NULL) ! ipf_group_del(softc, fr->fr_grphead, fr); if (fr->fr_icmpgrp != NULL) ! ipf_group_del(softc, fr->fr_icmpgrp, fr); if ((fr->fr_flags & FR_COPIED) != 0) { --- 5498,5508 ---- if (fr->fr_grp != NULL) ! ipf_group_del(fr->fr_grp, fr); if (fr->fr_grphead != NULL) ! ipf_group_del(fr->fr_grphead, fr); if (fr->fr_icmpgrp != NULL) ! ipf_group_del(fr->fr_icmpgrp, fr); if ((fr->fr_flags & FR_COPIED) != 0) { *************** *** 6193,6198 **** case IPL_LOGSYNC : if (softc->ipf_running > 0) { ! error = ipf_sync_ioctl(softc, data, cmd, mode, ! uid, ctx); } else { error = EIO; --- 6189,6193 ---- case IPL_LOGSYNC : if (softc->ipf_running > 0) { ! error = ipf_sync_ioctl(softc, data, cmd); } else { error = EIO; *************** *** 6214,6219 **** case IPL_LOGLOOKUP : if (softc->ipf_running > 0) { ! error = ipf_lookup_ioctl(softc, data, cmd, mode, ! uid, ctx); } else { error = EIO; --- 6209,6213 ---- case IPL_LOGLOOKUP : if (softc->ipf_running > 0) { ! error = ipf_lookup_ioctl(softc, data, cmd, uid, ctx); } else { error = EIO; *************** *** 7510,7514 **** break; ! ipf_token_deref(softc, it); } RWLOCK_EXIT(&softc->ipf_tokens); --- 7504,7508 ---- break; ! (void) ipf_token_deref(softc, it); } RWLOCK_EXIT(&softc->ipf_tokens); *************** *** 7574,7578 **** uid == it->ipt_uid) { it->ipt_complete = 2; ! ipf_token_deref(softc, it); error = 0; break; --- 7568,7572 ---- uid == it->ipt_uid) { it->ipt_complete = 2; ! (void) ipf_token_deref(softc, it); error = 0; break; *************** *** 7991,7995 **** error = ipf_getnextrule(softc, token, data); WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { --- 7985,7989 ---- error = ipf_getnextrule(softc, token, data); WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { *************** *** 8086,8090 **** if ((grp != NULL) && (next != &zero)) { WRITE_ENTER(&softc->ipf_mutex); ! ipf_group_del(softc, grp, NULL); RWLOCK_EXIT(&softc->ipf_mutex); } --- 8080,8084 ---- if ((grp != NULL) && (next != &zero)) { WRITE_ENTER(&softc->ipf_mutex); ! ipf_group_del(grp, NULL); RWLOCK_EXIT(&softc->ipf_mutex); } *************** *** 8157,8161 **** error = ipf_geniter(softc, token, &iter); WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { --- 8151,8155 ---- error = ipf_geniter(softc, token, &iter); WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { *************** *** 8476,8480 **** /* Parameters: fin(I) - pointer to packet information */ /* pass(I) - IP protocol version to match */ - /* l5proto(I) - layer 5 protocol to decode UDP data as. */ /* */ /* This function is called for packets that are wrapt up in other packets, */ --- 8470,8473 ---- *************** *** 8485,8492 **** /* ------------------------------------------------------------------------ */ u_32_t ! ipf_decaps(fin, pass, l5proto) fr_info_t *fin; u_32_t pass; - int l5proto; { fr_info_t fin2, *fino = NULL; --- 8478,8484 ---- /* ------------------------------------------------------------------------ */ u_32_t ! ipf_decaps(fin, pass) fr_info_t *fin; u_32_t pass; { fr_info_t fin2, *fino = NULL; *************** *** 8639,8643 **** pass |= FR_BLOCK|FR_QUICK; fin->fin_reason = FRB_DECAPFRIP; ! return -1; } --- 8631,8635 ---- pass |= FR_BLOCK|FR_QUICK; fin->fin_reason = FRB_DECAPFRIP; ! return pass; } *************** *** 8874,8879 **** rv |= ((fin->fin_saddr & e->ipfe_arg0[i * 2 + 1]) == ! e->ipfe_arg0[i * 2]) || ! ((fin->fin_daddr & e->ipfe_arg0[i * 2 + 1]) == e->ipfe_arg0[i * 2]); --- 8866,8871 ---- rv |= ((fin->fin_saddr & e->ipfe_arg0[i * 2 + 1]) == ! e->ipfe_arg0[i * 2]); ! rv |= ((fin->fin_daddr & e->ipfe_arg0[i * 2 + 1]) == e->ipfe_arg0[i * 2]); *************** *** 8908,8913 **** rv |= IP6_MASKEQ(&fin->fin_src6, &e->ipfe_arg0[i * 8 + 4], ! &e->ipfe_arg0[i * 8]) || ! IP6_MASKEQ(&fin->fin_dst6, &e->ipfe_arg0[i * 8 + 4], &e->ipfe_arg0[i * 8]); --- 8900,8905 ---- rv |= IP6_MASKEQ(&fin->fin_src6, &e->ipfe_arg0[i * 8 + 4], ! &e->ipfe_arg0[i * 8]); ! rv |= IP6_MASKEQ(&fin->fin_dst6, &e->ipfe_arg0[i * 8 + 4], &e->ipfe_arg0[i * 8]); *************** *** 8919,8924 **** case IPF_EXP_TCP_PORT : for (i = 0; !rv && i < e->ipfe_narg; i++) { ! rv |= (fin->fin_sport == e->ipfe_arg0[i]) || ! (fin->fin_dport == e->ipfe_arg0[i]); } break; --- 8911,8916 ---- case IPF_EXP_TCP_PORT : for (i = 0; !rv && i < e->ipfe_narg; i++) { ! rv |= ((fin->fin_sport == e->ipfe_arg0[i]) || ! (fin->fin_dport == e->ipfe_arg0[i])); } break; *************** *** 9812,9816 **** if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr, IPL_LOGIPF, 0); } --- 9804,9808 ---- if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr); } *************** *** 9822,9826 **** if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr, IPL_LOGIPF, 1); } --- 9814,9818 ---- if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr); } *************** *** 10081,10084 **** --- 10073,10077 ---- /* Free an actual host_node_t structure. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ void ipf_rb_ht_freenode(node, arg) Index: ip_netbios_pxy.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_netbios_pxy.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ip_netbios_pxy.c 29 Jul 2009 06:13:00 -0000 1.5 --- ip_netbios_pxy.c 13 Aug 2012 11:42:01 -0000 1.6 *************** *** 67,70 **** --- 67,71 ---- + /*ARGSUSED*/ int ipf_p_netbios_out(arg, fin, aps, nat) Index: ip_htable.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_htable.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** ip_htable.c 22 Jul 2012 08:02:22 -0000 1.32 --- ip_htable.c 13 Aug 2012 11:42:01 -0000 1.33 *************** *** 60,64 **** static iphtent_t *ipf_iphmfind(iphtable_t *, struct in_addr *); static int ipf_iphmfindip(ipf_main_softc_t *, void *, int, void *, u_int); ! static int ipf_htable_clear(ipf_main_softc_t *, void *, iphtable_t *); static int ipf_htable_create(ipf_main_softc_t *, void *, iplookupop_t *); static int ipf_htable_deref(ipf_main_softc_t *, void *, void *); --- 60,64 ---- static iphtent_t *ipf_iphmfind(iphtable_t *, struct in_addr *); static int ipf_iphmfindip(ipf_main_softc_t *, void *, int, void *, u_int); ! static int ipf_htable_clear(void *, iphtable_t *); static int ipf_htable_create(ipf_main_softc_t *, void *, iplookupop_t *); static int ipf_htable_deref(ipf_main_softc_t *, void *, void *); *************** *** 84,89 **** static int ipf_htent_insert(ipf_main_softc_t *, void *, iphtable_t *, iphtent_t *); ! static int ipf_htent_remove(ipf_main_softc_t *, void *, iphtable_t *, ! iphtent_t *); static void *ipf_htable_select_add_ref(void *, int, char *); static void ipf_htable_expire(ipf_main_softc_t *, void *); --- 84,88 ---- static int ipf_htent_insert(ipf_main_softc_t *, void *, iphtable_t *, iphtent_t *); ! static int ipf_htent_remove(void *, iphtable_t *, iphtent_t *); static void *ipf_htable_select_add_ref(void *, int, char *); static void ipf_htable_expire(ipf_main_softc_t *, void *); *************** *** 156,159 **** --- 155,159 ---- /* up the pool context too. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_htable_soft_destroy(softc, arg) *************** *** 175,178 **** --- 175,179 ---- /* Initialise the hash table ready for use. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_htable_soft_init(softc, arg) *************** *** 211,215 **** fop.iplf_count = 0; *fop.iplf_name = '\0'; ! ipf_htable_flush(softc, arg, &fop); } --- 212,216 ---- fop.iplf_count = 0; *fop.iplf_name = '\0'; ! (void) ipf_htable_flush(softc, arg, &fop); } *************** *** 423,432 **** if (iph->iph_ref != 0) { ! ipf_htable_clear(softc, arg, iph); iph->iph_flags |= IPHASH_DELETE; return 0; } ! ipf_htable_remove(softc, arg, iph); return 0; --- 424,433 ---- if (iph->iph_ref != 0) { ! (void) ipf_htable_clear(arg, iph); iph->iph_flags |= IPHASH_DELETE; return 0; } ! (void) ipf_htable_remove(softc, arg, iph); return 0; *************** *** 437,442 **** /* Function: ipf_htable_clear */ /* Returns: int - 0 = success, else error */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table to destroy */ /* */ --- 438,442 ---- /* Function: ipf_htable_clear */ /* Returns: int - 0 = success, else error */ ! /* Parameters: arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table to destroy */ /* */ *************** *** 445,450 **** /* ------------------------------------------------------------------------ */ static int ! ipf_htable_clear(softc, arg, iph) ! ipf_main_softc_t *softc; void *arg; iphtable_t *iph; --- 445,449 ---- /* ------------------------------------------------------------------------ */ static int ! ipf_htable_clear(arg, iph) void *arg; iphtable_t *iph; *************** *** 453,457 **** while ((ipe = iph->iph_list) != NULL) ! if (ipf_htent_remove(softc, arg, iph, ipe) != 0) return 1; return 0; --- 452,456 ---- while ((ipe = iph->iph_list) != NULL) ! if (ipf_htent_remove(arg, iph, ipe) != 0) return 1; return 0; *************** *** 504,508 **** { ! if (ipf_htable_clear(softc, arg, iph) != 0) return 1; --- 503,507 ---- { ! if (ipf_htable_clear(arg, iph) != 0) return 1; *************** *** 566,570 **** } ! err = ipf_htent_remove(softc, arg, iph, ent); return err; --- 565,569 ---- } ! err = ipf_htent_remove(arg, iph, ent); return err; *************** *** 602,607 **** /* Function: ipf_htent_remove */ /* Returns: int - 0 = success, else error */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table */ /* ipe(I) - pointer to hash table entry to remove */ --- 601,605 ---- /* Function: ipf_htent_remove */ /* Returns: int - 0 = success, else error */ ! /* Parameters: arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table */ /* ipe(I) - pointer to hash table entry to remove */ *************** *** 610,615 **** /* ------------------------------------------------------------------------ */ static int ! ipf_htent_remove(softc, arg, iph, ipe) ! ipf_main_softc_t *softc; void *arg; iphtable_t *iph; --- 608,612 ---- /* ------------------------------------------------------------------------ */ static int ! ipf_htent_remove(arg, iph, ipe) void *arg; iphtable_t *iph; *************** *** 645,649 **** case IPHASH_GROUPMAP : if (ipe->ipe_group != NULL) ! ipf_group_del(softc, ipe->ipe_ptr, NULL); break; --- 642,646 ---- case IPHASH_GROUPMAP : if (ipe->ipe_group != NULL) ! ipf_group_del(ipe->ipe_ptr, NULL); break; *************** *** 666,669 **** --- 663,667 ---- /* */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_htable_deref(softc, arg, object) *************** *** 1038,1042 **** iphtent_t ipe, *ent; u_int hv; - int bits; bcopy((char *)ipeo, (char *)&ipe, sizeof(ipe)); --- 1036,1039 ---- *************** *** 1046,1050 **** ipe.ipe_addr.i6[3] &= ipe.ipe_mask.i6[3]; if (ipe.ipe_family == AF_INET) { - bits = count4bits(ipe.ipe_mask.in4_addr); ipe.ipe_addr.i6[1] = 0; ipe.ipe_addr.i6[2] = 0; --- 1043,1046 ---- *************** *** 1058,1062 **** #ifdef USE_INET6 if (ipe.ipe_family == AF_INET6) { - bits = count6bits(ipe.ipe_mask.i6); hv = IPE_V6_HASH_FN(ipe.ipe_addr.i6, ipe.ipe_mask.i6, iph->iph_size); --- 1054,1057 ---- *************** *** 1305,1309 **** if (iph != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! ipf_htable_deref(softc, softh, iph); RWLOCK_EXIT(&softc->ipf_poolrw); } --- 1300,1304 ---- if (iph != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! (void) ipf_htable_deref(softc, softh, iph); RWLOCK_EXIT(&softc->ipf_poolrw); } *************** *** 1318,1322 **** if (node != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! ipf_htent_deref(softc, node); RWLOCK_EXIT(&softc->ipf_poolrw); } --- 1313,1317 ---- if (node != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! (void) ipf_htent_deref(softc, node); RWLOCK_EXIT(&softc->ipf_poolrw); } *************** *** 1359,1367 **** { case IPFLOOKUPITER_LIST : ! ipf_htable_deref(softc, arg, (iphtable_t *)data); break; case IPFLOOKUPITER_NODE : ! ipf_htent_deref(arg, (iphtent_t *)data); break; default : --- 1354,1362 ---- { case IPFLOOKUPITER_LIST : ! (void) ipf_htable_deref(softc, arg, (iphtable_t *)data); break; case IPFLOOKUPITER_NODE : ! (void) ipf_htent_deref(arg, (iphtent_t *)data); break; default : *************** *** 1430,1434 **** break; ! ipf_htent_remove(softc, softh, n->ipe_owner, n); } } --- 1425,1429 ---- break; ! (void) ipf_htent_remove(softh, n->ipe_owner, n); } } Index: ip_sync.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_sync.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ip_sync.c 22 Jul 2012 08:02:22 -0000 1.26 --- ip_sync.c 13 Aug 2012 11:42:01 -0000 1.27 *************** *** 182,185 **** --- 182,186 ---- /* any data structures, as required. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_sync_soft_init(softc, arg) *************** *** 249,252 **** --- 250,254 ---- /* with the synchronisation tables. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_sync_soft_fini(softc, arg) *************** *** 257,262 **** if (softs->syncnattab != NULL) { ! ipf_sync_flush_table(softs, softs->ipf_sync_nat_tab_sz, ! softs->syncnattab); KFREES(softs->syncnattab, softs->ipf_sync_nat_tab_sz * sizeof(*softs->syncnattab)); --- 259,264 ---- if (softs->syncnattab != NULL) { ! (void) ipf_sync_flush_table(softs, softs->ipf_sync_nat_tab_sz, ! softs->syncnattab); KFREES(softs->syncnattab, softs->ipf_sync_nat_tab_sz * sizeof(*softs->syncnattab)); *************** *** 265,270 **** if (softs->syncstatetab != NULL) { ! ipf_sync_flush_table(softs, softs->ipf_sync_state_tab_sz, ! softs->syncstatetab); KFREES(softs->syncstatetab, softs->ipf_sync_state_tab_sz * --- 267,272 ---- if (softs->syncstatetab != NULL) { ! (void) ipf_sync_flush_table(softs, softs->ipf_sync_state_tab_sz, ! softs->syncstatetab); KFREES(softs->syncstatetab, softs->ipf_sync_state_tab_sz * *************** *** 296,299 **** --- 298,302 ---- } + /*ARGSUSED*/ void ipf_sync_soft_destroy(softc, arg) *************** *** 568,572 **** /* no more data */ ! return 0; } --- 571,575 ---- /* no more data */ ! return err; } *************** *** 746,750 **** if (softs->ipf_sync_debug > 4) ! printf("[%d] Filter rules = %p\n", sp->sm_num, fr); is->is_rule = fr; --- 749,753 ---- if (softs->ipf_sync_debug > 4) ! printf("[%d] Filter rule = %p\n", sp->sm_num,(void*)fr); is->is_rule = fr; *************** *** 764,768 **** softs->syncstatetab[hv] = sl; MUTEX_DOWNGRADE(&softs->ipf_syncstate); ! ipf_state_insert(softc, is, sp->sm_rev); /* * Do not initialise the interface pointers for the state --- 767,771 ---- softs->syncstatetab[hv] = sl; MUTEX_DOWNGRADE(&softs->ipf_syncstate); ! (void) ipf_state_insert(softc, is, sp->sm_rev); /* * Do not initialise the interface pointers for the state *************** *** 938,942 **** synclist_t *sl; u_int hv = 0; ! int err; READ_ENTER(&softs->ipf_syncnat); --- 941,945 ---- synclist_t *sl; u_int hv = 0; ! int err = 0; READ_ENTER(&softs->ipf_syncnat); *************** *** 1015,1019 **** RWLOCK_EXIT(&softs->ipf_syncnat); ! return 0; } --- 1018,1022 ---- RWLOCK_EXIT(&softs->ipf_syncnat); ! return err; } *************** *** 1299,1308 **** /* ------------------------------------------------------------------------ */ int ! ipf_sync_ioctl(softc, data, cmd, mode, uid, ctx) ipf_main_softc_t *softc; caddr_t data; ioctlcmd_t cmd; - int mode, uid; - void *ctx; { ipf_sync_softc_t *softs = softc->ipf_sync_soft; --- 1302,1309 ---- /* ------------------------------------------------------------------------ */ int ! ipf_sync_ioctl(softc, data, cmd) ipf_main_softc_t *softc; caddr_t data; ioctlcmd_t cmd; { ipf_sync_softc_t *softs = softc->ipf_sync_soft; *************** *** 1398,1401 **** --- 1399,1403 ---- /* XXX Maybe this should return false if the sync table is full? */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_sync_canwrite(arg) Index: ip_fil_solaris.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_fil_solaris.c,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** ip_fil_solaris.c 22 Jul 2012 08:02:22 -0000 1.46 --- ip_fil_solaris.c 13 Aug 2012 11:42:01 -0000 1.47 *************** *** 147,151 **** --- 147,153 ---- ipf_main_softc_t *softc; { + #if SOLARIS2 <= 8 int i; + #endif #ifdef IPFDEBUG *************** *** 243,246 **** --- 245,249 ---- dev, cmd, data, mode, cp, rp); #endif + softc = GET_SOFTC(crgetzoneid(cp)); unit = getminor(dev); if (IPL_LOGMAX < unit) { *************** *** 249,254 **** } - softc = GET_SOFTC(crgetzoneid(cp)); - if (softc->ipf_running <= 0) { if (unit != IPL_LOGIPF && cmd != SIOCIPFINTERROR) { --- 252,255 ---- *************** *** 721,725 **** struct sockaddr_in sin[2]; net_ifaddr_t types[2]; - void *array; int error; --- 722,725 ---- *************** *** 744,748 **** int logical = 0; - array = sin; do { error = net_getlifaddr(softc->ipf_nd_v4, --- 744,747 ---- *************** *** 755,761 **** return error; } else { ! array = sin6; ! net_getlifaddr(softc->ipf_nd_v6, (phy_if_t)qifptr, 0, ! 2, types, sin6); } --- 754,761 ---- return error; } else { ! error = net_getlifaddr(softc->ipf_nd_v6, (phy_if_t)qifptr, 0, ! 2, types, sin6); ! if (error != 0) ! return error; } *************** *** 821,826 **** { ipf_main_softc_t *softc = fin->fin_main_soft; - ipstate_t *is; - nat_t *nat; u_short id; --- 821,824 ---- *************** *** 1135,1138 **** --- 1133,1137 ---- else dst6 = fin->fin_dst6.in6; + dstp = &dst6; } #endif *************** *** 1238,1242 **** { qpktinfo_t *qpi = fin->fin_qpi; ! int out = fin->fin_out, dpoff; char *ip; mb_t *m; --- 1237,1241 ---- { qpktinfo_t *qpi = fin->fin_qpi; ! int dpoff; char *ip; mb_t *m; *************** *** 1330,1334 **** } ! qp->qp_mb = *fin->fin_mp; if (fin->fin_v == 4) qp->qp_sap = 0x800; --- 1329,1336 ---- } ! if (m == fin->fin_m) ! qp->qp_mb = *fin->fin_mp; ! else ! qp->qp_mb = m; if (fin->fin_v == 4) qp->qp_sap = 0x800; *************** *** 1344,1348 **** net_inject_t inject; inject.ni_physical = (phy_if_t)fin->fin_ifp; ! inject.ni_packet = *fin->fin_mp; if (fin->fin_v == 4) { sin = (struct sockaddr_in *)&inject.ni_addr; --- 1346,1353 ---- net_inject_t inject; inject.ni_physical = (phy_if_t)fin->fin_ifp; ! if (m == fin->fin_m) ! inject.ni_packet = *fin->fin_mp; ! else ! inject.ni_packet = m; if (fin->fin_v == 4) { sin = (struct sockaddr_in *)&inject.ni_addr; *************** *** 1357,1361 **** sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! memcpy(&sin6->sin6_addr, &fin->fin_dst6, sizeof(fin->fin_dst6)); if (fin->fin_out == 0) return net_inject(softc->ipf_nd_v6, NI_QUEUE_IN, &inject); --- 1362,1366 ---- sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! (void) memcpy(&sin6->sin6_addr, &fin->fin_dst6, sizeof(fin->fin_dst6)); if (fin->fin_out == 0) return net_inject(softc->ipf_nd_v6, NI_QUEUE_IN, &inject); *************** *** 1365,1368 **** --- 1370,1374 ---- + /*ARGSUSED*/ static int ipf_sendpkt(softc, v, ifp, mb, ip, dstp) *************** *** 1387,1391 **** sin = (struct sockaddr_in *)&inject.ni_addr; sin->sin_family = AF_INET; ! memcpy(&sin->sin_addr, dstp, sizeof(sin->sin_addr)); return net_inject(softc->ipf_nd_v4, NI_DIRECT_OUT, &inject); } --- 1393,1397 ---- sin = (struct sockaddr_in *)&inject.ni_addr; sin->sin_family = AF_INET; ! (void) memcpy(&sin->sin_addr, dstp, sizeof(sin->sin_addr)); return net_inject(softc->ipf_nd_v4, NI_DIRECT_OUT, &inject); } *************** *** 1393,1397 **** sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! memcpy(&sin6->sin6_addr, dstp, sizeof(sin6->sin6_addr)); return net_inject(softc->ipf_nd_v6, NI_DIRECT_OUT, &inject); #endif --- 1399,1403 ---- sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! (void) memcpy(&sin6->sin6_addr, dstp, sizeof(sin6->sin6_addr)); return net_inject(softc->ipf_nd_v6, NI_DIRECT_OUT, &inject); #endif *************** *** 1452,1456 **** ipf_prependmbt(fr_info_t *fin, mblk_t *m) { ! mblk_t *o = NULL, *top; mblk_t *n = *fin->fin_mp; qpktinfo_t *qpi; --- 1458,1462 ---- ipf_prependmbt(fr_info_t *fin, mblk_t *m) { ! mblk_t *o = NULL; mblk_t *n = *fin->fin_mp; qpktinfo_t *qpi; *************** *** 1496,1499 **** --- 1502,1506 ---- + /*ARGSUSED*/ static void * ipf_routeto(fin, v, dstip) *************** *** 1508,1512 **** struct sockaddr *sock; net_handle_t proto; - int result; switch (fin->fin_v) --- 1515,1518 ---- Index: ip_state.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_state.c,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** ip_state.c 22 Jul 2012 08:02:22 -0000 1.71 --- ip_state.c 13 Aug 2012 11:42:01 -0000 1.72 *************** *** 143,148 **** #define SINCL(x) ATOMIC_INCL(softs->x) #define SBUMP(x) (softs->x)++ ! #define SBUMPD(x, y) do { (softs->x.y)++; DT(y); } while (0) ! #define SBUMPDX(x, y, z)do { (softs->x.y)++; DT(z); } while (0) #ifdef USE_INET6 --- 143,157 ---- #define SINCL(x) ATOMIC_INCL(softs->x) #define SBUMP(x) (softs->x)++ ! #define SBUMPD(x, y) do { \ ! (softs->x.y)++; \ ! DT(y); \ ! _NOTE(CONSTCOND) \ ! } while (0) ! #define SBUMPDX(x, y, z) \ ! do { \ ! (softs->x.y)++; \ ! DT(z); \ ! _NOTE(CONSTCOND) \ ! } while (0) #ifdef USE_INET6 *************** *** 287,291 **** if (softs->ipf_state_tune != NULL) { ! ipf_tune_array_unlink(softc, softs->ipf_state_tune); KFREES(softs->ipf_state_tune, sizeof(ipf_state_tuneables)); softs->ipf_state_tune = NULL; --- 296,300 ---- if (softs->ipf_state_tune != NULL) { ! (void) ipf_tune_array_unlink(softc, softs->ipf_state_tune); KFREES(softs->ipf_state_tune, sizeof(ipf_state_tuneables)); softs->ipf_state_tune = NULL; *************** *** 422,426 **** while ((is = softs->ipf_state_list) != NULL) ! ipf_state_del(softc, is, ISL_UNLOAD); /* --- 431,435 ---- while ((is = softs->ipf_state_list) != NULL) ! (void) ipf_state_del(softc, is, ISL_UNLOAD); /* *************** *** 558,562 **** !bcmp((caddr_t)&sp->is_ps, (caddr_t)&st.is_ps, sizeof(st.is_ps))) { ! ipf_state_del(softc, sp, ISL_REMOVE); RWLOCK_EXIT(&softc->ipf_state); return 0; --- 567,571 ---- !bcmp((caddr_t)&sp->is_ps, (caddr_t)&st.is_ps, sizeof(st.is_ps))) { ! (void) ipf_state_del(softc, sp, ISL_REMOVE); RWLOCK_EXIT(&softc->ipf_state); return 0; *************** *** 785,789 **** error = ipf_state_iter(softc, token, &iter, &obj); WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { --- 794,798 ---- error = ipf_state_iter(softc, token, &iter, &obj); WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { *************** *** 911,916 **** ipstate_t *is, *isn; ipstate_save_t ips; - int error, out, i; frentry_t *fr; char *name; --- 920,925 ---- ipstate_t *is, *isn; ipstate_save_t ips; frentry_t *fr; + int error, i; char *name; *************** *** 957,961 **** } bcopy((char *)&ips.ips_fr, (char *)fr, sizeof(*fr)); - out = fr->fr_flags & FR_OUTQUE ? 1 : 0; isn->is_rule = fr; ips.ips_is.is_rule = fr; --- 966,969 ---- *************** *** 1864,1870 **** fr->fr_names[fr->fr_ifnames[out << 1] + 1] == '\0')) { is->is_ifp[out << 1] = fr->fr_ifas[0]; ! strncpy(is->is_ifname[out << 1], ! fr->fr_names + fr->fr_ifnames[0], ! sizeof(fr->fr_ifnames[0])); } else { is->is_ifp[out << 1] = fin->fin_ifp; --- 1872,1878 ---- fr->fr_names[fr->fr_ifnames[out << 1] + 1] == '\0')) { is->is_ifp[out << 1] = fr->fr_ifas[0]; ! (void) strncpy(is->is_ifname[out << 1], ! fr->fr_names + fr->fr_ifnames[0], ! sizeof(fr->fr_ifnames[0])); } else { is->is_ifp[out << 1] = fin->fin_ifp; *************** *** 1875,1895 **** is->is_ifp[(out << 1) + 1] = fr->fr_ifas[1]; if (fr->fr_ifnames[1] != -1) { ! strncpy(is->is_ifname[(out << 1) + 1], ! fr->fr_names + fr->fr_ifnames[1], ! sizeof(fr->fr_ifnames[1])); } is->is_ifp[(1 - out) << 1] = fr->fr_ifas[2]; if (fr->fr_ifnames[2] != -1) { ! strncpy(is->is_ifname[((1 - out) << 1)], ! fr->fr_names + fr->fr_ifnames[2], ! sizeof(fr->fr_ifnames[2])); } is->is_ifp[((1 - out) << 1) + 1] = fr->fr_ifas[3]; if (fr->fr_ifnames[3] != -1) { ! strncpy(is->is_ifname[((1 - out) << 1) + 1], ! fr->fr_names + fr->fr_ifnames[3], ! sizeof(fr->fr_ifnames[3])); } } else { --- 1883,1903 ---- is->is_ifp[(out << 1) + 1] = fr->fr_ifas[1]; if (fr->fr_ifnames[1] != -1) { ! (void) strncpy(is->is_ifname[(out << 1) + 1], ! fr->fr_names + fr->fr_ifnames[1], ! sizeof(fr->fr_ifnames[1])); } is->is_ifp[(1 - out) << 1] = fr->fr_ifas[2]; if (fr->fr_ifnames[2] != -1) { ! (void) strncpy(is->is_ifname[((1 - out) << 1)], ! fr->fr_names + fr->fr_ifnames[2], ! sizeof(fr->fr_ifnames[2])); } is->is_ifp[((1 - out) << 1) + 1] = fr->fr_ifas[3]; if (fr->fr_ifnames[3] != -1) { ! (void) strncpy(is->is_ifname[((1 - out) << 1) + 1], ! fr->fr_names + fr->fr_ifnames[3], ! sizeof(fr->fr_ifnames[3])); } } else { *************** *** 1994,1999 **** fdp = &fr->fr_tifs[0]; if (fdp->fd_type == FRD_DSTLIST) { ! ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[0]); } else { bcopy(fdp, &is->is_tifs[0], sizeof(*fdp)); --- 2002,2007 ---- fdp = &fr->fr_tifs[0]; if (fdp->fd_type == FRD_DSTLIST) { ! (void) ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[0]); } else { bcopy(fdp, &is->is_tifs[0], sizeof(*fdp)); *************** *** 2002,2007 **** fdp = &fr->fr_tifs[1]; if (fdp->fd_type == FRD_DSTLIST) { ! ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[1]); } else { bcopy(fdp, &is->is_tifs[1], sizeof(*fdp)); --- 2010,2015 ---- fdp = &fr->fr_tifs[1]; if (fdp->fd_type == FRD_DSTLIST) { ! (void) ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[1]); } else { bcopy(fdp, &is->is_tifs[1], sizeof(*fdp)); *************** *** 2011,2016 **** fdp = &fr->fr_dif; if (fdp->fd_type == FRD_DSTLIST) { ! ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_dif); } else { bcopy(fdp, &is->is_dif, sizeof(*fdp)); --- 2019,2024 ---- fdp = &fr->fr_dif; if (fdp->fd_type == FRD_DSTLIST) { ! (void) ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[1]); } else { bcopy(fdp, &is->is_dif, sizeof(*fdp)); *************** *** 2405,2413 **** inseq = 1; } else if (!(flags & IS_TCPFSM)) { int i; i = (fin->fin_rev << 1) + fin->fin_out; - #if 0 if (is_pkts[i]0 == 0) { /* --- 2413,2421 ---- inseq = 1; } else if (!(flags & IS_TCPFSM)) { + #if 0 int i; i = (fin->fin_rev << 1) + fin->fin... [truncated message content] |
From: Darren <dar...@us...> - 2012-07-22 11:32:51
|
Update of /cvsroot/ipfilter/ipfilter/Linux In directory vz-cvs-4.sog:/tmp/cvs-serv22087/Linux Modified Files: Tag: v5-1-RELEASE ipfilter.spec.dist Log Message: bump to 5.1.2 Index: ipfilter.spec.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/Linux/ipfilter.spec.dist,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** ipfilter.spec.dist 30 Jan 2012 15:08:51 -0000 1.6.2.2 --- ipfilter.spec.dist 22 Jul 2012 11:32:49 -0000 1.6.2.3 *************** *** 1,7 **** Summary: IP Filter Software Name: ipfilter ! Version: 5.1.1 Release: 1 ! License: Darren Reed Group: System Environment/Base BuildRoot: /usr/src/redhat/BUILD/ipfilter --- 1,7 ---- Summary: IP Filter Software Name: ipfilter ! Version: 5.1.2 Release: 1 ! License: GPLv2 Group: System Environment/Base BuildRoot: /usr/src/redhat/BUILD/ipfilter |
From: Darren <dar...@us...> - 2012-07-22 08:04:27
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory vz-cvs-4.sog:/tmp/cvs-serv11823/tools Modified Files: Tag: v5-1-RELEASE ipf.c ipf_y.y ipfs.c ipfsyncd.c ipmon.c ipmon_y.y ipnat.c ippool.c ipscan_y.y ipsyncm.c ipsyncs.c lex_var.h lexer.c lexer.h Log Message: 3547171 copyright date update to 2012 Index: ippool.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ippool.c,v retrieving revision 1.10.2.4 retrieving revision 1.10.2.5 diff -C2 -d -r1.10.2.4 -r1.10.2.5 *** ippool.c 6 Jul 2012 14:35:37 -0000 1.10.2.4 --- ippool.c 22 Jul 2012 08:04:24 -0000 1.10.2.5 *************** *** 1,4 **** /* ! * Copyright (C) 2010 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: lexer.h =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/lexer.h,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** lexer.h 26 Jan 2012 05:44:26 -0000 1.4.2.1 --- lexer.h 22 Jul 2012 08:04:24 -0000 1.4.2.2 *************** *** 1,4 **** /* ! * Copyright (C) 2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipfsyncd.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipfsyncd.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** ipfsyncd.c 26 Jan 2012 05:44:26 -0000 1.1.2.1 --- ipfsyncd.c 22 Jul 2012 08:04:24 -0000 1.1.2.2 *************** *** 1,4 **** /* ! * Copyright (C) 2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipfs.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipfs.c,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** ipfs.c 26 Jan 2012 05:44:26 -0000 1.6.2.1 --- ipfs.c 22 Jul 2012 08:04:24 -0000 1.6.2.2 *************** *** 1,4 **** /* ! * Copyright (C) 2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: lexer.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/lexer.c,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -C2 -d -r1.9.2.2 -r1.9.2.3 *** lexer.c 15 Jun 2012 08:28:57 -0000 1.9.2.2 --- lexer.c 22 Jul 2012 08:04:24 -0000 1.9.2.3 *************** *** 1,4 **** /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipscan_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipscan_y.y,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** ipscan_y.y 26 Jan 2012 05:44:26 -0000 1.6.2.1 --- ipscan_y.y 22 Jul 2012 08:04:24 -0000 1.6.2.2 *************** *** 1,4 **** /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipmon.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipmon.c,v retrieving revision 1.20.2.6 retrieving revision 1.20.2.7 diff -C2 -d -r1.20.2.6 -r1.20.2.7 *** ipmon.c 20 Jul 2012 07:40:57 -0000 1.20.2.6 --- ipmon.c 22 Jul 2012 08:04:24 -0000 1.20.2.7 *************** *** 1,4 **** /* ! * Copyright (C) 2010 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipsyncm.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipsyncm.c,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** ipsyncm.c 26 Jan 2012 05:44:26 -0000 1.7.2.1 --- ipsyncm.c 22 Jul 2012 08:04:24 -0000 1.7.2.2 *************** *** 1,4 **** /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipsyncs.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipsyncs.c,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** ipsyncs.c 26 Jan 2012 05:44:26 -0000 1.7.2.1 --- ipsyncs.c 22 Jul 2012 08:04:24 -0000 1.7.2.2 *************** *** 1,4 **** /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipf.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipf.c,v retrieving revision 1.10.2.3 retrieving revision 1.10.2.4 diff -C2 -d -r1.10.2.3 -r1.10.2.4 *** ipf.c 29 May 2012 15:04:01 -0000 1.10.2.3 --- ipf.c 22 Jul 2012 08:04:24 -0000 1.10.2.4 *************** *** 1,4 **** /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipmon_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipmon_y.y,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -C2 -d -r1.11.2.2 -r1.11.2.3 *** ipmon_y.y 16 Feb 2012 02:22:30 -0000 1.11.2.2 --- ipmon_y.y 22 Jul 2012 08:04:24 -0000 1.11.2.3 *************** *** 1,4 **** /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: lex_var.h =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/lex_var.h,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** lex_var.h 26 Jan 2012 05:44:26 -0000 1.3.2.1 --- lex_var.h 22 Jul 2012 08:04:24 -0000 1.3.2.2 *************** *** 1,4 **** /* ! * Copyright (C) 2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipf_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipf_y.y,v retrieving revision 1.22.2.11 retrieving revision 1.22.2.12 diff -C2 -d -r1.22.2.11 -r1.22.2.12 *** ipf_y.y 13 Jul 2012 06:03:05 -0000 1.22.2.11 --- ipf_y.y 22 Jul 2012 08:04:24 -0000 1.22.2.12 *************** *** 1,4 **** /* ! * Copyright (C) 2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipnat.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipnat.c,v retrieving revision 1.10.2.12 retrieving revision 1.10.2.13 diff -C2 -d -r1.10.2.12 -r1.10.2.13 *** ipnat.c 20 Jul 2012 08:29:44 -0000 1.10.2.12 --- ipnat.c 22 Jul 2012 08:04:24 -0000 1.10.2.13 *************** *** 1,4 **** /* ! * Copyright (C) 2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. |
From: Darren <dar...@us...> - 2012-07-22 08:04:26
|
Update of /cvsroot/ipfilter/ipfilter/HPUX In directory vz-cvs-4.sog:/tmp/cvs-serv11823/HPUX Modified Files: Tag: v5-1-RELEASE Makefile ipf.psf.dist Log Message: 3547171 copyright date update to 2012 Index: ipf.psf.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/HPUX/ipf.psf.dist,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -C2 -d -r1.5.2.2 -r1.5.2.3 *** ipf.psf.dist 26 Jan 2012 05:44:25 -0000 1.5.2.2 --- ipf.psf.dist 22 Jul 2012 08:04:23 -0000 1.5.2.3 *************** *** 3,7 **** # Purpose: IP Filter Product Specification File (PSF) for swpackage # ! # Copyright (C) 2009 by Darren Reed. # # Description: PSF for IP FIlter 5.1.0 --- 3,7 ---- # Purpose: IP Filter Product Specification File (PSF) for swpackage # ! # Copyright (C) 2012 by Darren Reed. # # Description: PSF for IP FIlter 5.1.0 Index: Makefile =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/HPUX/Makefile,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -d -r1.3.2.3 -r1.3.2.4 *** Makefile 26 Jan 2012 05:44:25 -0000 1.3.2.3 --- Makefile 22 Jul 2012 08:04:23 -0000 1.3.2.4 *************** *** 1,4 **** # ! # Copyright (C) 2011 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- # ! # Copyright (C) 2012 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. |
From: Darren <dar...@us...> - 2012-07-22 08:03:41
|
Update of /cvsroot/ipfilter/ipfilter/lib In directory vz-cvs-4.sog:/tmp/cvs-serv11780/lib Modified Files: Tag: v5-1-RELEASE interror.c Log Message: 3547171 copyright date update to 2012 3547166 ippool errors are 77777 Index: interror.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/interror.c,v retrieving revision 1.9.2.11 retrieving revision 1.9.2.12 diff -C2 -d -r1.9.2.11 -r1.9.2.12 *** interror.c 20 Jul 2012 08:12:10 -0000 1.9.2.11 --- interror.c 22 Jul 2012 08:03:39 -0000 1.9.2.12 *************** *** 1,4 **** /* ! * Copyright (C) 2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. *************** *** 18,22 **** static ipf_error_entry_t *find_error __P((int)); ! #define IPF_NUM_ERRORS 471 /* --- 18,22 ---- static ipf_error_entry_t *find_error __P((int)); ! #define IPF_NUM_ERRORS 475 /* *************** *** 390,393 **** --- 390,397 ---- { 70032, "cannot allocate memory for pool context" }, { 70033, "cannot allocate memory for radix tree context" }, + { 70034, "adding IPv6 node with incorrect address length" }, + { 70035, "IPv4 address not masked" }, + { 70036, "IPv6 address not masked" }, + { 70037, "removing IPv6 node with incorrect address length" }, /* -------------------------------------------------------------------------- */ { 80001, "could not find proxy" }, |
Update of /cvsroot/ipfilter/ipfilter/lib In directory vz-cvs-4.sog:/tmp/cvs-serv11368/lib Modified Files: Makefile addicmp.c addipopt.c alist_free.c alist_new.c allocmbt.c assigndefined.c bcopywrap.c binprint.c buildopts.c checkrev.c count4bits.c count6bits.c debug.c dupmbt.c facpri.c fill6bits.c findword.c flags.c freembt.c genmask.c gethost.c geticmptype.c getifname.c getnattype.c getportproto.c getsumd.c hostname.c icmpcode.c icmptypename.c icmptypes.c initparse.c ionames.c ipf_dotuning.c ipft_hx.c ipft_pc.c ipft_tx.c ipoptsec.c kmem.c kmemcpywrap.c kvatoname.c load_dstlist.c load_dstlistnode.c load_hash.c load_hashnode.c load_http.c load_pool.c load_poolnode.c load_url.c msgdsize.c mutex_emul.c nametokva.c nat_setgroupmap.c ntomask.c optname.c optprint.c optprintv6.c optvalue.c parsewhoisline.c poolio.c portname.c prependmbt.c print_toif.c printactiveaddr.c printactivenat.c printaddr.c printaps.c printbuf.c printdstl_live.c printdstlist.c printdstlistdata.c printdstlistnode.c printfr.c printfraginfo.c printhash.c printhash_live.c printhashnode.c printhost.c printhostmap.c printhostmask.c printifname.c printip.c printlog.c printlookup.c printmask.c printnat.c printnataddr.c printnatfield.c printnatside.c printpacket.c printpacket6.c printpool.c printpool_live.c printpoolfield.c printpoolnode.c printportcmp.c printproto.c printsbuf.c printstate.c printstatefields.c printtqtable.c printtunable.c remove_hash.c remove_hashnode.c remove_pool.c remove_poolnode.c resetlexer.c rwlock_emul.c tcpflags.c tcpoptnames.c v6ionames.c v6optvalue.c var.c verbose.c Log Message: 3547171 copyright date update to 2012 Index: icmptypename.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/icmptypename.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** icmptypename.c 9 Feb 2009 01:31:02 -0000 1.5 --- icmptypename.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2005-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2005-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: binprint.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/binprint.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** binprint.c 9 Feb 2009 01:31:02 -0000 1.4 --- binprint.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printhash_live.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printhash_live.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** printhash_live.c 6 Jul 2012 14:35:55 -0000 1.7 --- printhash_live.c 22 Jul 2012 08:02:23 -0000 1.8 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipft_hx.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/ipft_hx.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ipft_hx.c 20 Jul 2012 08:41:26 -0000 1.12 --- ipft_hx.c 22 Jul 2012 08:02:23 -0000 1.13 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printactiveaddr.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printactiveaddr.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** printactiveaddr.c 1 Mar 2009 12:48:32 -0000 1.3 --- printactiveaddr.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printhash.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printhash.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** printhash.c 9 Feb 2010 08:14:53 -0000 1.7 --- printhash.c 22 Jul 2012 08:02:23 -0000 1.8 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2010 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: addipopt.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/addipopt.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** addipopt.c 7 Aug 2011 02:37:35 -0000 1.5 --- addipopt.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: load_dstlist.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/load_dstlist.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** load_dstlist.c 5 Jun 2012 11:14:59 -0000 1.4 --- load_dstlist.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: load_http.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/load_http.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** load_http.c 29 May 2012 15:02:54 -0000 1.8 --- load_http.c 22 Jul 2012 08:02:23 -0000 1.9 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: kmemcpywrap.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/kmemcpywrap.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** kmemcpywrap.c 9 Feb 2009 01:31:02 -0000 1.5 --- kmemcpywrap.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printnat.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printnat.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** printnat.c 7 Jul 2012 01:42:56 -0000 1.12 --- printnat.c 22 Jul 2012 08:02:23 -0000 1.13 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: hostname.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/hostname.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** hostname.c 29 Mar 2009 10:46:00 -0000 1.6 --- hostname.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: fill6bits.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/fill6bits.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** fill6bits.c 9 Feb 2009 01:31:02 -0000 1.4 --- fill6bits.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printpacket6.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printpacket6.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** printpacket6.c 31 Jan 2010 14:17:41 -0000 1.8 --- printpacket6.c 22 Jul 2012 08:02:23 -0000 1.9 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2010 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: buildopts.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/buildopts.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** buildopts.c 7 Aug 2011 02:37:35 -0000 1.5 --- buildopts.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printdstlist.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printdstlist.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** printdstlist.c 6 Jul 2012 14:35:55 -0000 1.4 --- printdstlist.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printaddr.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printaddr.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** printaddr.c 1 Mar 2009 12:48:32 -0000 1.6 --- printaddr.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2005-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2005-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: print_toif.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/print_toif.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** print_toif.c 9 Jun 2012 06:19:02 -0000 1.8 --- print_toif.c 22 Jul 2012 08:02:23 -0000 1.9 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: optprint.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/optprint.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** optprint.c 9 Feb 2009 01:31:02 -0000 1.5 --- optprint.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: alist_free.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/alist_free.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** alist_free.c 9 Feb 2009 01:31:02 -0000 1.3 --- alist_free.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: bcopywrap.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/bcopywrap.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** bcopywrap.c 9 Feb 2009 01:31:02 -0000 1.5 --- bcopywrap.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printproto.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printproto.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** printproto.c 1 Mar 2009 12:48:32 -0000 1.6 --- printproto.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2005-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2005-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: optname.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/optname.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** optname.c 9 Feb 2009 01:31:02 -0000 1.4 --- optname.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: dupmbt.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/dupmbt.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dupmbt.c 9 Feb 2009 01:31:02 -0000 1.3 --- dupmbt.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: tcpoptnames.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/tcpoptnames.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcpoptnames.c 9 Feb 2009 01:31:02 -0000 1.3 --- tcpoptnames.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2006 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: findword.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/findword.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** findword.c 25 Oct 2007 12:55:32 -0000 1.3 --- findword.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: prependmbt.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/prependmbt.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** prependmbt.c 16 Feb 2012 02:22:51 -0000 1.4 --- prependmbt.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printtqtable.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printtqtable.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** printtqtable.c 1 Mar 2009 12:48:32 -0000 1.3 --- printtqtable.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printmask.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printmask.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** printmask.c 9 Jun 2012 06:19:02 -0000 1.7 --- printmask.c 22 Jul 2012 08:02:23 -0000 1.8 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: kvatoname.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/kvatoname.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kvatoname.c 1 Mar 2009 12:48:32 -0000 1.6 --- kvatoname.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: optvalue.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/optvalue.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** optvalue.c 9 Feb 2009 01:31:02 -0000 1.4 --- optvalue.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2001-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2001-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printnatside.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printnatside.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** printnatside.c 20 Jul 2012 08:03:29 -0000 1.6 --- printnatside.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: load_url.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/load_url.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** load_url.c 9 Feb 2009 01:31:02 -0000 1.3 --- load_url.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: addicmp.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/addicmp.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** addicmp.c 20 Aug 2007 10:15:23 -0000 1.3 --- addicmp.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2006 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: freembt.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/freembt.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** freembt.c 9 Feb 2009 01:31:02 -0000 1.3 --- freembt.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: getportproto.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/getportproto.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** getportproto.c 9 Feb 2009 01:31:02 -0000 1.6 --- getportproto.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: flags.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/flags.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** flags.c 9 Feb 2009 01:31:02 -0000 1.3 --- flags.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2001-2006 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2001-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printnatfield.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printnatfield.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** printnatfield.c 17 Nov 2011 20:26:50 -0000 1.7 --- printnatfield.c 22 Jul 2012 08:02:23 -0000 1.8 *************** *** 1,4 **** /* ! * Copyright (C) 2007-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2007-2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: verbose.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/verbose.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** verbose.c 9 Feb 2009 01:31:02 -0000 1.6 --- verbose.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: remove_hash.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/remove_hash.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** remove_hash.c 5 Jun 2012 11:14:59 -0000 1.6 --- remove_hash.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printsbuf.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printsbuf.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** printsbuf.c 29 May 2012 15:02:54 -0000 1.11 --- printsbuf.c 22 Jul 2012 08:02:23 -0000 1.12 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printip.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printip.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** printip.c 1 Mar 2009 12:48:32 -0000 1.6 --- printip.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: debug.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/debug.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** debug.c 9 Feb 2009 01:31:02 -0000 1.6 --- debug.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printactivenat.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printactivenat.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** printactivenat.c 17 Nov 2011 20:26:50 -0000 1.13 --- printactivenat.c 22 Jul 2012 08:02:23 -0000 1.14 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printlookup.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printlookup.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** printlookup.c 13 Jul 2012 06:02:02 -0000 1.7 --- printlookup.c 22 Jul 2012 08:02:23 -0000 1.8 *************** *** 1,4 **** /* ! * Copyright (C) 2005-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2005-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: nametokva.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/nametokva.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** nametokva.c 1 Mar 2009 12:48:32 -0000 1.6 --- nametokva.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: var.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/var.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** var.c 29 Jul 2009 06:13:02 -0000 1.7 --- var.c 22 Jul 2012 08:02:23 -0000 1.8 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2010 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printpoolfield.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printpoolfield.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** printpoolfield.c 17 Nov 2011 20:26:50 -0000 1.2 --- printpoolfield.c 22 Jul 2012 08:02:23 -0000 1.3 *************** *** 1,4 **** /* ! * Copyright (C) 2007-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2007-2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printpool.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printpool.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** printpool.c 6 Jul 2012 14:35:55 -0000 1.9 --- printpool.c 22 Jul 2012 08:02:23 -0000 1.10 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: v6ionames.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/v6ionames.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** v6ionames.c 9 Feb 2009 01:31:02 -0000 1.5 --- v6ionames.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printhost.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printhost.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** printhost.c 1 Mar 2009 12:48:32 -0000 1.3 --- printhost.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printdstl_live.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printdstl_live.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** printdstl_live.c 6 Jul 2012 14:35:55 -0000 1.3 --- printdstl_live.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printfraginfo.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printfraginfo.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** printfraginfo.c 14 Oct 2011 17:16:14 -0000 1.7 --- printfraginfo.c 22 Jul 2012 08:02:23 -0000 1.8 *************** *** 1,4 **** /* ! * Copyright (C) 2004-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2004-2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: v6optvalue.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/v6optvalue.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** v6optvalue.c 9 Feb 2009 01:31:02 -0000 1.4 --- v6optvalue.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printpoolnode.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printpoolnode.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** printpoolnode.c 6 Jul 2012 14:35:55 -0000 1.10 --- printpoolnode.c 22 Jul 2012 08:02:23 -0000 1.11 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: load_poolnode.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/load_poolnode.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** load_poolnode.c 5 Jun 2012 11:14:59 -0000 1.10 --- load_poolnode.c 22 Jul 2012 08:02:23 -0000 1.11 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printhostmask.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printhostmask.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** printhostmask.c 1 Mar 2009 12:48:32 -0000 1.7 --- printhostmask.c 22 Jul 2012 08:02:23 -0000 1.8 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: resetlexer.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/resetlexer.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** resetlexer.c 9 Feb 2009 01:31:02 -0000 1.4 --- resetlexer.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printpacket.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printpacket.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** printpacket.c 17 Nov 2011 20:26:50 -0000 1.9 --- printpacket.c 22 Jul 2012 08:02:23 -0000 1.10 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ntomask.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/ntomask.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ntomask.c 9 Feb 2009 01:31:02 -0000 1.8 --- ntomask.c 22 Jul 2012 08:02:23 -0000 1.9 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: load_hash.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/load_hash.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** load_hash.c 6 Jul 2012 14:35:55 -0000 1.12 --- load_hash.c 22 Jul 2012 08:02:23 -0000 1.13 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipoptsec.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/ipoptsec.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ipoptsec.c 7 Aug 2011 02:37:35 -0000 1.5 --- ipoptsec.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2001-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2001-2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: load_pool.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/load_pool.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** load_pool.c 20 Jun 2012 03:52:19 -0000 1.10 --- load_pool.c 22 Jul 2012 08:02:23 -0000 1.11 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: getnattype.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/getnattype.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** getnattype.c 15 Nov 2011 12:57:28 -0000 1.5 --- getnattype.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printnataddr.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printnataddr.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** printnataddr.c 29 Mar 2009 10:46:00 -0000 1.4 --- printnataddr.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: load_hashnode.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/load_hashnode.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** load_hashnode.c 5 Jun 2012 11:14:59 -0000 1.8 --- load_hashnode.c 22 Jul 2012 08:02:23 -0000 1.9 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printdstlistnode.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printdstlistnode.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** printdstlistnode.c 6 Jul 2012 14:35:55 -0000 1.3 --- printdstlistnode.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: facpri.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/facpri.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** facpri.c 9 Feb 2009 01:31:02 -0000 1.5 --- facpri.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printhostmap.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printhostmap.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** printhostmap.c 1 Mar 2009 12:48:32 -0000 1.8 --- printhostmap.c 22 Jul 2012 08:02:23 -0000 1.9 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipft_tx.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/ipft_tx.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ipft_tx.c 4 Jun 2012 12:49:42 -0000 1.17 --- ipft_tx.c 22 Jul 2012 08:02:23 -0000 1.18 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: icmptypes.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/icmptypes.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** icmptypes.c 9 Feb 2009 01:31:02 -0000 1.4 --- icmptypes.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2005-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2005-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: gethost.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/gethost.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gethost.c 29 Mar 2009 10:46:00 -0000 1.8 --- gethost.c 22 Jul 2012 08:02:23 -0000 1.9 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: parsewhoisline.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/parsewhoisline.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** parsewhoisline.c 6 Jul 2012 14:35:55 -0000 1.6 --- parsewhoisline.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2008-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2008-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printportcmp.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printportcmp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** printportcmp.c 1 Mar 2009 12:48:32 -0000 1.5 --- printportcmp.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: Makefile =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile 5 Jun 2012 11:14:59 -0000 1.20 --- Makefile 22 Jul 2012 08:02:23 -0000 1.21 *************** *** 1,4 **** # ! # Copyright (C) 1993-2001 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- # ! # Copyright (C) 1993-2012 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. Index: rwlock_emul.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/rwlock_emul.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** rwlock_emul.c 25 Jan 2012 06:29:55 -0000 1.7 --- rwlock_emul.c 22 Jul 2012 08:02:23 -0000 1.8 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: poolio.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/poolio.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** poolio.c 5 Jun 2012 11:14:59 -0000 1.2 --- poolio.c 22 Jul 2012 08:02:23 -0000 1.3 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printpool_live.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printpool_live.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** printpool_live.c 6 Jul 2012 14:35:55 -0000 1.10 --- printpool_live.c 22 Jul 2012 08:02:23 -0000 1.11 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipf_dotuning.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/ipf_dotuning.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ipf_dotuning.c 5 Jun 2012 11:14:59 -0000 1.7 --- ipf_dotuning.c 22 Jul 2012 08:02:23 -0000 1.8 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printdstlistdata.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printdstlistdata.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** printdstlistdata.c 20 Jun 2012 03:52:19 -0000 1.2 --- printdstlistdata.c 22 Jul 2012 08:02:23 -0000 1.3 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: count6bits.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/count6bits.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** count6bits.c 9 Feb 2009 01:31:02 -0000 1.4 --- count6bits.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: checkrev.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/checkrev.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** checkrev.c 5 Jun 2012 11:14:59 -0000 1.6 --- checkrev.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: portname.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/portname.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** portname.c 9 Feb 2009 01:31:02 -0000 1.4 --- portname.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: getsumd.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/getsumd.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** getsumd.c 9 Feb 2009 01:31:02 -0000 1.5 --- getsumd.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: geticmptype.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/geticmptype.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** geticmptype.c 9 Feb 2009 01:31:02 -0000 1.5 --- geticmptype.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2005-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2005-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printlog.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printlog.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** printlog.c 1 Mar 2009 12:48:32 -0000 1.6 --- printlog.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: assigndefined.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/assigndefined.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** assigndefined.c 9 Feb 2009 01:31:02 -0000 1.4 --- assigndefined.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2006-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2006-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: optprintv6.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/optprintv6.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** optprintv6.c 9 Jun 2012 06:19:02 -0000 1.5 --- optprintv6.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printstate.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printstate.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** printstate.c 5 Jun 2012 11:14:59 -0000 1.15 --- printstate.c 22 Jul 2012 08:02:23 -0000 1.16 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ipft_pc.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/ipft_pc.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ipft_pc.c 29 May 2012 15:02:54 -0000 1.11 --- ipft_pc.c 22 Jul 2012 08:02:23 -0000 1.12 *************** *** 1,4 **** /* ! * Copyright (C) 2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: load_dstlistnode.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/load_dstlistnode.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** load_dstlistnode.c 6 Jul 2012 14:35:55 -0000 1.4 --- load_dstlistnode.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: nat_setgroupmap.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/nat_setgroupmap.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** nat_setgroupmap.c 9 Feb 2009 01:31:02 -0000 1.4 --- nat_setgroupmap.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printhashnode.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printhashnode.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** printhashnode.c 6 Jul 2012 14:35:55 -0000 1.10 --- printhashnode.c 22 Jul 2012 08:02:23 -0000 1.11 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2002-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: kmem.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/kmem.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kmem.c 29 Jul 2009 06:13:02 -0000 1.6 --- kmem.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2010 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: ionames.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/ionames.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ionames.c 7 Aug 2011 02:37:35 -0000 1.5 --- ionames.c 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2006 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: genmask.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/genmask.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** genmask.c 9 Feb 2009 01:31:02 -0000 1.6 --- genmask.c 22 Jul 2012 08:02:23 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2009 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: mutex_emul.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/mutex_emul.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mutex_emul.c 6 Jul 2012 14:27:15 -0000 1.10 --- mutex_emul.c 22 Jul 2012 08:02:23 -0000 1.11 *************** *** 1,4 **** /* ! * Copyright (C) 2003-2008 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2003-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: initparse.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/initparse.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** initparse.c 29 Jul 2009 06:13:02 -0000 1.4 --- initparse.c 22 Jul 2012 08:02:23 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2006 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2010 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: printbuf.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printbuf.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** printbuf.c 20 Jul 2012 08:41:27 -0000 1.8 --- printbuf.c 22 Jul 2012 08:02:23 -0000 1.9 *************** *** 1,4 **** /* ! * Copyright (C) 2000-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2000-2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: msgdsize.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/msgdsize.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** msgdsize.c 15 Nov 2011 13:02:53 -0000 1.3 --- msgdsize.c 22 Jul 2012 08:02:23 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (C) 2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! * Copyright (C) 2011 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. Index: getifname.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/getifname.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** getifname.c 29 May 2012 15:02:54 -0000 1.8 --- getifname.c 22 Jul 2012 08:02:23 -0000 1.9 *************** *** 1,4 **** /* ! * Copyright (C) 2002-2007 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- /* ! *... [truncated message content] |
From: Darren <dar...@us...> - 2012-07-22 08:02:25
|
Update of /cvsroot/ipfilter/ipfilter/HPUX In directory vz-cvs-4.sog:/tmp/cvs-serv11368/HPUX Modified Files: Makefile Log Message: 3547171 copyright date update to 2012 Index: Makefile =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/HPUX/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 10 Dec 2011 17:47:38 -0000 1.5 --- Makefile 22 Jul 2012 08:02:23 -0000 1.6 *************** *** 1,4 **** # ! # Copyright (C) 1993-1998 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. --- 1,4 ---- # ! # Copyright (C) 1993-2011 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. |