From owner-p4-projects@FreeBSD.ORG  Mon Oct 29 03:03:34 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1C7DB16A41A; Mon, 29 Oct 2007 03:03:31 +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 467D616A419
	for <perforce@freebsd.org>; Mon, 29 Oct 2007 03:03:30 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 350FD13C49D
	for <perforce@freebsd.org>; Mon, 29 Oct 2007 03:03:30 +0000 (UTC)
	(envelope-from kmacy@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 l9T33U8h089403
	for <perforce@freebsd.org>; Mon, 29 Oct 2007 03:03:30 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9T33Rw8089400
	for perforce@freebsd.org; Mon, 29 Oct 2007 03:03:27 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 29 Oct 2007 03:03:27 GMT
Message-Id: <200710290303.l9T33Rw8089400@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 128270 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: Mon, 29 Oct 2007 03:03:34 -0000

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

Change 128270 by kmacy@kmacy:storage:toestack on 2007/10/29 03:03:23

	- fix route lookup 
	- make ofld_connect return 0 on success and error code on failure

Affected files ...

.. //depot/projects/toestack/sys/netinet/tcp_ofld.c#3 edit
.. //depot/projects/toestack/sys/netinet/tcp_ofld.h#4 edit

Differences ...

==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#3 (text+ko) ====

@@ -31,28 +31,38 @@
 	struct inpcb *inp = sotoinpcb(so);
 	struct ifnet *ifp;
 	struct toedev *tdev;
-	
+	int err;
+
+	if (inp->inp_route.ro_rt == NULL) {
+		inp->inp_route.ro_rt = rtalloc2(nam, 1, 0);
+		if (inp->inp_route.ro_rt)
+			memcpy(&inp->inp_route.ro_dst, nam, sizeof(struct sockaddr));
+	}
+
 	if (inp->inp_route.ro_rt == NULL) {
-		struct sockaddr_in *dst =  (struct sockaddr_in *)&inp->inp_route.ro_dst;
+		printf("no route found for offload\n");
 		
-		bzero(dst, sizeof(*dst));
-		dst->sin_family = AF_INET;
-		dst->sin_len = sizeof(*dst);
-		dst->sin_addr.s_addr = *(in_addr_t *)&nam->sa_data;
-		
-		rtalloc_ign(&inp->inp_route, 0);
+		return (EHOSTUNREACH);
 	}
-
-	if (inp->inp_route.ro_rt == NULL)
-		return (0);
+	
 	ifp = inp->inp_route.ro_rt->rt_ifp;
 	tdev = TOEDEV(ifp);
-
-	if ((tdev == NULL) || (tdev->can_offload(tdev, so) == 0))
-		return (0);
-	if (tdev->connect(tdev, so, ifp))
-		return (1);
-
+	if (tdev == NULL) {
+		printf("tdev not set for ifp=%p name=%s\n", ifp, if_name(ifp));
+		return (EINVAL);
+	}
+	
+	if ((tdev == NULL) || (tdev->can_offload(tdev, so) == 0)) {
+		printf("can't offload\n");
+		
+		return (EINVAL);
+	}
+	
+	if ((err = tdev->connect(tdev, so, ifp)))
+		return (err);
+		
+	printf("connected!!!\n");
+			    
 	return (0);
 }
 

==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#4 (text+ko) ====

@@ -23,7 +23,7 @@
 	int error;
 	struct tcpcb *tp = sototcpcb(so);
 	
-	if (!SO_OFFLOADABLE(so) || (error = ofld_connect(so, nam)) == 0)
+	if (!SO_OFFLOADABLE(so) || (error = ofld_connect(so, nam)) != 0)
 		error = tcp_output(tp);
 	else	
 		printf("connection offloaded\n");