From owner-p4-projects@FreeBSD.ORG  Thu Jun 19 23:00:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 13C5E106568C; Thu, 19 Jun 2008 23:00:33 +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 C9B5E1065675
	for <perforce@FreeBSD.org>; Thu, 19 Jun 2008 23:00:32 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AF07C8FC0C
	for <perforce@FreeBSD.org>; Thu, 19 Jun 2008 23:00:32 +0000 (UTC)
	(envelope-from rpaulo@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 m5JN0WLP086109
	for <perforce@FreeBSD.org>; Thu, 19 Jun 2008 23:00:32 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JN0W3L086107
	for perforce@freebsd.org; Thu, 19 Jun 2008 23:00:32 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Thu, 19 Jun 2008 23:00:32 GMT
Message-Id: <200806192300.m5JN0W3L086107@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 143791 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: Thu, 19 Jun 2008 23:00:33 -0000

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

Change 143791 by rpaulo@rpaulo_epsilon on 2008/06/19 22:59:31

	Add last bits of basic FSM processing.

Affected files ...

.. //depot/projects/soc2008/rpaulo-tcpad/handler.c#8 edit

Differences ...

==== //depot/projects/soc2008/rpaulo-tcpad/handler.c#8 (text+ko) ====

@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#7 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#8 $
  */
 
 #include <stdio.h>
@@ -129,32 +129,42 @@
 		cp->pktshead = rcp->pktshead;
 		dumper_addpkt(cp->pktshead, ph, bytes);
 	} else if ((tcp->th_flags & TH_FLAGS) == TH_ACK) {
+		if (cp == NULL || rcp == NULL)
+			return;
 
-		if (cp) {
-			dumper_addpkt(cp->pktshead, ph, bytes);
-			if (cp->tcpstate == TCPS_SYN_SENT ||
-			    cp->tcpstate == TCPS_SYN_RECEIVED) {
-				cp->tcpstate = TCPS_ESTABLISHED;
-				rcp->tcpstate = TCPS_ESTABLISHED;
-				DPRINTF("established\n");
-				print_packet(bytes, linkhlen);
-			}
-			if (cp->tcpstate == TCPS_FIN_WAIT_1) {
-				cp->tcpstate = TCPS_FIN_WAIT_2;
-				rcp->tcpstate = TCPS_CLOSE_WAIT;
-				print_packet(bytes, linkhlen);
-			}
+		dumper_addpkt(cp->pktshead, ph, bytes);
+		if (cp->tcpstate == TCPS_SYN_SENT ||
+		    cp->tcpstate == TCPS_SYN_RECEIVED) {
+			cp->tcpstate = TCPS_ESTABLISHED;
+			rcp->tcpstate = TCPS_ESTABLISHED;
+			DPRINTF("established\n");
+			print_packet(bytes, linkhlen);
+		}
+		if (cp->tcpstate == TCPS_ESTABLISHED &&
+		    rcp->tcpstate == TCPS_FIN_WAIT_1) {
+			printf("first ack\n");
+			cp->tcpstate = TCPS_CLOSE_WAIT;
+			rcp->tcpstate = TCPS_FIN_WAIT_2;
+		}
+		if (cp->tcpstate == TCPS_LAST_ACK) {
+			cp->tcpstate = TCPS_TIME_WAIT;
+			printf("connection down\n");
 		}
 	} else if ((tcp->th_flags & TH_FLAGS) == (TH_FIN|TH_ACK)) {
-		if (cp) {
-			dumper_addpkt(cp->pktshead, ph, bytes);
-			if (cp->tcpstate == TCPS_ESTABLISHED) {
-				cp->tcpstate = TCPS_FIN_WAIT_1;
-				rcp->tcpstate = TCPS_CLOSE_WAIT;
-				DPRINTF("fin_wait_1\n");
-				print_packet(bytes, linkhlen);
-				dumper_error(p, "test.cap", cp->pktshead);
-			}
+		if (cp == NULL || rcp == NULL)
+			return;
+
+		dumper_addpkt(cp->pktshead, ph, bytes);
+		if (cp->tcpstate == TCPS_ESTABLISHED) {
+			cp->tcpstate = TCPS_FIN_WAIT_1;
+			DPRINTF("fin_wait_1\n");
+			print_packet(bytes, linkhlen);
+		}
+		if (cp->tcpstate == TCPS_CLOSE_WAIT &&
+		    rcp->tcpstate == TCPS_FIN_WAIT_2) {
+			printf("last_ack\n");
+			cp->tcpstate = TCPS_TIME_WAIT;
+			rcp->tcpstate = TCPS_LAST_ACK;
 		}
 	} else if ((tcp->th_flags & TH_FLAGS) == (TH_RST|TH_ACK)) {
 		if (rcp && rcp->tcpstate == TCPS_SYN_SENT) {