From owner-p4-projects@FreeBSD.ORG Sun Sep 16 22:00:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11C8F16A420; Sun, 16 Sep 2007 22:00:56 +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 CEE0616A417 for ; Sun, 16 Sep 2007 22:00:55 +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 C747E13C45D for ; Sun, 16 Sep 2007 22:00:55 +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 l8GM0tem080395 for ; Sun, 16 Sep 2007 22:00:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8GM0tUv080388 for perforce@freebsd.org; Sun, 16 Sep 2007 22:00:55 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 16 Sep 2007 22:00:55 GMT Message-Id: <200709162200.l8GM0tUv080388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126489 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: Sun, 16 Sep 2007 22:00:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=126489 Change 126489 by kmacy@kmacy_home:ethng on 2007/09/16 22:00:18 cache the route in the inpcb this is currently half-complete at best as it doesn't yet re-validate the rt_entry against a gen_count as is intended Affected files ... .. //depot/projects/ethng/src/sys/netinet/tcp_output.c#3 edit Differences ... ==== //depot/projects/ethng/src/sys/netinet/tcp_output.c#3 (text+ko) ==== @@ -123,7 +123,8 @@ int tcp_output(struct tcpcb *tp) { - struct socket *so = tp->t_inpcb->inp_socket; + struct inpcb *inp = tp->t_inpcb; + struct socket *so = inp->inp_socket; long len, recwin, sendwin; int off, flags, error; #ifdef TCP_SIGNATURE @@ -1121,9 +1122,23 @@ */ if (path_mtu_discovery) ip->ip_off |= IP_DF; + /* + * XXX need to validate + */ + if (inp->inp_route.ro_rt == NULL) { + struct sockaddr_in *dst = (struct sockaddr_in *)&inp->inp_route.ro_dst; + struct ip *ip = mtod(m, struct ip *); + + bzero(dst, sizeof(*dst)); + dst->sin_family = AF_INET; + dst->sin_len = sizeof(*dst); + dst->sin_addr = ip->ip_dst; + + rtalloc_ign(&inp->inp_route, 0); + } m->m_pkthdr.rss_hash = tp->t_inpcb->inp_rss_hash; - error = ip_output(m, tp->t_inpcb->inp_options, NULL, + error = ip_output(m, tp->t_inpcb->inp_options, &inp->inp_route, ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0, tp->t_inpcb); }