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.1.1.2 retrieving revision 1.25 diff -u -p -r1.1.1.2 -r1.25 --- src/sys/netinet/raw_ip.c 1998/01/05 09:54:16 1.1.1.2 +++ src/sys/netinet/raw_ip.c 1996/02/18 18:58:33 1.25 @@ -1,3 +1,5 @@ +/* $NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $ */ + /* * Copyright (c) 1982, 1986, 1988, 1993 * The Regents of the University of California. All rights reserved. @@ -51,8 +53,11 @@ #include #include #include +#include + +#include -struct inpcb rawinpcb; +struct inpcbtable rawcbtable; /* * Nominal space allocated to a raw ip socket. @@ -71,7 +76,7 @@ void rip_init() { - rawinpcb.inp_next = rawinpcb.inp_prev = &rawinpcb; + in_pcbinit(&rawcbtable, 1); } struct sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET }; @@ -81,28 +86,36 @@ struct sockaddr_in ripsrc = { sizeof(rip * 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; ripsrc.sin_addr = ip->ip_src; - for (inp = rawinpcb.inp_next; inp != &rawinpcb; inp = inp->inp_next) { + 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) + 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) + 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)) { - if (sbappendaddr(&last->so_rcv, &ripsrc, - n, (struct mbuf *)0) == 0) + 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 @@ -112,8 +125,8 @@ rip_input(m) last = inp->inp_socket; } if (last) { - if (sbappendaddr(&last->so_rcv, &ripsrc, - m, (struct mbuf *)0) == 0) + if (sbappendaddr(&last->so_rcv, sintosa(&ripsrc), m, + (struct mbuf *)0) == 0) m_freem(m); else sorwakeup(last); @@ -129,15 +142,29 @@ rip_input(m) * Tack on options user may have setup with control call. */ int -rip_output(m, so, dst) - register struct mbuf *m; +#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 inpcb *inp = sotoinpcb(so); + register struct inpcb *inp; struct mbuf *opts; - int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST; + 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. @@ -177,10 +204,15 @@ rip_ctloutput(op, so, level, optname, m) struct mbuf **m; { register struct inpcb *inp = sotoinpcb(so); - register int error; +#ifdef MROUTING + int error; +#endif - if (level != IPPROTO_IP) + if (level != IPPROTO_IP) { + if (m != 0 && *m != 0) + (void)m_free(*m); return (EINVAL); + } switch (optname) { @@ -202,25 +234,30 @@ rip_ctloutput(op, so, level, optname, m) } break; - case DVMRP_INIT: - case DVMRP_DONE: - case DVMRP_ADD_VIF: - case DVMRP_DEL_VIF: - case DVMRP_ADD_LGRP: - case DVMRP_DEL_LGRP: - case DVMRP_ADD_MRT: - case DVMRP_DEL_MRT: + 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 - if (op == PRCO_SETOPT) { - error = ip_mrouter_cmd(optname, so, *m); - if (*m) - (void)m_free(*m); - } else + switch (op) { + case PRCO_SETOPT: + error = ip_mrouter_set(optname, so, m); + break; + case PRCO_GETOPT: + error = ip_mrouter_get(optname, so, m); + break; + default: error = EINVAL; + break; + } return (error); #else if (op == PRCO_SETOPT && *m) - (void)m_free(*m); + m_free(*m); return (EOPNOTSUPP); #endif } @@ -242,6 +279,15 @@ rip_usrreq(so, req, m, nam, control) #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: @@ -252,10 +298,10 @@ rip_usrreq(so, req, m, nam, control) break; } if ((error = soreserve(so, rip_sendspace, rip_recvspace)) || - (error = in_pcballoc(so, &rawinpcb))) + (error = in_pcballoc(so, &rawcbtable))) break; inp = (struct inpcb *)so->so_pcb; - inp->inp_ip.ip_p = (int)nam; + inp->inp_ip.ip_p = (long)nam; break; case PRU_DISCONNECT: @@ -285,11 +331,11 @@ rip_usrreq(so, req, m, nam, control) error = EINVAL; break; } - if ((ifnet == 0) || + 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)) { + ifa_ifwithaddr(sintosa(addr)) == 0)) { error = EADDRNOTAVAIL; break; } @@ -304,7 +350,7 @@ rip_usrreq(so, req, m, nam, control) error = EINVAL; break; } - if (ifnet == 0) { + if (ifnet.tqh_first == 0) { error = EADDRNOTAVAIL; break; } @@ -335,7 +381,7 @@ rip_usrreq(so, req, m, nam, control) */ case PRU_SEND: { - register u_long dst; + register u_int32_t dst; if (so->so_state & SS_ISCONNECTED) { if (nam) { @@ -383,6 +429,7 @@ rip_usrreq(so, req, m, nam, control) default: panic("rip_usrreq"); } +release: if (m != NULL) m_freem(m); return (error);