From owner-p4-projects@FreeBSD.ORG Tue Jan 30 01:43:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16E6216A408; Tue, 30 Jan 2007 01:43:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C927E16A406 for ; Tue, 30 Jan 2007 01:43:06 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BABCE13C467 for ; Tue, 30 Jan 2007 01:43:06 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0U1h6lE091050 for ; Tue, 30 Jan 2007 01:43:06 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0U1h6RF091047 for perforce@freebsd.org; Tue, 30 Jan 2007 01:43:06 GMT (envelope-from piso@freebsd.org) Date: Tue, 30 Jan 2007 01:43:06 GMT Message-Id: <200701300143.l0U1h6RF091047@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 113687 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: Tue, 30 Jan 2007 01:43:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=113687 Change 113687 by piso@piso_newluxor on 2007/01/30 01:43:01 In TcpMonitorIn() and TcpMonitorOut() we don't need any pointer to the ip or tcp header: pass down the tcp flags field and axe an ip_next() usage. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#39 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#39 (text+ko) ==== @@ -170,48 +170,42 @@ */ /* Local prototypes */ -static void TcpMonitorIn(struct ip *, struct alias_link *); +static void TcpMonitorIn(struct alias_link *, u_char th_flags); -static void TcpMonitorOut(struct ip *, struct alias_link *); +static void TcpMonitorOut(struct alias_link *, u_char th_flags); static void -TcpMonitorIn(struct ip *pip, struct alias_link *lnk) +TcpMonitorIn(struct alias_link *lnk, u_char th_flags) { - struct tcphdr *tc; - tc = (struct tcphdr *)ip_next(pip); - switch (GetStateIn(lnk)) { case ALIAS_TCP_STATE_NOT_CONNECTED: - if (tc->th_flags & TH_RST) + if (th_flags & TH_RST) SetStateIn(lnk, ALIAS_TCP_STATE_DISCONNECTED); - else if (tc->th_flags & TH_SYN) + else if (th_flags & TH_SYN) SetStateIn(lnk, ALIAS_TCP_STATE_CONNECTED); break; case ALIAS_TCP_STATE_CONNECTED: - if (tc->th_flags & (TH_FIN | TH_RST)) + if (th_flags & (TH_FIN | TH_RST)) SetStateIn(lnk, ALIAS_TCP_STATE_DISCONNECTED); break; } } static void -TcpMonitorOut(struct ip *pip, struct alias_link *lnk) +TcpMonitorOut(struct alias_link *lnk, u_char th_flags) { - struct tcphdr *tc; - - tc = (struct tcphdr *)ip_next(pip); switch (GetStateOut(lnk)) { case ALIAS_TCP_STATE_NOT_CONNECTED: - if (tc->th_flags & TH_RST) + if (th_flags & TH_RST) SetStateOut(lnk, ALIAS_TCP_STATE_DISCONNECTED); - else if (tc->th_flags & TH_SYN) + else if (th_flags & TH_SYN) SetStateOut(lnk, ALIAS_TCP_STATE_CONNECTED); break; case ALIAS_TCP_STATE_CONNECTED: - if (tc->th_flags & (TH_FIN | TH_RST)) + if (th_flags & (TH_FIN | TH_RST)) SetStateOut(lnk, ALIAS_TCP_STATE_DISCONNECTED); break; } @@ -954,7 +948,7 @@ ADJUST_CHECKSUM(accumulate, pip->ip_sum); /* Monitor TCP connection state */ - TcpMonitorIn(pip, lnk); + TcpMonitorIn(lnk, tc->th_flags); return (PKT_ALIAS_OK); } @@ -1038,7 +1032,7 @@ alias_address = GetAliasAddress(lnk); /* Monitor TCP connection state */ - TcpMonitorOut(pip, lnk); + TcpMonitorOut(lnk, tc->th_flags); /* Walk out chain. */ error = find_handler(OUT, TCP, la, pip, &ad);