[BACK]Return to raw_ip.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/raw_ip.c between version 1.56.2.4 and 1.57

version 1.56.2.4, 2002/09/06 08:49:18 version 1.57, 2001/07/25 23:28:02
Line 3 
Line 3 
 /*  /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.   * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.   * All rights reserved.
  *   *
  * 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:
Line 15 
Line 15 
  * 3. Neither the name of the project nor the names of its contributors   * 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 PROJECT 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
Line 64 
Line 64 
  *      @(#)raw_ip.c    8.7 (Berkeley) 5/15/95   *      @(#)raw_ip.c    8.7 (Berkeley) 5/15/95
  */   */
   
 #include <sys/cdefs.h>  
 __KERNEL_RCSID(0, "$NetBSD$");  
   
 #include "opt_ipsec.h"  #include "opt_ipsec.h"
 #include "opt_mrouting.h"  #include "opt_mrouting.h"
   
Line 100  __KERNEL_RCSID(0, "$NetBSD$");
Line 97  __KERNEL_RCSID(0, "$NetBSD$");
   
 struct inpcbtable rawcbtable;  struct inpcbtable rawcbtable;
   
 int      rip_pcbnotify __P((struct inpcbtable *, struct in_addr,  
     struct in_addr, int, int, void (*) __P((struct inpcb *, int))));  
 int      rip_bind __P((struct inpcb *, struct mbuf *));  int      rip_bind __P((struct inpcb *, struct mbuf *));
 int      rip_connect __P((struct inpcb *, struct mbuf *));  int      rip_connect __P((struct inpcb *, struct mbuf *));
 void     rip_disconnect __P((struct inpcb *));  void     rip_disconnect __P((struct inpcb *));
Line 163  rip_input(m, va_alist)
Line 158  rip_input(m, va_alist)
   
         /*          /*
          * XXX Compatibility: programs using raw IP expect ip_len           * XXX Compatibility: programs using raw IP expect ip_len
          * XXX to have the header length subtracted, and in host order.           * XXX to have the header length subtracted.
          * XXX ip_off is also expected to be host order.  
          */           */
         ip->ip_len = ntohs(ip->ip_len) - (ip->ip_hl << 2);          ip->ip_len -= ip->ip_hl << 2;
         NTOHS(ip->ip_off);  
   
         CIRCLEQ_FOREACH(inp, &rawcbtable.inpt_queue, inp_queue) {          for (inp = rawcbtable.inpt_queue.cqh_first;
               inp != (struct inpcb *)&rawcbtable.inpt_queue;
               inp = inp->inp_queue.cqe_next) {
                 if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto)                  if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto)
                         continue;                          continue;
                 if (!in_nullhost(inp->inp_laddr) &&                  if (!in_nullhost(inp->inp_laddr) &&
Line 237  rip_input(m, va_alist)
Line 232  rip_input(m, va_alist)
         return;          return;
 }  }
   
 int  
 rip_pcbnotify(table, faddr, laddr, proto, errno, notify)  
         struct inpcbtable *table;  
         struct in_addr faddr, laddr;  
         int proto;  
         int errno;  
         void (*notify) __P((struct inpcb *, int));  
 {  
         struct inpcb *inp, *ninp;  
         int nmatch;  
   
         nmatch = 0;  
         for (inp = CIRCLEQ_FIRST(&table->inpt_queue);  
             inp != (struct inpcb *)&table->inpt_queue;  
             inp = ninp) {  
                 ninp = inp->inp_queue.cqe_next;  
                 if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto)  
                         continue;  
                 if (in_hosteq(inp->inp_faddr, faddr) &&  
                     in_hosteq(inp->inp_laddr, laddr)) {  
                         (*notify)(inp, errno);  
                         nmatch++;  
                 }  
         }  
   
         return nmatch;  
 }  
   
 void *  
 rip_ctlinput(cmd, sa, v)  
         int cmd;  
         struct sockaddr *sa;  
         void *v;  
 {  
         struct ip *ip = v;  
         void (*notify) __P((struct inpcb *, int)) = in_rtchange;  
         int errno;  
   
         if (sa->sa_family != AF_INET ||  
             sa->sa_len != sizeof(struct sockaddr_in))  
                 return NULL;  
         if ((unsigned)cmd >= PRC_NCMDS)  
                 return NULL;  
         errno = inetctlerrmap[cmd];  
         if (PRC_IS_REDIRECT(cmd))  
                 notify = in_rtchange, ip = 0;  
         else if (cmd == PRC_HOSTDEAD)  
                 ip = 0;  
         else if (errno == 0)  
                 return NULL;  
         if (ip) {  
                 rip_pcbnotify(&rawcbtable, satosin(sa)->sin_addr,  
                     ip->ip_src, ip->ip_p, errno, notify);  
   
                 /* XXX mapped address case */  
         } else  
                 in_pcbnotifyall(&rawcbtable, satosin(sa)->sin_addr, errno,  
                     notify);  
         return NULL;  
 }  
   
 /*  /*
  * Generate IP header and pass packet to ip_output.   * Generate IP header and pass packet to ip_output.
  * Tack on options user may have setup with control call.   * Tack on options user may have setup with control call.
Line 337  rip_output(m, va_alist)
Line 271  rip_output(m, va_alist)
                 M_PREPEND(m, sizeof(struct ip), M_WAIT);                  M_PREPEND(m, sizeof(struct ip), M_WAIT);
                 ip = mtod(m, struct ip *);                  ip = mtod(m, struct ip *);
                 ip->ip_tos = 0;                  ip->ip_tos = 0;
                 ip->ip_off = htons(0);                  ip->ip_off = 0;
                 ip->ip_p = inp->inp_ip.ip_p;                  ip->ip_p = inp->inp_ip.ip_p;
                 ip->ip_len = htons(m->m_pkthdr.len);                  ip->ip_len = m->m_pkthdr.len;
                 ip->ip_src = inp->inp_laddr;                  ip->ip_src = inp->inp_laddr;
                 ip->ip_dst = inp->inp_faddr;                  ip->ip_dst = inp->inp_faddr;
                 ip->ip_ttl = MAXTTL;                  ip->ip_ttl = MAXTTL;
Line 350  rip_output(m, va_alist)
Line 284  rip_output(m, va_alist)
                         return (EMSGSIZE);                          return (EMSGSIZE);
                 }                  }
                 ip = mtod(m, struct ip *);                  ip = mtod(m, struct ip *);
                 /* XXX userland passes ip_len and ip_off in host order */  
                 if (m->m_pkthdr.len != ip->ip_len) {                  if (m->m_pkthdr.len != ip->ip_len) {
                         m_freem(m);                          m_freem(m);
                         return (EINVAL);                          return (EINVAL);
                 }                  }
                 HTONS(ip->ip_len);  
                 HTONS(ip->ip_off);  
                 if (ip->ip_id == 0)                  if (ip->ip_id == 0)
                         ip->ip_id = htons(ip_id++);                          ip->ip_id = htons(ip_id++);
                 opts = NULL;                  opts = NULL;
