From owner-p4-projects@FreeBSD.ORG  Tue Jan 30 00:55:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 687DD16A40F; Tue, 30 Jan 2007 00:55:14 +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 1455B16A409
	for <perforce@freebsd.org>; Tue, 30 Jan 2007 00:55:13 +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 A1CA813C4A6
	for <perforce@freebsd.org>; Tue, 30 Jan 2007 00:55:03 +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 l0U0t3Qb081934
	for <perforce@freebsd.org>; Tue, 30 Jan 2007 00:55:03 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0U0t3HB081931
	for perforce@freebsd.org; Tue, 30 Jan 2007 00:55:03 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 30 Jan 2007 00:55:03 GMT
Message-Id: <200701300055.l0U0t3HB081931@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 113683 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Jan 2007 00:55:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=113683

Change 113683 by piso@piso_newluxor on 2007/01/30 00:54:23

	We don't need to ip_next() in GetDeltaAckIt(): pass down the tcp ack field
	and eliminate the necessity to have pointers to the ip and tcp headers.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#37 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#19 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#14 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#37 (text+ko) ====

@@ -930,7 +930,7 @@
 		if (GetAckModified(lnk) == 1) {
 			int delta;
 
-			delta = GetDeltaAckIn(pip, lnk);
+			delta = GetDeltaAckIn(lnk, tc->th_ack);
 			if (delta != 0) {
 				accumulate += twowords(&tc->th_ack);
 				tc->th_ack = htonl(ntohl(tc->th_ack) - delta);

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#19 (text+ko) ====

@@ -2007,7 +2007,7 @@
 
 
 int
-GetDeltaAckIn(struct ip *pip, struct alias_link *lnk)
+GetDeltaAckIn(struct alias_link *lnk, u_long ack)
 {
 /*
 Find out how much the ACK number has been altered for an incoming
@@ -2016,12 +2016,7 @@
 */
 
 	int i;
-	struct tcphdr *tc;
 	int delta, ack_diff_min;
-	u_long ack;
-
-	tc = ip_next(pip);
-	ack = tc->th_ack;
 
 	delta = 0;
 	ack_diff_min = -1;

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#14 (text+ko) ====

@@ -298,7 +298,7 @@
 void		SetProxyPort(struct alias_link *_lnk, u_short _port);
 void		SetAckModified(struct alias_link *_lnk);
 int		GetAckModified(struct alias_link *_lnk);
-int		GetDeltaAckIn(struct ip *_pip, struct alias_link *_lnk);
+int		GetDeltaAckIn(struct alias_link *_lnk, u_long ack);
 int		GetDeltaSeqOut(struct ip *_pip, struct alias_link *_lnk);
 void		AddSeq    (struct ip *_pip, struct alias_link *_lnk, int _delta);
 void		SetExpire (struct alias_link *_lnk, int _expire);