[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.74 and 1.82.2.2.4.1

version 1.74, 1998/11/13 03:24:22 version 1.82.2.2.4.1, 1999/06/28 06:37:00
Line 1 
Line 1 
 /*      $NetBSD$        */  /*      $NetBSD$        */
   
 /*  /*-
  * Copyright (c) 1982, 1986, 1988, 1993   * Copyright (c) 1998 The NetBSD Foundation, Inc.
  *      The Regents of the University of California.  All rights reserved.   * 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   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
Line 14 
Line 18 
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software   * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:   *    must display the following acknowledgement:
  *      This product includes software developed by the University of   *      This product includes software developed by the NetBSD
  *      California, Berkeley and its contributors.   *      Foundation, Inc. and its contributors.
  * 4. Neither the name of the University nor the names of 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.
    */
   
   /*
    * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
    * All rights reserved.
    *
    * 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. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software   *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.   *    without specific prior written permission.
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND   * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE   * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
Line 31 
Line 64 
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY   * 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   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.   * SUCH DAMAGE.
  *  
  *      @(#)ip_input.c  8.2 (Berkeley) 1/4/94  
  */   */
   
 /*-  /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.   * Copyright (c) 1982, 1986, 1988, 1993
  * All rights reserved.   *      The Regents of the University of California.  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   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
  * are met:   * are met:
  * 1. Redistributions of source code must retain the above copyright   * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.   *    notice, this list of conditions and the following disclaimer.
Line 53 
Line 80 
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software   * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:   *    must display the following acknowledgement:
  *      This product includes software developed by the NetBSD   *      This product includes software developed by the University of
  *      Foundation, Inc. and its contributors.   *      California, Berkeley and its contributors.
  * 4. Neither the name of The NetBSD Foundation nor the names of its   * 4. Neither the name of the University nor the names of its contributors
  *    contributors may be used to endorse or promote products derived   *    may be used to endorse or promote products derived from this software
  *    from this software without specific prior written permission.   *    without specific prior written permission.
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS   * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS   * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * POSSIBILITY OF SUCH DAMAGE.   * SUCH DAMAGE.
    *
    *      @(#)ip_input.c  8.2 (Berkeley) 1/4/94
  */   */
   
 #include "opt_gateway.h"  #include "opt_gateway.h"
Line 105 
Line 134 
 #include <netinet/in_var.h>  #include <netinet/in_var.h>
 #include <netinet/ip_var.h>  #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>  #include <netinet/ip_icmp.h>
   /* just for gif_ttl */
   #include <netinet/in_gif.h>
   #include "gif.h"
   
   #ifdef IPSEC
   #include <netinet6/ipsec.h>
   #include <netinet6/ah.h>
   #include <netinet6/esp.h>
   #include <netkey/key.h>
   #include <netkey/key_debug.h>
   #endif
   
 #ifndef IPFORWARDING  #ifndef IPFORWARDING
 #ifdef GATEWAY  #ifdef GATEWAY
Line 164  struct ifqueue ipintrq;
Line 204  struct ifqueue ipintrq;
 struct  ipstat  ipstat;  struct  ipstat  ipstat;
 u_int16_t       ip_id;  u_int16_t       ip_id;
 int     ip_defttl;  int     ip_defttl;
   
 struct ipqhead ipq;  struct ipqhead ipq;
   int     ipq_locked;
   
   static __inline int ipq_lock_try __P((void));
   static __inline void ipq_unlock __P((void));
   
   static __inline int
   ipq_lock_try()
   {
           int s;
   
           s = splimp();
           if (ipq_locked) {
                   splx(s);
                   return (0);
           }
           ipq_locked = 1;
           splx(s);
           return (1);
   }
   
   static __inline void
   ipq_unlock()
   {
           int s;
   
           s = splimp();
           ipq_locked = 0;
           splx(s);
   }
   
   #ifdef DIAGNOSTIC
   #define IPQ_LOCK()                                                      \
   do {                                                                    \
           if (ipq_lock_try() == 0) {                                      \
                   printf("%s:%d: ipq already locked\n", __FILE__, __LINE__); \
                   panic("ipq_lock");                                      \
           }                                                               \
   } while (0)
   #define IPQ_LOCK_CHECK()                                                \
   do {                                                                    \
           if (ipq_locked == 0) {                                          \
                   printf("%s:%d: ipq lock not held\n", __FILE__, __LINE__); \
                   panic("ipq lock check");                                \
           }                                                               \
   } while (0)
   #else
   #define IPQ_LOCK()              (void) ipq_lock_try()
   #define IPQ_LOCK_CHECK()        /* nothing */
   #endif
   
   #define IPQ_UNLOCK()            ipq_unlock()
   
 struct pool ipqent_pool;  struct pool ipqent_pool;
   
Line 226  struct sockaddr_in ipaddr = { sizeof(ipa
Line 318  struct sockaddr_in ipaddr = { sizeof(ipa
 struct  route ipforward_rt;  struct  route ipforward_rt;
   
 /*  /*
    * IP software interrupt routine
    */
   void
   ipintr()
   {
           int s;
           struct mbuf *m;
   
           while (1) {
                   s = splimp();
                   IF_DEQUEUE(&ipintrq, m);
                   splx(s);
                   if (m == 0)
                           return;
                   ip_input(m);
           }
   }
   
   /*
  * Ip input routine.  Checksum and byte swap header.  If fragmented   * Ip input routine.  Checksum and byte swap header.  If fragmented
  * try to reassemble.  Process options.  Pass to next level.   * try to reassemble.  Process options.  Pass to next level.
  */   */
 void  void
 ipintr()  ip_input(struct mbuf *m)
 {  {
         register struct ip *ip = NULL;          register struct ip *ip = NULL;
         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;          register struct ifaddr *ifa;
         struct ipqent *ipqe;          struct ipqent *ipqe;
         int hlen = 0, mff, len, s;          int hlen = 0, mff, len;
 #ifdef PFIL_HOOKS  #ifdef PFIL_HOOKS
         struct packet_filter_hook *pfh;          struct packet_filter_hook *pfh;
         struct mbuf *m0;          struct mbuf *m0;
         int rv;          int rv;
 #endif /* PFIL_HOOKS */  #endif /* PFIL_HOOKS */
   
 next:  
         /*  
          * Get next datagram off input queue and get IP header  
          * in first mbuf.  
          */  
         s = splimp();  
         IF_DEQUEUE(&ipintrq, m);  
         splx(s);  
         if (m == 0)  
                 return;  
 #ifdef  DIAGNOSTIC  #ifdef  DIAGNOSTIC
         if ((m->m_flags & M_PKTHDR) == 0)          if ((m->m_flags & M_PKTHDR) == 0)
                 panic("ipintr no HDR");                  panic("ipintr no HDR");
 #endif  #endif
   #ifdef IPSEC
           /*
            * should the inner packet be considered authentic?
            * see comment in ah4_input().
            */
           if (m) {
                   m->m_flags &= ~M_AUTHIPHDR;
                   m->m_flags &= ~M_AUTHIPDGM;
           }
   #endif
         /*          /*
          * 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.
Line 269  next:
Line 379  next:
         if (m->m_len < sizeof (struct ip) &&          if (m->m_len < sizeof (struct ip) &&
             (m = m_pullup(m, sizeof (struct ip))) == 0) {              (m = m_pullup(m, sizeof (struct ip))) == 0) {
                 ipstat.ips_toosmall++;                  ipstat.ips_toosmall++;
                 goto next;                  return;
         }          }
         ip = mtod(m, struct ip *);          ip = mtod(m, struct ip *);
         if (ip->ip_v != IPVERSION) {          if (ip->ip_v != IPVERSION) {
Line 284  next:
Line 394  next:
         if (hlen > m->m_len) {          if (hlen > m->m_len) {
                 if ((m = m_pullup(m, hlen)) == 0) {                  if ((m = m_pullup(m, hlen)) == 0) {
                         ipstat.ips_badhlen++;                          ipstat.ips_badhlen++;
                         goto next;                          return;
                 }                  }
                 ip = mtod(m, struct ip *);                  ip = mtod(m, struct ip *);
         }          }
         if ((ip->ip_sum = in_cksum(m, hlen)) != 0) {          if (in_cksum(m, hlen) != 0) {
                 ipstat.ips_badsum++;                  ipstat.ips_badsum++;
                 goto bad;                  goto bad;
         }          }
Line 297  next:
Line 407  next:
          * Convert fields to host representation.           * Convert fields to host representation.
          */           */
         NTOHS(ip->ip_len);          NTOHS(ip->ip_len);
         NTOHS(ip->ip_id);  
         NTOHS(ip->ip_off);          NTOHS(ip->ip_off);
         len = ip->ip_len;          len = ip->ip_len;
   
         /*          /*
            * Check for additional length bogosity
            */
           if (len < hlen)
           {
                   ipstat.ips_badlen++;
                   goto bad;
           }
   
           /*
          * Check that the amount of data in the buffers           * Check that the amount of data in the buffers
          * is as at least much as the IP header would have us expect.           * is as at least much as the IP header would have us expect.
          * Trim mbufs if longer than we expect.           * Trim mbufs if longer than we expect.
Line 338  next:
Line 456  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;                                  return;
                         m = m0;                          m = m0;
                         if (m == NULL)                          if (m == NULL)
                                 goto next;                                  return;
                         ip = mtod(m, struct ip *);                          ip = mtod(m, struct ip *);
                 }                  }
 #endif /* PFIL_HOOKS */  #endif /* PFIL_HOOKS */
Line 354  next:
Line 472  next:
          */           */
         ip_nhops = 0;           /* for source routed packets */          ip_nhops = 0;           /* for source routed packets */
         if (hlen > sizeof (struct ip) && ip_dooptions(m))          if (hlen > sizeof (struct ip) && ip_dooptions(m))
                 goto next;                  return;
   
         /*          /*
          * 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);          INADDR_TO_IA(ip->ip_dst, ia);
         if (ia != NULL) goto ours;          if (ia != NULL)
                   goto ours;
         if (m->m_pkthdr.rcvif->if_flags & IFF_BROADCAST) {          if (m->m_pkthdr.rcvif->if_flags & IFF_BROADCAST) {
                 for (ifa = m->m_pkthdr.rcvif->if_addrlist.tqh_first;                  for (ifa = m->m_pkthdr.rcvif->if_addrlist.tqh_first;
                     ifa != NULL; ifa = ifa->ifa_list.tqe_next) {                      ifa != NULL; ifa = ifa->ifa_list.tqe_next) {
Line 391  next:
Line 510  next:
                 if (m->m_flags & M_EXT) {                  if (m->m_flags & M_EXT) {
                         if ((m = m_pullup(m, hlen)) == 0) {                          if ((m = m_pullup(m, hlen)) == 0) {
                                 ipstat.ips_toosmall++;                                  ipstat.ips_toosmall++;
                                 goto next;                                  return;
                         }                          }
                         ip = mtod(m, struct ip *);                          ip = mtod(m, struct ip *);
                 }                  }
Line 409  next:
Line 528  next:
                          * as expected when ip_mforward() is called from                           * as expected when ip_mforward() is called from
                          * ip_output().)                           * ip_output().)
                          */                           */
                         ip->ip_id = htons(ip->ip_id);  
                         if (ip_mforward(m, m->m_pkthdr.rcvif) != 0) {                          if (ip_mforward(m, m->m_pkthdr.rcvif) != 0) {
                                 ipstat.ips_cantforward++;                                  ipstat.ips_cantforward++;
                                 m_freem(m);                                  m_freem(m);
                                 goto next;                                  return;
                         }                          }
                         ip->ip_id = ntohs(ip->ip_id);  
   
                         /*                          /*
                          * The process-level routing demon needs to receive                           * The process-level routing demon needs to receive
Line 435  next:
Line 552  next:
                 if (inm == NULL) {                  if (inm == NULL) {
                         ipstat.ips_cantforward++;                          ipstat.ips_cantforward++;
                         m_freem(m);                          m_freem(m);
                         goto next;                          return;
                 }                  }
                 goto ours;                  goto ours;
         }          }
Line 451  next:
Line 568  next:
                 m_freem(m);                  m_freem(m);
         } else          } else
                 ip_forward(m, 0);                  ip_forward(m, 0);
         goto next;          return;
   
 ours:  ours:
         /*          /*
Line 466  ours:
Line 583  ours:
                  * Look for queue of fragments                   * Look for queue of fragments
                  * of this datagram.                   * of this datagram.
                  */                   */
                   IPQ_LOCK();
                 for (fp = ipq.lh_first; fp != NULL; fp = fp->ipq_q.le_next)                  for (fp = ipq.lh_first; fp != NULL; fp = fp->ipq_q.le_next)
                         if (ip->ip_id == fp->ipq_id &&                          if (ip->ip_id == fp->ipq_id &&
                             in_hosteq(ip->ip_src, fp->ipq_src) &&                              in_hosteq(ip->ip_src, fp->ipq_src) &&
Line 489  found:
Line 607  found:
                          */                           */
                         if (ip->ip_len == 0 || (ip->ip_len & 0x7) != 0) {                          if (ip->ip_len == 0 || (ip->ip_len & 0x7) != 0) {
                                 ipstat.ips_badfrags++;                                  ipstat.ips_badfrags++;
                                   IPQ_UNLOCK();
                                 goto bad;                                  goto bad;
                         }                          }
                 }                  }
Line 504  found:
Line 623  found:
                         ipqe = pool_get(&ipqent_pool, PR_NOWAIT);                          ipqe = pool_get(&ipqent_pool, PR_NOWAIT);
                         if (ipqe == NULL) {                          if (ipqe == NULL) {
                                 ipstat.ips_rcvmemdrop++;                                  ipstat.ips_rcvmemdrop++;
                                   IPQ_UNLOCK();
                                 goto bad;                                  goto bad;
                         }                          }
                         ipqe->ipqe_mff = mff;                          ipqe->ipqe_mff = mff;
                         ipqe->ipqe_m = m;                          ipqe->ipqe_m = m;
                         ipqe->ipqe_ip = ip;                          ipqe->ipqe_ip = ip;
                         m = ip_reass(ipqe, fp);                          m = ip_reass(ipqe, fp);
                         if (m == 0)                          if (m == 0) {
                                 goto next;                                  IPQ_UNLOCK();
                                   return;
                           }
                         ipstat.ips_reassembled++;                          ipstat.ips_reassembled++;
                         ip = mtod(m, struct ip *);                          ip = mtod(m, struct ip *);
                         hlen = ip->ip_hl << 2;                          hlen = ip->ip_hl << 2;
                           ip->ip_len += hlen;
                 } else                  } else
                         if (fp)                          if (fp)
                                 ip_freef(fp);                                  ip_freef(fp);
         } else                  IPQ_UNLOCK();
                 ip->ip_len -= hlen;          }
   
         /*          /*
          * Switch out to protocol's input routine.           * Switch out to protocol's input routine.
          */           */
   #if IFA_STATS
           ia->ia_ifa.ifa_data.ifad_inbytes += ip->ip_len;
   #endif
         ipstat.ips_delivered++;          ipstat.ips_delivered++;
         (*inetsw[ip_protox[ip->ip_p]].pr_input)(m, hlen);      {
         goto next;          int off = hlen, nh = ip->ip_p;
   
           (*inetsw[ip_protox[nh]].pr_input)(m, off, nh);
           return;
       }
 bad:  bad:
         m_freem(m);          m_freem(m);
         goto next;  
 }  }
   
 /*  /*
Line 550  ip_reass(ipqe, fp)
Line 679  ip_reass(ipqe, fp)
         int hlen = ipqe->ipqe_ip->ip_hl << 2;          int hlen = ipqe->ipqe_ip->ip_hl << 2;
         int i, next;          int i, next;
   
           IPQ_LOCK_CHECK();
   
         /*          /*
          * Presence of header sizes in mbufs           * Presence of header sizes in mbufs
          * would confuse code below.           * would confuse code below.
Line 672  insert:
Line 803  insert:
          * Make header visible.           * Make header visible.
          */           */
         ip->ip_len = next;          ip->ip_len = next;
           ip->ip_ttl = 0; /* xxx */
           ip->ip_sum = 0;
         ip->ip_src = fp->ipq_src;          ip->ip_src = fp->ipq_src;
         ip->ip_dst = fp->ipq_dst;          ip->ip_dst = fp->ipq_dst;
         LIST_REMOVE(fp, ipq_q);          LIST_REMOVE(fp, ipq_q);
Line 704  ip_freef(fp)
Line 837  ip_freef(fp)
 {  {
         register struct ipqent *q, *p;          register struct ipqent *q, *p;
   
           IPQ_LOCK_CHECK();
   
         for (q = fp->ipq_fragq.lh_first; q != NULL; q = p) {          for (q = fp->ipq_fragq.lh_first; q != NULL; q = p) {
                 p = q->ipqe_q.le_next;                  p = q->ipqe_q.le_next;
                 m_freem(q->ipqe_m);                  m_freem(q->ipqe_m);
Line 725  ip_slowtimo()
Line 860  ip_slowtimo()
         register struct ipq *fp, *nfp;          register struct ipq *fp, *nfp;
         int s = splsoftnet();          int s = splsoftnet();
   
           IPQ_LOCK();
         for (fp = ipq.lh_first; fp != NULL; fp = nfp) {          for (fp = ipq.lh_first; fp != NULL; fp = nfp) {
                 nfp = fp->ipq_q.le_next;                  nfp = fp->ipq_q.le_next;
                 if (--fp->ipq_ttl == 0) {                  if (--fp->ipq_ttl == 0) {
Line 732  ip_slowtimo()
Line 868  ip_slowtimo()
                         ip_freef(fp);                          ip_freef(fp);
                 }                  }
         }          }
           IPQ_UNLOCK();
 #ifdef GATEWAY  #ifdef GATEWAY
         ipflow_slowtimo();          ipflow_slowtimo();
 #endif  #endif
Line 745  void
Line 882  void
 ip_drain()  ip_drain()
 {  {
   
           /*
            * We may be called from a device's interrupt context.  If
            * the ipq is already busy, just bail out now.
            */
           if (ipq_lock_try() == 0)
                   return;
   
         while (ipq.lh_first != NULL) {          while (ipq.lh_first != NULL) {
                 ipstat.ips_fragdropped++;                  ipstat.ips_fragdropped++;
                 ip_freef(ipq.lh_first);                  ip_freef(ipq.lh_first);
         }          }
   
           IPQ_UNLOCK();
 }  }
   
 /*  /*
Line 948  ip_dooptions(m)
Line 1094  ip_dooptions(m)
         }          }
         return (0);          return (0);
 bad:  bad:
         ip->ip_len -= ip->ip_hl << 2;   /* XXX icmp_error adds in hdr length */  
         icmp_error(m, type, code, 0, 0);          icmp_error(m, type, code, 0, 0);
         ipstat.ips_badoptions++;          ipstat.ips_badoptions++;
         return (1);          return (1);
Line 997  save_rte(option, dst)
Line 1142  save_rte(option, dst)
 #ifdef DIAGNOSTIC  #ifdef DIAGNOSTIC
         if (ipprintfs)          if (ipprintfs)
                 printf("save_rte: olen %d\n", olen);                  printf("save_rte: olen %d\n", olen);
 #endif  #endif /* 0 */
         if (olen > sizeof(ip_srcrt) - (1 + sizeof(dst)))          if (olen > sizeof(ip_srcrt) - (1 + sizeof(dst)))
                 return;                  return;
         bcopy((caddr_t)option, (caddr_t)ip_srcrt.srcopt, olen);          bcopy((caddr_t)option, (caddr_t)ip_srcrt.srcopt, olen);
Line 1091  ip_stripoptions(m, mopt)
Line 1236  ip_stripoptions(m, mopt)
         register caddr_t opts;          register caddr_t opts;
         int olen;          int olen;
   
         olen = (ip->ip_hl<<2) - sizeof (struct ip);          olen = (ip->ip_hl << 2) - sizeof (struct ip);
         opts = (caddr_t)(ip + 1);          opts = (caddr_t)(ip + 1);
         i = m->m_len - (sizeof (struct ip) + olen);          i = m->m_len - (sizeof (struct ip) + olen);
         bcopy(opts  + olen, opts, (unsigned)i);          bcopy(opts  + olen, opts, (unsigned)i);
         m->m_len -= olen;          m->m_len -= olen;
         if (m->m_flags & M_PKTHDR)          if (m->m_flags & M_PKTHDR)
                 m->m_pkthdr.len -= olen;                  m->m_pkthdr.len -= olen;
         ip->ip_hl = sizeof(struct ip) >> 2;          ip->ip_len -= olen;
           ip->ip_hl = sizeof (struct ip) >> 2;
 }  }
   
 int inetctlerrmap[PRC_NCMDS] = {  int inetctlerrmap[PRC_NCMDS] = {
Line 1136  ip_forward(m, srcrt)
Line 1282  ip_forward(m, srcrt)
         struct mbuf *mcopy;          struct mbuf *mcopy;
         n_long dest;          n_long dest;
         struct ifnet *destifp;          struct ifnet *destifp;
   #ifdef IPSEC
           struct ifnet dummyifp;
   #endif
   
         dest = 0;          dest = 0;
 #ifdef DIAGNOSTIC  #ifdef DIAGNOSTIC
Line 1149  ip_forward(m, srcrt)
Line 1298  ip_forward(m, srcrt)
                 m_freem(m);                  m_freem(m);
                 return;                  return;
         }          }
         HTONS(ip->ip_id);  
         if (ip->ip_ttl <= IPTTLDEC) {          if (ip->ip_ttl <= IPTTLDEC) {
                 icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, dest, 0);                  icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, dest, 0);
                 return;                  return;
Line 1196  ip_forward(m, srcrt)
Line 1344  ip_forward(m, srcrt)
                 if (rt->rt_ifa &&                  if (rt->rt_ifa &&
                     (ip->ip_src.s_addr & ifatoia(rt->rt_ifa)->ia_subnetmask) ==                      (ip->ip_src.s_addr & ifatoia(rt->rt_ifa)->ia_subnetmask) ==
                     ifatoia(rt->rt_ifa)->ia_subnet) {                      ifatoia(rt->rt_ifa)->ia_subnet) {
                     if (rt->rt_flags & RTF_GATEWAY)                          if (rt->rt_flags & RTF_GATEWAY)
                         dest = satosin(rt->rt_gateway)->sin_addr.s_addr;                                  dest = satosin(rt->rt_gateway)->sin_addr.s_addr;
                     else                          else
                         dest = ip->ip_dst.s_addr;                                  dest = ip->ip_dst.s_addr;
                     /* Router requirements says to only send host redirects */                          /*
                     type = ICMP_REDIRECT;                           * Router requirements says to only send host
                     code = ICMP_REDIRECT_HOST;                           * redirects.
                            */
                           type = ICMP_REDIRECT;
                           code = ICMP_REDIRECT_HOST;
 #ifdef DIAGNOSTIC  #ifdef DIAGNOSTIC
                     if (ipprintfs)                          if (ipprintfs)
                         printf("redirect (%d) to %x\n", code, (u_int32_t)dest);                                  printf("redirect (%d) to %x\n", code,
                                       (u_int32_t)dest);
 #endif  #endif
                 }                  }
         }          }
   
   #ifdef IPSEC
           m->m_pkthdr.rcvif = NULL;
   #endif /*IPSEC*/
         error = ip_output(m, (struct mbuf *)0, &ipforward_rt,          error = ip_output(m, (struct mbuf *)0, &ipforward_rt,
             (IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)), 0);              (IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)), 0);
         if (error)          if (error)
