[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.180 and 1.187

version 1.180, 2003/11/10 20:03:29 version 1.187, 2003/11/26 21:15:47
Line 100 
Line 100 
 #include <sys/cdefs.h>  #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD$");  __KERNEL_RCSID(0, "$NetBSD$");
   
   #include "opt_inet.h"
 #include "opt_gateway.h"  #include "opt_gateway.h"
 #include "opt_pfil_hooks.h"  #include "opt_pfil_hooks.h"
 #include "opt_ipsec.h"  #include "opt_ipsec.h"
Line 197  int ip_mtudisc_timeout = IPMTUDISCTIMEOU
Line 198  int ip_mtudisc_timeout = IPMTUDISCTIMEOU
 #ifdef DIAGNOSTIC  #ifdef DIAGNOSTIC
 int     ipprintfs = 0;  int     ipprintfs = 0;
 #endif  #endif
   
   int     ip_do_randomid = 0;
   
 /*  /*
  * XXX - Setting ip_checkinterface mostly implements the receive side of   * XXX - Setting ip_checkinterface mostly implements the receive side of
  * the Strong ES model described in RFC 1122, but since the routing table   * the Strong ES model described in RFC 1122, but since the routing table
Line 219  extern struct domain inetdomain;
Line 223  extern struct domain inetdomain;
 int     ipqmaxlen = IFQ_MAXLEN;  int     ipqmaxlen = IFQ_MAXLEN;
 u_long  in_ifaddrhash;                          /* size of hash table - 1 */  u_long  in_ifaddrhash;                          /* size of hash table - 1 */
 int     in_ifaddrentries;                       /* total number of addrs */  int     in_ifaddrentries;                       /* total number of addrs */
 struct  in_ifaddrhead in_ifaddr;  struct in_ifaddrhead in_ifaddrhead;
 struct  in_ifaddrhashhead *in_ifaddrhashtbl;  struct  in_ifaddrhashhead *in_ifaddrhashtbl;
 u_long  in_multihash;                           /* size of hash table - 1 */  u_long  in_multihash;                           /* size of hash table - 1 */
 int     in_multientries;                        /* total number of addrs */  int     in_multientries;                        /* total number of addrs */
 struct  in_multihashhead *in_multihashtbl;  struct  in_multihashhead *in_multihashtbl;
 struct  ifqueue ipintrq;  struct  ifqueue ipintrq;
 struct  ipstat  ipstat;  struct  ipstat  ipstat;
   uint16_t ip_id;
   
 #ifdef PFIL_HOOKS  #ifdef PFIL_HOOKS
 struct pfil_head inet_pfil_hook;  struct pfil_head inet_pfil_hook;
Line 359  ip_init()
Line 364  ip_init()
                     pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW)                      pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW)
                         ip_protox[pr->pr_protocol] = pr - inetsw;                          ip_protox[pr->pr_protocol] = pr - inetsw;
         LIST_INIT(&ipq);          LIST_INIT(&ipq);
           ip_id = time.tv_sec & 0xfffff;
         ipintrq.ifq_maxlen = ipqmaxlen;          ipintrq.ifq_maxlen = ipqmaxlen;
         TAILQ_INIT(&in_ifaddr);          TAILQ_INIT(&in_ifaddrhead);
         in_ifaddrhashtbl = hashinit(IN_IFADDR_HASH_SIZE, HASH_LIST, M_IFADDR,          in_ifaddrhashtbl = hashinit(IN_IFADDR_HASH_SIZE, HASH_LIST, M_IFADDR,
             M_WAITOK, &in_ifaddrhash);              M_WAITOK, &in_ifaddrhash);
         in_multihashtbl = hashinit(IN_IFADDR_HASH_SIZE, HASH_LIST, M_IPMADDR,          in_multihashtbl = hashinit(IN_IFADDR_HASH_SIZE, HASH_LIST, M_IPMADDR,
Line 448  ip_input(struct mbuf *m)
Line 454  ip_input(struct mbuf *m)
          * If no IP addresses have been set yet but the interfaces           * If no IP addresses have been set yet but the interfaces
          * are receiving, can't do anything with incoming packets yet.           * are receiving, can't do anything with incoming packets yet.
          */           */
         if (TAILQ_FIRST(&in_ifaddr) == 0)          if (TAILQ_FIRST(&in_ifaddrhead) == 0)
                 goto bad;                  goto bad;
         ipstat.ips_total++;          ipstat.ips_total++;
         /*          /*
Line 580  ip_input(struct mbuf *m)
Line 586  ip_input(struct mbuf *m)
          */           */
 #ifdef IPSEC  #ifdef IPSEC
         if (!ipsec_getnhist(m))          if (!ipsec_getnhist(m))
   #elif defined(FAST_IPSEC)
           if (!ipsec_indone(m))
 #else  #else
         if (1)          if (1)
 #endif  #endif
Line 2059  ip_sysctl(name, namelen, oldp, oldlenp, 
Line 2067  ip_sysctl(name, namelen, oldp, oldlenp, 
         case IPCTL_CHECKINTERFACE:          case IPCTL_CHECKINTERFACE:
                 return (sysctl_int(oldp, oldlenp, newp, newlen,                  return (sysctl_int(oldp, oldlenp, newp, newlen,
                     &ip_checkinterface));                      &ip_checkinterface));
   
         case IPCTL_IFQ:          case IPCTL_IFQ:
                 return (sysctl_ifq(name+1, namelen-1,                  return (sysctl_ifq(name + 1, namelen - 1, oldp, oldlenp,
                                   oldp, oldlenp, newp, newlen,                      newp, newlen, &ipintrq));
                                   &ipintrq));  
           case IPCTL_RANDOMID:
                   return (sysctl_int(oldp, oldlenp, newp, newlen,
                       &ip_do_randomid));
   
         default:          default:
                 return (EOPNOTSUPP);                  return (EOPNOTSUPP);

Legend:
Removed from v.1.180  
changed lines
  Added in v.1.187

CVSweb <webmaster@jp.NetBSD.org>