PERFORCE change 144584 for review

[Julian Elischer]

http://perforce.freebsd.org/chv.cgi?CH=144584

Change 144584 by julian at julian_trafmon1 on 2008/07/03 23:58:40

	make up our mind abut ipstealth on a vimage basis

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#9 edit
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#26 edit
.. //depot/projects/vimage/src/sys/netinet/ip_options.c#10 edit
.. //depot/projects/vimage/src/sys/netinet/vinet.h#22 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#9 (text+ko) ====

@@ -400,7 +400,7 @@
 	 * Check TTL
 	 */
 #ifdef IPSTEALTH
-	if (!ipstealth) {
+	if (!V_ipstealth) {
 #endif
 	if (ip->ip_ttl <= IPTTLDEC) {
 		icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, 0, 0);

==== //depot/projects/vimage/src/sys/netinet/ip_input.c#26 (text+ko) ====

@@ -677,7 +677,7 @@
 	 * IPSTEALTH: Process non-routing options only
 	 * if the packet is destined for us.
 	 */
-	if (ipstealth && hlen > sizeof (struct ip) &&
+	if (V_ipstealth && hlen > sizeof (struct ip) &&
 	    ip_dooptions(m, 1))
 		return;
 #endif /* IPSTEALTH */
@@ -1331,7 +1331,7 @@
 		return;
 	}
 #ifdef IPSTEALTH
-	if (!ipstealth) {
+	if (!V_ipstealth) {
 #endif
 		if (ip->ip_ttl <= IPTTLDEC) {
 			icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS,
@@ -1382,7 +1382,7 @@
 	}
 
 #ifdef IPSTEALTH
-	if (!ipstealth) {
+	if (!V_ipstealth) {
 #endif
 		ip->ip_ttl -= IPTTLDEC;
 #ifdef IPSTEALTH

==== //depot/projects/vimage/src/sys/netinet/ip_options.c#10 (text+ko) ====

@@ -155,7 +155,7 @@
 		case IPOPT_LSRR:
 		case IPOPT_SSRR:
 #ifdef IPSTEALTH
-			if (ipstealth && pass > 0)
+			if (V_ipstealth && pass > 0)
 				break;
 #endif
 			if (optlen < IPOPT_OFFSET + sizeof(*cp)) {
@@ -194,7 +194,7 @@
 				break;
 			}
 #ifdef IPSTEALTH
-			if (ipstealth)
+			if (V_ipstealth)
 				goto dropit;
 #endif
 			if (!ip_dosourceroute) {
@@ -257,7 +257,7 @@
 
 		case IPOPT_RR:
 #ifdef IPSTEALTH
-			if (ipstealth && pass == 0)
+			if (V_ipstealth && pass == 0)
 				break;
 #endif
 			if (optlen < IPOPT_OFFSET + sizeof(*cp)) {
@@ -294,7 +294,7 @@
 
 		case IPOPT_TS:
 #ifdef IPSTEALTH
-			if (ipstealth && pass == 0)
+			if (V_ipstealth && pass == 0)
 				break;
 #endif
 			code = cp - (u_char *)ip;

==== //depot/projects/vimage/src/sys/netinet/vinet.h#22 (text+ko) ====

@@ -66,6 +66,7 @@
 	int	_sameprefixcarponly;
 
 	int	_ipforwarding;
+	int	_ipstealth;
 	int	_ipfastforward_active;
 	int	_ipsendredirects;
 	int	_ip_defttl;
@@ -201,6 +202,7 @@
 #define V_sameprefixcarponly	VNET_INET(sameprefixcarponly)
 
 #define V_ipforwarding		VNET_INET(ipforwarding)
+#define V_ipstealth		VNET_INET(ipstealth)
 #define V_ipfastforward_active	VNET_INET(ipfastforward_active)
 #define V_ipsendredirects	VNET_INET(ipsendredirects)
 #define V_ip_defttl		VNET_INET(ip_defttl)