[BACK]Return to in6_proto.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / netinet6

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/netinet6/in6_proto.c between version 1.16 and 1.17

version 1.16, 2000/02/26 09:09:17 version 1.17, 2000/04/19 06:30:56
Line 82 
Line 82 
 #include <netinet/in.h>  #include <netinet/in.h>
 #include <netinet/in_systm.h>  #include <netinet/in_systm.h>
 #include <netinet/in_var.h>  #include <netinet/in_var.h>
   #include <netinet/ip_encap.h>
 #ifndef TCP6  #ifndef TCP6
 #include <netinet/ip.h>  #include <netinet/ip.h>
 #include <netinet/ip_var.h>  #include <netinet/ip_var.h>
Line 224  struct ip6protosw inet6sw[] = {
Line 225  struct ip6protosw inet6sw[] = {
   ipsec6_sysctl,    ipsec6_sysctl,
 },  },
 #endif /* IPSEC */  #endif /* IPSEC */
 #if NGIF > 0  #ifdef INET
 { SOCK_RAW,     &inet6domain,   IPPROTO_IPV4,   PR_ATOMIC|PR_ADDR,  { SOCK_RAW,     &inet6domain,   IPPROTO_IPV4,   PR_ATOMIC|PR_ADDR,
   in6_gif_input, rip6_output,   0,              rip6_ctloutput,    encap6_input, rip6_output,    0,              rip6_ctloutput,
   rip6_usrreq,    rip6_usrreq,
   0,            0,              0,              0,    0,            0,              0,              0,
 },  },
 #ifdef INET6  #endif
 { SOCK_RAW,     &inet6domain,   IPPROTO_IPV6,   PR_ATOMIC|PR_ADDR,  { SOCK_RAW,     &inet6domain,   IPPROTO_IPV6,   PR_ATOMIC|PR_ADDR,
   in6_gif_input, rip6_output,   0,              rip6_ctloutput,    encap6_input, rip6_output,     0,             rip6_ctloutput,
   rip6_usrreq,    rip6_usrreq,
   #ifndef INET6
   0,            0,              0,              0,    0,            0,              0,              0,
   #else
     encap_init,   0,              0,              0,
   #endif
 },  },
 #endif /* INET6 */  
 #endif /* GIF */  
 { SOCK_RAW,     &inet6domain,   IPPROTO_PIM,    PR_ATOMIC|PR_ADDR,  { SOCK_RAW,     &inet6domain,   IPPROTO_PIM,    PR_ATOMIC|PR_ADDR,
   pim6_input,    rip6_output,   0,              rip6_ctloutput,    pim6_input,    rip6_output,   0,              rip6_ctloutput,
   rip6_usrreq,    rip6_usrreq,
Line 251  struct ip6protosw inet6sw[] = {
Line 254  struct ip6protosw inet6sw[] = {
 },  },
 };  };
   
   #if NGIF > 0
   struct ip6protosw in6_gif_protosw =
   { SOCK_RAW,     &inet6domain,   0/*IPPROTO_IPV[46]*/,   PR_ATOMIC|PR_ADDR,
     in6_gif_input, rip6_output,   0,              rip6_ctloutput,
     rip6_usrreq,
     0,            0,              0,              0,
   };
   #endif /*NGIF*/
   
 struct domain inet6domain =  struct domain inet6domain =
     { AF_INET6, "internet6", 0, 0, 0,      { AF_INET6, "internet6", 0, 0, 0,
       (struct protosw *)inet6sw,        (struct protosw *)inet6sw,

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17

CVSweb <webmaster@jp.NetBSD.org>