From owner-p4-projects@FreeBSD.ORG Sun Aug 17 14:24:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19B5B1065673; Sun, 17 Aug 2008 14:24:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D152D1065671 for ; Sun, 17 Aug 2008 14:24:08 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B6F778FC08 for ; Sun, 17 Aug 2008 14:24:08 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HEO89l029297 for ; Sun, 17 Aug 2008 14:24:08 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HEO8r8029295 for perforce@freebsd.org; Sun, 17 Aug 2008 14:24:08 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 14:24:08 GMT Message-Id: <200808171424.m7HEO8r8029295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147651 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 14:24:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=147651 Change 147651 by bz@bz_dumpster on 2008/08/17 14:23:49 V_ification of udp_blackhole Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#12 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#2 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#7 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#11 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#12 (text+ko) ==== @@ -321,7 +321,7 @@ * Save a copy of the IP header in case we want restore it for * sending an ICMP error message in response. */ - if (!udp_blackhole) + if (!V_udp_blackhole) save_ip = *ip; else memset(&save_ip, 0, sizeof(save_ip)); @@ -529,7 +529,7 @@ V_udpstat.udps_noportbcast++; goto badheadlocked; } - if (udp_blackhole) + if (V_udp_blackhole) goto badheadlocked; if (badport_bandlim(BANDLIM_ICMP_UNREACH) < 0) goto badheadlocked; ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#7 (text+ko) ==== @@ -337,7 +337,7 @@ goto badheadlocked; } INP_INFO_RUNLOCK(&V_udbinfo); - if (udp_blackhole) + if (V_udp_blackhole) goto badunlocked; if (badport_bandlim(BANDLIM_ICMP6_UNREACH) < 0) goto badunlocked; ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#11 (text+ko) ==== @@ -334,6 +334,7 @@ #define V_twq_2msl twq_2msl #define V_udb udb #define V_udbinfo udbinfo +#define V_udp_blackhole udp_blackhole #define V_udp6_recvspace udp6_recvspace #define V_udp6_sendspace udp6_sendspace #define V_udpstat udpstat