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.10 retrieving revision 1.25.4.1 diff -u -p -r1.10 -r1.25.4.1 --- src/sys/netinet/raw_ip.c 1994/01/10 20:14:28 1.10 +++ src/sys/netinet/raw_ip.c 1996/11/10 21:57:53 1.25.4.1 @@ -1,6 +1,8 @@ +/* $NetBSD: raw_ip.c,v 1.25.4.1 1996/11/10 21:57:53 thorpej Exp $ */ + /* - * Copyright (c) 1982, 1986, 1988 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1982, 1986, 1988, 1993 + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,8 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)raw_ip.c 7.8 (Berkeley) 7/25/90 - * $Id: raw_ip.c,v 1.10 1994/01/10 20:14:28 mycroft Exp $ + * @(#)raw_ip.c 8.2 (Berkeley) 1/4/94 */ #include @@ -41,41 +42,96 @@ #include #include #include +#include #include #include -#include #include #include #include #include -#include #include +#include +#include + +#include + +struct inpcbtable rawcbtable; + +/* + * Nominal space allocated to a raw ip socket. + */ +#define RIPSNDQ 8192 +#define RIPRCVQ 8192 /* * Raw interface to IP protocol. */ -struct sockaddr_in ripdst = { sizeof(ripdst), AF_INET }; -struct sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET }; -struct sockproto ripproto = { PF_INET }; /* + * Initialize raw connection block q. + */ +void +rip_init() +{ + + in_pcbinit(&rawcbtable, 1); +} + +struct sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET }; +/* * Setup generic address and protocol structures * for raw_input routine, then pass them along with * mbuf chain. */ void -rip_input(m) +#if __STDC__ +rip_input(struct mbuf *m, ...) +#else +rip_input(m, va_alist) struct mbuf *m; + va_dcl +#endif { register struct ip *ip = mtod(m, struct ip *); + register struct inpcb *inp; + struct socket *last = 0; - ripproto.sp_protocol = ip->ip_p; - ripdst.sin_addr = ip->ip_dst; ripsrc.sin_addr = ip->ip_src; - if (raw_input(m, &ripproto, (struct sockaddr *)&ripsrc, - (struct sockaddr *)&ripdst) == 0) { + 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) + continue; + if (inp->inp_laddr.s_addr && + inp->inp_laddr.s_addr != ip->ip_dst.s_addr) + continue; + if (inp->inp_faddr.s_addr && + inp->inp_faddr.s_addr != ip->ip_src.s_addr) + continue; + if (last) { + struct mbuf *n; + if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) { + if (sbappendaddr(&last->so_rcv, + sintosa(&ripsrc), n, + (struct mbuf *)0) == 0) + /* should notify about lost packet */ + m_freem(n); + else + sorwakeup(last); + } + } + last = inp->inp_socket; + } + if (last) { + if (sbappendaddr(&last->so_rcv, sintosa(&ripsrc), m, + (struct mbuf *)0) == 0) + m_freem(m); + else + sorwakeup(last); + } else { + m_freem(m); ipstat.ips_noproto++; ipstat.ips_delivered--; } @@ -85,51 +141,64 @@ rip_input(m) * Generate IP header and pass packet to ip_output. * Tack on options user may have setup with control call. */ -#define satosin(sa) ((struct sockaddr_in *)(sa)) int -rip_output(m, so) - register struct mbuf *m; - struct socket *so; +#if __STDC__ +rip_output(struct mbuf *m, ...) +#else +rip_output(m, va_alist) + struct mbuf *m; + va_dcl +#endif { + struct socket *so; + u_long dst; register struct ip *ip; - register struct raw_inpcb *rp = sotorawinpcb(so); - register struct sockaddr_in *sin; + register struct inpcb *inp; struct mbuf *opts; + int flags; + va_list ap; + + va_start(ap, m); + so = va_arg(ap, struct socket *); + dst = va_arg(ap, u_long); + va_end(ap); + + inp = sotoinpcb(so); + flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST; /* * If the user handed us a complete IP packet, use it. * Otherwise, allocate an mbuf for a header and fill it in. */ - if (rp->rinp_flags & RINPF_HDRINCL) { - ip = mtod(m, struct ip *); - if (ip->ip_len > m->m_pkthdr.len) - return EMSGSIZE; - ip->ip_len = m->m_pkthdr.len; - opts = NULL; - } else { + if ((inp->inp_flags & INP_HDRINCL) == 0) { + if ((m->m_pkthdr.len + sizeof(struct ip)) > IP_MAXPACKET) { + m_freem(m); + return (EMSGSIZE); + } M_PREPEND(m, sizeof(struct ip), M_WAIT); ip = mtod(m, struct ip *); ip->ip_tos = 0; ip->ip_off = 0; - ip->ip_p = rp->rinp_rcb.rcb_proto.sp_protocol; + ip->ip_p = inp->inp_ip.ip_p; ip->ip_len = m->m_pkthdr.len; - if (sin = satosin(rp->rinp_rcb.rcb_laddr)) { - ip->ip_src = sin->sin_addr; - } else - ip->ip_src.s_addr = 0; - if (sin = satosin(rp->rinp_rcb.rcb_faddr)) - ip->ip_dst = sin->sin_addr; + ip->ip_src = inp->inp_laddr; + ip->ip_dst.s_addr = dst; ip->ip_ttl = MAXTTL; - opts = rp->rinp_options; + opts = inp->inp_options; + } else { + if (m->m_pkthdr.len > IP_MAXPACKET) { + m_freem(m); + return (EMSGSIZE); + } + ip = mtod(m, struct ip *); + if (ip->ip_id == 0) + ip->ip_id = htons(ip_id++); + opts = NULL; + /* XXX prevent ip_output from overwriting header fields */ + flags |= IP_RAWOUTPUT; + ipstat.ips_rawout++; } - return (ip_output(m, opts, &rp->rinp_route, - (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST -#ifdef MULTICAST - , rp->rinp_rcb.rcb_moptions -#else - , NULL -#endif - )); + return (ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions)); } /* @@ -142,93 +211,70 @@ rip_ctloutput(op, so, level, optname, m) int level, optname; struct mbuf **m; { - int error = 0; - register struct raw_inpcb *rp = sotorawinpcb(so); - - if (level != IPPROTO_IP) - error = EINVAL; - else switch (op) { + register struct inpcb *inp = sotoinpcb(so); +#ifdef MROUTING + int error; +#endif - case PRCO_SETOPT: - switch (optname) { + if (level != IPPROTO_IP) { + if (m != 0 && *m != 0) + (void)m_free(*m); + return (EINVAL); + } - case IP_OPTIONS: - return (ip_pcbopts(&rp->rinp_options, *m)); + switch (optname) { - case IP_HDRINCL: - if (m == 0 || *m == 0 || (*m)->m_len < sizeof (int)) { - error = EINVAL; - break; + case IP_HDRINCL: + if (op == PRCO_SETOPT || op == PRCO_GETOPT) { + if (m == 0 || *m == 0 || (*m)->m_len < sizeof (int)) + return (EINVAL); + if (op == PRCO_SETOPT) { + if (*mtod(*m, int *)) + inp->inp_flags |= INP_HDRINCL; + else + inp->inp_flags &= ~INP_HDRINCL; + (void)m_free(*m); + } else { + (*m)->m_len = sizeof (int); + *mtod(*m, int *) = inp->inp_flags & INP_HDRINCL; } - if (*mtod(*m, int *)) - rp->rinp_flags |= RINPF_HDRINCL; - else - rp->rinp_flags &= ~RINPF_HDRINCL; - break; -#ifdef MULTICAST - case IP_MULTICAST_IF: - case IP_MULTICAST_TTL: - case IP_MULTICAST_LOOP: - case IP_ADD_MEMBERSHIP: - case IP_DROP_MEMBERSHIP: - error = ip_setmoptions(optname, - &rp->rinp_rcb.rcb_moptions, *m); - break; - default: -#ifdef MROUTING - error = ip_mrouter_cmd(optname, so, *m); -#else - error = EINVAL; -#endif - break; -#else - default: - error = EINVAL; - break; -#endif + return (0); } break; - case PRCO_GETOPT: - *m = m_get(M_WAIT, MT_SOOPTS); - switch (optname) { - - case IP_OPTIONS: - if (rp->rinp_options) { - (*m)->m_len = rp->rinp_options->m_len; - bcopy(mtod(rp->rinp_options, caddr_t), - mtod(*m, caddr_t), (unsigned)(*m)->m_len); - } else - (*m)->m_len = 0; - break; - - case IP_HDRINCL: - (*m)->m_len = sizeof (int); - *mtod(*m, int *) = rp->rinp_flags & RINPF_HDRINCL; - break; -#ifdef MULTICAST - case IP_MULTICAST_IF: - case IP_MULTICAST_TTL: - case IP_MULTICAST_LOOP: - case IP_ADD_MEMBERSHIP: - case IP_DROP_MEMBERSHIP: - error = ip_getmoptions(optname, - rp->rinp_rcb.rcb_moptions, m); + case MRT_INIT: + case MRT_DONE: + case MRT_ADD_VIF: + case MRT_DEL_VIF: + case MRT_ADD_MFC: + case MRT_DEL_MFC: + case MRT_VERSION: + case MRT_ASSERT: +#ifdef MROUTING + switch (op) { + case PRCO_SETOPT: + error = ip_mrouter_set(optname, so, m); + break; + case PRCO_GETOPT: + error = ip_mrouter_get(optname, so, m); break; -#endif default: error = EINVAL; - m_freem(*m); - *m = 0; break; } - break; + return (error); +#else + if (op == PRCO_SETOPT && *m) + m_free(*m); + return (EOPNOTSUPP); +#endif } - if (op == PRCO_SETOPT && *m) - (void)m_free(*m); - return (error); + return (ip_ctloutput(op, so, level, optname, m)); } +u_long rip_sendspace = RIPSNDQ; +u_long rip_recvspace = RIPRCVQ; + /*ARGSUSED*/ int rip_usrreq(so, req, m, nam, control) @@ -237,77 +283,162 @@ rip_usrreq(so, req, m, nam, control) struct mbuf *m, *nam, *control; { register int error = 0; - register struct raw_inpcb *rp = sotorawinpcb(so); -#if defined(MULTICAST) && defined(MROUTING) + register struct inpcb *inp = sotoinpcb(so); +#ifdef MROUTING extern struct socket *ip_mrouter; #endif + if (req == PRU_CONTROL) + return (in_control(so, (long)m, (caddr_t)nam, + (struct ifnet *)control)); + + if (inp == NULL && req != PRU_ATTACH) { + error = EINVAL; + goto release; + } + switch (req) { case PRU_ATTACH: - if (rp) + if (inp) panic("rip_attach"); - MALLOC(rp, struct raw_inpcb *, sizeof *rp, M_PCB, M_WAITOK); - if (rp == 0) - return (ENOBUFS); - bzero((caddr_t)rp, sizeof *rp); - so->so_pcb = (caddr_t)rp; + if ((so->so_state & SS_PRIV) == 0) { + error = EACCES; + break; + } + if ((error = soreserve(so, rip_sendspace, rip_recvspace)) || + (error = in_pcballoc(so, &rawcbtable))) + break; + inp = (struct inpcb *)so->so_pcb; + inp->inp_ip.ip_p = (long)nam; break; + case PRU_DISCONNECT: + if ((so->so_state & SS_ISCONNECTED) == 0) { + error = ENOTCONN; + break; + } + /* FALLTHROUGH */ + case PRU_ABORT: + soisdisconnected(so); + /* FALLTHROUGH */ case PRU_DETACH: - if (rp == 0) + if (inp == 0) panic("rip_detach"); -#if defined(MULTICAST) && defined(MROUTING) +#ifdef MROUTING if (so == ip_mrouter) ip_mrouter_done(); #endif - if (rp->rinp_options) - m_freem(rp->rinp_options); -#ifdef MULTICAST - if (rp->rinp_rcb.rcb_moptions) - ip_freemoptions(rp->rinp_rcb.rcb_moptions); -#endif - if (rp->rinp_route.ro_rt) - RTFREE(rp->rinp_route.ro_rt); - if (rp->rinp_rcb.rcb_laddr) - rp->rinp_rcb.rcb_laddr = 0; + in_pcbdetach(inp); break; case PRU_BIND: { struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); - if (nam->m_len != sizeof(*addr)) - return (EINVAL); - if ((ifnet == 0) || + if (nam->m_len != sizeof(*addr)) { + error = EINVAL; + break; + } + if ((ifnet.tqh_first == 0) || ((addr->sin_family != AF_INET) && (addr->sin_family != AF_IMPLINK)) || (addr->sin_addr.s_addr && - ifa_ifwithaddr((struct sockaddr *)addr) == 0)) - return (EADDRNOTAVAIL); - rp->rinp_rcb.rcb_laddr = (struct sockaddr *)&rp->rinp_laddr; - rp->rinp_laddr = *addr; - return (0); + ifa_ifwithaddr(sintosa(addr)) == 0)) { + error = EADDRNOTAVAIL; + break; + } + inp->inp_laddr = addr->sin_addr; + break; } case PRU_CONNECT: { struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); - if (nam->m_len != sizeof(*addr)) - return (EINVAL); - if (ifnet == 0) - return (EADDRNOTAVAIL); + if (nam->m_len != sizeof(*addr)) { + error = EINVAL; + break; + } + if (ifnet.tqh_first == 0) { + error = EADDRNOTAVAIL; + break; + } if ((addr->sin_family != AF_INET) && - (addr->sin_family != AF_IMPLINK)) - return (EAFNOSUPPORT); - rp->rinp_rcb.rcb_faddr = (struct sockaddr *)&rp->rinp_faddr; - rp->rinp_faddr = *addr; + (addr->sin_family != AF_IMPLINK)) { + error = EAFNOSUPPORT; + break; + } + inp->inp_faddr = addr->sin_addr; soisconnected(so); - return (0); + break; } - } - error = raw_usrreq(so, req, m, nam, control); - if (error && (req == PRU_ATTACH) && so->so_pcb) - free(so->so_pcb, M_PCB); + case PRU_CONNECT2: + error = EOPNOTSUPP; + break; + + /* + * Mark the connection as being incapable of further input. + */ + case PRU_SHUTDOWN: + socantsendmore(so); + break; + + /* + * Ship a packet out. The appropriate raw output + * routine handles any massaging necessary. + */ + case PRU_SEND: + { + register u_int32_t dst; + + if (so->so_state & SS_ISCONNECTED) { + if (nam) { + error = EISCONN; + break; + } + dst = inp->inp_faddr.s_addr; + } else { + if (nam == NULL) { + error = ENOTCONN; + break; + } + dst = mtod(nam, struct sockaddr_in *)->sin_addr.s_addr; + } + error = rip_output(m, so, dst); + m = NULL; + break; + } + + case PRU_SENSE: + /* + * stat: don't bother with a blocksize. + */ + return (0); + + /* + * Not supported. + */ + case PRU_RCVOOB: + case PRU_RCVD: + case PRU_LISTEN: + case PRU_ACCEPT: + case PRU_SENDOOB: + error = EOPNOTSUPP; + break; + + case PRU_SOCKADDR: + in_setsockaddr(inp, nam); + break; + + case PRU_PEERADDR: + in_setpeeraddr(inp, nam); + break; + + default: + panic("rip_usrreq"); + } +release: + if (m != NULL) + m_freem(m); return (error); }