From owner-p4-projects@FreeBSD.ORG Thu May 28 06:44:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A6331065675; Thu, 28 May 2009 06:44:22 +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 387181065673 for ; Thu, 28 May 2009 06:44:22 +0000 (UTC) (envelope-from zjriggl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C4778FC12 for ; Thu, 28 May 2009 06:44:22 +0000 (UTC) (envelope-from zjriggl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S6iLq5064786 for ; Thu, 28 May 2009 06:44:21 GMT (envelope-from zjriggl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4S6iLbi064784 for perforce@freebsd.org; Thu, 28 May 2009 06:44:21 GMT (envelope-from zjriggl@FreeBSD.org) Date: Thu, 28 May 2009 06:44:21 GMT Message-Id: <200905280644.n4S6iLbi064784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zjriggl@FreeBSD.org using -f From: Zachariah Riggle To: Perforce Change Reviews Cc: Subject: PERFORCE change 162923 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: Thu, 28 May 2009 06:44:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=162923 Change 162923 by zjriggl@zjriggl_tcpregression on 2009/05/28 06:44:02 Interim submit, to prevent data loss. Affected files ... .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/echoServer.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/loggable.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/logging.conf#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/pcsextension/__init__.py#2 edit .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/sniffLocalhost.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/tcpConstructor.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/tcpFilter.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/tcpHandshake.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/test.html#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/testconfig.py#2 delete Differences ... ==== //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/pcsextension/__init__.py#2 (text+ko) ==== @@ -2,6 +2,7 @@ import logging.config import struct import socket +import sys from pcs.packets.tcp import tcp from pcs.packets.tcpv6 import tcpv6 @@ -9,7 +10,22 @@ # Configure logging logging.config.fileConfig("logging.conf") +(logging.FIELD_CHANGE, + logging.RESPONSE_GENERATION, + logging.PACKET_TRANSMIT, + logging.PACKET_RECEIVED, + logging.PACKET_SENT, + logging.VALIDATE, + logging.STATE_CHANGE) = range(logging.INFO-7, logging.INFO) +logging.addLevelName(logging.FIELD_CHANGE, "FIELD") +logging.addLevelName(logging.RESPONSE_GENERATION, "RESPONSE") +logging.addLevelName(logging.PACKET_TRANSMIT, "XMIT") +logging.addLevelName(logging.PACKET_RECEIVED, "RECEIVED") +logging.addLevelName(logging.PACKET_SENT, "SENT") +logging.addLevelName(logging.VALIDATE, "VALIDATE") +logging.addLevelName(logging.STATE_CHANGE, "STATE") + # Find the TCP layer in a packet. def findTcpLayer(packet): p = packet @@ -33,5 +49,4 @@ def tcpv4Checksum(t): if not isinstance(t, tcp): - return 0 - + return 0