Line 1251  ip_forward(m, srcrt)
Line 1406  ip_forward(m, srcrt)
         case EMSGSIZE:          case EMSGSIZE:
                 type = ICMP_UNREACH;                  type = ICMP_UNREACH;
                 code = ICMP_UNREACH_NEEDFRAG;                  code = ICMP_UNREACH_NEEDFRAG;
   #ifndef IPSEC
                 if (ipforward_rt.ro_rt)                  if (ipforward_rt.ro_rt)
                         destifp = ipforward_rt.ro_rt->rt_ifp;                          destifp = ipforward_rt.ro_rt->rt_ifp;
   #else
                   /*
                    * If the packet is routed over IPsec tunnel, tell the
                    * originator the tunnel MTU.
                    *      tunnel MTU = if MTU - sizeof(IP) - ESP/AH hdrsiz
                    * XXX quickhack!!!
                    */
                   if (ipforward_rt.ro_rt) {
                           struct secpolicy *sp;
                           int ipsecerror;
                           int ipsechdr;
                           struct route *ro;
   
                           sp = ipsec4_getpolicybyaddr(mcopy,
                                                       IP_FORWARDING,
                                                       &ipsecerror);
   
                           if (sp == NULL)
                                   destifp = ipforward_rt.ro_rt->rt_ifp;
                           else {
                                   /* count IPsec header size */
                                   ipsechdr = ipsec4_hdrsiz(mcopy, NULL);
   
                                   /*
                                    * find the correct route for outer IPv4
                                    * header, compute tunnel MTU.
                                    *
                                    * XXX BUG ALERT
                                    * The "dummyifp" code relies upon the fact
                                    * that icmp_error() touches only ifp->if_mtu.
                                    */
                                   /*XXX*/
                                   destifp = NULL;
                                   if (sp->req != NULL
                                    && sp->req->sa != NULL) {
                                           ro = &sp->req->sa->saidx->sa_route;
                                           if (ro->ro_rt && ro->ro_rt->rt_ifp) {
                                                   dummyifp.if_mtu =
                                                       ro->ro_rt->rt_ifp->if_mtu;
                                                   dummyifp.if_mtu -= ipsechdr;
                                                   destifp = &dummyifp;
                                           }
                                   }
   
                                   key_freesp(sp);
                           }
                   }
   #endif /*IPSEC*/
                 ipstat.ips_cantfrag++;                  ipstat.ips_cantfrag++;
                 break;                  break;
   
Line 1425  ip_sysctl(name, namelen, oldp, oldlenp, 
Line 1629  ip_sysctl(name, namelen, oldp, oldlenp, 
                 return (error);                  return (error);
             }              }
 #endif  #endif
   #if NGIF > 0
           case IPCTL_GIF_TTL:
                   return(sysctl_int(oldp, oldlenp, newp, newlen,
                                     &gif_ttl));
   #endif
         default:          default:
                 return (EOPNOTSUPP);                  return (EOPNOTSUPP);
         }          }
Legend:
Removed from v.1.74  
changed lines
  Added in v.1.82.2.2.4.1
CVSweb <webmaster@jp.NetBSD.org>