[BACK]Return to ip6_input.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/ip6_input.c between version 1.14 and 1.15

version 1.14, 2000/02/06 12:49:45 version 1.15, 2000/02/17 10:59:39
Line 66 
Line 66 
 #include "opt_inet.h"  #include "opt_inet.h"
 #include "opt_ipsec.h"  #include "opt_ipsec.h"
   #include "opt_pfil_hooks.h"
 #include <sys/param.h>  #include <sys/param.h>
 #include <sys/systm.h>  #include <sys/systm.h>
Line 86 
Line 87 
 #include <net/if_dl.h>  #include <net/if_dl.h>
 #include <net/route.h>  #include <net/route.h>
 #include <net/netisr.h>  #include <net/netisr.h>
   #ifdef PFIL_HOOKS
   #include <net/pfil.h>
 #include <netinet/in.h>  #include <netinet/in.h>
 #include <netinet/in_systm.h>  #include <netinet/in_systm.h>
Line 118 
Line 122 
 #include <net/net_osdep.h>  #include <net/net_osdep.h>
 extern struct domain inet6domain;  extern struct domain inet6domain;
 extern struct ip6protosw inet6sw[];  
 u_char ip6_protox[IPPROTO_MAX];  u_char ip6_protox[IPPROTO_MAX];
 static int ip6qmaxlen = IFQ_MAXLEN;  static int ip6qmaxlen = IFQ_MAXLEN;
Line 238  ip6_input(m)
Line 241  ip6_input(m)
         u_int32_t rtalert = ~0;          u_int32_t rtalert = ~0;
         int nxt, ours = 0;          int nxt, ours = 0;
         struct ifnet *deliverifp = NULL;          struct ifnet *deliverifp = NULL;
   #ifdef  PFIL_HOOKS
           struct packet_filter_hook *pfh;
           struct mbuf *m0;
           int rv;
   #endif  /* PFIL_HOOKS */
 #ifdef IPSEC  #ifdef IPSEC
         /*          /*
Line 297  ip6_input(m)
Line 305  ip6_input(m)
                 goto bad;                  goto bad;
         }          }
   #ifdef PFIL_HOOKS
            * Run through list of hooks for input packets.  If there are any
            * filters which require that additional packets in the flow are
            * not fast-forwarded, they must clear the M_CANFASTFWD flag.
            * Note that filters must _never_ set this flag, as another filter
            * in the list may have previously cleared it.
           m0 = m;
           pfh = pfil_hook_get(PFIL_IN, &inetsw[ip_protox[IPPROTO_IPV6]]);
           for (; pfh; pfh = pfh->pfil_link.tqe_next)
                   if (pfh->pfil_func) {
                           rv = pfh->pfil_func(ip6, sizeof(*ip6),
                                               m->m_pkthdr.rcvif, 0, &m0);
                           if (rv)
                           m = m0;
                           if (m == NULL)
                           ip6 = mtod(m, struct ip6_hdr *);
   #endif /* PFIL_HOOKS */
         ip6stat.ip6s_nxthist[ip6->ip6_nxt]++;          ip6stat.ip6s_nxthist[ip6->ip6_nxt]++;

Removed from v.1.14  
changed lines
  Added in v.1.15

CVSweb <webmaster@jp.NetBSD.org>