[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.53.2.4 and 1.54

version 1.53.2.4, 1998/11/15 19:18:13 version 1.54, 1998/01/05 09:52:04
Line 35 
Line 35 
  *      @(#)ip_input.c  8.2 (Berkeley) 1/4/94   *      @(#)ip_input.c  8.2 (Berkeley) 1/4/94
  */   */
   
 /*-  
  * Copyright (c) 1998 The NetBSD Foundation, Inc.  
  * All rights reserved.  
  *  
  * This code is derived from software contributed to The NetBSD Foundation  
  * by Public Access Networks Corporation ("Panix").  It was developed under  
  * contract to Panix by Eric Haszlakiewicz and Thor Lancelot Simon.  
  *  
  * Redistribution and use in source and binary forms, with or without  
  * modification, are permitted provided that the following conditions  
  * are met:  
  * 1. Redistributions of source code must retain the above copyright  
  *    notice, this list of conditions and the following disclaimer.  
  * 2. Redistributions in binary form must reproduce the above copyright  
  *    notice, this list of conditions and the following disclaimer in the  
  *    documentation and/or other materials provided with the distribution.  
  * 3. All advertising materials mentioning features or use of this software  
  *    must display the following acknowledgement:  
  *      This product includes software developed by the NetBSD  
  *      Foundation, Inc. and its contributors.  
  * 4. Neither the name of The NetBSD Foundation nor the names of its  
  *    contributors may be used to endorse or promote products derived  
  *    from this software without specific prior written permission.  
  *  
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS  
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED  
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS  
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR  
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF  
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS  
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN  
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)  
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE  
  * POSSIBILITY OF SUCH DAMAGE.  
  */  
   
 #include <sys/param.h>  #include <sys/param.h>
 #include <sys/systm.h>  #include <sys/systm.h>
 #include <sys/malloc.h>  #include <sys/malloc.h>
Line 123 
Line 86 
 #ifndef IPMTUDISC  #ifndef IPMTUDISC
 #define IPMTUDISC       0  #define IPMTUDISC       0
 #endif  #endif
 #ifndef IPMTUDISCTIMEOUT  
 #define IPMTUDISCTIMEOUT (10 * 60)      /* as per RFC 1191 */  
 #endif  
   
   
 /*  /*
  * Note: DIRECTED_BROADCAST is handled this way so that previous   * Note: DIRECTED_BROADCAST is handled this way so that previous
Line 146  int ip_forwsrcrt = IPFORWSRCRT;
Line 105  int ip_forwsrcrt = IPFORWSRCRT;
 int     ip_directedbcast = IPDIRECTEDBCAST;  int     ip_directedbcast = IPDIRECTEDBCAST;
 int     ip_allowsrcrt = IPALLOWSRCRT;  int     ip_allowsrcrt = IPALLOWSRCRT;
 int     ip_mtudisc = IPMTUDISC;  int     ip_mtudisc = IPMTUDISC;
 u_int   ip_mtudisc_timeout = IPMTUDISCTIMEOUT;  
 #ifdef DIAGNOSTIC  #ifdef DIAGNOSTIC
 int     ipprintfs = 0;  int     ipprintfs = 0;
 #endif  #endif
   
 struct rttimer_queue *ip_mtudisc_timeout_q = NULL;  
   
 extern  struct domain inetdomain;  extern  struct domain inetdomain;
 extern  struct protosw inetsw[];  extern  struct protosw inetsw[];
 u_char  ip_protox[IPPROTO_MAX];  u_char  ip_protox[IPPROTO_MAX];
 int     ipqmaxlen = IFQ_MAXLEN;  int     ipqmaxlen = IFQ_MAXLEN;
 struct  in_ifaddrhead in_ifaddr;  struct  in_ifaddrhead in_ifaddr;
 struct  in_ifaddrhashhead *in_ifaddrhashtbl;  
 struct  ifqueue ipintrq;  struct  ifqueue ipintrq;
   
 /*  /*
Line 202  ip_init()
Line 157  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, M_IFADDR, &in_ifaddrhash);  
         if (ip_mtudisc != 0)  
                 ip_mtudisc_timeout_q =  
                     rt_timer_queue_create(ip_mtudisc_timeout);  
 }  }
   
 struct  sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };  struct  sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
Line 223  ipintr()
Line 173  ipintr()
         register struct mbuf *m;          register struct mbuf *m;
         register struct ipq *fp;          register struct ipq *fp;
         register struct in_ifaddr *ia;          register struct in_ifaddr *ia;
         register struct ifaddr *ifa;  
         struct ipqent *ipqe;          struct ipqent *ipqe;
         int hlen = 0, mff, len, s;          int hlen = 0, mff, len, s;
 #ifdef PFIL_HOOKS  #ifdef PFIL_HOOKS
Line 311  next:
Line 260  next:
          * Run through list of hooks for input packets.           * Run through list of hooks for input packets.
          */           */
         m0 = m;          m0 = m;
         for (pfh = pfil_hook_get(PFIL_IN); pfh; pfh = pfh->pfil_link.tqe_next)          for (pfh = pfil_hook_get(PFIL_IN); pfh; pfh = pfh->pfil_link.le_next)
                 if (pfh->pfil_func) {                  if (pfh->pfil_func) {
                         rv = pfh->pfil_func(ip, hlen, m->m_pkthdr.rcvif, 0, &m0);                          rv = pfh->pfil_func(ip, hlen, m->m_pkthdr.rcvif, 0, &m0);
                         if (rv)                          if (rv)
                                 goto next;                                  goto next;
                         m = m0;                          ip = mtod(m = m0, struct ip *);
                         if (m == NULL)  
                                 goto next;  
                         ip = mtod(m, struct ip *);  
                 }                  }
 #endif /* PFIL_HOOKS */  #endif /* PFIL_HOOKS */
   
Line 336  next:
Line 282  next:
         /*          /*
          * Check our list of addresses, to see if the packet is for us.           * Check our list of addresses, to see if the packet is for us.
          */           */
         INADDR_TO_IA(ip->ip_dst, ia);          for (ia = in_ifaddr.tqh_first; ia; ia = ia->ia_list.tqe_next) {
         if (ia != NULL) goto ours;                  if (in_hosteq(ip->ip_dst, ia->ia_addr.sin_addr))
         if (m->m_pkthdr.rcvif->if_flags & IFF_BROADCAST) {                          goto ours;
                 for (ifa = m->m_pkthdr.rcvif->if_addrlist.tqh_first;                  if (((ip_directedbcast == 0) || (ip_directedbcast &&
                     ifa != NULL; ifa = ifa->ifa_list.tqe_next) {                      ia->ia_ifp == m->m_pkthdr.rcvif)) &&
                         if (ifa->ifa_addr->sa_family != AF_INET) continue;                      (ia->ia_ifp->if_flags & IFF_BROADCAST)) {
                         ia = ifatoia(ifa);  
                         if (in_hosteq(ip->ip_dst, ia->ia_broadaddr.sin_addr) ||                          if (in_hosteq(ip->ip_dst, ia->ia_broadaddr.sin_addr) ||
                             in_hosteq(ip->ip_dst, ia->ia_netbroadcast) ||                              in_hosteq(ip->ip_dst, ia->ia_netbroadcast) ||
                             /*                              /*
Line 352  next:
Line 297  next:
                             ip->ip_dst.s_addr == ia->ia_subnet ||                              ip->ip_dst.s_addr == ia->ia_subnet ||
                             ip->ip_dst.s_addr == ia->ia_net)                              ip->ip_dst.s_addr == ia->ia_net)
                                 goto ours;                                  goto ours;
                         /*  
                          * An interface with IP address zero accepts  
                          * all packets that arrive on that interface.  
                          */  
                         if (in_nullhost(ia->ia_addr.sin_addr))  
                                 goto ours;  
                 }                  }
                   /*
                    * An interface with IP address zero accepts
                    * all packets that arrive on that interface.
                    */
                   if ((ia->ia_ifp == m->m_pkthdr.rcvif) &&
                       in_nullhost(ia->ia_addr.sin_addr))
                           goto ours;
         }          }
         if (IN_MULTICAST(ip->ip_dst.s_addr)) {          if (IN_MULTICAST(ip->ip_dst.s_addr)) {
                 struct in_multi *inm;                  struct in_multi *inm;
Line 492  found:
Line 438  found:
                                 goto next;                                  goto next;
                         ipstat.ips_reassembled++;                          ipstat.ips_reassembled++;
                         ip = mtod(m, struct ip *);                          ip = mtod(m, struct ip *);
                         hlen = ip->ip_hl << 2;  
                 } else                  } else
                         if (fp)                          if (fp)
                                 ip_freef(fp);                                  ip_freef(fp);
Line 1303  ip_sysctl(name, namelen, oldp, oldlenp, 
Line 1248  ip_sysctl(name, namelen, oldp, oldlenp, 
         size_t newlen;          size_t newlen;
 {  {
         extern int subnetsarelocal;          extern int subnetsarelocal;
         int error;  
           int error, old;
   
         /* All sysctl names at this level are terminal. */          /* All sysctl names at this level are terminal. */
         if (namelen != 1)          if (namelen != 1)
Line 1339  ip_sysctl(name, namelen, oldp, oldlenp, 
Line 1285  ip_sysctl(name, namelen, oldp, oldlenp, 
                 return (sysctl_int(oldp, oldlenp, newp, newlen,                  return (sysctl_int(oldp, oldlenp, newp, newlen,
                     &subnetsarelocal));                      &subnetsarelocal));
         case IPCTL_MTUDISC:          case IPCTL_MTUDISC:
                 error = sysctl_int(oldp, oldlenp, newp, newlen,                  return (sysctl_int(oldp, oldlenp, newp, newlen,
                     &ip_mtudisc);                      &ip_mtudisc));
                 if (ip_mtudisc != 0 && ip_mtudisc_timeout_q == NULL) {          case IPCTL_ANONPORTMIN:
                         ip_mtudisc_timeout_q =                  old = anonportmin;
                             rt_timer_queue_create(ip_mtudisc_timeout);                  error = sysctl_int(oldp, oldlenp, newp, newlen, &anonportmin);
                 } else if (ip_mtudisc == 0 && ip_mtudisc_timeout_q != NULL) {                  if (anonportmin >= anonportmax || anonportmin > 65535
                         rt_timer_queue_destroy(ip_mtudisc_timeout_q, TRUE);  #ifndef IPNOPRIVPORTS
                         ip_mtudisc_timeout_q = NULL;                      || anonportmin < IPPORT_RESERVED
   #endif
                       ) {
                           anonportmin = old;
                           return (EINVAL);
                   }
                   return (error);
           case IPCTL_ANONPORTMAX:
                   old = anonportmax;
                   error = sysctl_int(oldp, oldlenp, newp, newlen, &anonportmax);
                   if (anonportmin >= anonportmax || anonportmax > 65535
   #ifndef IPNOPRIVPORTS
                       || anonportmax < IPPORT_RESERVED
   #endif
                       ) {
                           anonportmax = old;
                           return (EINVAL);
                 }                  }
                 return error;                  return (error);
         case IPCTL_MTUDISCTIMEOUT:  
                 error = sysctl_int(oldp, oldlenp, newp, newlen,  
                    &ip_mtudisc_timeout);  
                 if (ip_mtudisc_timeout_q != NULL)  
                         rt_timer_queue_change(ip_mtudisc_timeout_q,  
                                               ip_mtudisc_timeout);  
                 return (error);  
         default:          default:
                 return (EOPNOTSUPP);                  return (EOPNOTSUPP);
         }          }
Legend:
Removed from v.1.53.2.4  
changed lines
  Added in v.1.54
CVSweb <webmaster@jp.NetBSD.org>