From owner-p4-projects@FreeBSD.ORG Mon Jun 8 23:11:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A8441065675; Mon, 8 Jun 2009 23:11: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 EA081106566B for ; Mon, 8 Jun 2009 23:11:21 +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 BC8058FC08 for ; Mon, 8 Jun 2009 23:11:21 +0000 (UTC) (envelope-from anchie@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 n58NBLmr044673 for ; Mon, 8 Jun 2009 23:11:21 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n58NBLMD044671 for perforce@freebsd.org; Mon, 8 Jun 2009 23:11:21 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 8 Jun 2009 23:11:21 GMT Message-Id: <200906082311.n58NBLMD044671@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 163844 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, 08 Jun 2009 23:11:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=163844 Change 163844 by anchie@anchie_malimis on 2009/06/08 23:10:25 Adding some code for SeND input_hook processing. Affected files ... .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/net.c#2 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/snd_proto.h#2 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#4 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#6 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#6 edit Differences ... ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/net.c#2 (text+ko) ==== @@ -119,6 +119,7 @@ snd_icmp_sock_read(void) { struct sockaddr_in6 sin[1]; + struct input_hook_packet_info pi; struct sbuff *b; uint8_t *type; socklen_t slen; @@ -147,6 +148,9 @@ goto done; } + /* Populate input_hook_packet_info structure! */ + /* Populate ifidx and in integers. */ + type = sbuff_data(b); switch (*type) { case ICMP6_SND_CPS: @@ -160,7 +164,8 @@ &sin->sin6_addr); break; default: - DBG(&dbg_snd, "Unhandled ICMP6 type %d", *type); + snd_recv_pkt(sbuff_data(b), ifidx, in, pi); + break; } ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/snd_proto.h#2 (text+ko) ==== @@ -49,6 +49,12 @@ #define NDISC_OPT_SPACE(len) (((len)+2+7)&~7) +#define ND_ROUTER_SOLICIT 133 +#define ND_ROUTER_ADVERT 134 +#define ND_NEIGHBOR_SOLICIT 135 +#define ND_NEIGHBOR_ADVERT 136 +#define ND_REDIRECT 137 + #define ICMP6_SND_CPS 148 #define ICMP6_SND_CPA 149 ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#4 (text+ko) ==== @@ -802,6 +802,8 @@ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { /* send incoming SeND-protected/ND packet to sendd */ + if (send_input_hook != NULL) + send_input_hook(); /* give up local */ nd6_ns_input(m, off, icmp6len); ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#6 (text+ko) ==== @@ -5,6 +5,8 @@ #include #include +#include + #include static int X_send_input_hook(void); @@ -12,6 +14,9 @@ static int X_send_input_hook(void) { + + /* send module is loaded, send incoming packet to sendd */ + return 0; } ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#6 (text+ko) ==== @@ -1,2 +1,2 @@ /* send.c */ -int (*send_input_hook)(void); +int (*send_input_hook)(struct mbuf *, int, int);