From owner-p4-projects@FreeBSD.ORG Mon Jan 19 09:59:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 613E716A4D0; Mon, 19 Jan 2004 09:59:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 21DE316A4CE for ; Mon, 19 Jan 2004 09:59:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D56243D39 for ; Mon, 19 Jan 2004 09:59:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0JHxG0B086951 for ; Mon, 19 Jan 2004 09:59:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0JHxG4t086948 for perforce@freebsd.org; Mon, 19 Jan 2004 09:59:16 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 19 Jan 2004 09:59:16 -0800 (PST) Message-Id: <200401191759.i0JHxG4t086948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 17:59:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=45603 Change 45603 by sam@sam_ebb on 2004/01/19 09:58:47 revert sockaddr assignment optimization not directly related to socket locking; this should be kept separate Affected files ... .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#3 edit Differences ... ==== //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#3 (text+ko) ==== @@ -248,6 +248,7 @@ struct icmp *icp; struct in_ifaddr *ia; struct ip *ip = mtod(m, struct ip *); + struct sockaddr_in icmpsrc, icmpdst, icmpgw; int hlen = off; int icmplen = ip->ip_len; int i, code; @@ -310,6 +311,17 @@ if (icp->icmp_type > ICMP_MAXTYPE) goto raw; + /* Initialize */ + bzero(&icmpsrc, sizeof(icmpsrc)); + icmpsrc.sin_len = sizeof(struct sockaddr_in); + icmpsrc.sin_family = AF_INET; + bzero(&icmpdst, sizeof(icmpdst)); + icmpdst.sin_len = sizeof(struct sockaddr_in); + icmpdst.sin_family = AF_INET; + bzero(&icmpgw, sizeof(icmpgw)); + icmpgw.sin_len = sizeof(struct sockaddr_in); + icmpgw.sin_family = AF_INET; + icmpstat.icps_inhist[icp->icmp_type]++; code = icp->icmp_code; switch (icp->icmp_type) { @@ -369,10 +381,7 @@ if (code) goto badcode; code = PRC_QUENCH; - deliver: { - struct sockaddr_in icmpsrc = - { sizeof(struct sockaddr_in), AF_INET }; - + deliver: /* * Problem with datagram; advise higher level routines. */ @@ -442,7 +451,6 @@ (*ctlfunc)(code, (struct sockaddr *)&icmpsrc, (void *)&icp->icmp_ip); break; - } badcode: icmpstat.icps_badcode++; @@ -478,10 +486,7 @@ else goto reflect; - case ICMP_MASKREQ: { - struct sockaddr_in icmpdst = - { sizeof(struct sockaddr_in), AF_INET }; - + case ICMP_MASKREQ: if (icmpmaskrepl == 0) break; /* @@ -523,16 +528,8 @@ icmpstat.icps_outhist[icp->icmp_type]++; icmp_reflect(m); return; - } - case ICMP_REDIRECT: { - struct sockaddr_in icmpsrc = - { sizeof(struct sockaddr_in), AF_INET }; - struct sockaddr_in icmpdst = - { sizeof(struct sockaddr_in), AF_INET }; - struct sockaddr_in icmpgw = - { sizeof(struct sockaddr_in), AF_INET }; - + case ICMP_REDIRECT: if (log_redirect) { u_long src, dst, gw; @@ -589,7 +586,6 @@ key_sa_routechange((struct sockaddr *)&icmpsrc); #endif break; - } /* * No kernel processing for the following;