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

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

Diff for /src/sys/netinet/ip_input.c between version 1.93.2.4 and 1.114.4.4

version 1.93.2.4, 2001/01/05 17:36:55 version 1.114.4.4, 2001/03/11 21:10:34
Line 120 
Line 120 
 #include <sys/proc.h>  #include <sys/proc.h>
 #include <sys/pool.h>  #include <sys/pool.h>
   
 #include <uvm/uvm_extern.h>  #include <vm/vm.h>
   
 #include <sys/sysctl.h>  #include <sys/sysctl.h>
   
 #include <net/if.h>  #include <net/if.h>
Line 147 
Line 146 
 #ifdef IPSEC  #ifdef IPSEC
 #include <netinet6/ipsec.h>  #include <netinet6/ipsec.h>
 #include <netkey/key.h>  #include <netkey/key.h>
   #include <netkey/key_debug.h>
 #endif  #endif
   
 #ifndef IPFORWARDING  #ifndef IPFORWARDING
Line 205  struct ifqueue ipintrq;
Line 205  struct ifqueue ipintrq;
 struct  ipstat  ipstat;  struct  ipstat  ipstat;
 u_int16_t       ip_id;  u_int16_t       ip_id;
   
 #ifdef PFIL_HOOKS  
 struct pfil_head inet_pfil_hook;  
 #endif  
   
 struct ipqhead ipq;  struct ipqhead ipq;
 int     ipq_locked;  int     ipq_locked;
   
Line 308  ip_init()
Line 304  ip_init()
         ip_id = time.tv_sec & 0xffff;          ip_id = time.tv_sec & 0xffff;
         ipintrq.ifq_maxlen = ipqmaxlen;          ipintrq.ifq_maxlen = ipqmaxlen;
         TAILQ_INIT(&in_ifaddr);          TAILQ_INIT(&in_ifaddr);
         in_ifaddrhashtbl = hashinit(IN_IFADDR_HASH_SIZE, HASH_LIST, M_IFADDR,          in_ifaddrhashtbl =
             M_WAITOK, &in_ifaddrhash);              hashinit(IN_IFADDR_HASH_SIZE, M_IFADDR, M_WAITOK, &in_ifaddrhash);
         if (ip_mtudisc != 0)          if (ip_mtudisc != 0)
                 ip_mtudisc_timeout_q =                  ip_mtudisc_timeout_q =
                     rt_timer_queue_create(ip_mtudisc_timeout);                      rt_timer_queue_create(ip_mtudisc_timeout);
 #ifdef GATEWAY  #ifdef GATEWAY
         ipflow_init();          ipflow_init();
 #endif  #endif
   
 #ifdef PFIL_HOOKS  
         /* Register our Packet Filter hook. */  
         inet_pfil_hook.ph_type = PFIL_TYPE_AF;  
         inet_pfil_hook.ph_af   = AF_INET;  
         i = pfil_head_register(&inet_pfil_hook);  
         if (i != 0)  
                 printf("ip_init: WARNING: unable to register pfil hook, "  
                     "error %d\n", i);  
 #endif /* PFIL_HOOKS */  
 }  }
   
 struct  sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };  struct  sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
Line 364  ip_input(struct mbuf *m)
Line 350  ip_input(struct mbuf *m)
         struct ipqent *ipqe;          struct ipqent *ipqe;
         int hlen = 0, mff, len;          int hlen = 0, mff, len;
         int downmatch;          int downmatch;
   #ifdef PFIL_HOOKS
           struct packet_filter_hook *pfh;
           struct mbuf *m0;
           int rv;
   #endif /* PFIL_HOOKS */
   
 #ifdef  DIAGNOSTIC  #ifdef  DIAGNOSTIC
         if ((m->m_flags & M_PKTHDR) == 0)          if ((m->m_flags & M_PKTHDR) == 0)
Line 423  ip_input(struct mbuf *m)
Line 414  ip_input(struct mbuf *m)
                 goto bad;                  goto bad;
         }          }
   
         /* Retrieve the packet length. */          /*
         len = ntohs(ip->ip_len);           * Convert fields to host representation.
            */
           NTOHS(ip->ip_len);
           NTOHS(ip->ip_off);
           len = ip->ip_len;
   
         /*          /*
          * Check for additional length bogosity           * Check for additional length bogosity
Line 471  ip_input(struct mbuf *m)
Line 466  ip_input(struct mbuf *m)
          * Note that filters must _never_ set this flag, as another filter           * Note that filters must _never_ set this flag, as another filter
          * in the list may have previously cleared it.           * in the list may have previously cleared it.
          */           */
         if (pfil_run_hooks(&inet_pfil_hook, &m, m->m_pkthdr.rcvif,          m0 = m;
                            PFIL_IN) != 0)          pfh = pfil_hook_get(PFIL_IN, &inetsw[ip_protox[IPPROTO_IP]].pr_pfh);
                 return;          for (; pfh; pfh = pfh->pfil_link.tqe_next)
         if (m == NULL)                  if (pfh->pfil_func) {
                 return;                          rv = pfh->pfil_func(ip, hlen,
         ip = mtod(m, struct ip *);                                              m->m_pkthdr.rcvif, 0, &m0);
                           if (rv)
                                   return;
                           m = m0;
                           if (m == NULL)
                                   return;
                           ip = mtod(m, struct ip *);
                   }
 #endif /* PFIL_HOOKS */  #endif /* PFIL_HOOKS */
   
 #ifdef ALTQ  
         /* XXX Temporary until ALTQ is changed to use a pfil hook */  
         if (altq_input != NULL && (*altq_input)(m, AF_INET) == 0) {  
                 /* packet dropped by traffic conditioner */  
                 return;  
         }  
 #endif  
   
         /*  
          * Convert fields to host representation.  
          */  
         NTOHS(ip->ip_len);  
         NTOHS(ip->ip_off);  
   
         /*          /*
          * Process options and, if not destined for us,           * Process options and, if not destined for us,
          * ship it on.  ip_dooptions returns 1 when an           * ship it on.  ip_dooptions returns 1 when an
Line 699  found:
Line 687  found:
                 IPQ_UNLOCK();                  IPQ_UNLOCK();
         }          }
   
   #ifdef IPSEC
           /*
            * enforce IPsec policy checking if we are seeing last header.
            * note that we do not visit this with protocols with pcb layer
            * code - like udp/tcp/raw ip.
            */
           if ((inetsw[ip_protox[ip->ip_p]].pr_flags & PR_LASTHDR) != 0 &&
               ipsec4_in_reject(m, NULL)) {
                   ipsecstat.in_polvio++;
                   goto bad;
           }
   #endif
   
         /*          /*
          * Switch out to protocol's input routine.           * Switch out to protocol's input routine.
          */           */
 #if IFA_STATS  #if IFA_STATS
         if (ia && ip)          ia->ia_ifa.ifa_data.ifad_inbytes += ip->ip_len;
                 ia->ia_ifa.ifa_data.ifad_inbytes += ip->ip_len;  
 #endif  #endif
         ipstat.ips_delivered++;          ipstat.ips_delivered++;
     {      {

Legend:
Removed from v.1.93.2.4  
changed lines
  Added in v.1.114.4.4

CVSweb <webmaster@jp.NetBSD.org>