From owner-p4-projects@FreeBSD.ORG Mon Aug 10 13:25:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D8081065674; Mon, 10 Aug 2009 13:25:37 +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 0DD751065670 for ; Mon, 10 Aug 2009 13:25:37 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D7C8D8FC16 for ; Mon, 10 Aug 2009 13:25:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7ADPac0034377 for ; Mon, 10 Aug 2009 13:25:36 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7ADPaHr034375 for perforce@freebsd.org; Mon, 10 Aug 2009 13:25:36 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 10 Aug 2009 13:25:36 GMT Message-Id: <200908101325.n7ADPaHr034375@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 167170 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: Mon, 10 Aug 2009 13:25:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=167170 Change 167170 by anchie@anchie_malimis on 2009/08/10 13:25:07 Minor corrections. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#19 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#21 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#19 (text+ko) ==== @@ -814,9 +814,12 @@ goto badcode; if (icmp6len < sizeof(struct nd_neighbor_solicit)) goto badlen; +#if 0 if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { +#endif + if ((n = m_dup(m, M_DONTWAIT)) == NULL) { - /* Send incoming SeND-protected/ND packet to user space. */ + /* Send incoming SeND/ND packet to user space. */ if (send_input_hook != NULL) { send_input_hook(m, ifp, SND_IN, ip6len); return (IPPROTO_DONE); ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#21 (text+ko) ==== @@ -19,7 +19,7 @@ #include static int -send_output(struct mbuf *m, struct ifnet *ifp, int in) +send_output(struct mbuf *m, struct ifnet *ifp, int direction) { struct ip6_hdr *ip6; struct sockaddr_in6 *dst; @@ -34,7 +34,7 @@ * Outgoing packets are sent out using if_output(). */ - switch (in) { + switch (direction) { case SND_IN: icmp6len = m->m_pkthdr.len - sizeof(struct ip6_hdr); printf("send_output: m_pkthdr.len = %d\n", m->m_pkthdr.len); @@ -79,13 +79,16 @@ return (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, NULL); //return (0); break; + + default: + panic("Must be either SND_IN or SND_OUT."); } return (0); } static int -send_input(struct mbuf *m, struct ifnet *ifp, int in, int msglen) +send_input(struct mbuf *m, struct ifnet *ifp, int direction, int msglen) { struct ip6_hdr *ip6; @@ -97,7 +100,7 @@ /* * Send incoming or outgoing traffic to the user space either to be * protected (outgoing) or validated (incoming) according to rfc3971. */ - rt_securendmsg(ifp, in, ip6, msglen); + rt_securendmsg(ifp, direction, ip6, msglen); return (0); }