Line 370  rip_output(m, va_alist)
Line 301  rip_output(m, va_alist)
                 return ENOBUFS;                  return ENOBUFS;
         }          }
 #endif /*IPSEC*/  #endif /*IPSEC*/
         return (ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions,          return (ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions, &inp->inp_errormtu));
             &inp->inp_errormtu));  
 }  }
   
 /*  /*
Line 459  rip_bind(inp, nam)
Line 389  rip_bind(inp, nam)
   
         if (nam->m_len != sizeof(*addr))          if (nam->m_len != sizeof(*addr))
                 return (EINVAL);                  return (EINVAL);
         if (TAILQ_FIRST(&ifnet) == 0)          if (ifnet.tqh_first == 0)
                 return (EADDRNOTAVAIL);                  return (EADDRNOTAVAIL);
         if (addr->sin_family != AF_INET &&          if (addr->sin_family != AF_INET &&
             addr->sin_family != AF_IMPLINK)              addr->sin_family != AF_IMPLINK)
Line 480  rip_connect(inp, nam)
Line 410  rip_connect(inp, nam)
   
         if (nam->m_len != sizeof(*addr))          if (nam->m_len != sizeof(*addr))
                 return (EINVAL);                  return (EINVAL);
         if (TAILQ_FIRST(&ifnet) == 0)          if (ifnet.tqh_first == 0)
                 return (EADDRNOTAVAIL);                  return (EADDRNOTAVAIL);
         if (addr->sin_family != AF_INET &&          if (addr->sin_family != AF_INET &&
             addr->sin_family != AF_IMPLINK)              addr->sin_family != AF_IMPLINK)

Legend:
Removed from v.1.56.2.4  
changed lines
  Added in v.1.57

CVSweb <webmaster@jp.NetBSD.org>