From owner-p4-projects@FreeBSD.ORG Wed Jun 17 12:03:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9DAF106570C; Wed, 17 Jun 2009 12:03:16 +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 952A51065709 for ; Wed, 17 Jun 2009 12:03:16 +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 7839F8FC1B for ; Wed, 17 Jun 2009 12:03:16 +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 n5HC3GfQ018583 for ; Wed, 17 Jun 2009 12:03:16 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5HC3GQ4018574 for perforce@freebsd.org; Wed, 17 Jun 2009 12:03:16 GMT (envelope-from anchie@FreeBSD.org) Date: Wed, 17 Jun 2009 12:03:16 GMT Message-Id: <200906171203.n5HC3GQ4018574@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 164571 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: Wed, 17 Jun 2009 12:03:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=164571 Change 164571 by anchie@anchie_malimis on 2009/06/17 12:03:13 Minor changes - attempt to unbreak kernel build. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#4 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#7 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#9 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#7 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_rtr.c#4 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#9 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#9 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#4 (text+ko) ==== @@ -60,6 +60,8 @@ #include #include +#include + #include #ifdef INET6 #include ==== //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#7 (text+ko) ==== @@ -125,6 +125,7 @@ #define ICMP6_FQDN_REPLY 140 /* FQDN reply */ #define ICMP6_NI_QUERY 139 /* node information request */ #define ICMP6_NI_REPLY 140 /* node information reply */ +#define MLDV2_LISTENER_REPORT 143 /* RFC3810 listener report */ #define SEND_CERT_PATH_SOLICIT 148 /* cert path solicitation */ #define SEND_CERT_PATH_ADVERT 149 /* cert path advertisement */ @@ -197,6 +198,8 @@ #define mld_cksum mld_icmp6_hdr.icmp6_cksum #define mld_maxdelay mld_icmp6_hdr.icmp6_data16[0] #define mld_reserved mld_icmp6_hdr.icmp6_data16[1] +#define mld_v2_reserved mld_icmp6_hdr.icmp6_data16[0] +#define mld_v2_numrecs mld_icmp6_hdr.icmp6_data16[1] /* * Neighbor Discovery @@ -599,6 +602,12 @@ u_quad_t icp6s_badredirect; /* bad redirect message */ }; +#ifdef _KERNEL +#define ICMP6STAT_ADD(name, val) V_icmp6stat.name += (val) +#define ICMP6STAT_INC(name) ICMP6STAT_ADD(name, 1) +#endif + + /* * Names for ICMP sysctl objects */ @@ -642,6 +651,7 @@ void icmp6_error2(struct mbuf *, int, int, int, struct ifnet *); int icmp6_input(struct mbuf **, int *, int); void icmp6_fasttimo(void); +void icmp6_slowtimo(void); void icmp6_reflect(struct mbuf *, size_t); void icmp6_prepare(struct mbuf *); void icmp6_redirect_input(struct mbuf *, int); @@ -710,8 +720,10 @@ } \ } while (/*CONSTCOND*/ 0) +#ifdef VIMAGE_GLOBALS extern int icmp6_rediraccept; /* accept/process redirects */ extern int icmp6_redirtimeout; /* cache time for redirect routes */ +#endif #define ICMP6_NODEINFO_FQDNOK 0x1 #define ICMP6_NODEINFO_NODEADDROK 0x2 ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/*- +/* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. * @@ -107,6 +107,7 @@ #include #include #include +#include #ifdef IPSEC #include @@ -140,6 +141,8 @@ struct ifnet *, int)); static int icmp6_notify_error(struct mbuf **, int, int, int); +int (*send_output_hook)(int, struct ifnet *, struct mbuf *, int); + void icmp6_init(void) @@ -810,7 +813,9 @@ send_output_hook(in, ifp, m, ip6len); /* give up local */ /* nd6_ns_input() will be called in X_send_input_hook() */ +#if 0 nd6_ns_input(in, m, off, icmp6len); +#endif m = NULL; goto freeit; } @@ -859,7 +864,7 @@ /* m stays. */ break; -#ifndef +#if 0 case SEND_CERT_PATH_SOLICIT: /* send CPS packet to sendd */ send6_cps_input(); ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#7 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_rtr.c#4 (text+ko) ==== @@ -425,7 +425,7 @@ m_freem(m); } -#ifndef +#if 0 /* * Receive Certification Path Solicitation [rfc3971]. */ ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#9 (text+ko) ==== @@ -5,15 +5,14 @@ #include #include -#include +#include +#include -#include +#include static int X_send_input_hook(void); static int X_send_output_hook(int, struct ifnet *, struct mbuf *, int); - - static int X_send_input_hook(void) { @@ -40,13 +39,17 @@ { int err = 0; + /* Add locking? icmp6.c and nd6.c are maybe using hooks.. */ + switch (type) { case MOD_LOAD: send_output_hook = X_send_output_hook; + send_input_hook = X_send_input_hook; break; case MOD_UNLOAD: send_input_hook = NULL; + send_output_hook = NULL; break; default: ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#9 (text+ko) ==== @@ -1,7 +1,5 @@ /* send.c */ -#if 0 extern int (*send_output_hook)(int, struct ifnet *, struct mbuf *, int); -#endif extern int (*send_input_hook)(void); /* Message formats for messages from ND to applications (sendd) via the @@ -9,7 +7,5 @@ * structure. */ -#if 0 #define RTM_SND_OUT 0 /* outgoing traffic sent to sendd */ #define RTM_SND_IN 1 /* incoming traffic sent to sendd */ -#endif