Date: Thu, 30 Jul 2009 22:32:01 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 166840 for review Message-ID: <200907302232.n6UMW1gm041057@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=166840 Change 166840 by trasz@trasz_anger on 2009/07/30 22:31:18 Discard more unrelated changes. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/netinet/in_pcb.c#10 edit .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_output.c#7 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/netinet/in_pcb.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/in_pcb.c,v 1.259 2009/07/19 14:20:53 rwatson Exp $"); +__FBSDID("$FreeBSD: head/sys/netinet/in_pcb.c 195760 2009-07-19 14:20:53Z rwatson $"); #include "opt_ddb.h" #include "opt_ipsec.h" @@ -558,23 +558,6 @@ sin = (struct sockaddr_in *)&sro.ro_dst; sin->sin_family = AF_INET; sin->sin_len = sizeof(struct sockaddr_in); - -#ifdef IPSEC - /* - * If there is an IPsec tunnel with a destination matching faddr, - * try to use source address for the tunnel. - */ - sin->sin_addr.s_addr = key_find_src(&faddr->s_addr); - ifa = ifa_ifwithnet(sintosa(sin)); - if (ifa != NULL) { - sin = IA_SIN(ifatoia(ifa)); - if (prison_check_ip4(cred, &sin->sin_addr) == 0) { - laddr->s_addr = sin->sin_addr.s_addr; - goto done; - } - } -#endif - sin->sin_addr.s_addr = faddr->s_addr; /* ==== //depot/projects/soc2009/trasz_limits/sys/netinet/ip_output.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/ip_output.c,v 1.313 2009/07/14 22:48:30 rwatson Exp $"); +__FBSDID("$FreeBSD: head/sys/netinet/ip_output.c 195699 2009-07-14 22:48:30Z rwatson $"); #include "opt_ipfw.h" #include "opt_ipsec.h" @@ -78,7 +78,6 @@ #ifdef IPSEC #include <netinet/ip_ipsec.h> #include <netipsec/ipsec.h> -#include <netipsec/key.h> #endif /* IPSEC*/ #include <machine/in_cksum.h> @@ -134,8 +133,6 @@ struct m_tag *fwd_tag = NULL; #endif #ifdef IPSEC - struct sockaddr_in sin; - struct ifaddr *ifa; int no_route_but_check_spd = 0; #endif M_ASSERTPKTHDR(m); @@ -193,17 +190,6 @@ hlen = ip->ip_hl << 2; } -#ifdef IPSEC - if (ip->ip_src.s_addr == INADDR_ANY) { - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = key_find_src(&ip->ip_dst.s_addr); - ifa = ifa_ifwithnet(sintosa(&sin)); - if (ifa != NULL) - ip->ip_src = IA_SIN(ifatoia(ifa))->sin_addr; - } -#endif - dst = (struct sockaddr_in *)&ro->ro_dst; again: /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907302232.n6UMW1gm041057>