ipfilter-cvs Mailing List for ipfilter (Page 4)
Brought to you by:
darren_r
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...> - 2012-07-22 07:58:06
|
Update of /cvsroot/ipfilter/ipfilter/lib
In directory vz-cvs-4.sog:/tmp/cvs-serv11280/lib
Modified Files:
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.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** interror.c 20 Jul 2012 08:11:43 -0000 1.19
--- interror.c 22 Jul 2012 07:58:04 -0000 1.20
***************
*** 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.
***************
*** 18,22 ****
static ipf_error_entry_t *find_error(int);
! #define IPF_NUM_ERRORS 481
/*
--- 18,22 ----
static ipf_error_entry_t *find_error(int);
! #define IPF_NUM_ERRORS 485
/*
***************
*** 400,403 ****
--- 400,407 ----
{ 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/ipf-test-suite/new-ipf-test/tests/3h/v6 In directory vz-cvs-4.sog:/tmp/cvs-serv32749/new-ipf-test/tests/3h/v6 Removed Files: 3h_net0_ftp_ipf_pass_state_ipnat_map_proxy_001_v6.sh 3h_net0_ftp_ipf_pass_state_ipnat_map_proxy_002_v6.sh 3h_net0_ftp_ipf_pass_state_ipnat_map_proxy_003_v6.sh 3h_net0_ftp_ipf_pass_state_ipnat_rdr_proxy_001_v6.sh 3h_net0_ping_ipf_block_000_v6.sh 3h_net0_ping_ipf_block_001_v6.sh 3h_net0_ping_ipf_block_002_v6.sh 3h_net0_ping_ipf_block_003_v6.sh 3h_net0_ping_ipf_block_004_v6.sh 3h_net0_ping_ipf_block_quick_001_v6.sh 3h_net0_ping_ipf_block_quick_002_v6.sh 3h_net0_ping_ipf_block_quick_003_v6.sh 3h_net0_ping_ipf_pass_000_v6.sh 3h_net0_ping_ipf_pass_001_v6.sh 3h_net0_ping_ipf_pass_002_v6.sh 3h_net0_ping_ipf_pass_003_v6.sh 3h_net0_ping_ipf_pass_004_v6.sh 3h_net0_ping_ipf_pass_quick_001_v6.sh 3h_net0_ping_ipf_pass_quick_002_v6.sh 3h_net0_ping_ipf_pass_quick_003_v6.sh 3h_net0_ping_ipf_pass_state_001_v6.sh 3h_net0_ping_ipf_pass_state_002_v6.sh 3h_net0_rcmd_ipf_pass_state_ipnat_rdr_proxy_001_v6.sh 3h_net0_tcp_ipf_block_001_v6.sh 3h_net0_tcp_ipf_block_002_v6.sh 3h_net0_tcp_ipf_block_003_v6.sh 3h_net0_tcp_ipf_block_004_v6.sh 3h_net0_tcp_ipf_block_005_v6.sh 3h_net0_tcp_ipf_block_006_v6.sh 3h_net0_tcp_ipf_block_007_v6.sh 3h_net0_tcp_ipf_block_008_v6.sh 3h_net0_tcp_ipf_block_009_v6.sh 3h_net0_tcp_ipf_decaps_001_v6.sh 3h_net0_tcp_ipf_pass_001_v6.sh 3h_net0_tcp_ipf_pass_002_v6.sh 3h_net0_tcp_ipf_pass_003_v6.sh 3h_net0_tcp_ipf_pass_004_v6.sh 3h_net0_tcp_ipf_pass_005_v6.sh 3h_net0_tcp_ipf_pass_006_v6.sh 3h_net0_tcp_ipf_pass_007_v6.sh 3h_net0_tcp_ipf_pass_008_v6.sh 3h_net0_tcp_ipf_pass_009_v6.sh 3h_net0_tcp_ipf_pass_state_001_v6.sh 3h_net0_tcp_ipf_pass_state_002_v6.sh 3h_net0_tcp_ipf_pass_state_ipnat_map_001_v6.sh 3h_net0_tcp_ipf_pass_state_ipnat_map_002_v6.sh 3h_net0_tcp_ipf_pass_state_ipnat_map_003_v6.sh 3h_net0_tcp_ipf_pass_state_ipnat_rdr_001_v6.sh 3h_net0_tcp_ipf_pass_state_ipnat_rdr_002_v6.sh 3h_net0_tcp_ipf_pass_state_ipnat_rdr_003_v6.sh 3h_net0_udp_ipf_block_001_v6.sh 3h_net0_udp_ipf_block_002_v6.sh 3h_net0_udp_ipf_block_003_v6.sh 3h_net0_udp_ipf_block_004_v6.sh 3h_net0_udp_ipf_block_005_v6.sh 3h_net0_udp_ipf_block_006_v6.sh 3h_net0_udp_ipf_block_007_v6.sh 3h_net0_udp_ipf_block_008_v6.sh 3h_net0_udp_ipf_block_009_v6.sh 3h_net0_udp_ipf_decaps_001_v6.sh 3h_net0_udp_ipf_pass_001_v6.sh 3h_net0_udp_ipf_pass_002_v6.sh 3h_net0_udp_ipf_pass_003_v6.sh 3h_net0_udp_ipf_pass_004_v6.sh 3h_net0_udp_ipf_pass_005_v6.sh 3h_net0_udp_ipf_pass_006_v6.sh 3h_net0_udp_ipf_pass_007_v6.sh 3h_net0_udp_ipf_pass_008_v6.sh 3h_net0_udp_ipf_pass_009_v6.sh 3h_net0_udp_ipf_pass_state_001_v6.sh 3h_net0_udp_ipf_pass_state_ipnat_map_001_v6.sh 3h_net0_udp_ipf_pass_state_ipnat_map_002_v6.sh 3h_net0_udp_ipf_pass_state_ipnat_map_003_v6.sh 3h_net0_udp_ipf_pass_state_ipnat_rdr_001_v6.sh 3h_net0_udp_ipf_pass_state_ipnat_rdr_002_v6.sh 3h_net0_udp_ipf_pass_state_ipnat_rdr_003_v6.sh Log Message: Update to the proper 1.0 version --- 3h_net0_udp_ipf_block_003_v6.sh DELETED --- --- 3h_net0_ping_ipf_block_quick_003_v6.sh DELETED --- --- 3h_net0_udp_ipf_block_001_v6.sh DELETED --- --- 3h_net0_ping_ipf_block_001_v6.sh DELETED --- --- 3h_net0_ping_ipf_pass_state_001_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_state_ipnat_rdr_003_v6.sh DELETED --- --- 3h_net0_ping_ipf_pass_quick_002_v6.sh DELETED --- --- 3h_net0_ping_ipf_pass_state_002_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_005_v6.sh DELETED --- --- 3h_net0_ping_ipf_pass_004_v6.sh DELETED --- --- 3h_net0_tcp_ipf_block_003_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_state_001_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_state_ipnat_rdr_001_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_006_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_state_ipnat_rdr_002_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_001_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_008_v6.sh DELETED --- --- 3h_net0_ping_ipf_pass_quick_001_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_004_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_state_ipnat_map_001_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_state_001_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_004_v6.sh DELETED --- --- 3h_net0_rcmd_ipf_pass_state_ipnat_rdr_proxy_001_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_002_v6.sh DELETED --- --- 3h_net0_ftp_ipf_pass_state_ipnat_map_proxy_002_v6.sh DELETED --- --- 3h_net0_tcp_ipf_block_005_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_003_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_state_ipnat_rdr_002_v6.sh DELETED --- --- 3h_net0_ping_ipf_pass_000_v6.sh DELETED --- --- 3h_net0_ping_ipf_block_quick_001_v6.sh DELETED --- --- 3h_net0_ftp_ipf_pass_state_ipnat_map_proxy_003_v6.sh DELETED --- --- 3h_net0_udp_ipf_block_006_v6.sh DELETED --- --- 3h_net0_tcp_ipf_block_001_v6.sh DELETED --- --- 3h_net0_tcp_ipf_block_008_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_state_ipnat_map_003_v6.sh DELETED --- --- 3h_net0_tcp_ipf_block_009_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_state_ipnat_map_001_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_007_v6.sh DELETED --- --- 3h_net0_ping_ipf_pass_002_v6.sh DELETED --- --- 3h_net0_ping_ipf_block_000_v6.sh DELETED --- --- 3h_net0_tcp_ipf_decaps_001_v6.sh DELETED --- --- 3h_net0_ping_ipf_pass_001_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_state_ipnat_map_002_v6.sh DELETED --- --- 3h_net0_tcp_ipf_block_002_v6.sh DELETED --- --- 3h_net0_udp_ipf_block_004_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_state_ipnat_rdr_003_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_006_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_009_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_state_ipnat_map_002_v6.sh DELETED --- --- 3h_net0_ping_ipf_block_004_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_008_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_005_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_state_002_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_009_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_007_v6.sh DELETED --- --- 3h_net0_ping_ipf_block_003_v6.sh DELETED --- --- 3h_net0_udp_ipf_decaps_001_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_003_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_001_v6.sh DELETED --- --- 3h_net0_udp_ipf_block_007_v6.sh DELETED --- --- 3h_net0_ftp_ipf_pass_state_ipnat_map_proxy_001_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_state_ipnat_map_003_v6.sh DELETED --- --- 3h_net0_ftp_ipf_pass_state_ipnat_rdr_proxy_001_v6.sh DELETED --- --- 3h_net0_ping_ipf_block_002_v6.sh DELETED --- --- 3h_net0_ping_ipf_block_quick_002_v6.sh DELETED --- --- 3h_net0_tcp_ipf_block_006_v6.sh DELETED --- --- 3h_net0_ping_ipf_pass_003_v6.sh DELETED --- --- 3h_net0_udp_ipf_block_002_v6.sh DELETED --- --- 3h_net0_udp_ipf_block_005_v6.sh DELETED --- --- 3h_net0_udp_ipf_block_008_v6.sh DELETED --- --- 3h_net0_tcp_ipf_block_004_v6.sh DELETED --- --- 3h_net0_udp_ipf_pass_002_v6.sh DELETED --- --- 3h_net0_udp_ipf_block_009_v6.sh DELETED --- --- 3h_net0_tcp_ipf_block_007_v6.sh DELETED --- --- 3h_net0_tcp_ipf_pass_state_ipnat_rdr_001_v6.sh DELETED --- --- 3h_net0_ping_ipf_pass_quick_003_v6.sh DELETED --- |
Update of /cvsroot/ipfilter/ipf-test-suite/new-ipf-test/tests/2h/v6 In directory vz-cvs-4.sog:/tmp/cvs-serv32749/new-ipf-test/tests/2h/v6 Removed Files: 2h_net0_ping_ipf_block_001_v6.sh 2h_net0_ping_ipf_block_002_v6.sh 2h_net0_ping_ipf_block_003_v6.sh 2h_net0_ping_ipf_block_004_v6.sh 2h_net0_ping_ipf_block_005_v6.sh 2h_net0_ping_ipf_pass_001_v6.sh 2h_net0_ping_ipf_pass_002_v6.sh 2h_net0_ping_ipf_pass_003_v6.sh 2h_net0_ping_ipf_pass_004_v6.sh 2h_net0_ping_ipf_pass_005_v6.sh 2h_net0_ping_ipf_pass_state_002_v6.sh 2h_net0_ping_ipf_quick_block_001_v6.sh 2h_net0_ping_ipf_quick_block_002_v6.sh 2h_net0_ping_ipf_quick_block_003_v6.sh 2h_net0_ping_ipf_quick_pass_001_v6.sh 2h_net0_ping_ipf_quick_pass_002_v6.sh 2h_net0_ping_ipf_quick_pass_003_v6.sh 2h_net0_ping_ipf_state_pass_001_v6.sh 2h_net0_ping_ipnat_rewrite_001_v6.sh 2h_net0_tcp_ipf_block_001_v6.sh 2h_net0_tcp_ipf_block_002_v6.sh 2h_net0_tcp_ipf_block_003_v6.sh 2h_net0_tcp_ipf_block_004_v6.sh 2h_net0_tcp_ipf_block_005_v6.sh 2h_net0_tcp_ipf_block_006_v6.sh 2h_net0_tcp_ipf_block_007_v6.sh 2h_net0_tcp_ipf_block_008_v6.sh 2h_net0_tcp_ipf_block_009_v6.sh 2h_net0_tcp_ipf_pass_001_v6.sh 2h_net0_tcp_ipf_pass_002_v6.sh 2h_net0_tcp_ipf_pass_003_v6.sh 2h_net0_tcp_ipf_pass_004_v6.sh 2h_net0_tcp_ipf_pass_005_v6.sh 2h_net0_tcp_ipf_pass_006_v6.sh 2h_net0_tcp_ipf_pass_007_v6.sh 2h_net0_tcp_ipf_pass_008_v6.sh 2h_net0_tcp_ipf_pass_009_v6.sh 2h_net0_tcp_ipf_pass_state_001_v6.sh 2h_net0_tcp_ipf_pass_state_002_v6.sh 2h_net0_tcp_ipf_pass_state_ipnat_map_001_v6.sh 2h_net0_tcp_ipf_pass_state_ipnat_map_002_v6.sh 2h_net0_tcp_ipf_pass_state_ipnat_map_003_v6.sh 2h_net0_tcp_ipf_pass_state_ipnat_rdr_001_v6.sh 2h_net0_tcp_ipf_pass_state_ipnat_rdr_002_v6.sh 2h_net0_tcp_ipf_pass_state_ipnat_rdr_003_v6.sh 2h_net0_tcp_ipf_pass_state_ipnat_rewrite_001_v6.sh 2h_net0_tcp_ipnat_rewrite_001_v6.sh 2h_net0_udp_ipf_block_001_v6.sh 2h_net0_udp_ipf_block_002_v6.sh 2h_net0_udp_ipf_block_003_v6.sh 2h_net0_udp_ipf_block_004_v6.sh 2h_net0_udp_ipf_block_005_v6.sh 2h_net0_udp_ipf_block_006_v6.sh 2h_net0_udp_ipf_block_007_v6.sh 2h_net0_udp_ipf_block_008_v6.sh 2h_net0_udp_ipf_block_009_v6.sh 2h_net0_udp_ipf_pass_001_v6.sh 2h_net0_udp_ipf_pass_002_v6.sh 2h_net0_udp_ipf_pass_003_v6.sh 2h_net0_udp_ipf_pass_004_v6.sh 2h_net0_udp_ipf_pass_005_v6.sh 2h_net0_udp_ipf_pass_006_v6.sh 2h_net0_udp_ipf_pass_007_v6.sh 2h_net0_udp_ipf_pass_008_v6.sh 2h_net0_udp_ipf_pass_009_v6.sh 2h_net0_udp_ipf_pass_state_001_v6.sh 2h_net0_udp_ipf_pass_state_ipnat_map_001_v6.sh 2h_net0_udp_ipf_pass_state_ipnat_map_002_v6.sh 2h_net0_udp_ipf_pass_state_ipnat_map_003_v6.sh 2h_net0_udp_ipf_pass_state_ipnat_rdr_001_v6.sh 2h_net0_udp_ipf_pass_state_ipnat_rdr_002_v6.sh 2h_net0_udp_ipf_pass_state_ipnat_rdr_003_v6.sh 2h_net0_udp_ipf_pass_state_ipnat_rewrite_001_v6.sh 2h_net0_udp_ipnat_rewrite_001_v6.sh Log Message: Update to the proper 1.0 version --- 2h_net0_ping_ipf_block_002_v6.sh DELETED --- --- 2h_net0_udp_ipf_block_003_v6.sh DELETED --- --- 2h_net0_ping_ipf_quick_block_002_v6.sh DELETED --- --- 2h_net0_ping_ipf_pass_002_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_state_ipnat_map_001_v6.sh DELETED --- --- 2h_net0_udp_ipf_block_008_v6.sh DELETED --- --- 2h_net0_udp_ipf_block_005_v6.sh DELETED --- --- 2h_net0_udp_ipf_block_004_v6.sh DELETED --- --- 2h_net0_tcp_ipf_block_002_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_state_ipnat_map_003_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_state_ipnat_rdr_003_v6.sh DELETED --- --- 2h_net0_udp_ipf_block_009_v6.sh DELETED --- --- 2h_net0_tcp_ipnat_rewrite_001_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_005_v6.sh DELETED --- --- 2h_net0_udp_ipf_block_007_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_001_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_009_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_006_v6.sh DELETED --- --- 2h_net0_ping_ipf_block_005_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_state_001_v6.sh DELETED --- --- 2h_net0_ping_ipf_quick_block_001_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_state_ipnat_rewrite_001_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_002_v6.sh DELETED --- --- 2h_net0_udp_ipf_block_006_v6.sh DELETED --- --- 2h_net0_ping_ipf_quick_pass_001_v6.sh DELETED --- --- 2h_net0_udp_ipf_block_001_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_008_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_007_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_state_ipnat_rdr_002_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_004_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_003_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_006_v6.sh DELETED --- --- 2h_net0_ping_ipf_pass_004_v6.sh DELETED --- --- 2h_net0_ping_ipf_quick_pass_002_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_state_ipnat_rdr_001_v6.sh DELETED --- --- 2h_net0_ping_ipnat_rewrite_001_v6.sh DELETED --- --- 2h_net0_udp_ipnat_rewrite_001_v6.sh DELETED --- --- 2h_net0_tcp_ipf_block_003_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_state_ipnat_map_001_v6.sh DELETED --- --- 2h_net0_tcp_ipf_block_006_v6.sh DELETED --- --- 2h_net0_tcp_ipf_block_008_v6.sh DELETED --- --- 2h_net0_tcp_ipf_block_005_v6.sh DELETED --- --- 2h_net0_ping_ipf_pass_001_v6.sh DELETED --- --- 2h_net0_tcp_ipf_block_004_v6.sh DELETED --- --- 2h_net0_udp_ipf_block_002_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_state_ipnat_map_003_v6.sh DELETED --- --- 2h_net0_ping_ipf_quick_pass_003_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_state_ipnat_rdr_003_v6.sh DELETED --- --- 2h_net0_ping_ipf_pass_005_v6.sh DELETED --- --- 2h_net0_tcp_ipf_block_009_v6.sh DELETED --- --- 2h_net0_tcp_ipf_block_007_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_005_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_state_002_v6.sh DELETED --- --- 2h_net0_ping_ipf_block_004_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_state_ipnat_rdr_002_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_009_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_state_001_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_state_ipnat_rewrite_001_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_002_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_001_v6.sh DELETED --- --- 2h_net0_tcp_ipf_block_001_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_008_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_007_v6.sh DELETED --- --- 2h_net0_ping_ipf_state_pass_001_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_004_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_003_v6.sh DELETED --- --- 2h_net0_udp_ipf_pass_state_ipnat_map_002_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_state_ipnat_map_002_v6.sh DELETED --- --- 2h_net0_ping_ipf_quick_block_003_v6.sh DELETED --- --- 2h_net0_tcp_ipf_pass_state_ipnat_rdr_001_v6.sh DELETED --- --- 2h_net0_ping_ipf_block_001_v6.sh DELETED --- --- 2h_net0_ping_ipf_block_003_v6.sh DELETED --- --- 2h_net0_ping_ipf_pass_003_v6.sh DELETED --- --- 2h_net0_ping_ipf_pass_state_002_v6.sh DELETED --- |
|
From: Darren <dar...@us...> - 2012-07-20 09:09:15
|
Update of /cvsroot/ipfilter/ipf-test-suite/new-ipf-test/tests In directory vz-cvs-4.sog:/tmp/cvs-serv32749/new-ipf-test/tests Removed Files: ipf_test.conf ipnat_test.conf ippool_test.conf Log Message: Update to the proper 1.0 version --- ippool_test.conf DELETED --- --- ipnat_test.conf DELETED --- --- ipf_test.conf DELETED --- |
|
From: Darren <dar...@us...> - 2012-07-20 09:09:14
|
Update of /cvsroot/ipfilter/ipf-test-suite/new-ipf-test/dt In directory vz-cvs-4.sog:/tmp/cvs-serv32749/new-ipf-test/dt Removed Files: cksum.dt ftp.dt hotkernel.dt intf.dt ipf10.dt ipf8.d lookupiter.d nat2.dt nat6.dt pool.dt proxy.d sed.sh token.d v6in.dt Log Message: Update to the proper 1.0 version --- hotkernel.dt DELETED --- --- nat6.dt DELETED --- --- ftp.dt DELETED --- --- ipf10.dt DELETED --- --- v6in.dt DELETED --- --- intf.dt DELETED --- --- token.d DELETED --- --- nat2.dt DELETED --- --- sed.sh DELETED --- --- ipf8.d DELETED --- --- proxy.d DELETED --- --- cksum.dt DELETED --- --- lookupiter.d DELETED --- --- pool.dt DELETED --- |
|
From: Darren <dar...@us...> - 2012-07-20 08:48:35
|
Update of /cvsroot/ipfilter/ipfilter
In directory vz-cvs-4.sog:/tmp/cvs-serv32198
Modified Files:
Tag: v5-1-RELEASE
ip_compat.h
Log Message:
3546266 macro letters could be more consistent
Index: ip_compat.h
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_compat.h,v
retrieving revision 1.32.2.19
retrieving revision 1.32.2.20
diff -C2 -d -r1.32.2.19 -r1.32.2.20
*** ip_compat.h 29 May 2012 12:22:37 -0000 1.32.2.19
--- ip_compat.h 20 Jul 2012 08:48:33 -0000 1.32.2.20
***************
*** 354,359 ****
# endif
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(x) msgdsize(x)
! # define M_LEN(x) ((x)->b_wptr - (x)->b_rptr)
# define M_ADJ(m,x) adjmsg(m, x)
# define M_COPY(x) dupmsg((x))
--- 354,359 ----
# endif
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(m) msgdsize(m)
! # define M_LEN(m) ((m)->b_wptr - (m)->b_rptr)
# define M_ADJ(m,x) adjmsg(m, x)
# define M_COPY(x) dupmsg((x))
***************
*** 537,544 ****
# define KFREE(x) kmem_free((char *)(x), sizeof(*(x)))
# define KFREES(x,s) kmem_free((char *)(x), (s))
! # define MSGDSIZE(x) msgdsize(x)
# define M_ADJ(m,x) adjmsg(m, x)
! # define M_LEN(x) ((x)->b_wptr - (x)->b_rptr)
! # define M_COPY(x) copymsg((x))
# define M_DUP(m) dupmsg(m)
# define MTOD(m,t) ((t)((m)->b_rptr))
--- 537,544 ----
# define KFREE(x) kmem_free((char *)(x), sizeof(*(x)))
# define KFREES(x,s) kmem_free((char *)(x), (s))
! # define MSGDSIZE(m) msgdsize(m)
# define M_ADJ(m,x) adjmsg(m, x)
! # define M_LEN(m) ((m)->b_wptr - (m)->b_rptr)
! # define M_COPY(m) copymsg((m))
# define M_DUP(m) dupmsg(m)
# define MTOD(m,t) ((t)((m)->b_rptr))
***************
*** 685,692 ****
extern void m_copydata __P((struct mbuf *, int, int, caddr_t));
extern void m_copyback __P((struct mbuf *, int, int, caddr_t));
! # define MSGDSIZE(x) mbufchainlen(x)
# define M_ADJ(m,x) m_adj(m, x)
# define M_LEN(x) (x)->m_len
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
--- 685,692 ----
extern void m_copydata __P((struct mbuf *, int, int, caddr_t));
extern void m_copyback __P((struct mbuf *, int, int, caddr_t));
! # define MSGDSIZE(m) mbufchainlen(m)
# define M_ADJ(m,x) m_adj(m, x)
# define M_LEN(x) (x)->m_len
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
***************
*** 760,768 ****
# define KFREE(x) FREE((x), M_PFILT)
# define KFREES(x,s) FREE((x), M_PFILT)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
! # define M_DUP(x) m_copy((x), 0, M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
--- 760,768 ----
# define KFREE(x) FREE((x), M_PFILT)
# define KFREES(x,s) FREE((x), M_PFILT)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
! # define M_DUP(m) m_copy((m), 0, M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
***************
*** 881,886 ****
# define PROC_T struct proc
# endif
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
--- 881,886 ----
# define PROC_T struct proc
# endif
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
***************
*** 1090,1095 ****
# define GET_MINOR dev2unit
# endif
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
--- 1090,1095 ----
# define GET_MINOR dev2unit
# endif
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
***************
*** 1148,1155 ****
# define COPYOUT(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c))
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define IPF_PANIC(x,y) if (x) { printf y; panic("ipf_panic"); }
typedef struct mbuf mb_t;
--- 1148,1155 ----
# define COPYOUT(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c))
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define IPF_PANIC(x,y) if (x) { printf y; panic("ipf_panic"); }
typedef struct mbuf mb_t;
***************
*** 1184,1191 ****
# ifdef _KERNEL
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
typedef struct mbuf mb_t;
--- 1184,1191 ----
# ifdef _KERNEL
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
typedef struct mbuf mb_t;
***************
*** 1210,1217 ****
# include <sys/kmem_alloc.h>
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
# define GETIFP(n, v) ifunit(n, IFNAMSIZ)
--- 1210,1217 ----
# include <sys/kmem_alloc.h>
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
# define GETIFP(n, v) ifunit(n, IFNAMSIZ)
***************
*** 1514,1521 ****
# define KFREE(x) FREE((x), M_TEMP)
# define KFREES(x,s) FREE((x), M_TEMP)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define GETKTIME(x)
# define IPF_PANIC(x,y)
--- 1514,1521 ----
# define KFREE(x) FREE((x), M_TEMP)
# define KFREES(x,s) FREE((x), M_TEMP)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define GETKTIME(x)
# define IPF_PANIC(x,y)
***************
*** 1678,1689 ****
# undef M_MBCAST
# define M_MBCAST 0x04
! # define MSGDSIZE(x) msgdsize(x)
! # define M_LEN(x) (x)->mb_len
! # define M_ADJ(m,x) (x)->mb_len += x
! # define M_COPY(x) dupmbt(x)
! # define M_DUP(x) dupmbt(x)
# define GETKTIME(x) gettimeofday((struct timeval *)(x), NULL)
# define MTOD(m, t) ((t)(m)->mb_data)
! # define FREE_MB_T(x) freembt(x)
# define ALLOC_MB_T(m,l) (m) = allocmbt(l)
# define PREP_MB_T(f, m) do { \
--- 1678,1689 ----
# undef M_MBCAST
# define M_MBCAST 0x04
! # define MSGDSIZE(m) msgdsize(m)
! # define M_LEN(m) (m)->mb_len
! # define M_ADJ(m,x) (m)->mb_len += x
! # define M_COPY(m) dupmbt(m)
! # define M_DUP(m) dupmbt(m)
# define GETKTIME(x) gettimeofday((struct timeval *)(x), NULL)
# define MTOD(m, t) ((t)(m)->mb_data)
! # define FREE_MB_T(m) freembt(m)
# define ALLOC_MB_T(m,l) (m) = allocmbt(l)
# define PREP_MB_T(f, m) do { \
|
|
From: Darren <dar...@us...> - 2012-07-20 08:48:27
|
Update of /cvsroot/ipfilter/ipfilter
In directory vz-cvs-4.sog:/tmp/cvs-serv32180
Modified Files:
ip_compat.h
Log Message:
3546266 macro letters could be more consistent
Index: ip_compat.h
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_compat.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** ip_compat.h 9 Jun 2012 06:19:01 -0000 1.52
--- ip_compat.h 20 Jul 2012 08:48:24 -0000 1.53
***************
*** 335,340 ****
# endif
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(x) msgdsize(x)
! # define M_LEN(x) ((x)->b_wptr - (x)->b_rptr)
# define M_ADJ(m,x) adjmsg(m, x)
# define M_COPY(x) dupmsg((x))
--- 335,340 ----
# endif
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(m) msgdsize(m)
! # define M_LEN(m) ((m)->b_wptr - (m)->b_rptr)
# define M_ADJ(m,x) adjmsg(m, x)
# define M_COPY(x) dupmsg((x))
***************
*** 518,525 ****
# define KFREE(x) kmem_free((char *)(x), sizeof(*(x)))
# define KFREES(x,s) kmem_free((char *)(x), (s))
! # define MSGDSIZE(x) msgdsize(x)
# define M_ADJ(m,x) adjmsg(m, x)
! # define M_LEN(x) ((x)->b_wptr - (x)->b_rptr)
! # define M_COPY(x) copymsg((x))
# define M_DUP(m) dupmsg(m)
# define MTOD(m,t) ((t)((m)->b_rptr))
--- 518,525 ----
# define KFREE(x) kmem_free((char *)(x), sizeof(*(x)))
# define KFREES(x,s) kmem_free((char *)(x), (s))
! # define MSGDSIZE(m) msgdsize(m)
# define M_ADJ(m,x) adjmsg(m, x)
! # define M_LEN(m) ((m)->b_wptr - (m)->b_rptr)
! # define M_COPY(m) copymsg((m))
# define M_DUP(m) dupmsg(m)
# define MTOD(m,t) ((t)((m)->b_rptr))
***************
*** 666,673 ****
extern void m_copydata(struct mbuf *, int, int, caddr_t);
extern void m_copyback(struct mbuf *, int, int, caddr_t);
! # define MSGDSIZE(x) mbufchainlen(x)
# define M_ADJ(m,x) m_adj(m, x)
# define M_LEN(x) (x)->m_len
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
--- 666,673 ----
extern void m_copydata(struct mbuf *, int, int, caddr_t);
extern void m_copyback(struct mbuf *, int, int, caddr_t);
! # define MSGDSIZE(m) mbufchainlen(m)
# define M_ADJ(m,x) m_adj(m, x)
# define M_LEN(x) (x)->m_len
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
***************
*** 741,749 ****
# define KFREE(x) FREE((x), M_PFILT)
# define KFREES(x,s) FREE((x), M_PFILT)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
! # define M_DUP(x) m_dup((x), M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
--- 741,749 ----
# define KFREE(x) FREE((x), M_PFILT)
# define KFREES(x,s) FREE((x), M_PFILT)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
! # define M_DUP(m) m_dup((m), M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
***************
*** 864,869 ****
# define PROC_T struct proc
# endif
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
--- 864,869 ----
# define PROC_T struct proc
# endif
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
***************
*** 1085,1090 ****
# define GET_MINOR dev2unit
# endif
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
--- 1085,1090 ----
# define GET_MINOR dev2unit
# endif
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
***************
*** 1143,1150 ****
# define COPYOUT(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c))
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define IPF_PANIC(x,y) if (x) { printf y; panic("ipf_panic"); }
typedef struct mbuf mb_t;
--- 1143,1150 ----
# define COPYOUT(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c))
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define IPF_PANIC(x,y) if (x) { printf y; panic("ipf_panic"); }
typedef struct mbuf mb_t;
***************
*** 1179,1186 ****
# ifdef _KERNEL
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
typedef struct mbuf mb_t;
--- 1179,1186 ----
# ifdef _KERNEL
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
typedef struct mbuf mb_t;
***************
*** 1205,1212 ****
# include <sys/kmem_alloc.h>
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
# define GETIFP(n, v) ifunit(n, IFNAMSIZ)
--- 1205,1212 ----
# include <sys/kmem_alloc.h>
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
# define GETIFP(n, v) ifunit(n, IFNAMSIZ)
***************
*** 1509,1516 ****
# define KFREE(x) FREE((x), M_TEMP)
# define KFREES(x,s) FREE((x), M_TEMP)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define GETKTIME(x)
# define IPF_PANIC(x,y)
--- 1509,1516 ----
# define KFREE(x) FREE((x), M_TEMP)
# define KFREES(x,s) FREE((x), M_TEMP)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define GETKTIME(x)
# define IPF_PANIC(x,y)
***************
*** 1667,1675 ****
# undef m_data
# define m_data mb_data
! # define MSGDSIZE(x) msgdsize(x)
! # define M_LEN(x) (x)->mb_len
! # define M_ADJ(m,x) (x)->mb_len += x
! # define M_COPY(x) dupmbt(x)
! # define M_DUP(x) dupmbt(x)
# define GETKTIME(x) gettimeofday((struct timeval *)(x), NULL)
# define MTOD(m, t) ((t)(m)->mb_data)
--- 1667,1675 ----
# undef m_data
# define m_data mb_data
! # define MSGDSIZE(m) msgdsize(m)
! # define M_LEN(m) (m)->mb_len
! # define M_ADJ(m,x) (m)->mb_len += x
! # define M_COPY(m) dupmbt(m)
! # define M_DUP(m) dupmbt(m)
# define GETKTIME(x) gettimeofday((struct timeval *)(x), NULL)
# define MTOD(m, t) ((t)(m)->mb_data)
|
|
From: Darren <dar...@us...> - 2012-07-20 08:47:03
|
Update of /cvsroot/ipfilter/ipfilter/tools
In directory vz-cvs-4.sog:/tmp/cvs-serv32119/tools
Modified Files:
Tag: v5-1-RELEASE
ipfstat.c
Log Message:
3546265 not all of the state statistics are displayed
Index: ipfstat.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/tools/ipfstat.c,v
retrieving revision 1.18.2.11
retrieving revision 1.18.2.12
diff -C2 -d -r1.18.2.11 -r1.18.2.12
*** ipfstat.c 13 Jul 2012 06:15:08 -0000 1.18.2.11
--- ipfstat.c 20 Jul 2012 08:47:00 -0000 1.18.2.12
***************
*** 1167,1170 ****
--- 1167,1228 ----
}
+ PRINTF("%u\tactive state table entries\n",ipsp->iss_active);
+ PRINTF("%lu\tadd bad\n", ipsp->iss_add_bad);
+ PRINTF("%lu\tadd duplicate\n", ipsp->iss_add_dup);
+ PRINTF("%lu\tadd locked\n", ipsp->iss_add_locked);
+ PRINTF("%lu\tadd oow\n", ipsp->iss_add_oow);
+ PRINTF("%lu\tbucket full\n", ipsp->iss_bucket_full);
+ PRINTF("%lu\tcheck bad\n", ipsp->iss_check_bad);
+ PRINTF("%lu\tcheck miss\n", ipsp->iss_check_miss);
+ PRINTF("%lu\tcheck nattag\n", ipsp->iss_check_nattag);
+ PRINTF("%lu\tclone nomem\n", ipsp->iss_clone_nomem);
+ PRINTF("%lu\tcheck notag\n", ipsp->iss_check_notag);
+ PRINTF("%lu\tcheck success\n", ipsp->iss_hits);
+ PRINTF("%lu\tcloned\n", ipsp->iss_cloned);
+ PRINTF("%lu\texpired\n", ipsp->iss_expire);
+ PRINTF("%lu\tflush all\n", ipsp->iss_flush_all);
+ PRINTF("%lu\tflush closing\n", ipsp->iss_flush_closing);
+ PRINTF("%lu\tflush queue\n", ipsp->iss_flush_queue);
+ PRINTF("%lu\tflush state\n", ipsp->iss_flush_state);
+ PRINTF("%lu\tflush timeout\n", ipsp->iss_flush_timeout);
+ PRINTF("%u\thash buckets in use\n", ipsp->iss_inuse);
+ PRINTF("%lu\tICMP bad\n", ipsp->iss_icmp_bad);
+ PRINTF("%lu\tICMP banned\n", ipsp->iss_icmp_banned);
+ PRINTF("%lu\tICMP errors\n", ipsp->iss_icmp_icmperr);
+ PRINTF("%lu\tICMP head block\n", ipsp->iss_icmp_headblock);
+ PRINTF("%lu\tICMP hits\n", ipsp->iss_icmp_hits);
+ PRINTF("%lu\tICMP not query\n", ipsp->iss_icmp_notquery);
+ PRINTF("%lu\tICMP short\n", ipsp->iss_icmp_short);
+ PRINTF("%lu\tICMP too many\n", ipsp->iss_icmp_toomany);
+ PRINTF("%lu\tICMPv6 errors\n", ipsp->iss_icmp6_icmperr);
+ PRINTF("%lu\tICMPv6 miss\n", ipsp->iss_icmp6_miss);
+ PRINTF("%lu\tICMPv6 not info\n", ipsp->iss_icmp6_notinfo);
+ PRINTF("%lu\tICMPv6 not query\n", ipsp->iss_icmp6_notquery);
+ PRINTF("%lu\tlog fail\n", ipsp->iss_log_fail);
+ PRINTF("%lu\tlog ok\n", ipsp->iss_log_ok);
+ PRINTF("%lu\tlookup interface mismatch\n", ipsp->iss_lookup_badifp);
+ PRINTF("%lu\tlookup mask mismatch\n", ipsp->iss_miss_mask);
+ PRINTF("%lu\tlookup port mismatch\n", ipsp->iss_lookup_badport);
+ PRINTF("%lu\tlookup miss\n", ipsp->iss_lookup_miss);
+ PRINTF("%lu\tmaximum rule references\n", ipsp->iss_max_ref);
+ PRINTF("%lu\tmaximum hosts per rule\n", ipsp->iss_max_track);
+ PRINTF("%lu\tno memory\n", ipsp->iss_nomem);
+ PRINTF("%lu\tout of window\n", ipsp->iss_oow);
+ PRINTF("%lu\torphans\n", ipsp->iss_orphan);
+ PRINTF("%lu\tscan block\n", ipsp->iss_scan_block);
+ PRINTF("%lu\tstate table maximum reached\n", ipsp->iss_max);
+ PRINTF("%lu\tTCP closing\n", ipsp->iss_tcp_closing);
+ PRINTF("%lu\tTCP OOW\n", ipsp->iss_tcp_oow);
+ PRINTF("%lu\tTCP RST add\n", ipsp->iss_tcp_rstadd);
+ PRINTF("%lu\tTCP too small\n", ipsp->iss_tcp_toosmall);
+ PRINTF("%lu\tTCP bad options\n", ipsp->iss_tcp_badopt);
+ PRINTF("%lu\tTCP removed\n", ipsp->iss_fin);
+ PRINTF("%lu\tTCP FSM\n", ipsp->iss_tcp_fsm);
+ PRINTF("%lu\tTCP strict\n", ipsp->iss_tcp_strict);
+ PRINTF("%lu\tTCP wild\n", ipsp->iss_wild);
+ PRINTF("%lu\tMicrosoft Windows SACK\n", ipsp->iss_winsack);
+
+ PRINTF("State logging %sabled\n", state_logging ? "en" : "dis");
+
PRINTF("IP states added:\n");
for (i = 0; i < 256; i++) {
***************
*** 1173,1177 ****
proto = getprotobynumber(i);
! PRINTF("\t%lu", ipsp->iss_proto[i]);
if (proto != NULL)
PRINTF("\t%s\n", proto->p_name);
--- 1231,1235 ----
proto = getprotobynumber(i);
! PRINTF("%lu", ipsp->iss_proto[i]);
if (proto != NULL)
PRINTF("\t%s\n", proto->p_name);
***************
*** 1180,1198 ****
}
}
- PRINTF("\t%lu hits\n\t%lu misses\n", ipsp->iss_hits,
- ipsp->iss_lookup_miss);
- PRINTF("\t%lu bucket full\n", ipsp->iss_bucket_full);
- PRINTF("\t%lu maximum rule references\n", ipsp->iss_max_ref);
- PRINTF("\t%lu maximum hosts per rule\n", ipsp->iss_max_track);
- PRINTF("\t%lu maximum\n\t%lu no memory\n\t%u bkts in use\n",
- ipsp->iss_max, ipsp->iss_nomem, ipsp->iss_inuse);
- PRINTF("\t%u active\n\t%lu expired\n\t%lu closed\n",
- ipsp->iss_active, ipsp->iss_expire, ipsp->iss_fin);
-
- PRINTF("State logging %sabled\n",
- state_logging ? "en" : "dis");
PRINTF("\nState table bucket statistics:\n");
! PRINTF("\t%u in use\n", ipsp->iss_inuse);
minlen = ipsp->iss_max;
--- 1238,1244 ----
}
}
PRINTF("\nState table bucket statistics:\n");
! PRINTF("%u\tin use\n", ipsp->iss_inuse);
minlen = ipsp->iss_max;
***************
*** 1208,1217 ****
}
! PRINTF("\t%d hash efficiency\n",
totallen ? ipsp->iss_inuse * 100 / totallen : 0);
! PRINTF("\t%2.2f%% bucket usage\n\t%u minimal length\n",
((float)ipsp->iss_inuse / ipsp->iss_state_size) * 100.0,
minlen);
! PRINTF("\t%u maximal length\n\t%.3f average length\n",
maxlen,
ipsp->iss_inuse ? (float) totallen/ ipsp->iss_inuse :
--- 1254,1263 ----
}
! PRINTF("%d\thash efficiency\n",
totallen ? ipsp->iss_inuse * 100 / totallen : 0);
! PRINTF("%2.2f%%\tbucket usage\n%u\tminimal length\n",
((float)ipsp->iss_inuse / ipsp->iss_state_size) * 100.0,
minlen);
! PRINTF("%u\tmaximal length\n%.3f\taverage length\n",
maxlen,
ipsp->iss_inuse ? (float) totallen/ ipsp->iss_inuse :
***************
*** 1705,1715 ****
* print out the numeric statistics
*/
! PRINTF("IP fragment states:\n\t%lu new\n\t%lu expired\n\t%lu hits\n",
ifsp->ifs_new, ifsp->ifs_expire, ifsp->ifs_hits);
! PRINTF("\t%lu retrans\n\t%lu too short\n",
ifsp->ifs_retrans0, ifsp->ifs_short);
! PRINTF("\t%lu no memory\n\t%lu already exist\n",
ifsp->ifs_nomem, ifsp->ifs_exists);
! PRINTF("\t%lu inuse\n", ifsp->ifs_inuse);
PRINTF("\n");
--- 1751,1761 ----
* print out the numeric statistics
*/
! PRINTF("IP fragment states:\n%lu\tnew\n%lu\texpired\n%lu\thits\n",
ifsp->ifs_new, ifsp->ifs_expire, ifsp->ifs_hits);
! PRINTF("%lu\tretrans\n%lu\ttoo short\n",
ifsp->ifs_retrans0, ifsp->ifs_short);
! PRINTF("%lu\tno memory\n%lu\talready exist\n",
ifsp->ifs_nomem, ifsp->ifs_exists);
! PRINTF("%lu\tinuse\n", ifsp->ifs_inuse);
PRINTF("\n");
|
|
From: Darren <dar...@us...> - 2012-07-20 08:46:58
|
Update of /cvsroot/ipfilter/ipfilter/tools
In directory vz-cvs-4.sog:/tmp/cvs-serv32111/tools
Modified Files:
ipfstat.c
Log Message:
3546265 not all of the state statistics are displayed
Index: ipfstat.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/tools/ipfstat.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ipfstat.c 13 Jul 2012 06:14:41 -0000 1.29
--- ipfstat.c 20 Jul 2012 08:46:56 -0000 1.30
***************
*** 1037,1040 ****
--- 1037,1098 ----
}
+ PRINTF("%u\tactive state table entries\n",ipsp->iss_active);
+ PRINTF("%lu\tadd bad\n", ipsp->iss_add_bad);
+ PRINTF("%lu\tadd duplicate\n", ipsp->iss_add_dup);
+ PRINTF("%lu\tadd locked\n", ipsp->iss_add_locked);
+ PRINTF("%lu\tadd oow\n", ipsp->iss_add_oow);
+ PRINTF("%lu\tbucket full\n", ipsp->iss_bucket_full);
+ PRINTF("%lu\tcheck bad\n", ipsp->iss_check_bad);
+ PRINTF("%lu\tcheck miss\n", ipsp->iss_check_miss);
+ PRINTF("%lu\tcheck nattag\n", ipsp->iss_check_nattag);
+ PRINTF("%lu\tclone nomem\n", ipsp->iss_clone_nomem);
+ PRINTF("%lu\tcheck notag\n", ipsp->iss_check_notag);
+ PRINTF("%lu\tcheck success\n", ipsp->iss_hits);
+ PRINTF("%lu\tcloned\n", ipsp->iss_cloned);
+ PRINTF("%lu\texpired\n", ipsp->iss_expire);
+ PRINTF("%lu\tflush all\n", ipsp->iss_flush_all);
+ PRINTF("%lu\tflush closing\n", ipsp->iss_flush_closing);
+ PRINTF("%lu\tflush queue\n", ipsp->iss_flush_queue);
+ PRINTF("%lu\tflush state\n", ipsp->iss_flush_state);
+ PRINTF("%lu\tflush timeout\n", ipsp->iss_flush_timeout);
+ PRINTF("%u\thash buckets in use\n", ipsp->iss_inuse);
+ PRINTF("%lu\tICMP bad\n", ipsp->iss_icmp_bad);
+ PRINTF("%lu\tICMP banned\n", ipsp->iss_icmp_banned);
+ PRINTF("%lu\tICMP errors\n", ipsp->iss_icmp_icmperr);
+ PRINTF("%lu\tICMP head block\n", ipsp->iss_icmp_headblock);
+ PRINTF("%lu\tICMP hits\n", ipsp->iss_icmp_hits);
+ PRINTF("%lu\tICMP not query\n", ipsp->iss_icmp_notquery);
+ PRINTF("%lu\tICMP short\n", ipsp->iss_icmp_short);
+ PRINTF("%lu\tICMP too many\n", ipsp->iss_icmp_toomany);
+ PRINTF("%lu\tICMPv6 errors\n", ipsp->iss_icmp6_icmperr);
+ PRINTF("%lu\tICMPv6 miss\n", ipsp->iss_icmp6_miss);
+ PRINTF("%lu\tICMPv6 not info\n", ipsp->iss_icmp6_notinfo);
+ PRINTF("%lu\tICMPv6 not query\n", ipsp->iss_icmp6_notquery);
+ PRINTF("%lu\tlog fail\n", ipsp->iss_log_fail);
+ PRINTF("%lu\tlog ok\n", ipsp->iss_log_ok);
+ PRINTF("%lu\tlookup interface mismatch\n", ipsp->iss_lookup_badifp);
+ PRINTF("%lu\tlookup mask mismatch\n", ipsp->iss_miss_mask);
+ PRINTF("%lu\tlookup port mismatch\n", ipsp->iss_lookup_badport);
+ PRINTF("%lu\tlookup miss\n", ipsp->iss_lookup_miss);
+ PRINTF("%lu\tmaximum rule references\n", ipsp->iss_max_ref);
+ PRINTF("%lu\tmaximum hosts per rule\n", ipsp->iss_max_track);
+ PRINTF("%lu\tno memory\n", ipsp->iss_nomem);
+ PRINTF("%lu\tout of window\n", ipsp->iss_oow);
+ PRINTF("%lu\torphans\n", ipsp->iss_orphan);
+ PRINTF("%lu\tscan block\n", ipsp->iss_scan_block);
+ PRINTF("%lu\tstate table maximum reached\n", ipsp->iss_max);
+ PRINTF("%lu\tTCP closing\n", ipsp->iss_tcp_closing);
+ PRINTF("%lu\tTCP OOW\n", ipsp->iss_tcp_oow);
+ PRINTF("%lu\tTCP RST add\n", ipsp->iss_tcp_rstadd);
+ PRINTF("%lu\tTCP too small\n", ipsp->iss_tcp_toosmall);
+ PRINTF("%lu\tTCP bad options\n", ipsp->iss_tcp_badopt);
+ PRINTF("%lu\tTCP removed\n", ipsp->iss_fin);
+ PRINTF("%lu\tTCP FSM\n", ipsp->iss_tcp_fsm);
+ PRINTF("%lu\tTCP strict\n", ipsp->iss_tcp_strict);
+ PRINTF("%lu\tTCP wild\n", ipsp->iss_wild);
+ PRINTF("%lu\tMicrosoft Windows SACK\n", ipsp->iss_winsack);
+
+ PRINTF("State logging %sabled\n", state_logging ? "en" : "dis");
+
PRINTF("IP states added:\n");
for (i = 0; i < 256; i++) {
***************
*** 1043,1047 ****
proto = getprotobynumber(i);
! PRINTF("\t%lu", ipsp->iss_proto[i]);
if (proto != NULL)
PRINTF("\t%s\n", proto->p_name);
--- 1101,1105 ----
proto = getprotobynumber(i);
! PRINTF("%lu", ipsp->iss_proto[i]);
if (proto != NULL)
PRINTF("\t%s\n", proto->p_name);
***************
*** 1050,1068 ****
}
}
- PRINTF("\t%lu hits\n\t%lu misses\n", ipsp->iss_hits,
- ipsp->iss_lookup_miss);
- PRINTF("\t%lu bucket full\n", ipsp->iss_bucket_full);
- PRINTF("\t%lu maximum rule references\n", ipsp->iss_max_ref);
- PRINTF("\t%lu maximum hosts per rule\n", ipsp->iss_max_track);
- PRINTF("\t%lu maximum\n\t%lu no memory\n\t%u bkts in use\n",
- ipsp->iss_max, ipsp->iss_nomem, ipsp->iss_inuse);
- PRINTF("\t%u active\n\t%lu expired\n\t%lu closed\n",
- ipsp->iss_active, ipsp->iss_expire, ipsp->iss_fin);
-
- PRINTF("State logging %sabled\n",
- state_logging ? "en" : "dis");
PRINTF("\nState table bucket statistics:\n");
! PRINTF("\t%u in use\n", ipsp->iss_inuse);
minlen = ipsp->iss_max;
--- 1108,1114 ----
}
}
PRINTF("\nState table bucket statistics:\n");
! PRINTF("%u\tin use\n", ipsp->iss_inuse);
minlen = ipsp->iss_max;
***************
*** 1078,1087 ****
}
! PRINTF("\t%d hash efficiency\n",
totallen ? ipsp->iss_inuse * 100 / totallen : 0);
! PRINTF("\t%2.2f%% bucket usage\n\t%u minimal length\n",
((float)ipsp->iss_inuse / ipsp->iss_state_size) * 100.0,
minlen);
! PRINTF("\t%u maximal length\n\t%.3f average length\n",
maxlen,
ipsp->iss_inuse ? (float) totallen/ ipsp->iss_inuse :
--- 1124,1133 ----
}
! PRINTF("%d\thash efficiency\n",
totallen ? ipsp->iss_inuse * 100 / totallen : 0);
! PRINTF("%2.2f%%\tbucket usage\n%u\tminimal length\n",
((float)ipsp->iss_inuse / ipsp->iss_state_size) * 100.0,
minlen);
! PRINTF("%u\tmaximal length\n%.3f\taverage length\n",
maxlen,
ipsp->iss_inuse ? (float) totallen/ ipsp->iss_inuse :
***************
*** 1575,1585 ****
* print out the numeric statistics
*/
! PRINTF("IP fragment states:\n\t%lu new\n\t%lu expired\n\t%lu hits\n",
ifsp->ifs_new, ifsp->ifs_expire, ifsp->ifs_hits);
! PRINTF("\t%lu retrans\n\t%lu too short\n",
ifsp->ifs_retrans0, ifsp->ifs_short);
! PRINTF("\t%lu no memory\n\t%lu already exist\n",
ifsp->ifs_nomem, ifsp->ifs_exists);
! PRINTF("\t%lu inuse\n", ifsp->ifs_inuse);
PRINTF("\n");
--- 1621,1631 ----
* print out the numeric statistics
*/
! PRINTF("IP fragment states:\n%lu\tnew\n%lu\texpired\n%lu\thits\n",
ifsp->ifs_new, ifsp->ifs_expire, ifsp->ifs_hits);
! PRINTF("%lu\tretrans\n%lu\ttoo short\n",
ifsp->ifs_retrans0, ifsp->ifs_short);
! PRINTF("%lu\tno memory\n%lu\talready exist\n",
ifsp->ifs_nomem, ifsp->ifs_exists);
! PRINTF("%lu\tinuse\n", ifsp->ifs_inuse);
PRINTF("\n");
|
|
From: Darren <dar...@us...> - 2012-07-20 08:44:19
|
Update of /cvsroot/ipfilter/ipfilter/BSD
In directory vz-cvs-4.sog:/tmp/cvs-serv32039/BSD
Modified Files:
Tag: v5-1-RELEASE
kupgrade upgrade
Log Message:
3546261 scripts for updating BSD environment out of date
Index: kupgrade
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/BSD/kupgrade,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** kupgrade 26 Feb 2010 09:34:18 -0000 1.8.2.1
--- kupgrade 20 Jul 2012 08:44:17 -0000 1.8.2.2
***************
*** 57,64 ****
done
echo -n " net/radix_ipf.h"
! cp net/radix_ipf.h $ipfdir/../net
! chmod 644 $ipfdir/../net/radix_ipf.h
! echo -n " radix.c -> $ipfdir/radix_ipf.c"
! cp radix.c $ipfdir/radix_ipf.c
chmod 644 $ipfdir/radix_ipf.c
--- 57,64 ----
done
echo -n " net/radix_ipf.h"
! cp radix_ipf.h $ipfdir
! chmod 644 $ipfdir/radix_ipf.h
! echo -n " radix_ipf.c -> $ipfdir/radix_ipf.c"
! cp radix_ipf.c $ipfdir/radix_ipf.c
chmod 644 $ipfdir/radix_ipf.c
***************
*** 98,102 ****
for i in ip_nat6.c ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c \
! ip_fil_compat.c; do
echo -n " $i"
cp $i $ipfdir
--- 98,102 ----
for i in ip_nat6.c ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c \
! ip_fil_compat.c ipf_rb.h; do
echo -n " $i"
cp $i $ipfdir
***************
*** 114,118 ****
fi
done
! for j in ipl.h; do
if [ -f "$j" ] ; then
echo -n " $j"
--- 114,118 ----
fi
done
! for j in ipl.h ipf_rb.h; do
if [ -f "$j" ] ; then
echo -n " $j"
Index: upgrade
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/BSD/upgrade,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** upgrade 29 May 2012 13:35:35 -0000 1.1.2.2
--- upgrade 20 Jul 2012 08:44:17 -0000 1.1.2.3
***************
*** 23,31 ****
for i in ipf ipfstat ipmon ipnat ippool; do
! if [ ! -f /sbin/${i}.dist ] ; then
mv /sbin/${i} /sbin/${i}.dist
cp -p /sbin/${i}.dist /sbin/${i}
fi
- cp ${objdir}/${i} /sbin/
done
if [ -f /boot/kernel/ipl.ko ] ; then
--- 23,36 ----
for i in ipf ipfstat ipmon ipnat ippool; do
! if [ ! -f /sbin/${i}.dist -a -f /sbin/${i} ] ; then
mv /sbin/${i} /sbin/${i}.dist
cp -p /sbin/${i}.dist /sbin/${i}
+ cp ${objdir}/${i} /sbin/
+ fi
+ if [ ! -f /usr/sbin/${i}.dist -a -f /usr/sbin/${i} ] ; then
+ mv /usr/sbin/${i} /usr/sbin/${i}.dist
+ cp -p /usr/sbin/${i}.dist /usr/sbin/${i}
+ cp ${objdir}/${i} /usr/sbin/
fi
done
if [ -f /boot/kernel/ipl.ko ] ; then
|
|
From: Darren <dar...@us...> - 2012-07-20 08:44:10
|
Update of /cvsroot/ipfilter/ipfilter/BSD
In directory vz-cvs-4.sog:/tmp/cvs-serv32028/BSD
Modified Files:
kupgrade upgrade
Log Message:
3546261 scripts for updating BSD environment out of date
Index: kupgrade
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/BSD/kupgrade,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** kupgrade 26 Feb 2010 09:34:32 -0000 1.9
--- kupgrade 20 Jul 2012 08:44:08 -0000 1.10
***************
*** 57,64 ****
done
echo -n " net/radix_ipf.h"
! cp net/radix_ipf.h $ipfdir/../net
! chmod 644 $ipfdir/../net/radix_ipf.h
! echo -n " radix.c -> $ipfdir/radix_ipf.c"
! cp radix.c $ipfdir/radix_ipf.c
chmod 644 $ipfdir/radix_ipf.c
--- 57,64 ----
done
echo -n " net/radix_ipf.h"
! cp radix_ipf.h $ipfdir
! chmod 644 $ipfdir/radix_ipf.h
! echo -n " radix_ipf.c -> $ipfdir/radix_ipf.c"
! cp radix_ipf.c $ipfdir/radix_ipf.c
chmod 644 $ipfdir/radix_ipf.c
***************
*** 98,102 ****
for i in ip_nat6.c ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c \
! ip_fil_compat.c; do
echo -n " $i"
cp $i $ipfdir
--- 98,102 ----
for i in ip_nat6.c ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c \
! ip_fil_compat.c ipf_rb.h; do
echo -n " $i"
cp $i $ipfdir
***************
*** 114,118 ****
fi
done
! for j in ipl.h; do
if [ -f "$j" ] ; then
echo -n " $j"
--- 114,118 ----
fi
done
! for j in ipl.h ipf_rb.h; do
if [ -f "$j" ] ; then
echo -n " $j"
Index: upgrade
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/BSD/upgrade,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upgrade 29 May 2012 13:35:25 -0000 1.1
--- upgrade 20 Jul 2012 08:44:08 -0000 1.2
***************
*** 22,31 ****
set -e
for i in ipf ipfstat ipmon ipnat ippool; do
! if [ ! -f /sbin/${i}.dist ] ; then
mv /sbin/${i} /sbin/${i}.dist
cp -p /sbin/${i}.dist /sbin/${i}
fi
- cp ${objdir}/${i} /sbin/
done
if [ -f /boot/kernel/ipl.ko ] ; then
--- 22,51 ----
set -e
+ if [ "$1" = "backout" ] ; then
+ for i in ipf ipfstat ipmon ipnat ippool; do
+ if [ -f /sbin/${i}.dist ] ; then
+ mv /sbin/${i}.dist /sbin/${i}
+ else
+ mv /usr/sbin/${i}.dist /usr/sbin/${i}
+ fi
+ done
+ if [ -f /boot/kernel/ipl.ko ] ; then
+ mv /boot/kernel/ipl.ko.dist /boot/kernel/ipl.ko
+ mv /boot/kernel/ipl.ko.symbols.dist /boot/kernel/ipl.ko.symbols
+ fi
+ exit 0
+ fi
+
for i in ipf ipfstat ipmon ipnat ippool; do
! if [ ! -f /sbin/${i}.dist -a -f /sbin/${i} ] ; then
mv /sbin/${i} /sbin/${i}.dist
cp -p /sbin/${i}.dist /sbin/${i}
+ cp ${objdir}/${i} /sbin/
+ fi
+ if [ ! -f /usr/sbin/${i}.dist -a -f /usr/sbin/${i} ] ; then
+ mv /usr/sbin/${i} /usr/sbin/${i}.dist
+ cp -p /usr/sbin/${i}.dist /usr/sbin/${i}
+ cp ${objdir}/${i} /usr/sbin/
fi
done
if [ -f /boot/kernel/ipl.ko ] ; then
|
|
From: Darren <dar...@us...> - 2012-07-20 08:41:51
|
Update of /cvsroot/ipfilter/ipfilter/lib
In directory vz-cvs-4.sog:/tmp/cvs-serv31922/lib
Modified Files:
Tag: v5-1-RELEASE
ipft_hx.c printbuf.c
Log Message:
3546260 compiler warnings about non-integer array subscript
Index: printbuf.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/lib/printbuf.c,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** printbuf.c 16 Feb 2012 02:22:30 -0000 1.6.2.2
--- printbuf.c 20 Jul 2012 08:41:48 -0000 1.6.2.3
***************
*** 17,21 ****
int len, zend;
{
! char *s, c;
int i;
--- 17,22 ----
int len, zend;
{
! char *s;
! int c;
int i;
Index: ipft_hx.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/lib/ipft_hx.c,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -C2 -d -r1.7.2.3 -r1.7.2.4
*** ipft_hx.c 16 Feb 2012 02:22:30 -0000 1.7.2.3
--- ipft_hx.c 20 Jul 2012 08:41:48 -0000 1.7.2.4
***************
*** 133,141 ****
if ((opts & OPT_DEBUG) != 0) {
if (opts & OPT_ASCII) {
if (t < (char *)ip)
putchar('\t');
while (t < (char *)ip) {
! if (isprint(*t) && isascii(*t))
! putchar(*t);
else
putchar('.');
--- 133,142 ----
if ((opts & OPT_DEBUG) != 0) {
if (opts & OPT_ASCII) {
+ int c = *t;
if (t < (char *)ip)
putchar('\t');
while (t < (char *)ip) {
! if (isprint(c) && isascii(c))
! putchar(c);
else
putchar('.');
|
|
From: Darren <dar...@us...> - 2012-07-20 08:41:29
|
Update of /cvsroot/ipfilter/ipfilter/lib
In directory vz-cvs-4.sog:/tmp/cvs-serv31901/lib
Modified Files:
ipft_hx.c printbuf.c
Log Message:
3546260 compiler warnings about non-integer array subscript
Index: printbuf.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/lib/printbuf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** printbuf.c 16 Feb 2012 02:22:51 -0000 1.7
--- printbuf.c 20 Jul 2012 08:41:27 -0000 1.8
***************
*** 17,21 ****
int len, zend;
{
! char *s, c;
int i;
--- 17,22 ----
int len, zend;
{
! char *s;
! int c;
int i;
Index: ipft_hx.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/lib/ipft_hx.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ipft_hx.c 16 Feb 2012 02:22:51 -0000 1.11
--- ipft_hx.c 20 Jul 2012 08:41:26 -0000 1.12
***************
*** 138,146 ****
if ((opts & OPT_DEBUG) != 0) {
if (opts & OPT_ASCII) {
if (t < (char *)ip)
putchar('\t');
while (t < (char *)ip) {
! if (isprint(*t) && isascii(*t))
! putchar(*t);
else
putchar('.');
--- 138,147 ----
if ((opts & OPT_DEBUG) != 0) {
if (opts & OPT_ASCII) {
+ int c = *t;
if (t < (char *)ip)
putchar('\t');
while (t < (char *)ip) {
! if (isprint(c) && isascii(c))
! putchar(c);
else
putchar('.');
|
|
From: Darren <dar...@us...> - 2012-07-20 08:40:21
|
Update of /cvsroot/ipfilter/ipfilter
In directory vz-cvs-4.sog:/tmp/cvs-serv31855
Modified Files:
Tag: v5-1-RELEASE
ip_dstlist.c
Log Message:
3546259 asserting numdereflists == 0 is not correct
Index: ip_dstlist.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_dstlist.c,v
retrieving revision 1.13.2.11
retrieving revision 1.13.2.12
diff -C2 -d -r1.13.2.11 -r1.13.2.12
*** ip_dstlist.c 13 Jul 2012 12:25:34 -0000 1.13.2.11
--- ip_dstlist.c 20 Jul 2012 08:40:19 -0000 1.13.2.12
***************
*** 231,235 ****
}
- ASSERT(softd->stats.ipls_numdereflists == 0);
ASSERT(softd->stats.ipls_numderefnodes == 0);
}
--- 231,234 ----
|
|
From: Darren <dar...@us...> - 2012-07-20 08:40:02
|
Update of /cvsroot/ipfilter/ipfilter In directory vz-cvs-4.sog:/tmp/cvs-serv31841 Modified Files: ip_dstlist.c Log Message: 3546259 asserting numdereflists == 0 is not correct Index: ip_dstlist.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_dstlist.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ip_dstlist.c 13 Jul 2012 11:56:51 -0000 1.22 --- ip_dstlist.c 20 Jul 2012 08:39:58 -0000 1.23 *************** *** 225,229 **** } - ASSERT(softd->stats.ipls_numdereflists == 0); ASSERT(softd->stats.ipls_numderefnodes == 0); } --- 225,228 ---- |
|
From: Darren <dar...@us...> - 2012-07-20 08:36:52
|
Update of /cvsroot/ipfilter/ipfilter
In directory vz-cvs-4.sog:/tmp/cvs-serv31764
Modified Files:
Tag: v5-1-RELEASE
fil.c
Log Message:
3546258 expression matching does not see IPF_EXP_END
Index: fil.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v
retrieving revision 1.68.2.56
retrieving revision 1.68.2.57
diff -C2 -d -r1.68.2.56 -r1.68.2.57
*** fil.c 13 Jul 2012 12:25:34 -0000 1.68.2.56
--- fil.c 20 Jul 2012 08:36:49 -0000 1.68.2.57
***************
*** 8741,8744 ****
--- 8741,8746 ----
for (; n > 0; x += 3 + x[3], rv = 0) {
e = (ipfexp_t *)x;
+ if (e->ipfe_cmd == IPF_EXP_END)
+ break;
n -= e->ipfe_size;
|
|
From: Darren <dar...@us...> - 2012-07-20 08:36:23
|
Update of /cvsroot/ipfilter/ipfilter
In directory vz-cvs-4.sog:/tmp/cvs-serv31750
Modified Files:
fil.c
Log Message:
3546258 expression matching does not see IPF_EXP_END
Index: fil.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** fil.c 13 Jul 2012 11:56:51 -0000 1.124
--- fil.c 20 Jul 2012 08:36:21 -0000 1.125
***************
*** 8826,8829 ****
--- 8826,8831 ----
for (; n > 0; x += 3 + x[3], rv = 0) {
e = (ipfexp_t *)x;
+ if (e->ipfe_cmd == IPF_EXP_END)
+ break;
n -= e->ipfe_size;
|
|
From: Darren <dar...@us...> - 2012-07-20 08:29:46
|
Update of /cvsroot/ipfilter/ipfilter/tools
In directory vz-cvs-4.sog:/tmp/cvs-serv30514/tools
Modified Files:
Tag: v5-1-RELEASE
ipnat.c
Log Message:
3544317 ipnat/ipfstat are not using ipfexp_t
Index: ipnat.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/tools/ipnat.c,v
retrieving revision 1.10.2.11
retrieving revision 1.10.2.12
diff -C2 -d -r1.10.2.11 -r1.10.2.12
*** ipnat.c 13 Jul 2012 12:25:35 -0000 1.10.2.11
--- ipnat.c 20 Jul 2012 08:29:44 -0000 1.10.2.12
***************
*** 704,760 ****
int *array;
{
! int i, n, *x, e, p;
! e = 0;
n = array[0];
x = array + 1;
! for (; n > 0; x += 3 + x[3]) {
! if (x[0] == IPF_EXP_END)
break;
! e = 0;
!
! n -= x[3] + 3;
! p = x[0] >> 16;
! if (p != 0 && p != nat->nat_pr[1])
break;
! switch (x[0])
{
case IPF_EXP_IP_PR :
! for (i = 0; !e && i < x[3]; i++) {
! e |= (nat->nat_pr[1] == x[i + 3]);
}
break;
case IPF_EXP_IP_SRCADDR :
! for (i = 0; !e && i < x[3]; i++) {
! e |= ((nat->nat_nsrcaddr & x[i + 4]) ==
! x[i + 3]);
}
break;
case IPF_EXP_IP_DSTADDR :
! for (i = 0; !e && i < x[3]; i++) {
! e |= ((nat->nat_ndstaddr & x[i + 4]) ==
! x[i + 3]);
}
break;
case IPF_EXP_IP_ADDR :
! for (i = 0; !e && i < x[3]; i++) {
! e |= ((nat->nat_nsrcaddr & x[i + 4]) ==
! x[i + 3]) ||
! ((nat->nat_ndstaddr & x[i + 4]) ==
! x[i + 3]);
}
break;
case IPF_EXP_UDP_PORT :
case IPF_EXP_TCP_PORT :
! for (i = 0; !e && i < x[3]; i++) {
! e |= (nat->nat_nsport == x[i + 3]) ||
! (nat->nat_ndport == x[i + 3]);
}
break;
--- 704,831 ----
int *array;
{
! int i, n, *x, rv, p;
! ipfexp_t *e;
! rv = 0;
n = array[0];
x = array + 1;
! for (; n > 0; x += 3 + x[3], rv = 0) {
! e = (ipfexp_t *)x;
! if (e->ipfe_cmd == IPF_EXP_END)
break;
! n -= e->ipfe_size;
! p = e->ipfe_cmd >> 16;
! if ((p != 0) && (p != nat->nat_pr[1]))
break;
! switch (e->ipfe_cmd)
{
case IPF_EXP_IP_PR :
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= (nat->nat_pr[1] == e->ipfe_arg0[i]);
}
break;
case IPF_EXP_IP_SRCADDR :
! if (nat->nat_v[0] != 4)
! break;
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= ((nat->nat_osrcaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]) ||
! ((nat->nat_nsrcaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]);
}
break;
case IPF_EXP_IP_DSTADDR :
! if (nat->nat_v[0] != 4)
! break;
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= ((nat->nat_odstaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]) ||
! ((nat->nat_ndstaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]);
}
break;
case IPF_EXP_IP_ADDR :
! if (nat->nat_v[0] != 4)
! break;
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= ((nat->nat_osrcaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]) ||
! ((nat->nat_nsrcaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]) ||
! ((nat->nat_odstaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]) ||
! ((nat->nat_ndstaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]);
}
break;
+ #ifdef USE_INET6
+ case IPF_EXP_IP6_SRCADDR :
+ if (nat->nat_v[0] != 6)
+ break;
+ for (i = 0; !rv && i < e->ipfe_narg; i++) {
+ rv |= IP6_MASKEQ(&nat->nat_osrc6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]) ||
+ IP6_MASKEQ(&nat->nat_nsrc6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]);
+ }
+ break;
+
+ case IPF_EXP_IP6_DSTADDR :
+ if (nat->nat_v[0] != 6)
+ break;
+ for (i = 0; !rv && i < e->ipfe_narg; i++) {
+ rv |= IP6_MASKEQ(&nat->nat_odst6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]) ||
+ IP6_MASKEQ(&nat->nat_ndst6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]);
+ }
+ break;
+
+ case IPF_EXP_IP6_ADDR :
+ if (nat->nat_v[0] != 6)
+ break;
+ for (i = 0; !rv && i < e->ipfe_narg; i++) {
+ rv |= IP6_MASKEQ(&nat->nat_osrc6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]) ||
+ IP6_MASKEQ(&nat->nat_nsrc6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]) ||
+ IP6_MASKEQ(&nat->nat_odst6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]) ||
+ IP6_MASKEQ(&nat->nat_ndst6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]);
+ }
+ break;
+ #endif
+
case IPF_EXP_UDP_PORT :
case IPF_EXP_TCP_PORT :
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= (nat->nat_osport == e->ipfe_arg0[i]) ||
! (nat->nat_nsport == e->ipfe_arg0[i]) ||
! (nat->nat_odport == e->ipfe_arg0[i]) ||
! (nat->nat_ndport == e->ipfe_arg0[i]);
}
break;
***************
*** 762,767 ****
case IPF_EXP_UDP_SPORT :
case IPF_EXP_TCP_SPORT :
! for (i = 0; !e && i < x[3]; i++) {
! e |= (nat->nat_nsport == x[i + 3]);
}
break;
--- 833,839 ----
case IPF_EXP_UDP_SPORT :
case IPF_EXP_TCP_SPORT :
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= (nat->nat_osport == e->ipfe_arg0[i]) ||
! (nat->nat_nsport == e->ipfe_arg0[i]);
}
break;
***************
*** 769,783 ****
case IPF_EXP_UDP_DPORT :
case IPF_EXP_TCP_DPORT :
! for (i = 0; !e && i < x[3]; i++) {
! e |= (nat->nat_ndport == x[i + 3]);
}
break;
}
! e ^= x[2];
! if (!e)
break;
}
! return e;
}
--- 841,856 ----
case IPF_EXP_UDP_DPORT :
case IPF_EXP_TCP_DPORT :
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= (nat->nat_odport == e->ipfe_arg0[i]) ||
! (nat->nat_ndport == e->ipfe_arg0[i]);
}
break;
}
! rv ^= e->ipfe_not;
! if (rv == 0)
break;
}
! return rv;
}
|
|
From: Darren <dar...@us...> - 2012-07-20 08:29:37
|
Update of /cvsroot/ipfilter/ipfilter/tools
In directory vz-cvs-4.sog:/tmp/cvs-serv30501/tools
Modified Files:
ipnat.c
Log Message:
3544317 ipnat/ipfstat are not using ipfexp_t
Index: ipnat.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/tools/ipnat.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ipnat.c 13 Jul 2012 11:56:51 -0000 1.22
--- ipnat.c 20 Jul 2012 08:29:35 -0000 1.23
***************
*** 683,739 ****
int *array;
{
! int i, n, *x, e, p;
! e = 0;
n = array[0];
x = array + 1;
! for (; n > 0; x += 3 + x[3]) {
! if (x[0] == IPF_EXP_END)
break;
! e = 0;
!
! n -= x[3] + 3;
! p = x[0] >> 16;
! if (p != 0 && p != nat->nat_pr[1])
break;
! switch (x[0])
{
case IPF_EXP_IP_PR :
! for (i = 0; !e && i < x[3]; i++) {
! e |= (nat->nat_pr[1] == x[i + 3]);
}
break;
case IPF_EXP_IP_SRCADDR :
! for (i = 0; !e && i < x[3]; i++) {
! e |= ((nat->nat_nsrcaddr & x[i + 4]) ==
! x[i + 3]);
}
break;
case IPF_EXP_IP_DSTADDR :
! for (i = 0; !e && i < x[3]; i++) {
! e |= ((nat->nat_ndstaddr & x[i + 4]) ==
! x[i + 3]);
}
break;
case IPF_EXP_IP_ADDR :
! for (i = 0; !e && i < x[3]; i++) {
! e |= ((nat->nat_nsrcaddr & x[i + 4]) ==
! x[i + 3]) ||
! ((nat->nat_ndstaddr & x[i + 4]) ==
! x[i + 3]);
}
break;
case IPF_EXP_UDP_PORT :
case IPF_EXP_TCP_PORT :
! for (i = 0; !e && i < x[3]; i++) {
! e |= (nat->nat_nsport == x[i + 3]) ||
! (nat->nat_ndport == x[i + 3]);
}
break;
--- 683,810 ----
int *array;
{
! int i, n, *x, rv, p;
! ipfexp_t *e;
! rv = 0;
n = array[0];
x = array + 1;
! for (; n > 0; x += 3 + x[3], rv = 0) {
! e = (ipfexp_t *)x;
! if (e->ipfe_cmd == IPF_EXP_END)
break;
! n -= e->ipfe_size;
! p = e->ipfe_cmd >> 16;
! if ((p != 0) && (p != nat->nat_pr[1]))
break;
! switch (e->ipfe_cmd)
{
case IPF_EXP_IP_PR :
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= (nat->nat_pr[1] == e->ipfe_arg0[i]);
}
break;
case IPF_EXP_IP_SRCADDR :
! if (nat->nat_v[0] != 4)
! break;
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= ((nat->nat_osrcaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]) ||
! ((nat->nat_nsrcaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]);
}
break;
case IPF_EXP_IP_DSTADDR :
! if (nat->nat_v[0] != 4)
! break;
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= ((nat->nat_odstaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]) ||
! ((nat->nat_ndstaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]);
}
break;
case IPF_EXP_IP_ADDR :
! if (nat->nat_v[0] != 4)
! break;
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= ((nat->nat_osrcaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]) ||
! ((nat->nat_nsrcaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]) ||
! ((nat->nat_odstaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]) ||
! ((nat->nat_ndstaddr &
! e->ipfe_arg0[i * 2 + 1]) ==
! e->ipfe_arg0[i * 2]);
}
break;
+ #ifdef USE_INET6
+ case IPF_EXP_IP6_SRCADDR :
+ if (nat->nat_v[0] != 6)
+ break;
+ for (i = 0; !rv && i < e->ipfe_narg; i++) {
+ rv |= IP6_MASKEQ(&nat->nat_osrc6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]) ||
+ IP6_MASKEQ(&nat->nat_nsrc6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]);
+ }
+ break;
+
+ case IPF_EXP_IP6_DSTADDR :
+ if (nat->nat_v[0] != 6)
+ break;
+ for (i = 0; !rv && i < e->ipfe_narg; i++) {
+ rv |= IP6_MASKEQ(&nat->nat_odst6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]) ||
+ IP6_MASKEQ(&nat->nat_ndst6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]);
+ }
+ break;
+
+ case IPF_EXP_IP6_ADDR :
+ if (nat->nat_v[0] != 6)
+ break;
+ for (i = 0; !rv && i < e->ipfe_narg; i++) {
+ rv |= IP6_MASKEQ(&nat->nat_osrc6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]) ||
+ IP6_MASKEQ(&nat->nat_nsrc6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]) ||
+ IP6_MASKEQ(&nat->nat_odst6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]) ||
+ IP6_MASKEQ(&nat->nat_ndst6,
+ &e->ipfe_arg0[i * 8 + 4],
+ &e->ipfe_arg0[i * 8]);
+ }
+ break;
+ #endif
+
case IPF_EXP_UDP_PORT :
case IPF_EXP_TCP_PORT :
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= (nat->nat_osport == e->ipfe_arg0[i]) ||
! (nat->nat_nsport == e->ipfe_arg0[i]) ||
! (nat->nat_odport == e->ipfe_arg0[i]) ||
! (nat->nat_ndport == e->ipfe_arg0[i]);
}
break;
***************
*** 741,746 ****
case IPF_EXP_UDP_SPORT :
case IPF_EXP_TCP_SPORT :
! for (i = 0; !e && i < x[3]; i++) {
! e |= (nat->nat_nsport == x[i + 3]);
}
break;
--- 812,818 ----
case IPF_EXP_UDP_SPORT :
case IPF_EXP_TCP_SPORT :
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= (nat->nat_osport == e->ipfe_arg0[i]) ||
! (nat->nat_nsport == e->ipfe_arg0[i]);
}
break;
***************
*** 748,762 ****
case IPF_EXP_UDP_DPORT :
case IPF_EXP_TCP_DPORT :
! for (i = 0; !e && i < x[3]; i++) {
! e |= (nat->nat_ndport == x[i + 3]);
}
break;
}
! e ^= x[2];
! if (!e)
break;
}
! return e;
}
--- 820,835 ----
case IPF_EXP_UDP_DPORT :
case IPF_EXP_TCP_DPORT :
! for (i = 0; !rv && i < e->ipfe_narg; i++) {
! rv |= (nat->nat_odport == e->ipfe_arg0[i]) ||
! (nat->nat_ndport == e->ipfe_arg0[i]);
}
break;
}
! rv ^= e->ipfe_not;
! if (rv == 0)
break;
}
! return rv;
}
|
|
From: Darren <dar...@us...> - 2012-07-20 08:28:15
|
Update of /cvsroot/ipfilter/ipfilter/test/expected
In directory vz-cvs-4.sog:/tmp/cvs-serv30457/test/expected
Modified Files:
Tag: v5-1-RELEASE
i12 in102
Log Message:
3542981 exclamation mark cuases trouble with pools
Index: in102
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/in102,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** in102 1 Mar 2009 12:48:32 -0000 1.1
--- in102 20 Jul 2012 08:28:13 -0000 1.1.2.1
***************
*** 2,5 ****
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 0/0 -> src 0/0 dst dstlist/bee;
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 0/0 dst dstlist/cat;
! rewrite in on bge0 proto tcp from pool/a(!) to 2.2.2.2/32 -> src 0/0 dst dstlist/bat;
! rewrite in on bge0 proto tcp from pool/a(!) to pool/1(!) -> src 0/0 dst dstlist/ant;
--- 2,5 ----
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 0/0 -> src 0/0 dst dstlist/bee;
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 0/0 dst dstlist/cat;
! rewrite in on bge0 proto tcp from pool/a to 2.2.2.2/32 -> src 0/0 dst dstlist/bat;
! rewrite in on bge0 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant;
Index: i12
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/i12,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** i12 6 Jul 2012 14:35:37 -0000 1.3.2.1
--- i12 20 Jul 2012 08:28:13 -0000 1.3.2.2
***************
*** 31,39 ****
pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 9
pass in inet from 10.10.10.10/32 to 11.11.11.11/32
! pass in from pool/101(!) to hash/202(!)
! pass in from hash/303(!) to pool/404(!)
table role=ipf type=tree number=
{ ! 2.2.0.0/16; 2.2.2.2/32; ! 1.1.1.1/32; };
table role=ipf type=tree number=
{ 1.1.0.0/16; };
! pass in from pool/0(!) to pool/0(!)
--- 31,39 ----
pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 9
pass in inet from 10.10.10.10/32 to 11.11.11.11/32
! pass in from pool/101 to hash/202
! pass in from hash/303 to pool/404
table role=ipf type=tree number=
{ ! 2.2.0.0/16; 2.2.2.2/32; ! 1.1.1.1/32; };
table role=ipf type=tree number=
{ 1.1.0.0/16; };
! pass in from pool/0 to pool/0
|
|
From: Darren <dar...@us...> - 2012-07-20 08:27:59
|
Update of /cvsroot/ipfilter/ipfilter/test/expected
In directory vz-cvs-4.sog:/tmp/cvs-serv30440/test/expected
Modified Files:
i12 in102
Log Message:
3542981 exclamation mark cuases trouble with pools
Index: in102
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/in102,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** in102 1 Mar 2009 12:48:32 -0000 1.1
--- in102 20 Jul 2012 08:27:57 -0000 1.2
***************
*** 2,5 ****
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 0/0 -> src 0/0 dst dstlist/bee;
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 0/0 dst dstlist/cat;
! rewrite in on bge0 proto tcp from pool/a(!) to 2.2.2.2/32 -> src 0/0 dst dstlist/bat;
! rewrite in on bge0 proto tcp from pool/a(!) to pool/1(!) -> src 0/0 dst dstlist/ant;
--- 2,5 ----
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 0/0 -> src 0/0 dst dstlist/bee;
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 0/0 dst dstlist/cat;
! rewrite in on bge0 proto tcp from pool/a to 2.2.2.2/32 -> src 0/0 dst dstlist/bat;
! rewrite in on bge0 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant;
Index: i12
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/i12,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** i12 6 Jul 2012 14:35:55 -0000 1.4
--- i12 20 Jul 2012 08:27:57 -0000 1.5
***************
*** 31,39 ****
pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 9
pass in inet from 10.10.10.10/32 to 11.11.11.11/32
! pass in from pool/101(!) to hash/202(!)
! pass in from hash/303(!) to pool/404(!)
table role=ipf type=tree number=
{ ! 2.2.0.0/16; 2.2.2.2/32; ! 1.1.1.1/32; };
table role=ipf type=tree number=
{ 1.1.0.0/16; };
! pass in from pool/0(!) to pool/0(!)
--- 31,39 ----
pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 9
pass in inet from 10.10.10.10/32 to 11.11.11.11/32
! pass in from pool/101 to hash/202
! pass in from hash/303 to pool/404
table role=ipf type=tree number=
{ ! 2.2.0.0/16; 2.2.2.2/32; ! 1.1.1.1/32; };
table role=ipf type=tree number=
{ 1.1.0.0/16; };
! pass in from pool/0 to pool/0
|
Update of /cvsroot/ipfilter/ipfilter/test/expected
In directory vz-cvs-4.sog:/tmp/cvs-serv30240/test/expected
Modified Files:
Tag: v5-1-RELEASE
n6_6 n6 n5_6 n4_6 n4 n2_6 n1_6 n15_6 n15 n14 n11_6
Log Message:
3542974 reason for dropping packet is lost
Index: n14
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n14,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -d -r1.2.2.3 -r1.2.2.4
*** n14 25 Jan 2012 21:19:15 -0000 1.2.2.3
--- n14 20 Jul 2012 08:22:27 -0000 1.2.2.4
***************
*** 2,6 ****
< gre0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.1.253,80
< gre0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.1.254,80
! 16
List of active MAP/Redirect filters:
rdr gre0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky
--- 2,6 ----
< gre0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.1.253,80
< gre0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.1.254,80
! 15
List of active MAP/Redirect filters:
rdr gre0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky
Index: n15
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n15,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** n15 7 Feb 2010 12:26:03 -0000 1.2.2.2
--- n15 20 Jul 2012 08:22:27 -0000 1.2.2.3
***************
*** 1,4 ****
< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80
! 16
List of active MAP/Redirect filters:
rdr le0 0/0 port 80 -> 3.3.3.3/32 port 80 tcp
--- 1,4 ----
< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80
! 15
List of active MAP/Redirect filters:
rdr le0 0/0 port 80 -> 3.3.3.3/32 port 80 tcp
Index: n15_6
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n15_6,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** n15_6 9 Jun 2012 06:20:41 -0000 1.1.2.3
--- n15_6 20 Jul 2012 08:22:27 -0000 1.1.2.4
***************
*** 1,4 ****
< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80
! 18
List of active MAP/Redirect filters:
rdr le0 inet6 any port 80 -> 3:0:3::3:3/128 port 80 tcp
--- 1,4 ----
< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80
! 16
List of active MAP/Redirect filters:
rdr le0 inet6 any port 80 -> 3:0:3::3:3/128 port 80 tcp
Index: n11_6
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n11_6,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** n11_6 9 Jun 2012 06:20:41 -0000 1.1.2.3
--- n11_6 20 Jul 2012 08:22:27 -0000 1.1.2.4
***************
*** 38,42 ****
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2
! 17
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
--- 38,42 ----
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2
! 16
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
Index: n6_6
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n6_6,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** n6_6 9 Jun 2012 06:20:41 -0000 1.1.2.3
--- n6_6 20 Jul 2012 08:22:27 -0000 1.1.2.4
***************
*** 35,39 ****
-------------------------------
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023
! 18
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
--- 35,39 ----
-------------------------------
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023
! 16
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
***************
*** 70,74 ****
-------------------------------
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023
! 18
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
--- 70,74 ----
-------------------------------
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023
! 16
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
***************
*** 111,115 ****
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23
! 18
< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
--- 111,115 ----
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23
! 16
< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
Index: n5_6
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n5_6,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** n5_6 9 Jun 2012 06:20:41 -0000 1.1.2.4
--- n5_6 20 Jul 2012 08:22:27 -0000 1.1.2.5
***************
*** 86,90 ****
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
! 17
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
--- 86,90 ----
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
! 16
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
***************
*** 116,120 ****
> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
! 17
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:2,1025
> zx0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
--- 116,120 ----
> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
! 16
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:2,1025
> zx0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
***************
*** 471,475 ****
> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
! 17
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:2,1025
> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
--- 471,475 ----
> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
! 16
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:2,1025
> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
Index: n2_6
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n2_6,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** n2_6 9 Jun 2012 06:20:41 -0000 1.1.2.4
--- n2_6 20 Jul 2012 08:22:27 -0000 1.1.2.5
***************
*** 143,147 ****
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
! 17
> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:2:0:0:0:0:1,80
--- 143,147 ----
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
! 16
> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:2:0:0:0:0:1,80
Index: n1_6
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n1_6,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** n1_6 9 Jun 2012 06:20:41 -0000 1.1.2.3
--- n1_6 20 Jul 2012 08:22:27 -0000 1.1.2.4
***************
*** 58,62 ****
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
! 17
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
--- 58,62 ----
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
! 16
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
***************
*** 87,91 ****
> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:1:1:0:0:0:0:2
! 17
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4
--- 87,91 ----
> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:1:1:0:0:0:0:2
! 16
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4
Index: n4
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n4,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -d -r1.5.2.2 -r1.5.2.3
*** n4 7 Feb 2010 12:26:03 -0000 1.5.2.2
--- n4 20 Jul 2012 08:22:27 -0000 1.5.2.3
***************
*** 132,136 ****
< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
! 16
> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345
List of active MAP/Redirect filters:
--- 132,136 ----
< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
! 15
> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345
List of active MAP/Redirect filters:
***************
*** 164,168 ****
< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,53
> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
! 16
> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345
List of active MAP/Redirect filters:
--- 164,168 ----
< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,53
> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
! 15
> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345
List of active MAP/Redirect filters:
Index: n4_6
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n4_6,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** n4_6 9 Jun 2012 06:20:41 -0000 1.1.2.3
--- n4_6 20 Jul 2012 08:22:27 -0000 1.1.2.4
***************
*** 132,136 ****
< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
! 18
> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345
List of active MAP/Redirect filters:
--- 132,136 ----
< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
! 16
> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345
List of active MAP/Redirect filters:
***************
*** 164,168 ****
< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53
> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
! 18
> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345
List of active MAP/Redirect filters:
--- 164,168 ----
< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53
> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
! 16
> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345
List of active MAP/Redirect filters:
Index: n6
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/expected/Attic/n6,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -d -r1.4.2.2 -r1.4.2.3
*** n6 7 Feb 2010 12:26:03 -0000 1.4.2.2
--- n6 20 Jul 2012 08:22:27 -0000 1.4.2.3
***************
*** 35,39 ****
-------------------------------
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023
! 16
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
--- 35,39 ----
-------------------------------
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023
! 15
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
***************
*** 70,74 ****
-------------------------------
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023
! 16
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
--- 70,74 ----
-------------------------------
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023
! 15
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
***************
*** 111,115 ****
< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23
! 16
< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53
< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
--- 111,115 ----
< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23
! 15
< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53
< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
|
|
From: Darren <dar...@us...> - 2012-07-20 08:21:35
|
Update of /cvsroot/ipfilter/ipfilter/test/expected In directory vz-cvs-4.sog:/tmp/cvs-serv30189/test/expected Modified Files: n6_6.dist n6.dist n5_6.dist n4_6.dist n4.dist n2_6.dist n1_6.dist n15_6.dist n15.dist n14.dist n11_6.dist Log Message: 3542974 reason for dropping packet is lost Index: n4.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n4.dist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** n4.dist 17 Nov 2011 20:26:50 -0000 1.1 --- n4.dist 20 Jul 2012 08:21:32 -0000 1.2 *************** *** 132,136 **** < NIC0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 > NIC0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 ! 16 > NIC0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345 List of active MAP/Redirect filters: --- 132,136 ---- < NIC0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 > NIC0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 ! 15 > NIC0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345 List of active MAP/Redirect filters: *************** *** 164,168 **** < NIC0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,53 > NIC0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 ! 16 > NIC0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345 List of active MAP/Redirect filters: --- 164,168 ---- < NIC0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,53 > NIC0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 ! 15 > NIC0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345 List of active MAP/Redirect filters: Index: n15.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n15.dist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** n15.dist 17 Nov 2011 20:26:50 -0000 1.1 --- n15.dist 20 Jul 2012 08:21:32 -0000 1.2 *************** *** 1,4 **** < NIC0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80 ! 16 List of active MAP/Redirect filters: rdr NIC0 0/0 port 80 -> 3.3.3.3/32 port 80 tcp --- 1,4 ---- < NIC0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80 ! 15 List of active MAP/Redirect filters: rdr NIC0 0/0 port 80 -> 3.3.3.3/32 port 80 tcp Index: n6.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n6.dist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** n6.dist 17 Nov 2011 20:26:50 -0000 1.1 --- n6.dist 20 Jul 2012 08:21:32 -0000 1.2 *************** *** 35,39 **** ------------------------------- < NIC0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 ! 16 < NIC0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 < NIC0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 --- 35,39 ---- ------------------------------- < NIC0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 ! 15 < NIC0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 < NIC0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 *************** *** 70,74 **** ------------------------------- < NIC0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 ! 16 < NIC0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 < NIC0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 --- 70,74 ---- ------------------------------- < NIC0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 ! 15 < NIC0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 < NIC0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 *************** *** 111,115 **** < NIC0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 < NIC0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 ! 16 < NIC0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 < NIC0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 --- 111,115 ---- < NIC0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 < NIC0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 ! 15 < NIC0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 < NIC0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 Index: n14.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n14.dist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** n14.dist 25 Jan 2012 21:22:32 -0000 1.2 --- n14.dist 20 Jul 2012 08:21:32 -0000 1.3 *************** *** 2,6 **** < NIC0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.1.253,80 < NIC0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.1.254,80 ! 16 List of active MAP/Redirect filters: rdr NIC0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky --- 2,6 ---- < NIC0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.1.253,80 < NIC0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.1.254,80 ! 15 List of active MAP/Redirect filters: rdr NIC0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky Index: n11_6.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n11_6.dist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** n11_6.dist 9 Jun 2012 06:19:02 -0000 1.2 --- n11_6.dist 20 Jul 2012 08:21:32 -0000 1.3 *************** *** 38,42 **** ------------------------------- > NIC0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2 ! 17 > NIC0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:1 > NIC0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 --- 38,42 ---- ------------------------------- > NIC0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2 ! 16 > NIC0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:1 > NIC0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 Index: n5_6.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n5_6.dist,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** n5_6.dist 9 Jun 2012 06:19:02 -0000 1.3 --- n5_6.dist 20 Jul 2012 08:21:32 -0000 1.4 *************** *** 86,90 **** ------------------------------- > NIC0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2 ! 17 > NIC0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025 --- 86,90 ---- ------------------------------- > NIC0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2 ! 16 > NIC0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025 *************** *** 116,120 **** > NIC0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 < NIC0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 ! 17 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:2,1025 > NIC0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2 --- 116,120 ---- > NIC0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 < NIC0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 ! 16 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:2,1025 > NIC0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2 *************** *** 471,475 **** > NIC0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 < NIC0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 ! 17 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:2,1025 > NIC0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 --- 471,475 ---- > NIC0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 < NIC0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 ! 16 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:2,1025 > NIC0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 Index: n15_6.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n15_6.dist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** n15_6.dist 9 Jun 2012 06:19:02 -0000 1.2 --- n15_6.dist 20 Jul 2012 08:21:32 -0000 1.3 *************** *** 1,4 **** < NIC0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80 ! 18 List of active MAP/Redirect filters: rdr NIC0 inet6 any port 80 -> 3:0:3::3:3/128 port 80 tcp --- 1,4 ---- < NIC0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80 ! 16 List of active MAP/Redirect filters: rdr NIC0 inet6 any port 80 -> 3:0:3::3:3/128 port 80 tcp Index: n2_6.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n2_6.dist,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** n2_6.dist 9 Jun 2012 06:19:02 -0000 1.3 --- n2_6.dist 20 Jul 2012 08:21:32 -0000 1.4 *************** *** 143,147 **** > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 ! 17 > NIC0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:2:0:0:0:0:1,80 --- 143,147 ---- > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 ! 16 > NIC0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:2:0:0:0:0:1,80 Index: n4_6.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n4_6.dist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** n4_6.dist 9 Jun 2012 06:19:02 -0000 1.2 --- n4_6.dist 20 Jul 2012 08:21:32 -0000 1.3 *************** *** 132,136 **** < NIC0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 > NIC0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 ! 18 > NIC0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345 List of active MAP/Redirect filters: --- 132,136 ---- < NIC0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 > NIC0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 ! 16 > NIC0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345 List of active MAP/Redirect filters: *************** *** 164,168 **** < NIC0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53 > NIC0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 ! 18 > NIC0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345 List of active MAP/Redirect filters: --- 164,168 ---- < NIC0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53 > NIC0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 ! 16 > NIC0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345 List of active MAP/Redirect filters: Index: n6_6.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n6_6.dist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** n6_6.dist 9 Jun 2012 06:19:02 -0000 1.2 --- n6_6.dist 20 Jul 2012 08:21:32 -0000 1.3 *************** *** 35,39 **** ------------------------------- < NIC0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023 ! 18 < NIC0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 < NIC0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 --- 35,39 ---- ------------------------------- < NIC0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023 ! 16 < NIC0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 < NIC0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 *************** *** 70,74 **** ------------------------------- < NIC0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023 ! 18 < NIC0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 < NIC0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 --- 70,74 ---- ------------------------------- < NIC0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023 ! 16 < NIC0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 < NIC0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 *************** *** 111,115 **** < NIC0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 < NIC0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 ! 18 < NIC0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 < NIC0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 --- 111,115 ---- < NIC0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 < NIC0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 ! 16 < NIC0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 < NIC0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 Index: n1_6.dist =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/n1_6.dist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** n1_6.dist 9 Jun 2012 06:19:02 -0000 1.2 --- n1_6.dist 20 Jul 2012 08:21:32 -0000 1.3 *************** *** 58,62 **** ------------------------------- > NIC0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2 ! 17 > NIC0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025 --- 58,62 ---- ------------------------------- > NIC0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2 ! 16 > NIC0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1 > NIC0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025 *************** *** 87,91 **** > NIC0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4 < NIC0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:1:1:0:0:0:0:2 ! 17 < NIC0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 > NIC0 ip6/0 1 0 35 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4 --- 87,91 ---- > NIC0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4 < NIC0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:1:1:0:0:0:0:2 ! 16 < NIC0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 > NIC0 ip6/0 1 0 35 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4 |
|
From: Darren <dar...@us...> - 2012-07-20 08:18:56
|
Update of /cvsroot/ipfilter/ipfilter
In directory vz-cvs-4.sog:/tmp/cvs-serv30074
Modified Files:
Tag: v5-1-RELEASE
ip_fil.h ip_ftp_pxy.c ip_proxy.c ip_proxy.h ip_rcmd_pxy.c
ip_tftp_pxy.c
Log Message:
3545324 proxy checksum calculation is not hardware aware
3545321 FTP sequence number adjustment incorrectly applied
3545320 EPSV is not recognised
3545319 move nat rule creation to ip_proxy.c
3545317 better feedback of checksum requirements for proxies
3545314 ftp proxy levels do not make sense
3545312 EPRT is not supported by ftp proxy
Index: ip_proxy.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_proxy.c,v
retrieving revision 1.16.2.15
retrieving revision 1.16.2.16
diff -C2 -d -r1.16.2.15 -r1.16.2.16
*** ip_proxy.c 13 Jul 2012 06:39:03 -0000 1.16.2.15
--- ip_proxy.c 20 Jul 2012 08:18:53 -0000 1.16.2.16
***************
*** 120,124 ****
static ipftuneable_t ipf_proxy_tuneables[] = {
{ { (void *)offsetof(ipf_proxy_softc_t, ips_proxy_debug) },
! "ips_proxy_debug", 0, 10,
stsizeof(ipf_proxy_softc_t, ips_proxy_debug),
0, NULL, NULL },
--- 120,124 ----
static ipftuneable_t ipf_proxy_tuneables[] = {
{ { (void *)offsetof(ipf_proxy_softc_t, ips_proxy_debug) },
! "proxy_debug", 0, 0x1f,
stsizeof(ipf_proxy_softc_t, ips_proxy_debug),
0, NULL, NULL },
***************
*** 565,569 ****
!strncmp(a->apr_label, ap->apr_label,
sizeof(ap->apr_label))) {
! if (softp->ips_proxy_debug > 1)
printf("ipf_proxy_add: %s/%d present (B)\n",
a->apr_label, a->apr_p);
--- 565,569 ----
!strncmp(a->apr_label, ap->apr_label,
sizeof(ap->apr_label))) {
! if (softp->ips_proxy_debug & 0x01)
printf("ipf_proxy_add: %s/%d present (B)\n",
a->apr_label, a->apr_p);
***************
*** 575,579 ****
!strncmp(a->apr_label, ap->apr_label,
sizeof(ap->apr_label))) {
! if (softp->ips_proxy_debug > 1)
printf("ipf_proxy_add: %s/%d present (D)\n",
a->apr_label, a->apr_p);
--- 575,579 ----
!strncmp(a->apr_label, ap->apr_label,
sizeof(ap->apr_label))) {
! if (softp->ips_proxy_debug & 0x01)
printf("ipf_proxy_add: %s/%d present (D)\n",
a->apr_label, a->apr_p);
***************
*** 611,615 ****
a = ipf_proxy_lookup(arg, ctl->apc_p, ctl->apc_label);
if (a == NULL) {
! if (softp->ips_proxy_debug > 1)
printf("ipf_proxy_ctl: can't find %s/%d\n",
ctl->apc_label, ctl->apc_p);
--- 611,615 ----
a = ipf_proxy_lookup(arg, ctl->apc_p, ctl->apc_label);
if (a == NULL) {
! if (softp->ips_proxy_debug & 0x01)
printf("ipf_proxy_ctl: can't find %s/%d\n",
ctl->apc_label, ctl->apc_p);
***************
*** 617,621 ****
error = ESRCH;
} else if (a->apr_ctl == NULL) {
! if (softp->ips_proxy_debug > 1)
printf("ipf_proxy_ctl: no ctl function for %s/%d\n",
ctl->apc_label, ctl->apc_p);
--- 617,621 ----
error = ESRCH;
} else if (a->apr_ctl == NULL) {
! if (softp->ips_proxy_debug & 0x01)
printf("ipf_proxy_ctl: no ctl function for %s/%d\n",
ctl->apc_label, ctl->apc_p);
***************
*** 624,628 ****
} else {
error = (*a->apr_ctl)(softc, a->apr_soft, ctl);
! if ((error != 0) && (softp->ips_proxy_debug > 1))
printf("ipf_proxy_ctl: %s/%d ctl error %d\n",
a->apr_label, a->apr_p, error);
--- 624,628 ----
} else {
error = (*a->apr_ctl)(softc, a->apr_soft, ctl);
! if ((error != 0) && (softp->ips_proxy_debug & 0x02))
printf("ipf_proxy_ctl: %s/%d ctl error %d\n",
a->apr_label, a->apr_p, error);
***************
*** 781,785 ****
ipn = nat->nat_ptr;
! if (softp->ips_proxy_debug > 8)
printf("ipf_proxy_match(%lx,%lx) aps %lx ptr %lx\n",
(u_long)fin, (u_long)nat, (u_long)nat->nat_aps,
--- 781,785 ----
ipn = nat->nat_ptr;
! if (softp->ips_proxy_debug & 0x04)
printf("ipf_proxy_match(%lx,%lx) aps %lx ptr %lx\n",
(u_long)fin, (u_long)nat, (u_long)nat->nat_aps,
***************
*** 787,791 ****
if ((fin->fin_flx & (FI_SHORT|FI_BAD)) != 0) {
! if (softp->ips_proxy_debug > 0)
printf("ipf_proxy_match: flx 0x%x (BAD|SHORT)\n",
fin->fin_flx);
--- 787,791 ----
if ((fin->fin_flx & (FI_SHORT|FI_BAD)) != 0) {
! if (softp->ips_proxy_debug & 0x08)
printf("ipf_proxy_match: flx 0x%x (BAD|SHORT)\n",
fin->fin_flx);
***************
*** 795,799 ****
apr = ipn->in_apr;
if ((apr == NULL) || (apr->apr_flags & APR_DELETE)) {
! if (softp->ips_proxy_debug > 0)
printf("ipf_proxy_match:apr %lx apr_flags 0x%x\n",
(u_long)apr, apr ? apr->apr_flags : 0);
--- 795,799 ----
apr = ipn->in_apr;
if ((apr == NULL) || (apr->apr_flags & APR_DELETE)) {
! if (softp->ips_proxy_debug & 0x08)
printf("ipf_proxy_match:apr %lx apr_flags 0x%x\n",
(u_long)apr, apr ? apr->apr_flags : 0);
***************
*** 804,808 ****
result = (*apr->apr_match)(fin, nat->nat_aps, nat);
if (result != 0) {
! if (softp->ips_proxy_debug > 4)
printf("ipf_proxy_match: result %d\n", result);
return -1;
--- 804,808 ----
result = (*apr->apr_match)(fin, nat->nat_aps, nat);
if (result != 0) {
! if (softp->ips_proxy_debug & 0x08)
printf("ipf_proxy_match: result %d\n", result);
return -1;
***************
*** 833,841 ****
aproxy_t *apr;
! if (softp->ips_proxy_debug > 8)
printf("ipf_proxy_new(%lx,%lx) \n", (u_long)fin, (u_long)nat);
if ((nat->nat_ptr == NULL) || (nat->nat_aps != NULL)) {
! if (softp->ips_proxy_debug > 0)
printf("ipf_proxy_new: nat_ptr %lx nat_aps %lx\n",
(u_long)nat->nat_ptr, (u_long)nat->nat_aps);
--- 833,841 ----
aproxy_t *apr;
! if (softp->ips_proxy_debug & 0x04)
printf("ipf_proxy_new(%lx,%lx) \n", (u_long)fin, (u_long)nat);
if ((nat->nat_ptr == NULL) || (nat->nat_aps != NULL)) {
! if (softp->ips_proxy_debug & 0x08)
printf("ipf_proxy_new: nat_ptr %lx nat_aps %lx\n",
(u_long)nat->nat_ptr, (u_long)nat->nat_aps);
***************
*** 847,851 ****
if ((apr->apr_flags & APR_DELETE) ||
(fin->fin_p != apr->apr_p)) {
! if (softp->ips_proxy_debug > 2)
printf("ipf_proxy_new: apr_flags 0x%x p %d/%d\n",
apr->apr_flags, fin->fin_p, apr->apr_p);
--- 847,851 ----
if ((apr->apr_flags & APR_DELETE) ||
(fin->fin_p != apr->apr_p)) {
! if (softp->ips_proxy_debug & 0x08)
printf("ipf_proxy_new: apr_flags 0x%x p %d/%d\n",
apr->apr_flags, fin->fin_p, apr->apr_p);
***************
*** 855,859 ****
KMALLOC(aps, ap_session_t *);
if (!aps) {
! if (softp->ips_proxy_debug > 0)
printf("ipf_proxy_new: malloc failed (%lu)\n",
(u_long)sizeof(ap_session_t));
--- 855,859 ----
KMALLOC(aps, ap_session_t *);
if (!aps) {
! if (softp->ips_proxy_debug & 0x08)
printf("ipf_proxy_new: malloc failed (%lu)\n",
(u_long)sizeof(ap_session_t));
***************
*** 871,875 ****
}
KFREE(aps);
! if (softp->ips_proxy_debug > 2)
printf("ipf_proxy_new: new(%lx) failed\n",
(u_long)apr->apr_new);
--- 871,875 ----
}
KFREE(aps);
! if (softp->ips_proxy_debug & 0x08)
printf("ipf_proxy_new: new(%lx) failed\n",
(u_long)apr->apr_new);
***************
*** 920,925 ****
if (fin->fin_flx & FI_BAD) {
! if (softp->ips_proxy_debug > 0)
! printf("ipf_proxy_check: flx 0x%x (BAD)\n", fin->fin_flx);
return -1;
}
--- 920,926 ----
if (fin->fin_flx & FI_BAD) {
! if (softp->ips_proxy_debug & 0x08)
! printf("ipf_proxy_check: flx 0x%x (BAD)\n",
! fin->fin_flx);
return -1;
}
***************
*** 927,931 ****
#ifndef IPFILTER_CKSUM
if ((fin->fin_out == 0) && (ipf_checkl4sum(fin) == -1)) {
! if (softp->ips_proxy_debug > 0)
printf("ipf_proxy_check: l4 checksum failure %d\n",
fin->fin_p);
--- 928,932 ----
#ifndef IPFILTER_CKSUM
if ((fin->fin_out == 0) && (ipf_checkl4sum(fin) == -1)) {
! if (softp->ips_proxy_debug & 0x08)
printf("ipf_proxy_check: l4 checksum failure %d\n",
fin->fin_p);
***************
*** 945,950 ****
if ((fin->fin_dlen > 0) && !(fin->fin_flx & FI_COALESCE))
if (ipf_coalesce(fin) == -1) {
! if (softp->ips_proxy_debug > 0)
! printf("ipf_proxy_check: coalesce failed %x\n", fin->fin_flx);
return -1;
}
--- 946,952 ----
if ((fin->fin_dlen > 0) && !(fin->fin_flx & FI_COALESCE))
if (ipf_coalesce(fin) == -1) {
! if (softp->ips_proxy_debug & 0x08)
! printf("ipf_proxy_check: %s %x\n",
! "coalesce failed", fin->fin_flx);
return -1;
}
***************
*** 986,991 ****
rv = APR_EXIT(err);
! if (((softp->ips_proxy_debug > 0) && (rv != 0)) ||
! (softp->ips_proxy_debug > 8))
printf("ipf_proxy_check: out %d err %x rv %d\n",
fin->fin_out, err, rv);
--- 988,993 ----
rv = APR_EXIT(err);
! if (((softp->ips_proxy_debug & 0x08) && (rv != 0)) ||
! (softp->ips_proxy_debug & 0x04))
printf("ipf_proxy_check: out %d err %x rv %d\n",
fin->fin_out, err, rv);
***************
*** 1004,1015 ****
* packet.
*/
! adjlen = err & 0xffff;
#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi)
s1 = LONG_SUM(fin->fin_plen - adjlen);
s2 = LONG_SUM(fin->fin_plen);
CALC_SUMD(s1, s2, sd);
! if ((err != 0) && (fin->fin_cksum < FI_CK_L4PART))
ipf_fix_outcksum(0, &ip->ip_sum, sd, 0);
#endif
/*
--- 1006,1020 ----
* packet.
*/
! adjlen = APR_INC(err);
#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi)
s1 = LONG_SUM(fin->fin_plen - adjlen);
s2 = LONG_SUM(fin->fin_plen);
CALC_SUMD(s1, s2, sd);
! if ((err != 0) && (fin->fin_cksum < FI_CK_L4PART) &&
! fin->fin_v == 4)
ipf_fix_outcksum(0, &ip->ip_sum, sd, 0);
#endif
+ if (fin->fin_flx & FI_DOCKSUM)
+ dosum = 1;
/*
***************
*** 1023,1043 ****
*/
if (tcp != NULL) {
! err = ipf_proxy_fixseqack(fin, ip, aps, APR_INC(err));
! if (dosum) {
! tcp->th_sum = fr_cksum(fin, ip,
! IPPROTO_TCP, tcp);
! } else if (fin->fin_cksum == FI_CK_L4PART) {
u_short sum = ntohs(tcp->th_sum);
sum += adjlen;
tcp->th_sum = htons(sum);
}
} else if ((udp != NULL) && (udp->uh_sum != 0)) {
! if (dosum) {
! udp->uh_sum = fr_cksum(fin, ip,
! IPPROTO_UDP, udp);
! } else if (fin->fin_cksum == FI_CK_L4PART) {
u_short sum = ntohs(udp->uh_sum);
sum += adjlen;
udp->uh_sum = htons(sum);
}
}
--- 1028,1048 ----
*/
if (tcp != NULL) {
! err = ipf_proxy_fixseqack(fin, ip, aps, adjlen);
! if (fin->fin_cksum == FI_CK_L4PART) {
u_short sum = ntohs(tcp->th_sum);
sum += adjlen;
tcp->th_sum = htons(sum);
+ } else if (fin->fin_cksum < FI_CK_L4PART) {
+ tcp->th_sum = fr_cksum(fin, ip,
+ IPPROTO_TCP, tcp);
}
} else if ((udp != NULL) && (udp->uh_sum != 0)) {
! if (fin->fin_cksum == FI_CK_L4PART) {
u_short sum = ntohs(udp->uh_sum);
sum += adjlen;
udp->uh_sum = htons(sum);
+ } else if (dosum) {
+ udp->uh_sum = fr_cksum(fin, ip,
+ IPPROTO_UDP, udp);
}
}
***************
*** 1068,1072 ****
aproxy_t *ap;
! if (softp->ips_proxy_debug > 8)
printf("ipf_proxy_lookup(%d,%s)\n", pr, name);
--- 1073,1077 ----
aproxy_t *ap;
! if (softp->ips_proxy_debug & 0x04)
printf("ipf_proxy_lookup(%d,%s)\n", pr, name);
***************
*** 1078,1082 ****
}
! if (softp->ips_proxy_debug > 2)
printf("ipf_proxy_lookup: failed for %d/%s\n", pr, name);
return NULL;
--- 1083,1087 ----
}
! if (softp->ips_proxy_debug & 0x08)
printf("ipf_proxy_lookup: failed for %d/%s\n", pr, name);
return NULL;
***************
*** 1169,1174 ****
* ip_len has already been adjusted by 'inc'.
*/
! nlen = fin->fin_plen;
! nlen -= (IP_HL(ip) << 2) + (TCP_OFF(tcp) << 2);
inc2 = inc;
--- 1174,1179 ----
* ip_len has already been adjusted by 'inc'.
*/
! nlen = fin->fin_dlen;
! nlen -= (TCP_OFF(tcp) << 2);
inc2 = inc;
***************
*** 1182,1186 ****
if ((aps->aps_seqmin[!sel] > aps->aps_seqmin[sel]) &&
(seq1 > aps->aps_seqmin[!sel])) {
! if (softp->ips_proxy_debug > 7)
printf("proxy out switch set seq %d -> %d %x > %x\n",
sel, !sel, seq1,
--- 1187,1191 ----
if ((aps->aps_seqmin[!sel] > aps->aps_seqmin[sel]) &&
(seq1 > aps->aps_seqmin[!sel])) {
! if (softp->ips_proxy_debug & 0x10)
printf("proxy out switch set seq %d -> %d %x > %x\n",
sel, !sel, seq1,
***************
*** 1202,1206 ****
aps->aps_seqmin[sel] = seq1 + nlen - 1;
aps->aps_seqoff[sel] = aps->aps_seqoff[sel] + inc;
! if (softp->ips_proxy_debug > 7)
printf("proxy seq set %d at %x to %d + %d\n",
sel, aps->aps_seqmin[sel],
--- 1207,1211 ----
aps->aps_seqmin[sel] = seq1 + nlen - 1;
aps->aps_seqoff[sel] = aps->aps_seqoff[sel] + inc;
! if (softp->ips_proxy_debug & 0x10)
printf("proxy seq set %d at %x to %d + %d\n",
sel, aps->aps_seqmin[sel],
***************
*** 1216,1220 ****
if ((aps->aps_ackmin[!sel] > aps->aps_ackmin[sel]) &&
(seq1 > aps->aps_ackmin[!sel])) {
! if (softp->ips_proxy_debug > 7)
printf("proxy out switch set ack %d -> %d %x > %x\n",
sel, !sel, seq1,
--- 1221,1225 ----
if ((aps->aps_ackmin[!sel] > aps->aps_ackmin[sel]) &&
(seq1 > aps->aps_ackmin[!sel])) {
! if (softp->ips_proxy_debug & 0x10)
printf("proxy out switch set ack %d -> %d %x > %x\n",
sel, !sel, seq1,
***************
*** 1235,1239 ****
if ((aps->aps_ackmin[!sel] > aps->aps_ackmin[sel]) &&
(seq1 > aps->aps_ackmin[!sel])) {
! if (softp->ips_proxy_debug > 7)
printf("proxy in switch set ack %d -> %d %x > %x\n",
sel, !sel, seq1, aps->aps_ackmin[!sel]);
--- 1240,1244 ----
if ((aps->aps_ackmin[!sel] > aps->aps_ackmin[sel]) &&
(seq1 > aps->aps_ackmin[!sel])) {
! if (softp->ips_proxy_debug & 0x10)
printf("proxy in switch set ack %d -> %d %x > %x\n",
sel, !sel, seq1, aps->aps_ackmin[!sel]);
***************
*** 1255,1259 ****
aps->aps_ackoff[!sel] = aps->aps_ackoff[sel] + inc;
! if (softp->ips_proxy_debug > 7)
printf("proxy ack set %d at %x to %d + %d\n",
!sel, aps->aps_seqmin[!sel],
--- 1260,1264 ----
aps->aps_ackoff[!sel] = aps->aps_ackoff[sel] + inc;
! if (softp->ips_proxy_debug & 0x10)
printf("proxy ack set %d at %x to %d + %d\n",
!sel, aps->aps_seqmin[!sel],
***************
*** 1269,1273 ****
if ((aps->aps_seqmin[!sel] > aps->aps_seqmin[sel]) &&
(seq1 > aps->aps_seqmin[!sel])) {
! if (softp->ips_proxy_debug > 7)
printf("proxy in switch set seq %d -> %d %x > %x\n",
sel, !sel, seq1, aps->aps_seqmin[!sel]);
--- 1274,1278 ----
if ((aps->aps_seqmin[!sel] > aps->aps_seqmin[sel]) &&
(seq1 > aps->aps_seqmin[!sel])) {
! if (softp->ips_proxy_debug & 0x10)
printf("proxy in switch set seq %d -> %d %x > %x\n",
sel, !sel, seq1, aps->aps_seqmin[!sel]);
***************
*** 1276,1280 ****
if (aps->aps_seqoff[sel] != 0) {
! if (softp->ips_proxy_debug > 7)
printf("sel %d seqoff %d seq1 %x seqmin %x\n",
sel, aps->aps_seqoff[sel], seq1,
--- 1281,1285 ----
if (aps->aps_seqoff[sel] != 0) {
! if (softp->ips_proxy_debug & 0x10)
printf("sel %d seqoff %d seq1 %x seqmin %x\n",
sel, aps->aps_seqoff[sel], seq1,
***************
*** 1288,1294 ****
}
! if (softp->ips_proxy_debug > 8)
! printf("ipf_proxy_fixseqack: seq %x ack %x\n",
(u_32_t)ntohl(tcp->th_seq), (u_32_t)ntohl(tcp->th_ack));
return ch ? 2 : 0;
}
--- 1293,1466 ----
}
! if (softp->ips_proxy_debug & 0x10)
! printf("ipf_proxy_fixseqack: seq %u ack %u\n",
(u_32_t)ntohl(tcp->th_seq), (u_32_t)ntohl(tcp->th_ack));
return ch ? 2 : 0;
}
+
+
+ /* ------------------------------------------------------------------------ */
+ /* Function: ipf_proxy_rule_rev */
+ /* Returns: ipnat_t * - NULL = failure, else pointer to new rule */
+ /* Parameters: nat(I) - pointer to NAT session to create rule from */
+ /* */
+ /* This function creates a NAT rule that is based upon the reverse packet */
+ /* flow associated with this NAT session. Thus if this NAT session was */
+ /* created with a map rule then this function will create a rdr rule. */
+ /* Only address fields and network interfaces are assigned in this function */
+ /* and the address fields are formed such that an exact is required. If the */
+ /* original rule had a netmask, that is not replicated here not is it */
+ /* desired. The ultimate goal here is to create a NAT rule to support a NAT */
+ /* session being created that does not have a user configured rule. The */
+ /* classic example is supporting the FTP proxy, where a data channel needs */
+ /* to be setup, based on the addresses used for the control connection. In */
+ /* that case, this function is used to handle creating NAT rules to support */
+ /* data connections with the PORT and EPRT commands. */
+ /* ------------------------------------------------------------------------ */
+ ipnat_t *
+ ipf_proxy_rule_rev(nat)
+ nat_t *nat;
+ {
+ ipnat_t *old;
+ ipnat_t *ipn;
+ int size;
+
+ old = nat->nat_ptr;
+ size = old->in_size;
+
+ KMALLOCS(ipn, ipnat_t *, size);
+ if (ipn == NULL)
+ return NULL;
+
+ bzero((char *)ipn, size);
+
+ ipn->in_use = 1;
+ ipn->in_hits = 1;
+ ipn->in_ippip = 1;
+ ipn->in_apr = NULL;
+ ipn->in_size = size;
+ ipn->in_pr[0] = old->in_pr[1];
+ ipn->in_pr[1] = old->in_pr[0];
+ ipn->in_v[0] = old->in_v[1];
+ ipn->in_v[1] = old->in_v[0];
+ ipn->in_ifps[0] = old->in_ifps[1];
+ ipn->in_ifps[1] = old->in_ifps[0];
+ ipn->in_flags = (old->in_flags | IPN_PROXYRULE);
+
+ ipn->in_nsrcip6 = nat->nat_odst6;
+ ipn->in_osrcip6 = nat->nat_ndst6;
+
+ if ((old->in_redir & NAT_REDIRECT) != 0) {
+ ipn->in_redir = NAT_MAP;
+ if (ipn->in_v[0] == 4) {
+ ipn->in_snip = ntohl(nat->nat_odstaddr);
+ ipn->in_dnip = ntohl(nat->nat_nsrcaddr);
+ } else {
+ #ifdef USE_INET6
+ ipn->in_snip6 = nat->nat_odst6;
+ ipn->in_dnip6 = nat->nat_nsrc6;
+ #endif
+ }
+ ipn->in_ndstip6 = nat->nat_nsrc6;
+ ipn->in_odstip6 = nat->nat_osrc6;
+ } else {
+ ipn->in_redir = NAT_REDIRECT;
+ if (ipn->in_v[0] == 4) {
+ ipn->in_snip = ntohl(nat->nat_odstaddr);
+ ipn->in_dnip = ntohl(nat->nat_osrcaddr);
+ } else {
+ #ifdef USE_INET6
+ ipn->in_snip6 = nat->nat_odst6;
+ ipn->in_dnip6 = nat->nat_osrc6;
+ #endif
+ }
+ ipn->in_ndstip6 = nat->nat_osrc6;
+ ipn->in_odstip6 = nat->nat_nsrc6;
+ }
+
+ IP6_SETONES(&ipn->in_osrcmsk6);
+ IP6_SETONES(&ipn->in_nsrcmsk6);
+ IP6_SETONES(&ipn->in_odstmsk6);
+ IP6_SETONES(&ipn->in_ndstmsk6);
+
+ ipn->in_namelen = old->in_namelen;
+ ipn->in_ifnames[0] = old->in_ifnames[1];
+ ipn->in_ifnames[1] = old->in_ifnames[0];
+ bcopy(old->in_names, ipn->in_names, ipn->in_namelen);
+ MUTEX_INIT(&ipn->in_lock, "ipnat rev rule lock");
+
+ return ipn;
+ }
+
+
+ /* ------------------------------------------------------------------------ */
+ /* Function: ipf_proxy_rule_fwd */
+ /* Returns: ipnat_t * - NULL = failure, else pointer to new rule */
+ /* Parameters: nat(I) - pointer to NAT session to create rule from */
+ /* */
+ /* The purpose and rationale of this function is much the same as the above */
+ /* function, ipf_proxy_rule_rev, except that a rule is created that matches */
+ /* the same direction as that of the existing NAT session. Thus if this NAT */
+ /* session was created with a map rule then this function will also create */
+ /* a data structure to represent a map rule. Whereas ipf_proxy_rule_rev is */
+ /* used to support PORT/EPRT, this function supports PASV/EPSV. */
+ /* ------------------------------------------------------------------------ */
+ ipnat_t *
+ ipf_proxy_rule_fwd(nat)
+ nat_t *nat;
+ {
+ ipnat_t *old;
+ ipnat_t *ipn;
+ int size;
+
+ old = nat->nat_ptr;
+ size = old->in_size;
+
+ KMALLOCS(ipn, ipnat_t *, size);
+ if (ipn == NULL)
+ return NULL;
+
+ bzero((char *)ipn, size);
+
+ ipn->in_use = 1;
+ ipn->in_hits = 1;
+ ipn->in_ippip = 1;
+ ipn->in_apr = NULL;
+ ipn->in_size = size;
+ ipn->in_pr[0] = old->in_pr[0];
+ ipn->in_pr[1] = old->in_pr[1];
+ ipn->in_v[0] = old->in_v[0];
+ ipn->in_v[1] = old->in_v[1];
+ ipn->in_ifps[0] = nat->nat_ifps[0];
+ ipn->in_ifps[1] = nat->nat_ifps[1];
+ ipn->in_flags = (old->in_flags | IPN_PROXYRULE);
+
+ ipn->in_nsrcip6 = nat->nat_nsrc6;
+ ipn->in_osrcip6 = nat->nat_osrc6;
+ ipn->in_ndstip6 = nat->nat_ndst6;
+ ipn->in_odstip6 = nat->nat_odst6;
+ ipn->in_redir = old->in_redir;
+
+ if (ipn->in_v[0] == 4) {
+ ipn->in_snip = ntohl(nat->nat_nsrcaddr);
+ ipn->in_dnip = ntohl(nat->nat_ndstaddr);
+ } else {
+ #ifdef USE_INET6
+ ipn->in_snip6 = nat->nat_nsrc6;
+ ipn->in_dnip6 = nat->nat_ndst6;
+ #endif
+ }
+
+ IP6_SETONES(&ipn->in_osrcmsk6);
+ IP6_SETONES(&ipn->in_nsrcmsk6);
+ IP6_SETONES(&ipn->in_odstmsk6);
+ IP6_SETONES(&ipn->in_ndstmsk6);
+
+ ipn->in_namelen = old->in_namelen;
+ ipn->in_ifnames[0] = old->in_ifnames[0];
+ ipn->in_ifnames[1] = old->in_ifnames[1];
+ bcopy(old->in_names, ipn->in_names, ipn->in_namelen);
+ MUTEX_INIT(&ipn->in_lock, "ipnat fwd rule lock");
+
+ return ipn;
+ }
Index: ip_tftp_pxy.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_tftp_pxy.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** ip_tftp_pxy.c 13 Jul 2012 12:25:35 -0000 1.1.2.7
--- ip_tftp_pxy.c 20 Jul 2012 08:18:53 -0000 1.1.2.8
***************
*** 200,237 ****
ipn->in_size = size;
- ipn->in_ifps[0] = nat->nat_ifps[0];
- ipn->in_ifps[1] = nat->nat_ifps[1];
ipn->in_apr = NULL;
ipn->in_use = 1;
ipn->in_hits = 1;
ipn->in_ippip = 1;
if ((np->in_redir & NAT_REDIRECT) != 0) {
ipn->in_redir = NAT_MAP;
! ipn->in_snip = ntohl(nat->nat_odstaddr);
! ipn->in_nsrcaddr = nat->nat_odstaddr;
! ipn->in_dnip = ntohl(nat->nat_nsrcaddr);
! ipn->in_ndstaddr = nat->nat_nsrcaddr;
! ipn->in_osrcaddr = nat->nat_ndstaddr;
! ipn->in_odstaddr = nat->nat_osrcaddr;
} else {
ipn->in_redir = NAT_REDIRECT;
! ipn->in_snip = ntohl(nat->nat_odstaddr);
! ipn->in_nsrcaddr = nat->nat_odstaddr;
! ipn->in_dnip = ntohl(nat->nat_osrcaddr);
! ipn->in_ndstaddr = nat->nat_osrcaddr;
! ipn->in_osrcaddr = nat->nat_ndstaddr;
! ipn->in_odstaddr = nat->nat_nsrcaddr;
}
ipn->in_odport = htons(fin->fin_sport);
ipn->in_ndport = htons(fin->fin_sport);
! ipn->in_osrcmsk = 0xffffffff;
! ipn->in_nsrcmsk = 0xffffffff;
! ipn->in_odstmsk = 0xffffffff;
! ipn->in_ndstmsk = 0xffffffff;
! ipn->in_pr[0] = IPPROTO_UDP;
! ipn->in_pr[1] = IPPROTO_UDP;
! ipn->in_flags = IPN_UDP|IPN_FIXEDDPORT|IPN_PROXYRULE;
MUTEX_INIT(&ipn->in_lock, "tftp proxy NAT rule");
--- 200,252 ----
ipn->in_size = size;
ipn->in_apr = NULL;
ipn->in_use = 1;
ipn->in_hits = 1;
ipn->in_ippip = 1;
+ ipn->in_pr[0] = IPPROTO_UDP;
+ ipn->in_pr[1] = IPPROTO_UDP;
+ ipn->in_ifps[0] = nat->nat_ifps[0];
+ ipn->in_ifps[1] = nat->nat_ifps[1];
+ ipn->in_v[0] = nat->nat_ptr->in_v[1];
+ ipn->in_v[1] = nat->nat_ptr->in_v[0];
+ ipn->in_flags = IPN_UDP|IPN_FIXEDDPORT|IPN_PROXYRULE;
+
+ ipn->in_nsrcip6 = nat->nat_odst6;
+ ipn->in_osrcip6 = nat->nat_ndst6;
if ((np->in_redir & NAT_REDIRECT) != 0) {
ipn->in_redir = NAT_MAP;
! if (ipn->in_v[0] == 4) {
! ipn->in_snip = ntohl(nat->nat_odstaddr);
! ipn->in_dnip = ntohl(nat->nat_nsrcaddr);
! } else {
! #ifdef USE_INET6
! ipn->in_snip6 = nat->nat_odst6;
! ipn->in_dnip6 = nat->nat_nsrc6;
! #endif
! }
! ipn->in_ndstip6 = nat->nat_nsrc6;
! ipn->in_odstip6 = nat->nat_osrc6;
} else {
ipn->in_redir = NAT_REDIRECT;
! if (ipn->in_v[0] == 4) {
! ipn->in_snip = ntohl(nat->nat_odstaddr);
! ipn->in_dnip = ntohl(nat->nat_osrcaddr);
! } else {
! #ifdef USE_INET6
! ipn->in_snip6 = nat->nat_odst6;
! ipn->in_dnip6 = nat->nat_osrc6;
! #endif
! }
! ipn->in_ndstip6 = nat->nat_osrc6;
! ipn->in_odstip6 = nat->nat_nsrc6;
}
ipn->in_odport = htons(fin->fin_sport);
ipn->in_ndport = htons(fin->fin_sport);
! IP6_SETONES(&ipn->in_osrcmsk6);
! IP6_SETONES(&ipn->in_nsrcmsk6);
! IP6_SETONES(&ipn->in_odstmsk6);
! IP6_SETONES(&ipn->in_ndstmsk6);
MUTEX_INIT(&ipn->in_lock, "tftp proxy NAT rule");
***************
*** 275,279 ****
ipf_nat_softc_t *softn = softc->ipf_nat_soft;
#endif
! struct in_addr swip,swip2;
tftpinfo_t *ti;
udphdr_t udp;
--- 290,298 ----
ipf_nat_softc_t *softn = softc->ipf_nat_soft;
#endif
! #ifdef USE_INET6
! i6addr_t swip6, sw2ip6;
! ip6_t *ip6;
! #endif
! struct in_addr swip, sw2ip;
tftpinfo_t *ti;
udphdr_t udp;
***************
*** 294,303 ****
fi.fin_data[1] = 0;
- ip = fin->fin_ip;
- slen = ip->ip_len;
- swip = ip->ip_src;
- swip2 = ip->ip_dst;
-
- ip->ip_len = htons(fin->fin_hlen + sizeof(udp));
bzero((char *)&udp, sizeof(udp));
udp.uh_sport = 0; /* XXX - don't specify remote port */
--- 313,316 ----
***************
*** 305,321 ****
udp.uh_ulen = htons(sizeof(udp));
udp.uh_sum = 0;
! fi.fin_dp = (char *)&udp;
fi.fin_fr = &tftpfr;
! fi.fin_dport = ntohs(ti->ti_rule->in_ndport);
fi.fin_sport = 0;
fi.fin_dlen = sizeof(udp);
fi.fin_plen = fi.fin_hlen + sizeof(udp);
fi.fin_flx &= FI_LOWTTL|FI_FRAG|FI_TCPUDP|FI_OPTIONS|FI_IGNORE;
nflags = NAT_SLAVE|IPN_UDP|SI_W_SPORT;
! fi.fin_fi.fi_saddr = nat->nat_ndstaddr;
! ip->ip_src = nat->nat_ndstip;
! fi.fin_fi.fi_daddr = nat->nat_nsrcaddr;
! ip->ip_dst = nat->nat_nsrcip;
if (nat->nat_dir == NAT_INBOUND) {
--- 318,356 ----
udp.uh_ulen = htons(sizeof(udp));
udp.uh_sum = 0;
!
fi.fin_fr = &tftpfr;
! fi.fin_dp = (char *)&udp;
fi.fin_sport = 0;
+ fi.fin_dport = ntohs(ti->ti_rule->in_ndport);
fi.fin_dlen = sizeof(udp);
fi.fin_plen = fi.fin_hlen + sizeof(udp);
fi.fin_flx &= FI_LOWTTL|FI_FRAG|FI_TCPUDP|FI_OPTIONS|FI_IGNORE;
nflags = NAT_SLAVE|IPN_UDP|SI_W_SPORT;
+ #ifdef USE_INET6
+ ip6 = (ip6_t *)fin->fin_ip;
+ #endif
+ ip = fin->fin_ip;
+ sw2ip.s_addr = 0;
+ swip.s_addr = 0;
! fi.fin_src6 = nat->nat_ndst6;
! fi.fin_dst6 = nat->nat_nsrc6;
! if (nat->nat_v[0] == 4) {
! slen = ip->ip_len;
! ip->ip_len = htons(fin->fin_hlen + sizeof(udp));
! swip = ip->ip_src;
! sw2ip = ip->ip_dst;
! ip->ip_src = nat->nat_ndstip;
! ip->ip_dst = nat->nat_nsrcip;
! } else {
! #ifdef USE_INET6
! slen = ip6->ip6_plen;
! ip6->ip6_plen = htons(sizeof(udp));
! swip6.in6 = ip6->ip6_src;
! sw2ip6.in6 = ip6->ip6_dst;
! ip6->ip6_src = nat->nat_ndst6.in6;
! ip6->ip6_dst = nat->nat_nsrc6.in6;
! #endif
! }
if (nat->nat_dir == NAT_INBOUND) {
***************
*** 329,333 ****
MUTEX_ENTER(&softn->ipf_nat_new);
! nat2 = ipf_nat_add(&fi, ti->ti_rule, NULL, nflags, dir);
MUTEX_EXIT(&softn->ipf_nat_new);
if (nat2 != NULL) {
--- 364,371 ----
MUTEX_ENTER(&softn->ipf_nat_new);
! if (nat->nat_v[0] == 4)
! nat2 = ipf_nat_add(&fi, ti->ti_rule, NULL, nflags, dir);
! else
! nat2 = ipf_nat6_add(&fi, ti->ti_rule, NULL, nflags, dir);
MUTEX_EXIT(&softn->ipf_nat_new);
if (nat2 != NULL) {
***************
*** 336,348 ****
fi.fin_ifp = NULL;
if (ti->ti_rule->in_redir == NAT_MAP) {
! fi.fin_fi.fi_saddr = nat->nat_ndstaddr;
! ip->ip_src = nat->nat_ndstip;
! fi.fin_fi.fi_daddr = nat->nat_nsrcaddr;
! ip->ip_dst = nat->nat_nsrcip;
} else {
! fi.fin_fi.fi_saddr = nat->nat_odstaddr;
! ip->ip_src = nat->nat_odstip;
! fi.fin_fi.fi_daddr = nat->nat_osrcaddr;
! ip->ip_dst = nat->nat_osrcip;
}
if (ipf_state_add(softc, &fi, NULL, SI_W_SPORT) != 0) {
--- 374,400 ----
fi.fin_ifp = NULL;
if (ti->ti_rule->in_redir == NAT_MAP) {
! fi.fin_src6 = nat->nat_ndst6;
! fi.fin_dst6 = nat->nat_nsrc6;
! if (nat->nat_v[0] == 4) {
! ip->ip_src = nat->nat_ndstip;
! ip->ip_dst = nat->nat_nsrcip;
! } else {
! #ifdef USE_INET6
! ip6->ip6_src = nat->nat_ndst6.in6;
! ip6->ip6_dst = nat->nat_nsrc6.in6;
! #endif
! }
} else {
! fi.fin_src6 = nat->nat_odst6;
! fi.fin_dst6 = nat->nat_osrc6;
! if (fin->fin_v == 4) {
! ip->ip_src = nat->nat_odstip;
! ip->ip_dst = nat->nat_osrcip;
! } else {
! #ifdef USE_INET6
! ip6->ip6_src = nat->nat_odst6.in6;
! ip6->ip6_dst = nat->nat_osrc6.in6;
! #endif
! }
}
if (ipf_state_add(softc, &fi, NULL, SI_W_SPORT) != 0) {
***************
*** 350,356 ****
}
}
! ip->ip_len = slen;
! ip->ip_src = swip;
! ip->ip_dst = swip2;
return 0;
}
--- 402,416 ----
}
}
! if (nat->nat_v[0] == 4) {
! ip->ip_len = slen;
! ip->ip_src = swip;
! ip->ip_dst = sw2ip;
! } else {
! #ifdef USE_INET6
! ip6->ip6_plen = slen;
! ip6->ip6_src = swip6.in6;
! ip6->ip6_dst = sw2ip6.in6;
! #endif
! }
return 0;
}
Index: ip_proxy.h
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_proxy.h,v
retrieving revision 1.7.2.7
retrieving revision 1.7.2.8
diff -C2 -d -r1.7.2.7 -r1.7.2.8
*** ip_proxy.h 13 Jul 2012 06:39:03 -0000 1.7.2.7
--- ip_proxy.h 20 Jul 2012 08:18:53 -0000 1.7.2.8
***************
*** 451,454 ****
--- 451,456 ----
extern int ipf_proxy_main_load __P((void));
extern int ipf_proxy_main_unload __P((void));
+ extern ipnat_t *ipf_proxy_rule_fwd __P((nat_t *));
+ extern ipnat_t *ipf_proxy_rule_rev __P((nat_t *));
extern void *ipf_proxy_soft_create __P((ipf_main_softc_t *));
extern void ipf_proxy_soft_destroy __P((ipf_main_softc_t *, void *));
Index: ip_rcmd_pxy.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_rcmd_pxy.c,v
retrieving revision 1.17.2.6
retrieving revision 1.17.2.7
diff -C2 -d -r1.17.2.6 -r1.17.2.7
*** ip_rcmd_pxy.c 13 Jul 2012 12:25:35 -0000 1.17.2.6
--- ip_rcmd_pxy.c 20 Jul 2012 08:18:53 -0000 1.17.2.7
***************
*** 86,91 ****
return -1;
}
! KMALLOCS(ipn, ipnat_t *, size);
if (ipn == NULL) {
KFREE(rc);
--- 86,93 ----
return -1;
}
+ aps->aps_sport = tcp->th_sport;
+ aps->aps_dport = tcp->th_dport;
! ipn = ipf_proxy_rule_rev(nat);
if (ipn == NULL) {
KFREE(rc);
***************
*** 96,144 ****
aps->aps_psiz = sizeof(*rc);
bzero((char *)rc, sizeof(*rc));
- bzero((char *)ipn, size);
- rc->rcmd_rule = ipn;
-
- aps->aps_sport = tcp->th_sport;
- aps->aps_dport = tcp->th_dport;
-
- ipn->in_size = size;
- ipn->in_ifps[0] = nat->nat_ifps[0];
- ipn->in_ifps[1] = nat->nat_ifps[1];
- ipn->in_apr = NULL;
- ipn->in_use = 1;
- ipn->in_hits = 1;
- ipn->in_ippip = 1;
-
- if ((np->in_redir & NAT_REDIRECT) != 0) {
- ipn->in_redir = NAT_MAP;
- ipn->in_snip = ntohl(nat->nat_odstaddr);
- ipn->in_nsrcaddr = nat->nat_odstaddr;
- ipn->in_dnip = ntohl(nat->nat_nsrcaddr);
- ipn->in_ndstaddr = nat->nat_nsrcaddr;
- ipn->in_osrcaddr = nat->nat_ndstaddr;
- ipn->in_odstaddr = nat->nat_osrcaddr;
- } else {
- ipn->in_redir = NAT_REDIRECT;
- ipn->in_snip = ntohl(nat->nat_odstaddr);
- ipn->in_nsrcaddr = nat->nat_odstaddr;
- ipn->in_dnip = ntohl(nat->nat_osrcaddr);
- ipn->in_ndstaddr = nat->nat_osrcaddr;
- ipn->in_osrcaddr = nat->nat_ndstaddr;
- ipn->in_odstaddr = nat->nat_nsrcaddr;
- }
-
- ipn->in_osrcmsk = 0xffffffff;
- ipn->in_nsrcmsk = 0xffffffff;
- ipn->in_odstmsk = 0xffffffff;
- ipn->in_ndstmsk = 0xffffffff;
- ipn->in_pr[0] = IPPROTO_TCP;
- ipn->in_pr[1] = IPPROTO_TCP;
- ipn->in_flags = (np->in_flags | IPN_PROXYRULE);
- MUTEX_INIT(&ipn->in_lock, "rcmd proxy NAT rule");
! ipn->in_namelen = np->in_namelen;
! bcopy(np->in_names, ipn->in_ifnames, ipn->in_namelen);
! ipn->in_ifnames[0] = nat->nat_ptr->in_ifnames[0];
! ipn->in_ifnames[1] = nat->nat_ptr->in_ifnames[1];
return 0;
--- 98,103 ----
aps->aps_psiz = sizeof(*rc);
bzero((char *)rc, sizeof(*rc));
! rc->rcmd_rule = ipn;
return 0;
***************
*** 188,191 ****
--- 147,151 ----
int off, dlen, nflags, direction;
ipf_main_softc_t *softc;
+ ipf_nat_softc_t *softn;
char portbuf[8], *s;
rcmdinfo_t *rc;
***************
*** 193,196 ****
--- 153,159 ----
u_short sp;
nat_t *nat2;
+ ip6_t *ip6;
+ int tcpsz;
+ int slen;
ip_t *ip;
mb_t *m;
***************
*** 200,210 ****
m = fin->fin_m;
ip = fin->fin_ip;
! off = (char *)tcp - (char *)ip + (TCP_OFF(tcp) << 2) + fin->fin_ipoff;
! #ifdef __sgi
! dlen = fin->fin_plen - off;
! #else
! dlen = MSGDSIZE(m) - off;
! #endif
if (dlen <= 0)
return 0;
--- 163,173 ----
m = fin->fin_m;
ip = fin->fin_ip;
! tcpsz = TCP_OFF(tcp) << 2;
! ip6 = (ip6_t *)fin->fin_ip;
! softc = fin->fin_main_soft;
! softn = softc->ipf_nat_soft;
! off = (char *)tcp - (char *)ip + tcpsz + fin->fin_ipoff;
! dlen = fin->fin_dlen - tcpsz;
if (dlen <= 0)
return 0;
***************
*** 249,323 ****
fi.fin_data[0] = 0;
fi.fin_data[1] = sp;
! fi.fin_fi.fi_saddr = nat->nat_ndstaddr;
! fi.fin_fi.fi_daddr = nat->nat_nsrcaddr;
! if (nat->nat_dir == NAT_OUTBOUND) {
! nat2 = ipf_nat_outlookup(&fi, NAT_SEARCH|IPN_TCP,
! nat->nat_pr[1],
! nat->nat_osrcip, nat->nat_odstip);
} else {
! nat2 = ipf_nat_inlookup(&fi, NAT_SEARCH|IPN_TCP,
! nat->nat_pr[0],
! nat->nat_osrcip, nat->nat_odstip);
}
! softc = fin->fin_main_soft;
! if (nat2 == NULL) {
! #ifdef USE_MUTEXES
! ipf_nat_softc_t *softn = softc->ipf_nat_soft;
! #endif
!
! /*
! * Add skeleton NAT entry for connection which will come
! * back the other way.
! */
! int slen;
slen = ip->ip_len;
ip->ip_len = htons(fin->fin_hlen + sizeof(*tcp));
! /*
! * Fill out the fake TCP header with a few fields that ipfilter
! * considers to be important.
! */
! bzero((char *)tcp2, sizeof(*tcp2));
! tcp2->th_win = htons(8192);
! TCP_OFF_A(tcp2, 5);
! tcp2->th_flags = TH_SYN;
!
! fi.fin_dp = (char *)tcp2;
! fi.fin_fr = &rcmdfr;
! fi.fin_dlen = sizeof(*tcp2);
! fi.fin_plen = fi.fin_hlen + sizeof(*tcp2);
! if (nat->nat_dir == NAT_OUTBOUND) {
! fi.fin_out = 0;
! direction = NAT_INBOUND;
! } else {
! fi.fin_out = 1;
! direction = NAT_OUTBOUND;
! }
! nflags = SI_W_SPORT;
! fi.fin_flx &= FI_LOWTTL|FI_FRAG|FI_TCPUDP|FI_OPTIONS|FI_IGNORE;
! nflags |= NAT_SLAVE|IPN_TCP;
! MUTEX_ENTER(&softn->ipf_nat_new);
nat2 = ipf_nat_add(&fi, rc->rcmd_rule, NULL, nflags,
direction);
! MUTEX_EXIT(&softn->ipf_nat_new);
! if (nat2 != NULL) {
! (void) ipf_nat_proto(&fi, nat2, IPN_TCP);
! MUTEX_ENTER(&nat2->nat_lock);
! ipf_nat_update(&fi, nat2);
! MUTEX_EXIT(&nat2->nat_lock);
! fi.fin_ifp = NULL;
! if (nat2->nat_dir == NAT_INBOUND)
! fi.fin_fi.fi_daddr = nat->nat_osrcaddr;
! (void) ipf_state_add(softc, &fi, NULL, SI_W_SPORT);
! }
ip->ip_len = slen;
}
return 0;
}
--- 212,319 ----
fi.fin_data[0] = 0;
fi.fin_data[1] = sp;
! fi.fin_src6 = nat->nat_ndst6;
! fi.fin_dst6 = nat->nat_nsrc6;
! if (nat->nat_v[0] == 6) {
! #ifdef USE_INET6
! if (nat->nat_dir == NAT_OUTBOUND) {
! nat2 = ipf_nat6_outlookup(&fi, NAT_SEARCH|IPN_TCP,
! nat->nat_pr[1],
! &nat->nat_osrc6.in6,
! &nat->nat_odst6.in6);
! } else {
! nat2 = ipf_nat6_inlookup(&fi, NAT_SEARCH|IPN_TCP,
! nat->nat_pr[0],
! &nat->nat_osrc6.in6,
! &nat->nat_odst6.in6);
! }
! #else
! nat2 = (void *)-1;
! #endif
} else {
! if (nat->nat_dir == NAT_OUTBOUND) {
! nat2 = ipf_nat_outlookup(&fi, NAT_SEARCH|IPN_TCP,
! nat->nat_pr[1],
! nat->nat_osrcip,
! nat->nat_odstip);
! } else {
! nat2 = ipf_nat_inlookup(&fi, NAT_SEARCH|IPN_TCP,
! nat->nat_pr[0],
! nat->nat_osrcip,
! nat->nat_odstip);
! }
}
+ if (nat2 != NULL)
+ return APR_ERR(1);
! /*
! * Add skeleton NAT entry for connection which will come
! * back the other way.
! */
+ if (nat->nat_v[0] == 6) {
+ #ifdef USE_INET6
+ slen = ip6->ip6_plen;
+ ip6->ip6_plen = htons(sizeof(*tcp));
+ #endif
+ } else {
slen = ip->ip_len;
ip->ip_len = htons(fin->fin_hlen + sizeof(*tcp));
+ }
! /*
! * Fill out the fake TCP header with a few fields that ipfilter
! * considers to be important.
! */
! bzero((char *)tcp2, sizeof(*tcp2));
! tcp2->th_win = htons(8192);
! TCP_OFF_A(tcp2, 5);
! tcp2->th_flags = TH_SYN;
! fi.fin_dp = (char *)tcp2;
! fi.fin_fr = &rcmdfr;
! fi.fin_dlen = sizeof(*tcp2);
! fi.fin_plen = fi.fin_hlen + sizeof(*tcp2);
! fi.fin_flx &= FI_LOWTTL|FI_FRAG|FI_TCPUDP|FI_OPTIONS|FI_IGNORE;
! if (nat->nat_dir == NAT_OUTBOUND) {
! fi.fin_out = 0;
! direction = NAT_INBOUND;
! } else {
! fi.fin_out = 1;
! direction = NAT_OUTBOUND;
! }
! nflags = SI_W_SPORT|NAT_SLAVE|IPN_TCP;
! MUTEX_ENTER(&softn->ipf_nat_new);
! if (fin->fin_v == 4)
nat2 = ipf_nat_add(&fi, rc->rcmd_rule, NULL, nflags,
direction);
! #ifdef USE_INET6
! else
! nat2 = ipf_nat6_add(&fi, rc->rcmd_rule, NULL, nflags,
! direction);
! #endif
! MUTEX_EXIT(&softn->ipf_nat_new);
! if (nat2 != NULL) {
! (void) ipf_nat_proto(&fi, nat2, IPN_TCP);
! MUTEX_ENTER(&nat2->nat_lock);
! ipf_nat_update(&fi, nat2);
! MUTEX_EXIT(&nat2->nat_lock);
! fi.fin_ifp = NULL;
! if (nat2->nat_dir == NAT_INBOUND)
! fi.fin_dst6 = nat->nat_osrc6;
! (void) ipf_state_add(softc, &fi, NULL, SI_W_SPORT);
! }
! if (nat->nat_v[0] == 6) {
! #ifdef USE_INET6
! ip6->ip6_plen = slen;
! #endif
! } else {
ip->ip_len = slen;
}
+ if (nat2 == NULL)
+ return APR_ERR(1);
return 0;
}
Index: ip_ftp_pxy.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_ftp_pxy.c,v
retrieving revision 1.19.2.6
retrieving revision 1.19.2.7
diff -C2 -d -r1.19.2.6 -r1.19.2.7
*** ip_ftp_pxy.c 29 May 2012 12:22:38 -0000 1.19.2.6
--- ip_ftp_pxy.c 20 Jul 2012 08:18:53 -0000 1.19.2.7
***************
*** 98,101 ****
--- 98,103 ----
int ipf_p_ftp_eprt4 __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *,
ftpinfo_t *, int));
+ int ipf_p_ftp_eprt6 __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *,
+ ftpinfo_t *, int));
int ipf_p_ftp_addport __P((ipf_ftp_softc_t *, fr_info_t *, ip_t *, nat_t *,
ftpinfo_t *, int, int, int));
***************
*** 103,114 ****
[...1621 lines suppressed...]
+ off = (char *)tcp - (char *)ip + (TCP_OFF(tcp) << 2) + fin->fin_ipoff;
+ #if !defined(_KERNEL)
+ M_ADJ(m, inc);
+ #else
+ if (inc < 0)
+ M_ADJ(m, inc);
+ #endif
+ /* the mbuf chain will be extended if necessary by m_copyback() */
+ COPYBACK(m, off, nlen, newbuf);
+ fin->fin_flx |= FI_DOCKSUM;
+
+ if (inc != 0) {
+ fin->fin_plen += inc;
+ ip6->ip6_plen = htons(fin->fin_plen - fin->fin_hlen);
+ fin->fin_dlen += inc;
+ }
+
+ f->ftps_cmd = FTPXY_C_EPRT;
+ return ipf_p_ftp_addport(softf, fin, ip, nat, ftp, dlen, port, inc);
+ }
Index: ip_fil.h
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_fil.h,v
retrieving revision 1.42.2.31
retrieving revision 1.42.2.32
diff -C2 -d -r1.42.2.31 -r1.42.2.32
*** ip_fil.h 13 Jul 2012 06:15:08 -0000 1.42.2.31
--- ip_fil.h 20 Jul 2012 08:18:53 -0000 1.42.2.32
***************
*** 210,214 ****
#define NLADD(n,x) htonl(ntohl(n) + (x))
#define IP6_INC(a) \
! { u_32_t *_i6 = (u_32_t *)(a); \
_i6[3] = NLADD(_i6[3], 1); \
if (_i6[3] == 0) { \
--- 210,214 ----
#define NLADD(n,x) htonl(ntohl(n) + (x))
#define IP6_INC(a) \
! do { u_32_t *_i6 = (u_32_t *)(a); \
_i6[3] = NLADD(_i6[3], 1); \
if (_i6[3] == 0) { \
***************
*** 221,227 ****
} \
} \
! }
#define IP6_ADD(a,x,d) \
! { i6addr_t *_s = (i6addr_t *)(a); \
i6addr_t *_d = (i6addr_t *)(d); \
_d->i6[0] = NLADD(_s->i6[0], x); \
--- 221,227 ----
} \
} \
! } while (0)
#define IP6_ADD(a,x,d) \
! do { i6addr_t *_s = (i6addr_t *)(a); \
i6addr_t *_d = (i6addr_t *)(d); \
_d->i6[0] = NLADD(_s->i6[0], x); \
***************
*** 235,240 ****
} \
} \
! }
! #define IP6_AND(a,b,d) { i6addr_t *_s1 = (i6addr_t *)(a); \
i6addr_t *_s2 = (i6addr_t *)(b); \
i6addr_t *_d = (i6addr_t *)(d); \
--- 235,240 ----
} \
} \
! } while (0)
! #define IP6_AND(a,b,d) do { i6addr_t *_s1 = (i6addr_t *)(a); \
i6addr_t *_s2 = (i6addr_t *)(b); \
i6addr_t *_d = (i6addr_t *)(d); \
***************
*** 243,249 ****
_d->i6[2] = _s1->i6[2] & _s2->i6[2]; \
_d->i6[3] = _s1->i6[3] & _s2->i6[3]; \
! }
#define IP6_ANDASSIGN(a,m) \
! { i6addr_t *_d = (i6addr_t *)(a); \
i6addr_t *_m = (i6addr_t *)(m); \
_d->i6[0] &= _m->i6[0]; \
--- 243,249 ----
_d->i6[2] = _s1->i6[2] & _s2->i6[2]; \
_d->i6[3] = _s1->i6[3] & _s2->i6[3]; \
! } while (0)
#define IP6_ANDASSIGN(a,m) \
! do { i6addr_t *_d = (i6addr_t *)(a); \
i6addr_t *_m = (i6addr_t *)(m); \
_d->i6[0] &= _m->i6[0]; \
***************
*** 251,255 ****
_d->i6[2] &= _m->i6[2]; \
_d->i6[3] &= _m->i6[3]; \
! }
#define IP6_MASKEQ(a,m,b) \
(((I60(a) & I60(m)) == I60(b)) && \
--- 251,255 ----
_d->i6[2] &= _m->i6[2]; \
_d->i6[3] &= _m->i6[3]; \
! } while (0)
#define IP6_MASKEQ(a,m,b) \
(((I60(a) & I60(m)) == I60(b)) && \
***************
*** 263,267 ****
((I63(a) & I63(m)) != I63(b)))
#define IP6_MERGE(a,b,c) \
! { i6addr_t *_d, *_s1, *_s2; \
_d = (i6addr_t *)(a); \
_s1 = (i6addr_t *)(b); \
--- 263,267 ----
((I63(a) & I63(m)) != I63(b)))
#define IP6_MERGE(a,b,c) \
! do { i6addr_t *_d, *_s1, *_s2; \
_d = (i6addr_t *)(a); \
_s1 = (i6addr_t *)(b); \
***************
*** 271,277 ****
_d->i6[2] |= _s1->i6[2] & ~_s2->i6[2]; \
_d->i6[3] |= _s1->i6[3] & ~_s2->i6[3]; \
! }
#define IP6_MASK(a,b,c) \
! { i6addr_t *_d, *_s1, *_s2; \
_d = (i6addr_t *)(a); \
_s1 = (i6addr_t *)(b); \
--- 271,277 ----
_d->i6[2] |= _s1->i6[2] & ~_s2->i6[2]; \
_d->i6[3] |= _s1->i6[3] & ~_s2->i6[3]; \
! } while (0)
#define IP6_MASK(a,b,c) \
! do { i6addr_t *_d, *_s1, *_s2; \
_d = (i6addr_t *)(a); \
_s1 = (i6addr_t *)(b); \
***************
*** 281,285 ****
_d->i6[2] = _s1->i6[2] & ~_s2->i6[2]; \
_d->i6[3] = _s1->i6[3] & ~_s2->i6[3]; \
! }
typedef union ipso_u {
u_short ipso_ripso[2];
--- 281,293 ----
_d->i6[2] = _s1->i6[2] & ~_s2->i6[2]; \
_d->i6[3] = _s1->i6[3] & ~_s2->i6[3]; \
! } while (0)
! #define IP6_SETONES(a) \
! do { i6addr_t *_d = (i6addr_t *)(a); \
! _d->i6[0] = 0xffffffff; \
! _d->i6[1] = 0xffffffff; \
! _d->i6[2] = 0xffffffff; \
! _d->i6[3] = 0xffffffff; \
! } while (0)
!
typedef union ipso_u {
u_short ipso_ripso[2];
***************
*** 333,336 ****
--- 341,345 ----
#define FI_ENCAP 0x100000 /* encap/decap with NAT */
#define FI_AH 0x200000 /* AH header present */
+ #define FI_DOCKSUM 0x10000000 /* Proxy wants L4 recalculation */
#define FI_NOCKSUM 0x20000000 /* don't do a L4 checksum validation */
#define FI_NOWILD 0x40000000 /* Do not do wildcard searches */
|
|
From: Darren <dar...@us...> - 2012-07-20 08:18:38
|
Update of /cvsroot/ipfilter/ipfilter/test/expected In directory vz-cvs-4.sog:/tmp/cvs-serv30036/test/expected Modified Files: ni5 Log Message: 3545324 proxy checksum calculation is not hardware aware 3545321 FTP sequence number adjustment incorrectly applied 3545320 EPSV is not recognised 3545319 move nat rule creation to ip_proxy.c 3545317 better feedback of checksum requirements for proxies 3545314 ftp proxy levels do not make sense 3545312 EPRT is not supported by ftp proxy Index: ni5 =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/test/expected/ni5,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ni5 17 Nov 2011 20:26:50 -0000 1.6 --- ni5 20 Jul 2012 08:18:35 -0000 1.7 *************** *** 5,8 **** --- 5,9 ---- 4500 0028 0001 4000 ff06 02ff 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 76c5 5010 269c 5aa0 0000 + ipf_p_ftp_servert_valid:i(0) < 5 4500 006f ffde 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 76c5 bd6b c9c9 5018 269c 967e 0000 3232 302d 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 7520 4e63 4654 5064 2053 6572 7665 7220 2866 7265 6520 6564 7563 6174 696f 6e61 6c20 6c69 6365 6e73 6529 2072 6561 6479 2e0d 0a *************** *** 23,26 **** --- 24,28 ---- 4500 0036 0006 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5018 269c 373f 0000 5041 5353 2061 7661 6c6f 6e40 0d0a + ipf_p_ftp_servert_valid:i(0) < 5 4500 005f ffe2 4000 ef06 533c 96cb e002 c0a8 0103 0015 8032 3786 77ef bd6b c9e7 5018 269c 895e 0000 3233 302d 596f 7520 6172 6520 7573 6572 2023 3420 6f66 2035 3020 7369 6d75 6c74 616e 656f 7573 2075 7365 7273 2061 6c6c 6f77 6564 2e0d 0a |