From owner-p4-projects@FreeBSD.ORG Tue Jan 30 01:32:53 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 1350A16A407; Tue, 30 Jan 2007 01:32:53 +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 DE04416A400 for ; Tue, 30 Jan 2007 01:32:52 +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 CEB2813C49D for ; Tue, 30 Jan 2007 01:32:52 +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 l0U1Wqaw089282 for ; Tue, 30 Jan 2007 01:32:52 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0U1WqdN089277 for perforce@freebsd.org; Tue, 30 Jan 2007 01:32:52 GMT (envelope-from piso@freebsd.org) Date: Tue, 30 Jan 2007 01:32:52 GMT Message-Id: <200701300132.l0U1WqdN089277@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 113686 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:32:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=113686 Change 113686 by piso@piso_newluxor on 2007/01/30 01:32:35 Remove another usage of ip_next(): pass down tcp offset and seq number, and axe ip_next() from AddSeq(). Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#21 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#15 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#16 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#16 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#17 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#16 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#21 (text+ko) ==== @@ -2085,7 +2085,8 @@ void -AddSeq(struct ip *pip, struct alias_link *lnk, int delta) +AddSeq(struct ip *pip, struct alias_link *lnk, int delta, u_int th_off, + u_int th_seq) { /* When a TCP packet has been altered in length, save this @@ -2093,19 +2094,16 @@ been altered, then this list will begin to overwrite itself. */ - struct tcphdr *tc; struct ack_data_record x; int hlen, tlen, dlen; int i; - tc = ip_next(pip); - - hlen = (pip->ip_hl + tc->th_off) << 2; + hlen = (pip->ip_hl + th_off) << 2; tlen = ntohs(pip->ip_len); dlen = tlen - hlen; - x.ack_old = htonl(ntohl(tc->th_seq) + dlen); - x.ack_new = htonl(ntohl(tc->th_seq) + dlen + delta); + x.ack_old = htonl(ntohl(th_seq) + dlen); + x.ack_new = htonl(ntohl(th_seq) + dlen + delta); x.delta = delta; x.active = 1; ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#15 (text+ko) ==== @@ -734,7 +734,8 @@ SetAckModified(lnk); delta = GetDeltaSeqOut(lnk, tc->th_seq); - AddSeq(pip, lnk, delta + slen - dlen); + AddSeq(pip, lnk, delta + slen - dlen, tc->th_off, + tc->th_seq); } /* Revise IP header */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#16 (text+ko) ==== @@ -432,7 +432,8 @@ SetAckModified(lnk); delta = GetDeltaSeqOut(lnk, tc->th_seq); - AddSeq(pip, lnk, delta + copyat + iCopy - dlen); + AddSeq(pip, lnk, delta + copyat + iCopy - dlen, + tc->th_off, tc->th_seq); } /* Revise IP header */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#16 (text+ko) ==== @@ -300,7 +300,8 @@ int GetAckModified(struct alias_link *_lnk); int GetDeltaAckIn(struct alias_link *_lnk, u_long ack); int GetDeltaSeqOut(struct alias_link *_lnk, u_long seq); -void AddSeq (struct ip *_pip, struct alias_link *_lnk, int _delta); +void AddSeq (struct ip *_pip, struct alias_link *_lnk, int _delta, + u_int th_off, u_int th_seq); void SetExpire (struct alias_link *_lnk, int _expire); void ClearCheckNewLink(struct libalias *la); void SetProtocolFlags(struct alias_link *_lnk, int _pflags); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#17 (text+ko) ==== @@ -454,7 +454,7 @@ SetAckModified(lnk); delta = GetDeltaSeqOut(lnk, tc->th_seq); - AddSeq(pip, lnk, delta + slen); + AddSeq(pip, lnk, delta + slen, tc->th_off, tc->th_seq); } /* Update IP header packet length and checksum */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#16 (text+ko) ==== @@ -405,7 +405,7 @@ SetAckModified(lnk); delta = GetDeltaSeqOut(lnk, tc->th_seq); - AddSeq(pip, lnk, delta + new_dlen - dlen); + AddSeq(pip, lnk, delta + new_dlen - dlen, tc->th_off, tc->th_seq); new_len = htons(hlen + new_dlen); DifferentialChecksum(&pip->ip_sum,