Menu
▾
▴
ipfilter-cvs — Mailing list for CVS emails
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...> - 2014-06-28 06:58:32
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18761/tools Modified Files: ipsyncm.c Log Message: 557 compiler warning cleanup Index: ipsyncm.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipsyncm.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ipsyncm.c 22 Jul 2012 08:02:23 -0000 1.9 --- ipsyncm.c 28 Jun 2014 06:58:30 -0000 1.10 *************** *** 58,62 **** struct sockaddr_in sin; char buff[BUFFERLEN]; - synclogent_t *sl; syncupdent_t *su; int nfd = -1, lfd = -1, n1, n2, n3, len; --- 58,61 ---- *************** *** 189,193 **** #ifdef IPSYNC_DEBUG if (sh->sm_cmd == SMC_CREATE) { ! sl = (synclogent_t *)buff; } else if (sh->sm_cmd == SMC_UPDATE) { --- 188,192 ---- #ifdef IPSYNC_DEBUG if (sh->sm_cmd == SMC_CREATE) { ! ; } else if (sh->sm_cmd == SMC_UPDATE) { |
|
From: Darren <dar...@us...> - 2014-06-28 06:47:39
|
Update of /cvsroot/ipfilter/ipfilter/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18135/lib Modified Files: Tag: v5-1-RELEASE printfieldhdr.c printfraginfo.c Log Message: 557 compiler warning cleanup Index: printfieldhdr.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printfieldhdr.c,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -d -r1.5.2.3 -r1.5.2.4 *** printfieldhdr.c 22 Jul 2012 08:04:24 -0000 1.5.2.3 --- printfieldhdr.c 28 Jun 2014 06:47:37 -0000 1.5.2.4 *************** *** 17,24 **** wordtab_t *w; char *s, *t; - int i; if (field->w_value == -2) { ! for (i = 0, w = words; w->w_word != NULL; ) { if (w->w_value > 0) { printfieldhdr(words, w); --- 17,23 ---- wordtab_t *w; char *s, *t; if (field->w_value == -2) { ! for (w = words; w->w_word != NULL; ) { if (w->w_value > 0) { printfieldhdr(words, w); Index: printfraginfo.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/printfraginfo.c,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -d -r1.6.2.3 -r1.6.2.4 *** printfraginfo.c 22 Jul 2012 08:04:24 -0000 1.6.2.3 --- printfraginfo.c 28 Jun 2014 06:47:37 -0000 1.6.2.4 *************** *** 15,19 **** struct ipfr *ifr; { - frentry_t fr; int family; --- 15,18 ---- *************** *** 26,30 **** family = AF_INET; } - fr.fr_flags = 0xffffffff; PRINTF(" %s -> ", hostname(family, &ifr->ipfr_src)); --- 25,28 ---- |
|
From: Darren <dar...@us...> - 2014-06-28 06:47:23
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18105 Modified Files: ip_auth.c Log Message: 557 compiler warning cleanup Index: ip_auth.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_auth.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** ip_auth.c 13 Aug 2012 11:42:00 -0000 1.32 --- ip_auth.c 28 Jun 2014 06:47:20 -0000 1.33 *************** *** 1276,1279 **** --- 1276,1281 ---- RWLOCK_EXIT(&softa->ipf_authlk); } + #else + m = m; /* LINT */ #endif /* _KERNEL */ SPL_X(s); |
|
From: Darren <dar...@us...> - 2014-06-28 06:45:19
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17956 Modified Files: Tag: v5-1-RELEASE ip_frag.c Log Message: #558 add in some missing frag table function comments Index: ip_frag.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_frag.c,v retrieving revision 1.24.2.12 retrieving revision 1.24.2.13 diff -C2 -d -r1.24.2.12 -r1.24.2.13 *** ip_frag.c 13 Aug 2012 11:44:15 -0000 1.24.2.12 --- ip_frag.c 28 Jun 2014 06:45:17 -0000 1.24.2.13 *************** *** 956,960 **** /* Function: ipf_frag_natforget */ /* Returns: Nil */ ! /* Parameters: ptr(I) - pointer to data structure */ /* */ /* Search through all of the fragment cache entries for NAT and wherever a */ --- 956,961 ---- /* Function: ipf_frag_natforget */ /* Returns: Nil */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* ptr(I) - pointer to data structure */ /* */ /* Search through all of the fragment cache entries for NAT and wherever a */ *************** *** 980,984 **** /* Function: ipf_frag_delete */ /* Returns: Nil */ ! /* Parameters: fra(I) - pointer to fragment structure to delete */ /* tail(IO) - pointer to the pointer to the tail of the frag */ /* list */ --- 981,986 ---- /* Function: ipf_frag_delete */ /* Returns: Nil */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* fra(I) - pointer to fragment structure to delete */ /* tail(IO) - pointer to the pointer to the tail of the frag */ /* list */ *************** *** 1017,1021 **** --- 1019,1026 ---- /* Function: ipf_frag_free */ /* Returns: Nil */ + /* Parameters: softf(I) - pointer to fragment context information */ + /* fra(I) - pointer to fragment structure to free */ /* */ + /* Free up a fragment cache entry and bump relevent statistics. */ /* ------------------------------------------------------------------------ */ static void *************** *** 1033,1037 **** /* Function: ipf_frag_clear */ /* Returns: Nil */ ! /* Parameters: Nil */ /* */ /* Free memory in use by fragment state information kept. Do the normal */ --- 1038,1042 ---- /* Function: ipf_frag_clear */ /* Returns: Nil */ ! /* Parameters: softc(I) - pointer to soft context main structure */ /* */ /* Free memory in use by fragment state information kept. Do the normal */ *************** *** 1074,1078 **** /* Function: ipf_frag_expire */ /* Returns: Nil */ ! /* Parameters: Nil */ /* */ /* Expire entries in the fragment cache table that have been there too long */ --- 1079,1083 ---- /* Function: ipf_frag_expire */ /* Returns: Nil */ ! /* Parameters: softc(I) - pointer to soft context main structure */ /* */ /* Expire entries in the fragment cache table that have been there too long */ *************** *** 1146,1149 **** --- 1151,1161 ---- /* ------------------------------------------------------------------------ */ /* Function: ipf_frag_pkt_next */ + /* Returns: int - 0 == success, else error */ + /* Parameters: softc(I) - pointer to soft context main structure */ + /* token(I) - pointer to token information for this caller */ + /* itp(I) - pointer to generic iterator from caller */ + /* */ + /* This function is used to step through the fragment cache list used for */ + /* filter rules. The hard work is done by the more generic ipf_frag_next. */ /* ------------------------------------------------------------------------ */ int *************** *** 1166,1169 **** --- 1178,1188 ---- /* ------------------------------------------------------------------------ */ /* Function: ipf_frag_nat_next */ + /* Returns: int - 0 == success, else error */ + /* Parameters: softc(I) - pointer to soft context main structure */ + /* token(I) - pointer to token information for this caller */ + /* itp(I) - pointer to generic iterator from caller */ + /* */ + /* This function is used to step through the fragment cache list used for */ + /* NAT. The hard work is done by the more generic ipf_frag_next. */ /* ------------------------------------------------------------------------ */ int *************** *** 1186,1190 **** /* Function: ipf_frag_next */ /* Returns: int - 0 == success, else error */ ! /* Parameters: token(I) - pointer to token information for this caller */ /* itp(I) - pointer to generic iterator from caller */ /* top(I) - top of the fragment list */ --- 1205,1210 ---- /* Function: ipf_frag_next */ /* Returns: int - 0 == success, else error */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* token(I) - pointer to token information for this caller */ /* itp(I) - pointer to generic iterator from caller */ /* top(I) - top of the fragment list */ *************** *** 1265,1269 **** --- 1285,1293 ---- /* Function: ipf_frag_pkt_deref */ /* Returns: Nil */ + /* Parameters: softc(I) - pointer to soft context main structure */ + /* data(I) - pointer to frag cache pointer */ /* */ + /* This function is the external interface for dropping a reference to a */ + /* fragment cache entry used by filter rules. */ /* ------------------------------------------------------------------------ */ void *************** *** 1287,1291 **** --- 1311,1319 ---- /* Function: ipf_frag_nat_deref */ /* Returns: Nil */ + /* Parameters: softc(I) - pointer to soft context main structure */ + /* data(I) - pointer to frag cache pointer */ /* */ + /* This function is the external interface for dropping a reference to a */ + /* fragment cache entry used by NAT table entries. */ /* ------------------------------------------------------------------------ */ void |
|
From: Darren <dar...@us...> - 2014-06-28 06:45:04
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17904 Modified Files: ip_frag.c Log Message: #558 add in some missing frag table function comments Index: ip_frag.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_frag.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ip_frag.c 13 Aug 2012 11:42:01 -0000 1.35 --- ip_frag.c 28 Jun 2014 06:45:01 -0000 1.36 *************** *** 955,959 **** /* Function: ipf_frag_natforget */ /* Returns: Nil */ ! /* Parameters: ptr(I) - pointer to data structure */ /* */ /* Search through all of the fragment cache entries for NAT and wherever a */ --- 955,960 ---- /* Function: ipf_frag_natforget */ /* Returns: Nil */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* ptr(I) - pointer to data structure */ /* */ /* Search through all of the fragment cache entries for NAT and wherever a */ *************** *** 979,983 **** /* Function: ipf_frag_delete */ /* Returns: Nil */ ! /* Parameters: fra(I) - pointer to fragment structure to delete */ /* tail(IO) - pointer to the pointer to the tail of the frag */ /* list */ --- 980,985 ---- /* Function: ipf_frag_delete */ /* Returns: Nil */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* fra(I) - pointer to fragment structure to delete */ /* tail(IO) - pointer to the pointer to the tail of the frag */ /* list */ *************** *** 1016,1020 **** --- 1018,1025 ---- /* Function: ipf_frag_free */ /* Returns: Nil */ + /* Parameters: softf(I) - pointer to fragment context information */ + /* fra(I) - pointer to fragment structure to free */ /* */ + /* Free up a fragment cache entry and bump relevent statistics. */ /* ------------------------------------------------------------------------ */ static void *************** *** 1032,1036 **** /* Function: ipf_frag_clear */ /* Returns: Nil */ ! /* Parameters: Nil */ /* */ /* Free memory in use by fragment state information kept. Do the normal */ --- 1037,1041 ---- /* Function: ipf_frag_clear */ /* Returns: Nil */ ! /* Parameters: softc(I) - pointer to soft context main structure */ /* */ /* Free memory in use by fragment state information kept. Do the normal */ *************** *** 1073,1077 **** /* Function: ipf_frag_expire */ /* Returns: Nil */ ! /* Parameters: Nil */ /* */ /* Expire entries in the fragment cache table that have been there too long */ --- 1078,1082 ---- /* Function: ipf_frag_expire */ /* Returns: Nil */ ! /* Parameters: softc(I) - pointer to soft context main structure */ /* */ /* Expire entries in the fragment cache table that have been there too long */ *************** *** 1145,1148 **** --- 1150,1160 ---- /* ------------------------------------------------------------------------ */ /* Function: ipf_frag_pkt_next */ + /* Returns: int - 0 == success, else error */ + /* Parameters: softc(I) - pointer to soft context main structure */ + /* token(I) - pointer to token information for this caller */ + /* itp(I) - pointer to generic iterator from caller */ + /* */ + /* This function is used to step through the fragment cache list used for */ + /* filter rules. The hard work is done by the more generic ipf_frag_next. */ /* ------------------------------------------------------------------------ */ int *************** *** 1165,1168 **** --- 1177,1187 ---- /* ------------------------------------------------------------------------ */ /* Function: ipf_frag_nat_next */ + /* Returns: int - 0 == success, else error */ + /* Parameters: softc(I) - pointer to soft context main structure */ + /* token(I) - pointer to token information for this caller */ + /* itp(I) - pointer to generic iterator from caller */ + /* */ + /* This function is used to step through the fragment cache list used for */ + /* NAT. The hard work is done by the more generic ipf_frag_next. */ /* ------------------------------------------------------------------------ */ int *************** *** 1185,1189 **** /* Function: ipf_frag_next */ /* Returns: int - 0 == success, else error */ ! /* Parameters: token(I) - pointer to token information for this caller */ /* itp(I) - pointer to generic iterator from caller */ /* top(I) - top of the fragment list */ --- 1204,1209 ---- /* Function: ipf_frag_next */ /* Returns: int - 0 == success, else error */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* token(I) - pointer to token information for this caller */ /* itp(I) - pointer to generic iterator from caller */ /* top(I) - top of the fragment list */ *************** *** 1264,1268 **** --- 1284,1292 ---- /* Function: ipf_frag_pkt_deref */ /* Returns: Nil */ + /* Parameters: softc(I) - pointer to soft context main structure */ + /* data(I) - pointer to frag cache pointer */ /* */ + /* This function is the external interface for dropping a reference to a */ + /* fragment cache entry used by filter rules. */ /* ------------------------------------------------------------------------ */ void *************** *** 1286,1290 **** --- 1310,1318 ---- /* Function: ipf_frag_nat_deref */ /* Returns: Nil */ + /* Parameters: softc(I) - pointer to soft context main structure */ + /* data(I) - pointer to frag cache pointer */ /* */ + /* This function is the external interface for dropping a reference to a */ + /* fragment cache entry used by NAT table entries. */ /* ------------------------------------------------------------------------ */ void |
|
From: Darren <dar...@us...> - 2014-06-20 17:27:29
|
Update of /cvsroot/ipfilter/ipf-test-suite In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5327 Modified Files: vars.sh Log Message: #556 ipmon not called with BIN_IPMON Index: vars.sh =================================================================== RCS file: /cvsroot/ipfilter/ipf-test-suite/vars.sh,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** vars.sh 20 Jul 2012 09:06:02 -0000 1.1.1.2 --- vars.sh 20 Jun 2014 17:27:26 -0000 1.2 *************** *** 76,79 **** --- 76,80 ---- BIN_IPNAT=/usr/sbin/ipnat BIN_IPPOOL=/usr/sbin/ippool + BIN_IPMON=/usr/sbin/ipmon # IPF_VAR_DIR=/var/tmp/ipf_test *************** *** 164,168 **** RECEIVER_NET0_ADDR_V6 RECEIVER_NET1_ADDR_V6 \ LOG0_FILE LOG1_FILE LOGS_FILE LOGR_FILE \ ! RRCP RRSH BIN_IPF BIN_IPFSTAT BIN_IPNAT BIN_IPPOOL \ PING_TRIES PING_SIZE_LARGE PING_SIZE_SMALL \ TEST_IPF_CONF TEST_IPNAT_CONF TEST_IPPOOL_CONF \ --- 165,169 ---- RECEIVER_NET0_ADDR_V6 RECEIVER_NET1_ADDR_V6 \ LOG0_FILE LOG1_FILE LOGS_FILE LOGR_FILE \ ! RRCP RRSH BIN_IPF BIN_IPFSTAT BIN_IPNAT BIN_IPPOOL BIN_IPMON \ PING_TRIES PING_SIZE_LARGE PING_SIZE_SMALL \ TEST_IPF_CONF TEST_IPNAT_CONF TEST_IPPOOL_CONF \ |
|
From: Darren <dar...@us...> - 2014-06-20 17:19:43
|
Update of /cvsroot/ipfilter/ipf-test-suite/bin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4765/bin Modified Files: log.sh Log Message: #556 ipmon not called with BIN_IPMON Index: log.sh =================================================================== RCS file: /cvsroot/ipfilter/ipf-test-suite/bin/log.sh,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** log.sh 20 Jul 2012 09:06:03 -0000 1.1.1.2 --- log.sh 20 Jun 2014 17:19:41 -0000 1.2 *************** *** 25,29 **** fi if [[ $capture_ipmon -eq 1 ]] ; then ! ipmon -DP ${IPF_TMP_DIR}/ipmon.pid -Fa ${IPF_TMP_DIR}/ipmon.out fi --- 25,30 ---- fi if [[ $capture_ipmon -eq 1 ]] ; then ! ${BIN_IPMON} -DP ${IPF_TMP_DIR}/ipmon.pid -Fa \ ! ${IPF_TMP_DIR}/ipmon.out fi |
|
From: Darren <dar...@us...> - 2014-06-20 17:17:22
|
Update of /cvsroot/ipfilter/ipf-test-suite In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4562 Modified Files: one_test.sh Log Message: #555 an aborted test continues when it should stop Index: one_test.sh =================================================================== RCS file: /cvsroot/ipfilter/ipf-test-suite/one_test.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** one_test.sh 7 Jun 2014 14:46:28 -0000 1.2 --- one_test.sh 20 Jun 2014 17:17:20 -0000 1.3 *************** *** 52,56 **** print "#" print '#################################################################' ! return 1 } --- 52,56 ---- print "#" print '#################################################################' ! exit 1 } |
|
From: Darren <dar...@us...> - 2014-06-20 17:03:52
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3671 Modified Files: fil.c Log Message: white space cleanup Index: fil.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** fil.c 20 Jun 2014 16:56:05 -0000 1.129 --- fil.c 20 Jun 2014 17:03:49 -0000 1.130 *************** *** 299,303 **** { "srcgrpmap", ipf_srcgrpmap, ipf_grpmapinit, ipf_grpmapfini }, { "dstgrpmap", ipf_dstgrpmap, ipf_grpmapinit, ipf_grpmapfini }, ! { "", NULL, NULL, NULL } }; --- 299,303 ---- { "srcgrpmap", ipf_srcgrpmap, ipf_grpmapinit, ipf_grpmapfini }, { "dstgrpmap", ipf_dstgrpmap, ipf_grpmapinit, ipf_grpmapfini }, ! { "", NULL, NULL, NULL } }; *************** *** 4696,4700 **** fprev = NULL; if (unit == IPL_LOGAUTH) { ! if ((fp->fr_tifs[0].fd_ptr != NULL) || (fp->fr_tifs[1].fd_ptr != NULL) || (fp->fr_dif.fd_ptr != NULL) || --- 4696,4700 ---- fprev = NULL; if (unit == IPL_LOGAUTH) { ! if ((fp->fr_tifs[0].fd_ptr != NULL) || (fp->fr_tifs[1].fd_ptr != NULL) || (fp->fr_dif.fd_ptr != NULL) || |
|
From: Darren <dar...@us...> - 2014-06-20 17:03:18
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3584 Modified Files: Tag: v5-1-RELEASE fil.c Log Message: white space cleanup Index: fil.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v retrieving revision 1.68.2.60 retrieving revision 1.68.2.61 diff -C2 -d -r1.68.2.60 -r1.68.2.61 *** fil.c 20 Jun 2014 16:56:16 -0000 1.68.2.60 --- fil.c 20 Jun 2014 17:03:03 -0000 1.68.2.61 *************** *** 316,320 **** { "srcgrpmap", ipf_srcgrpmap, ipf_grpmapinit, ipf_grpmapfini }, { "dstgrpmap", ipf_dstgrpmap, ipf_grpmapinit, ipf_grpmapfini }, ! { "", NULL, NULL, NULL } }; --- 316,320 ---- { "srcgrpmap", ipf_srcgrpmap, ipf_grpmapinit, ipf_grpmapfini }, { "dstgrpmap", ipf_dstgrpmap, ipf_grpmapinit, ipf_grpmapfini }, ! { "", NULL, NULL, NULL } }; *************** *** 4704,4712 **** fprev = NULL; if (unit == IPL_LOGAUTH) { ! if ((fp->fr_tifs[0].fd_ptr != NULL) || (fp->fr_tifs[1].fd_ptr != NULL) || (fp->fr_dif.fd_ptr != NULL) || (fp->fr_flags & FR_FASTROUTE)) { ! softc->ipf_interror = 145; error = EINVAL; goto donenolock; --- 4704,4712 ---- fprev = NULL; if (unit == IPL_LOGAUTH) { ! if ((fp->fr_tifs[0].fd_ptr != NULL) || (fp->fr_tifs[1].fd_ptr != NULL) || (fp->fr_dif.fd_ptr != NULL) || (fp->fr_flags & FR_FASTROUTE)) { ! IPFERROR(145); error = EINVAL; goto donenolock; |
|
From: Darren <dar...@us...> - 2014-06-20 16:56:19
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2911 Modified Files: Tag: v5-1-RELEASE fil.c Log Message: #554 Determining why a ipf rule matches is hard Index: fil.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v retrieving revision 1.68.2.59 retrieving revision 1.68.2.60 diff -C2 -d -r1.68.2.59 -r1.68.2.60 *** fil.c 15 Jun 2014 12:09:13 -0000 1.68.2.59 --- fil.c 20 Jun 2014 16:56:16 -0000 1.68.2.60 *************** *** 4437,4440 **** --- 4437,4473 ---- /* ------------------------------------------------------------------------ */ + /* Function: ipf_rule_compare */ + /* Parameters: fr1(I) - first rule structure to compare */ + /* fr2(I) - second rule structure to compare */ + /* Returns: int - 0 == rules are the same, else mismatch */ + /* */ + /* Compare two rules and return 0 if they match or a number indicating */ + /* which of the individual checks failed. */ + /* ------------------------------------------------------------------------ */ + static int + ipf_rule_compare(frentry_t *fr1, frentry_t *fr2) + { + if (fr1->fr_cksum != fr2->fr_cksum) + return 1; + if (fr1->fr_size != fr2->fr_size) + return 2; + if (fr1->fr_dsize != fr2->fr_dsize) + return 3; + if (bcmp((char *)&fr1->fr_func, (char *)&fr2->fr_func, + fr1->fr_size - offsetof(struct frentry, fr_func)) != 0) + return 4; + if (fr1->fr_data && !fr2->fr_data) + return 5; + if (!fr1->fr_data && fr2->fr_data) + return 6; + if (fr1->fr_data) { + if (bcmp(fr1->fr_caddr, fr2->fr_caddr, fr1->fr_dsize)) + return 7; + } + return 0; + } + + + /* ------------------------------------------------------------------------ */ /* Function: frrequest */ /* Returns: int - 0 == success, > 0 == errno value */ *************** *** 4927,4941 **** for (; (f = *ftail) != NULL; ftail = &f->fr_next) { ! DT2(rule_cmp, frentry_t *, fp, frentry_t *, f); ! if ((fp->fr_cksum != f->fr_cksum) || ! (fp->fr_size != f->fr_size) || ! (f->fr_dsize != fp->fr_dsize)) ! continue; ! if (bcmp((char *)&f->fr_func, (char *)&fp->fr_func, ! fp->fr_size - offsetof(struct frentry, fr_func)) != 0) ! continue; ! if ((!ptr && !f->fr_data) || ! (ptr && f->fr_data && ! !bcmp((char *)ptr, (char *)f->fr_data, f->fr_dsize))) break; } --- 4960,4964 ---- for (; (f = *ftail) != NULL; ftail = &f->fr_next) { ! if (ipf_rule_compare(fp, f) == 0) break; } |
|
From: Darren <dar...@us...> - 2014-06-20 16:56:07
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2876 Modified Files: fil.c Log Message: #554 Determining why a ipf rule matches is hard Index: fil.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** fil.c 15 Jun 2014 12:08:57 -0000 1.128 --- fil.c 20 Jun 2014 16:56:05 -0000 1.129 *************** *** 4429,4432 **** --- 4429,4465 ---- /* ------------------------------------------------------------------------ */ + /* Function: ipf_rule_compare */ + /* Parameters: fr1(I) - first rule structure to compare */ + /* fr2(I) - second rule structure to compare */ + /* Returns: int - 0 == rules are the same, else mismatch */ + /* */ + /* Compare two rules and return 0 if they match or a number indicating */ + /* which of the individual checks failed. */ + /* ------------------------------------------------------------------------ */ + static int + ipf_rule_compare(frentry_t *fr1, frentry_t *fr2) + { + if (fr1->fr_cksum != fr2->fr_cksum) + return 1; + if (fr1->fr_size != fr2->fr_size) + return 2; + if (fr1->fr_dsize != fr2->fr_dsize) + return 3; + if (bcmp((char *)&fr1->fr_func, (char *)&fr2->fr_func, + fr1->fr_size - offsetof(struct frentry, fr_func)) != 0) + return 4; + if (fr1->fr_data && !fr2->fr_data) + return 5; + if (!fr1->fr_data && fr2->fr_data) + return 6; + if (fr1->fr_data) { + if (bcmp(fr1->fr_caddr, fr2->fr_caddr, fr1->fr_dsize)) + return 7; + } + return 0; + } + + + /* ------------------------------------------------------------------------ */ /* Function: frrequest */ /* Returns: int - 0 == success, > 0 == errno value */ *************** *** 4919,4933 **** for (; (f = *ftail) != NULL; ftail = &f->fr_next) { ! DT2(rule_cmp, frentry_t *, fp, frentry_t *, f); ! if ((fp->fr_cksum != f->fr_cksum) || ! (fp->fr_size != f->fr_size) || ! (f->fr_dsize != fp->fr_dsize)) ! continue; ! if (bcmp((char *)&f->fr_func, (char *)&fp->fr_func, ! fp->fr_size - offsetof(struct frentry, fr_func)) != 0) ! continue; ! if ((!ptr && !f->fr_data) || ! (ptr && f->fr_data && ! !bcmp((char *)ptr, (char *)f->fr_data, f->fr_dsize))) break; } --- 4952,4956 ---- for (; (f = *ftail) != NULL; ftail = &f->fr_next) { ! if (ipf_rule_compare(fp, f) == 0) break; } |
|
From: Darren <dar...@us...> - 2014-06-20 16:43:00
|
Update of /cvsroot/ipfilter/ipfilter/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1917/lib Modified Files: Tag: v5-1-RELEASE gethost.c Log Message: #553 gethost needs to zero entire IP address structure Index: gethost.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/gethost.c,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** gethost.c 25 Aug 2012 14:16:41 -0000 1.8.2.3 --- gethost.c 20 Jun 2014 16:42:58 -0000 1.8.2.4 *************** *** 18,21 **** --- 18,22 ---- u_32_t addr; + bzero(hostp, sizeof(*hostp)); if (!strcmp(name, "test.host.dots")) { if (family == AF_INET) { |
|
From: Darren <dar...@us...> - 2014-06-20 16:42:54
|
Update of /cvsroot/ipfilter/ipfilter/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1905/lib Modified Files: gethost.c Log Message: #553 gethost needs to zero entire IP address structure Index: gethost.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/gethost.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gethost.c 25 Aug 2012 14:16:27 -0000 1.10 --- gethost.c 20 Jun 2014 16:42:52 -0000 1.11 *************** *** 18,21 **** --- 18,22 ---- u_32_t addr; + bzero(hostp, sizeof(*hostp)); if (!strcmp(name, "test.host.dots")) { if (family == AF_INET) { |
|
From: Darren <dar...@us...> - 2014-06-17 11:53:47
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28471/tools Modified Files: Tag: v5-1-RELEASE ipnat_y.y Log Message: #552 destination port not zero after parsing nat rule Index: ipnat_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipnat_y.y,v retrieving revision 1.19.2.16 retrieving revision 1.19.2.17 diff -C2 -d -r1.19.2.16 -r1.19.2.17 *** ipnat_y.y 9 Jun 2014 15:51:27 -0000 1.19.2.16 --- ipnat_y.y 17 Jun 2014 11:53:44 -0000 1.19.2.17 *************** *** 1057,1061 **** portstuff: ! compare portspec { $$.pc = $1; $$.p1 = $2; } | portspec range portspec { $$.pc = $2; $$.p1 = $1; $$.p2 = $3; } ; --- 1057,1061 ---- portstuff: ! compare portspec { $$.pc = $1; $$.p1 = $2; $$.p2 = 0; } | portspec range portspec { $$.pc = $2; $$.p1 = $1; $$.p2 = $3; } ; *************** *** 1150,1154 **** free($1); if ($$ == -1) ! yyerror("unknwon protocol"); if ($$ != IPPROTO_TCP && $$ != IPPROTO_UDP) --- 1150,1154 ---- free($1); if ($$ == -1) ! yyerror("unknown protocol"); if ($$ != IPPROTO_TCP && $$ != IPPROTO_UDP) *************** *** 1172,1175 **** --- 1172,1176 ---- family = AF_INET; bzero(&$$, sizeof($$)); + bzero(&addr, sizeof(addr)); $$.f = family; if (gethost(family, $1, *************** *** 1510,1514 **** if (opts & OPT_DEBUG) ! binprint(ipn, sizeof(*ipn)); if ((opts & OPT_ZERORULEST) != 0) { --- 1511,1515 ---- if (opts & OPT_DEBUG) ! binprint(ipn, ipn->in_size); if ((opts & OPT_ZERORULEST) != 0) { |
|
From: Darren <dar...@us...> - 2014-06-17 11:53:38
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28460/tools Modified Files: ipnat_y.y Log Message: #552 destination port not zero after parsing nat rule Index: ipnat_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipnat_y.y,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** ipnat_y.y 9 Jun 2014 15:51:22 -0000 1.37 --- ipnat_y.y 17 Jun 2014 11:53:36 -0000 1.38 *************** *** 1057,1061 **** portstuff: ! compare portspec { $$.pc = $1; $$.p1 = $2; } | portspec range portspec { $$.pc = $2; $$.p1 = $1; $$.p2 = $3; } ; --- 1057,1061 ---- portstuff: ! compare portspec { $$.pc = $1; $$.p1 = $2; $$.p2 = 0; } | portspec range portspec { $$.pc = $2; $$.p1 = $1; $$.p2 = $3; } ; *************** *** 1150,1154 **** free($1); if ($$ == -1) ! yyerror("unknwon protocol"); if ($$ != IPPROTO_TCP && $$ != IPPROTO_UDP) --- 1150,1154 ---- free($1); if ($$ == -1) ! yyerror("unknown protocol"); if ($$ != IPPROTO_TCP && $$ != IPPROTO_UDP) *************** *** 1172,1175 **** --- 1172,1176 ---- family = AF_INET; bzero(&$$, sizeof($$)); + bzero(&addr, sizeof(addr)); $$.f = family; if (gethost(family, $1, *************** *** 1510,1514 **** if (opts & OPT_DEBUG) ! binprint(ipn, sizeof(*ipn)); if ((opts & OPT_ZERORULEST) != 0) { --- 1511,1515 ---- if (opts & OPT_DEBUG) ! binprint(ipn, ipn->in_size); if ((opts & OPT_ZERORULEST) != 0) { |
|
From: Darren <dar...@us...> - 2014-06-17 11:50:52
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28289/tools Modified Files: Tag: v5-1-RELEASE ipf_y.y Log Message: #551 ipf.conf address structure not properly zero filled Index: ipf_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipf_y.y,v retrieving revision 1.22.2.13 retrieving revision 1.22.2.14 diff -C2 -d -r1.22.2.13 -r1.22.2.14 *** ipf_y.y 8 Jun 2014 14:31:47 -0000 1.22.2.13 --- ipf_y.y 17 Jun 2014 11:50:50 -0000 1.22.2.14 *************** *** 1026,1030 **** yyexpectaddr = 0; } ! | hostname { $$.a = $1.adr; $$.f = $1.f; if ($1.f == AF_INET6) --- 1026,1031 ---- yyexpectaddr = 0; } ! | hostname { bzero(&($$), sizeof($$)); ! $$.a = $1.adr; $$.f = $1.f; if ($1.f == AF_INET6) *************** *** 1039,1043 **** maskspace { yysetdict(maskwords); yyexpectaddr = 2; } ! ipmask { ntomask($1.f, $5, $$.m.i6); $$.a = $1.adr; $$.a.i6[0] &= $$.m.i6[0]; --- 1040,1045 ---- maskspace { yysetdict(maskwords); yyexpectaddr = 2; } ! ipmask { bzero(&($$), sizeof($$)); ! ntomask($1.f, $5, $$.m.i6); $$.a = $1.adr; $$.a.i6[0] &= $$.m.i6[0]; *************** *** 1061,1065 **** yyexpectaddr = 0; } ! | '(' YY_STR ')' { $$.type = FRI_DYNAMIC; ifpflag = FRI_DYNAMIC; $$.ifpos = addname(&fr, $2); --- 1063,1068 ---- yyexpectaddr = 0; } ! | '(' YY_STR ')' { bzero(&($$), sizeof($$)); ! $$.type = FRI_DYNAMIC; ifpflag = FRI_DYNAMIC; $$.ifpos = addname(&fr, $2); *************** *** 1069,1073 **** { ifpflag = FRI_DYNAMIC; yysetdict(maskwords); } maskopts ! { $$.type = ifpflag; $$.ifpos = addname(&fr, $2); $$.lif = 0; --- 1072,1077 ---- { ifpflag = FRI_DYNAMIC; yysetdict(maskwords); } maskopts ! { bzero(&($$), sizeof($$)); ! $$.type = ifpflag; $$.ifpos = addname(&fr, $2); $$.lif = 0; *************** *** 1084,1088 **** { ifpflag = FRI_DYNAMIC; yysetdict(maskwords); } maskopts ! { $$.type = ifpflag; $$.ifpos = addname(&fr, $2); $$.lif = $4; --- 1088,1093 ---- { ifpflag = FRI_DYNAMIC; yysetdict(maskwords); } maskopts ! { bzero(&($$), sizeof($$)); ! $$.type = ifpflag; $$.ifpos = addname(&fr, $2); $$.lif = $4; *************** *** 1143,1147 **** hostname: ! ipv4 { $$.adr.in4 = $1; if (frc->fr_family == AF_INET6) YYERROR; --- 1148,1153 ---- hostname: ! ipv4 { bzero(&($$), sizeof($$)); ! $$.adr.in4 = $1; if (frc->fr_family == AF_INET6) YYERROR; *************** *** 1149,1153 **** yyexpectaddr = 2; } ! | YY_NUMBER { if (frc->fr_family == AF_INET6) YYERROR; $$.adr.in4_addr = $1; --- 1155,1160 ---- yyexpectaddr = 2; } ! | YY_NUMBER { bzero(&($$), sizeof($$)); ! if (frc->fr_family == AF_INET6) YYERROR; $$.adr.in4_addr = $1; *************** *** 1155,1159 **** yyexpectaddr = 2; } ! | YY_HEX { if (frc->fr_family == AF_INET6) YYERROR; $$.adr.in4_addr = $1; --- 1162,1167 ---- yyexpectaddr = 2; } ! | YY_HEX { bzero(&($$), sizeof($$)); ! if (frc->fr_family == AF_INET6) YYERROR; $$.adr.in4_addr = $1; *************** *** 1161,1170 **** yyexpectaddr = 2; } ! | YY_STR { if (lookuphost($1, &$$.adr) == 0) $$.f = AF_INET; free($1); yyexpectaddr = 2; } ! | YY_IPV6 { if (frc->fr_family == AF_INET) YYERROR; $$.adr = $1; --- 1169,1180 ---- yyexpectaddr = 2; } ! | YY_STR { bzero(&($$), sizeof($$)); ! if (lookuphost($1, &$$.adr) == 0) $$.f = AF_INET; free($1); yyexpectaddr = 2; } ! | YY_IPV6 { bzero(&($$), sizeof($$)); ! if (frc->fr_family == AF_INET) YYERROR; $$.adr = $1; |
|
From: Darren <dar...@us...> - 2014-06-17 11:50:49
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28278/tools Modified Files: ipf_y.y Log Message: #551 ipf.conf address structure not properly zero filled Index: ipf_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipf_y.y,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ipf_y.y 8 Jun 2014 14:31:38 -0000 1.36 --- ipf_y.y 17 Jun 2014 11:50:47 -0000 1.37 *************** *** 1024,1028 **** yyexpectaddr = 0; } ! | hostname { $$.a = $1.adr; $$.f = $1.f; if ($1.f == AF_INET6) --- 1024,1029 ---- yyexpectaddr = 0; } ! | hostname { bzero(&($$), sizeof($$)); ! $$.a = $1.adr; $$.f = $1.f; if ($1.f == AF_INET6) *************** *** 1037,1041 **** maskspace { yysetdict(maskwords); yyexpectaddr = 2; } ! ipmask { ntomask($1.f, $5, $$.m.i6); $$.a = $1.adr; $$.a.i6[0] &= $$.m.i6[0]; --- 1038,1043 ---- maskspace { yysetdict(maskwords); yyexpectaddr = 2; } ! ipmask { bzero(&($$), sizeof($$)); ! ntomask($1.f, $5, $$.m.i6); $$.a = $1.adr; $$.a.i6[0] &= $$.m.i6[0]; *************** *** 1059,1063 **** yyexpectaddr = 0; } ! | '(' YY_STR ')' { $$.type = FRI_DYNAMIC; ifpflag = FRI_DYNAMIC; $$.ifpos = addname(&fr, $2); --- 1061,1066 ---- yyexpectaddr = 0; } ! | '(' YY_STR ')' { bzero(&($$), sizeof($$)); ! $$.type = FRI_DYNAMIC; ifpflag = FRI_DYNAMIC; $$.ifpos = addname(&fr, $2); *************** *** 1067,1071 **** { ifpflag = FRI_DYNAMIC; yysetdict(maskwords); } maskopts ! { $$.type = ifpflag; $$.ifpos = addname(&fr, $2); $$.lif = 0; --- 1070,1075 ---- { ifpflag = FRI_DYNAMIC; yysetdict(maskwords); } maskopts ! { bzero(&($$), sizeof($$)); ! $$.type = ifpflag; $$.ifpos = addname(&fr, $2); $$.lif = 0; *************** *** 1082,1086 **** { ifpflag = FRI_DYNAMIC; yysetdict(maskwords); } maskopts ! { $$.type = ifpflag; $$.ifpos = addname(&fr, $2); $$.lif = $4; --- 1086,1091 ---- { ifpflag = FRI_DYNAMIC; yysetdict(maskwords); } maskopts ! { bzero(&($$), sizeof($$)); ! $$.type = ifpflag; $$.ifpos = addname(&fr, $2); $$.lif = $4; *************** *** 1141,1145 **** hostname: ! ipv4 { $$.adr.in4 = $1; if (frc->fr_family == AF_INET6) YYERROR; --- 1146,1151 ---- hostname: ! ipv4 { bzero(&($$), sizeof($$)); ! $$.adr.in4 = $1; if (frc->fr_family == AF_INET6) YYERROR; *************** *** 1147,1151 **** yyexpectaddr = 2; } ! | YY_NUMBER { if (frc->fr_family == AF_INET6) YYERROR; $$.adr.in4_addr = $1; --- 1153,1158 ---- yyexpectaddr = 2; } ! | YY_NUMBER { bzero(&($$), sizeof($$)); ! if (frc->fr_family == AF_INET6) YYERROR; $$.adr.in4_addr = $1; *************** *** 1153,1157 **** yyexpectaddr = 2; } ! | YY_HEX { if (frc->fr_family == AF_INET6) YYERROR; $$.adr.in4_addr = $1; --- 1160,1165 ---- yyexpectaddr = 2; } ! | YY_HEX { bzero(&($$), sizeof($$)); ! if (frc->fr_family == AF_INET6) YYERROR; $$.adr.in4_addr = $1; *************** *** 1159,1168 **** yyexpectaddr = 2; } ! | YY_STR { if (lookuphost($1, &$$.adr) == 0) $$.f = AF_INET; free($1); yyexpectaddr = 2; } ! | YY_IPV6 { if (frc->fr_family == AF_INET) YYERROR; $$.adr = $1; --- 1167,1178 ---- yyexpectaddr = 2; } ! | YY_STR { bzero(&($$), sizeof($$)); ! if (lookuphost($1, &$$.adr) == 0) $$.f = AF_INET; free($1); yyexpectaddr = 2; } ! | YY_IPV6 { bzero(&($$), sizeof($$)); ! if (frc->fr_family == AF_INET) YYERROR; $$.adr = $1; |
|
From: Darren <dar...@us...> - 2014-06-15 12:09:15
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6672 Modified Files: Tag: v5-1-RELEASE fil.c Log Message: #550 filter rule list corrupted with inserted rules Index: fil.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v retrieving revision 1.68.2.58 retrieving revision 1.68.2.59 diff -C2 -d -r1.68.2.58 -r1.68.2.59 *** fil.c 13 Aug 2012 11:44:14 -0000 1.68.2.58 --- fil.c 15 Jun 2014 12:09:13 -0000 1.68.2.59 *************** *** 3898,3901 **** --- 3898,3903 ---- return s; } + + /* ------------------------------------------------------------------------ */ /* Function: ipf_fixskip */ *************** *** 4494,4498 **** --- 4496,4508 ---- fp = f; f = NULL; + fp->fr_next = NULL; fp->fr_dnext = NULL; + fp->fr_pnext = NULL; + fp->fr_pdnext = NULL; + fp->fr_grp = NULL; + fp->fr_grphead = NULL; + fp->fr_icmpgrp = NULL; + fp->fr_isc = (void *)-1; + fp->fr_ptr = NULL; fp->fr_ref = 0; fp->fr_flags |= FR_COPIED; *************** *** 4997,5001 **** --- 5007,5013 ---- break; ftail = &f->fr_next; + fprev = ftail; } + ftail = fprev; f = NULL; ptr = NULL; *************** *** 5088,5091 **** --- 5100,5105 ---- fp->fr_pnext = ftail; fp->fr_next = *ftail; + if (fp->fr_next != NULL) + fp->fr_next->fr_pnext = &fp->fr_next; *ftail = fp; if (addrem == 0) |
|
From: Darren <dar...@us...> - 2014-06-15 12:08:59
|
Update of /cvsroot/ipfilter/ipfilter In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6616 Modified Files: fil.c Log Message: #550 filter rule list corrupted with inserted rules Index: fil.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** fil.c 13 Aug 2012 11:42:00 -0000 1.127 --- fil.c 15 Jun 2014 12:08:57 -0000 1.128 *************** *** 4488,4492 **** --- 4488,4500 ---- fp = f; f = NULL; + fp->fr_next = NULL; fp->fr_dnext = NULL; + fp->fr_pnext = NULL; + fp->fr_pdnext = NULL; + fp->fr_grp = NULL; + fp->fr_grphead = NULL; + fp->fr_icmpgrp = NULL; + fp->fr_isc = (void *)-1; + fp->fr_ptr = NULL; fp->fr_ref = 0; fp->fr_flags |= FR_COPIED; *************** *** 4991,4995 **** --- 4999,5005 ---- break; ftail = &f->fr_next; + fprev = ftail; } + ftail = fprev; f = NULL; ptr = NULL; *************** *** 5082,5085 **** --- 5092,5097 ---- fp->fr_pnext = ftail; fp->fr_next = *ftail; + if (fp->fr_next != NULL) + fp->fr_next->fr_pnext = &fp->fr_next; *ftail = fp; |
|
From: Darren <dar...@us...> - 2014-06-15 12:05:41
|
Update of /cvsroot/ipfilter/ipfilter/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6282/lib Modified Files: walk_live_fr_rules.c Log Message: #548 ipfstat hits a bus error on netbsd/sparc64 Index: walk_live_fr_rules.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/lib/walk_live_fr_rules.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** walk_live_fr_rules.c 15 Jun 2012 08:33:08 -0000 1.3 --- walk_live_fr_rules.c 15 Jun 2014 12:05:38 -0000 1.4 *************** *** 66,75 **** continue; } ! if (fp->fr_data != NULL) ! fp->fr_data = (char *)fp + fp->fr_size; if (fp->fr_die != 0) fp->fr_die -= ticks; rules++; walker(fp); } --- 66,82 ---- continue; } ! if (fp->fr_data != NULL) { ! fp->fr_data = calloc(1, fp->fr_dsize); ! if (fp->fr_data != NULL) { ! bcopy((char *)fp + fp->fr_size, fp->fr_data, ! fp->fr_dsize); ! } ! } if (fp->fr_die != 0) fp->fr_die -= ticks; rules++; walker(fp); + if (fp->fr_data != NULL) + free(fp->fr_data); } |
|
From: Darren <dar...@us...> - 2014-06-15 12:01:50
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5904/tools Modified Files: Tag: v5-1-RELEASE ipfstat.c Log Message: #548 ipfstat hits a bus error on netbsd/sparc64 Index: ipfstat.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipfstat.c,v retrieving revision 1.18.2.12 retrieving revision 1.18.2.13 diff -C2 -d -r1.18.2.12 -r1.18.2.13 *** ipfstat.c 20 Jul 2012 08:47:00 -0000 1.18.2.12 --- ipfstat.c 15 Jun 2014 12:01:47 -0000 1.18.2.13 *************** *** 798,802 **** ipfruleiter_t rule; frentry_t zero; - frgroup_t *g; ipfobj_t obj; int rules; --- 798,801 ---- *************** *** 848,853 **** continue; } ! if (fp->fr_data != NULL) ! fp->fr_data = (char *)fp + fp->fr_size; rules++; --- 847,857 ---- continue; } ! if (fp->fr_data != NULL) { ! fp->fr_data = calloc(1, fp->fr_dsize); ! if (fp->fr_data != NULL) { ! bcopy((char *)fp + fp->fr_size, fp->fr_data, ! fp->fr_dsize); ! } ! } rules++; *************** *** 877,904 **** binprint(fp->fr_data, fp->fr_dsize); } - if (fp->fr_grhead != -1) { - for (g = grtop; g != NULL; g = g->fg_next) { - if (!strncmp(fp->fr_names + fp->fr_grhead, - g->fg_name, - FR_GROUPLEN)) - break; - } - if (g == NULL) { - g = calloc(1, sizeof(*g)); - - if (g != NULL) { - strncpy(g->fg_name, - fp->fr_names + fp->fr_grhead, - FR_GROUPLEN); - if (grtop == NULL) { - grtop = g; - grtail = g; - } else { - grtail->fg_next = g; - grtail = g; - } - } - } - } if (fp->fr_type == FR_T_CALLFUNC) { rules += printlivelist(fiop, out, set, fp->fr_data, --- 881,884 ---- |
|
From: Darren <dar...@us...> - 2014-06-09 15:51:30
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32058/tools Modified Files: Tag: v5-1-RELEASE ipnat_y.y Log Message: #547 rule parsing puts junk at the end of ipf rules Index: ipnat_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipnat_y.y,v retrieving revision 1.19.2.15 retrieving revision 1.19.2.16 diff -C2 -d -r1.19.2.15 -r1.19.2.16 *** ipnat_y.y 8 Jun 2014 14:45:58 -0000 1.19.2.15 --- ipnat_y.y 9 Jun 2014 15:51:27 -0000 1.19.2.16 *************** *** 1767,1771 **** nlen = strlen(name) + 1; n = calloc(1, (*np)->in_size + nlen); ! bcopy(*np, n, (*np)->in_size + nlen); free(*np); if (*np == nattop) --- 1767,1771 ---- nlen = strlen(name) + 1; n = calloc(1, (*np)->in_size + nlen); ! bcopy(*np, n, (*np)->in_size); free(*np); if (*np == nattop) |
|
From: Darren <dar...@us...> - 2014-06-09 15:51:24
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32034/tools Modified Files: ipnat_y.y Log Message: #547 rule parsing puts junk at the end of ipf rules Index: ipnat_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipnat_y.y,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ipnat_y.y 8 Jun 2014 14:45:49 -0000 1.36 --- ipnat_y.y 9 Jun 2014 15:51:22 -0000 1.37 *************** *** 1767,1771 **** nlen = strlen(name) + 1; n = calloc(1, (*np)->in_size + nlen); ! bcopy(*np, n, (*np)->in_size + nlen); free(*np); if (*np == nattop) --- 1767,1771 ---- nlen = strlen(name) + 1; n = calloc(1, (*np)->in_size + nlen); ! bcopy(*np, n, (*np)->in_size); free(*np); if (*np == nattop) |
|
From: Darren <dar...@us...> - 2014-06-08 14:46:01
|
Update of /cvsroot/ipfilter/ipfilter/tools In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17069/tools Modified Files: Tag: v5-1-RELEASE ipnat_y.y Log Message: #547 rule parsing puts junk at the end of ipf rules Index: ipnat_y.y =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/tools/ipnat_y.y,v retrieving revision 1.19.2.14 retrieving revision 1.19.2.15 diff -C2 -d -r1.19.2.14 -r1.19.2.15 *** ipnat_y.y 25 Aug 2012 14:14:08 -0000 1.19.2.14 --- ipnat_y.y 8 Jun 2014 14:45:58 -0000 1.19.2.15 *************** *** 1766,1770 **** nlen = strlen(name) + 1; ! n = realloc(*np, (*np)->in_size + nlen); if (*np == nattop) nattop = n; --- 1766,1772 ---- nlen = strlen(name) + 1; ! n = calloc(1, (*np)->in_size + nlen); ! bcopy(*np, n, (*np)->in_size + nlen); ! free(*np); if (*np == nattop) nattop = n; |
