[ipfilter-cvs] ipfilter ip_dns_pxy.c, v5-1-RELEASE ip_ipsec_pxy.c, v5-1-RELEASE ip_irc_pxy.c, v5-1-RELEASE ip_pptp_pxy.c, v5-1-RELEASE ip_raudio_pxy.c, v5-1-RELEASE ip_rpcb_pxy.c, v5-1-RELEASE

[Darren <dar...@us...>]

Update of /cvsroot/ipfilter/ipfilter
In directory vz-cvs-4.sog:/tmp/cvs-serv28113

Modified Files:
      Tag: v5-1-RELEASE
	ip_dns_pxy.c ip_ipsec_pxy.c ip_irc_pxy.c ip_pptp_pxy.c 
	ip_raudio_pxy.c ip_rpcb_pxy.c 
Log Message:
3545309 non-ipv6 safe proxies do not fail with ipv6

Index: ip_ipsec_pxy.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_ipsec_pxy.c,v
retrieving revision 1.14.2.6
retrieving revision 1.14.2.7
diff -C2 -d -r1.14.2.6 -r1.14.2.7
*** ip_ipsec_pxy.c	13 Jul 2012 12:25:34 -0000	1.14.2.6
--- ip_ipsec_pxy.c	20 Jul 2012 07:58:22 -0000	1.14.2.7
***************
*** 151,154 ****
--- 151,157 ----
  	mb_t *m;
  
+ 	if (fin->fin_v != 4)
+ 		return -1;
+ 
  	off = fin->fin_plen - fin->fin_dlen + fin->fin_ipoff;
  	bzero(softi->ipsec_buffer, sizeof(softi->ipsec_buffer));

Index: ip_pptp_pxy.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_pptp_pxy.c,v
retrieving revision 1.13.2.6
retrieving revision 1.13.2.7
diff -C2 -d -r1.13.2.6 -r1.13.2.7
*** ip_pptp_pxy.c	13 Jul 2012 12:25:35 -0000	1.13.2.6
--- ip_pptp_pxy.c	20 Jul 2012 07:58:22 -0000	1.13.2.7
***************
*** 120,123 ****
--- 120,126 ----
  	ip_t *ip;
  
+ 	if (fin->fin_v != 4)
+ 		return -1;
+ 
  	ip = fin->fin_ip;
  	np = nat->nat_ptr;

Index: ip_raudio_pxy.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_raudio_pxy.c,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -d -r1.9.2.3 -r1.9.2.4
*** ip_raudio_pxy.c	26 Jan 2012 05:44:25 -0000	1.9.2.3
--- ip_raudio_pxy.c	20 Jul 2012 07:58:22 -0000	1.9.2.4
***************
*** 57,67 ****
  	raudio_t *rap;
  
  	KMALLOCS(aps->aps_data, void *, sizeof(raudio_t));
  	if (aps->aps_data == NULL)
  		return -1;
  
- 	fin = fin;	/* LINT */
- 	nat = nat;	/* LINT */
- 
  	bzero(aps->aps_data, sizeof(raudio_t));
  	rap = aps->aps_data;
--- 57,69 ----
  	raudio_t *rap;
  
+ 	nat = nat;	/* LINT */
+ 
+ 	if (fin->fin_v != 4)
+ 		return -1;
+ 
  	KMALLOCS(aps->aps_data, void *, sizeof(raudio_t));
  	if (aps->aps_data == NULL)
  		return -1;
  
  	bzero(aps->aps_data, sizeof(raudio_t));
  	rap = aps->aps_data;

Index: ip_irc_pxy.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_irc_pxy.c,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -d -r1.9.2.4 -r1.9.2.5
*** ip_irc_pxy.c	29 May 2012 12:22:38 -0000	1.9.2.4
--- ip_irc_pxy.c	20 Jul 2012 07:58:22 -0000	1.9.2.5
***************
*** 233,241 ****
  	ircinfo_t *irc;
  
  	KMALLOC(irc, ircinfo_t *);
  	if (irc == NULL)
  		return -1;
  
- 	fin = fin;	/* LINT */
  	nat = nat;	/* LINT */
  
--- 233,243 ----
  	ircinfo_t *irc;
  
+ 	if (fin->fin_v != 4)
+ 		return -1;
+ 
  	KMALLOC(irc, ircinfo_t *);
  	if (irc == NULL)
  		return -1;
  
  	nat = nat;	/* LINT */
  
***************
*** 357,360 ****
--- 359,363 ----
  #endif
  	COPYBACK(m, off, nlen, newbuf);
+ 	fin->fin_flx |= FI_DOCKSUM;
  
  	if (inc != 0) {

Index: ip_rpcb_pxy.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_rpcb_pxy.c,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -C2 -d -r1.13.2.3 -r1.13.2.4
*** ip_rpcb_pxy.c	13 Jul 2012 06:39:03 -0000	1.13.2.3
--- ip_rpcb_pxy.c	20 Jul 2012 07:58:22 -0000	1.13.2.4
***************
*** 151,157 ****
  	rpcb_session_t *rs;
  
- 	fin = fin;	/* LINT */
  	nat = nat;	/* LINT */
  
  	KMALLOC(rs, rpcb_session_t *);
  	if (rs == NULL)
--- 151,159 ----
  	rpcb_session_t *rs;
  
  	nat = nat;	/* LINT */
  
+ 	if (fin->fin_v != 4)
+ 		return -1;
+ 
  	KMALLOC(rs, rpcb_session_t *);
  	if (rs == NULL)

Index: ip_dns_pxy.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_dns_pxy.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** ip_dns_pxy.c	29 Jan 2012 05:30:35 -0000	1.1.2.8
--- ip_dns_pxy.c	20 Jul 2012 07:58:22 -0000	1.1.2.9
***************
*** 184,187 ****
--- 184,190 ----
  	int dlen;
  
+ 	if (fin->fin_v != 4)
+ 		return -1;
+ 
  	dlen = fin->fin_dlen - sizeof(udphdr_t);
  	if (dlen < sizeof(ipf_dns_hdr_t)) {