Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.41.6.1 retrieving revision 1.52 diff -u -p -r1.41.6.1 -r1.52 --- src/sys/netinet/raw_ip.c 1998/12/11 04:53:09 1.41.6.1 +++ src/sys/netinet/raw_ip.c 2000/03/01 12:49:36 1.52 @@ -1,4 +1,33 @@ -/* $NetBSD: raw_ip.c,v 1.41.6.1 1998/12/11 04:53:09 kenh Exp $ */ +/* $NetBSD: raw_ip.c,v 1.52 2000/03/01 12:49:36 itojun Exp $ */ + +/* + * 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 + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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) 1982, 1986, 1988, 1993 @@ -35,6 +64,7 @@ * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 */ +#include "opt_ipsec.h" #include "opt_mrouting.h" #include @@ -55,11 +85,16 @@ #include #include #include +#include #include #include #include +#ifdef IPSEC +#include +#endif /*IPSEC*/ + struct inpcbtable rawcbtable; int rip_bind __P((struct inpcb *, struct mbuf *)); @@ -86,6 +121,8 @@ rip_init() in_pcbinit(&rawcbtable, 1, 1); } +static struct sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET }; + /* * Setup generic address and protocol structures * for raw_input routine, then pass them along with @@ -100,11 +137,18 @@ rip_input(m, va_alist) va_dcl #endif { + int off, proto; register struct ip *ip = mtod(m, struct ip *); register struct inpcb *inp; struct inpcb *last = 0; struct mbuf *opts = 0; struct sockaddr_in ripsrc; + va_list ap; + + va_start(ap, m); + off = va_arg(ap, int); + proto = va_arg(ap, int); + va_end(ap); ripsrc.sin_family = AF_INET; ripsrc.sin_len = sizeof(struct sockaddr_in); @@ -112,10 +156,16 @@ rip_input(m, va_alist) ripsrc.sin_port = 0; bzero((caddr_t)ripsrc.sin_zero, sizeof(ripsrc.sin_zero)); + /* + * XXX Compatibility: programs using raw IP expect ip_len + * XXX to have the header length subtracted. + */ + ip->ip_len -= ip->ip_hl << 2; + 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 != ip->ip_p) + if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != proto) continue; if (!in_nullhost(inp->inp_laddr) && !in_hosteq(inp->inp_laddr, ip->ip_dst)) @@ -154,10 +204,15 @@ rip_input(m, va_alist) } else sorwakeup(last->inp_socket); } else { - m_freem(m); - ipstat.ips_noproto++; - ipstat.ips_delivered--; + if (inetsw[ip_protox[ip->ip_p]].pr_input == rip_input) { + icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PROTOCOL, + 0, 0); + ipstat.ips_noproto++; + ipstat.ips_delivered--; + } else + m_freem(m); } + return; } /* @@ -223,6 +278,9 @@ rip_output(m, va_alist) flags |= IP_RAWOUTPUT; ipstat.ips_rawout++; } +#ifdef IPSEC + ipsec_setsocket(m, inp->inp_socket); +#endif /*IPSEC*/ return (ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions, &inp->inp_errormtu)); } @@ -308,7 +366,6 @@ rip_bind(inp, nam) struct mbuf *nam; { struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); - struct ifaddr *ifa = NULL; if (nam->m_len != sizeof(*addr)) return (EINVAL); @@ -318,11 +375,9 @@ rip_bind(inp, nam) addr->sin_family != AF_IMPLINK) return (EAFNOSUPPORT); if (!in_nullhost(addr->sin_addr) && - (ifa = ifa_ifwithaddr(sintosa(addr))) == 0) + ifa_ifwithaddr(sintosa(addr)) == 0) return (EADDRNOTAVAIL); inp->inp_laddr = addr->sin_addr; - if (ifa != NULL) - ifa_delref(ifa); return (0); } @@ -374,6 +429,12 @@ rip_usrreq(so, req, m, nam, control, p) return (in_control(so, (long)m, (caddr_t)nam, (struct ifnet *)control, p)); + if (req == PRU_PURGEIF) { + in_purgeif((struct ifnet *)control); + in_pcbpurgeif(&rawcbtable, (struct ifnet *)control); + return (0); + } + s = splsoftnet(); inp = sotoinpcb(so); #ifdef DIAGNOSTIC @@ -406,6 +467,13 @@ rip_usrreq(so, req, m, nam, control, p) break; inp = sotoinpcb(so); inp->inp_ip.ip_p = (long)nam; +#ifdef IPSEC + error = ipsec_init_policy(so, &inp->inp_sp); + if (error != 0) { + in_pcbdetach(inp); + break; + } +#endif /*IPSEC*/ break; case PRU_DETACH: