From owner-p4-projects@FreeBSD.ORG Mon Mar 10 16:11:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63E501065676; Mon, 10 Mar 2008 16:11:28 +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 2381C106566B for ; Mon, 10 Mar 2008 16:11:28 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 230EE8FC1D for ; Mon, 10 Mar 2008 16:11:28 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AGBSCJ008795 for ; Mon, 10 Mar 2008 16:11:28 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AGBREp008793 for perforce@freebsd.org; Mon, 10 Mar 2008 16:11:27 GMT (envelope-from piso@freebsd.org) Date: Mon, 10 Mar 2008 16:11:27 GMT Message-Id: <200803101611.m2AGBREp008793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 137323 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: Mon, 10 Mar 2008 16:11:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=137323 Change 137323 by piso@piso_ferret on 2008/03/10 16:10:28 -Don't pass the entire pkt to FragmentIn() & FragmentOut() -Remove some stale comments Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#67 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#67 (text+ko) ==== @@ -642,8 +642,6 @@ return (iresult); } - -// XXX ip free static int ProtoAliasIn(struct libalias *la, struct in_addr ip_src, struct in_addr *ip_dst, u_char ip_p, u_short *ip_sum) @@ -677,7 +675,6 @@ return (PKT_ALIAS_IGNORED); } -// XXX ip free static int ProtoAliasOut(struct libalias *la, struct in_addr *ip_src, struct in_addr ip_dst, u_char ip_p, u_short *ip_sum, int create) @@ -1094,41 +1091,42 @@ */ /* Local prototypes */ -static int FragmentIn(struct libalias *, struct ip *); -static int FragmentOut(struct libalias *, struct ip *); +static int FragmentIn(struct libalias *la, struct in_addr ip_src, + struct in_addr *ip_dst, u_char ip_p, u_short *ip_sum); +static int FragmentOut(struct libalias *, struct in_addr *ip_src, + u_short *ip_sum); -// XXX ip free static int -FragmentIn(struct libalias *la, struct ip *pip) +FragmentIn(struct libalias *la, struct in_addr ip_src, struct in_addr *ip_dst, + u_char ip_id, u_short *ip_sum) { struct alias_link *lnk; LIBALIAS_LOCK_ASSERT(la); - lnk = FindFragmentIn2(la, pip->ip_src, pip->ip_dst, pip->ip_id); + lnk = FindFragmentIn2(la, ip_src, *ip_dst, ip_id); if (lnk != NULL) { struct in_addr original_address; GetFragmentAddr(lnk, &original_address); - DifferentialChecksum(&pip->ip_sum, - &original_address, &pip->ip_dst, 2); - pip->ip_dst = original_address; + DifferentialChecksum(ip_sum, + &original_address, ip_dst, 2); + *ip_dst = original_address; return (PKT_ALIAS_OK); } return (PKT_ALIAS_UNRESOLVED_FRAGMENT); } -// XXX ip free static int -FragmentOut(struct libalias *la, struct ip *pip) +FragmentOut(struct libalias *la, struct in_addr *ip_src, u_short *ip_sum) { struct in_addr alias_address; LIBALIAS_LOCK_ASSERT(la); - alias_address = FindAliasAddress(la, pip->ip_src); - DifferentialChecksum(&pip->ip_sum, - &alias_address, &pip->ip_src, 2); - pip->ip_src = alias_address; + alias_address = FindAliasAddress(la, *ip_src); + DifferentialChecksum(ip_sum, + &alias_address, ip_src, 2); + *ip_src = alias_address; return (PKT_ALIAS_OK); } @@ -1310,7 +1308,8 @@ } } } else { - iresult = FragmentIn(la, pip); + iresult = FragmentIn(la, pip->ip_src, &pip->ip_dst, pip->ip_id, + &pip->ip_sum); } getout: @@ -1441,7 +1440,7 @@ break; } } else { - iresult = FragmentOut(la, pip); + iresult = FragmentOut(la, &pip->ip_src, &pip->ip_sum); } SetDefaultAliasAddress(la, addr_save);