From owner-svn-src-user@FreeBSD.ORG  Mon Nov  3 03:17:57 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3D2151065752;
	Mon,  3 Nov 2008 03:17:57 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 12EA08FC1C;
	Mon,  3 Nov 2008 03:17:57 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA33HuYp055145;
	Mon, 3 Nov 2008 03:17:56 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA33HuAH055144;
	Mon, 3 Nov 2008 03:17:56 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811030317.mA33HuAH055144@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 3 Nov 2008 03:17:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184575 - user/kmacy/HEAD_fast_xmit/sys/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Nov 2008 03:17:57 -0000

Author: kmacy
Date: Mon Nov  3 03:17:56 2008
New Revision: 184575
URL: http://svn.freebsd.org/changeset/base/184575

Log:
  add DIAGNOSTICs

Modified:
  user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c

Modified: user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c
==============================================================================
--- user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c	Mon Nov  3 03:17:35 2008	(r184574)
+++ user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c	Mon Nov  3 03:17:56 2008	(r184575)
@@ -539,13 +539,6 @@ route_to_rtentry_info(struct route *ro, 
 		memcpy(&ri->ri_dst, sin, sizeof(struct sockaddr_in));
 	
 	if (desten) {
-#ifdef INVARIANTS
-		int i;
-		
-		for (i = 0; i < 3; i++)
-			if (((uint16_t *)desten)[i] == 0)
-				panic("bad juju with the MAC addr dude");
-#endif		
 		memcpy(ri->ri_desten, desten, ETHER_ADDR_LEN);
 		ri->ri_flags |= RTF_DESTEN_VALID;
 	}
@@ -648,18 +641,29 @@ uncached:
 	if (ro.ro_rt == NULL) 
 		error = ENETUNREACH;
 	else {
-#ifdef INVARIANTS		
-		log(LOG_DEBUG, "destination address=%s proto=%d hash=%x "
-		    "rt_flags=%lx",
-		    inet_ntoa(((struct sockaddr_in*)&ro.ro_dst)->sin_addr), proto, hash,
-		    ro.ro_rt->rt_flags);
-#endif
 		if (ro.ro_rt->rt_flags & RTF_GATEWAY)
 			error = arpresolve(ro.ro_rt->rt_ifp, ro.ro_rt,
 			    NULL, ro.ro_rt->rt_gateway, desten);
-		else
+		else				
 			error = arpresolve(ro.ro_rt->rt_ifp, ro.ro_rt,
 			    NULL, &ro.ro_dst, desten);
+#ifdef DIAGNOSTICS
+		log(LOG_WARNING, "dst=%s gw=%s proto=%d hash=%x "
+		    "rt_flags=%lx error=%d\n",
+		    inet_ntoa(((struct sockaddr_in*)&ro.ro_dst)->sin_addr),
+		    inet_ntoa(((struct sockaddr_in*)&ro.ro_rt->rt_gateway)->sin_addr),
+		    proto, hash, ro.ro_rt->rt_flags, error);
+
+		if (!error)
+			log(LOG_WARNING, "desten=%x:%x:%x:%x:%x:%x",
+			    desten[0], desten[1], desten[2], desten[3],
+			    desten[4], desten[5]);
+
+		/* XXXX expire needs to be set to zero or some value
+		   greater than uptime :/
+		*/
+		
+#endif
 		route_to_rtentry_info(&ro, error ? NULL : desten, ri);
 
 		if (error == 0 && cache)