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.16 retrieving revision 1.32 diff -u -p -r1.16 -r1.32 --- src/sys/netinet/raw_ip.c 1995/03/02 09:33:40 1.16 +++ src/sys/netinet/raw_ip.c 1996/09/09 14:51:19 1.32 @@ -1,4 +1,4 @@ -/* $NetBSD: raw_ip.c,v 1.16 1995/03/02 09:33:40 glass Exp $ */ +/* $NetBSD: raw_ip.c,v 1.32 1996/09/09 14:51:19 mycroft Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1993 @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -53,8 +54,15 @@ #include #include #include +#include -struct inpcb rawinpcb; +#include + +struct inpcbtable rawcbtable; + +int rip_bind __P((struct inpcb *, struct mbuf *)); +int rip_connect __P((struct inpcb *, struct mbuf *)); +void rip_disconnect __P((struct inpcb *)); /* * Nominal space allocated to a raw ip socket. @@ -73,39 +81,49 @@ void rip_init() { - rawinpcb.inp_next = rawinpcb.inp_prev = &rawinpcb; + 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; + struct sockaddr_in ripsrc; + ripsrc.sin_family = AF_INET; + ripsrc.sin_len = sizeof(struct sockaddr_in); 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) + if (!in_nullhost(inp->inp_laddr) && + !in_hosteq(inp->inp_laddr, ip->ip_dst)) continue; - if (inp->inp_faddr.s_addr && - inp->inp_faddr.s_addr != ip->ip_src.s_addr) + if (!in_nullhost(inp->inp_faddr) && + !in_hosteq(inp->inp_faddr, ip->ip_src)) continue; if (last) { struct mbuf *n; - if (n = m_copy(m, 0, (int)M_COPYALL)) { + if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) { if (sbappendaddr(&last->so_rcv, - (struct sockaddr *)&ripsrc, - n, (struct mbuf *)0) == 0) + sintosa(&ripsrc), n, + (struct mbuf *)0) == 0) /* should notify about lost packet */ m_freem(n); else @@ -115,8 +133,8 @@ rip_input(m) last = inp->inp_socket; } if (last) { - if (sbappendaddr(&last->so_rcv, (struct sockaddr *)&ripsrc, - m, (struct mbuf *)0) == 0) + if (sbappendaddr(&last->so_rcv, sintosa(&ripsrc), m, + (struct mbuf *)0) == 0) m_freem(m); else sorwakeup(last); @@ -132,15 +150,26 @@ rip_input(m) * Tack on options user may have setup with control call. */ int -rip_output(m, so, dst) - register struct mbuf *m; - struct socket *so; - u_long dst; +#if __STDC__ +rip_output(struct mbuf *m, ...) +#else +rip_output(m, va_alist) + struct mbuf *m; + va_dcl +#endif { + register struct inpcb *inp; register struct ip *ip; - register struct inpcb *inp = sotoinpcb(so); struct mbuf *opts; - int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST; + int flags; + va_list ap; + + va_start(ap, m); + inp = va_arg(ap, struct inpcb *); + va_end(ap); + + flags = + (inp->inp_socket->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST; /* * If the user handed us a complete IP packet, use it. @@ -154,7 +183,7 @@ rip_output(m, so, dst) ip->ip_p = inp->inp_ip.ip_p; ip->ip_len = m->m_pkthdr.len; ip->ip_src = inp->inp_laddr; - ip->ip_dst.s_addr = dst; + ip->ip_dst = inp->inp_faddr; ip->ip_ttl = MAXTTL; opts = inp->inp_options; } else { @@ -180,57 +209,116 @@ rip_ctloutput(op, so, level, optname, m) struct mbuf **m; { register struct inpcb *inp = sotoinpcb(so); - register int error; + int error = 0; if (level != IPPROTO_IP) { - if (m != 0 && *m != 0) - (void)m_free(*m); - return (EINVAL); - } - - switch (optname) { - - 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) { + error = ENOPROTOOPT; + if (op == PRCO_SETOPT && *m != 0) + (void) m_free(*m); + } else switch (op) { + + case PRCO_SETOPT: + switch (optname) { + case IP_HDRINCL: + if (*m == 0 || (*m)->m_len < sizeof (int)) + error = EINVAL; + else { 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; } - return (0); + if (*m != 0) + (void) m_free(*m); + break; + +#ifdef MROUTING + case MRT_INIT: + case MRT_DONE: + case MRT_ADD_VIF: + case MRT_DEL_VIF: + case MRT_ADD_MFC: + case MRT_DEL_MFC: + case MRT_ASSERT: + error = ip_mrouter_set(so, optname, m); + break; +#endif + + default: + error = ip_ctloutput(op, so, level, optname, m); + break; } 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 PRCO_GETOPT: + switch (optname) { + case IP_HDRINCL: + *m = m_get(M_WAIT, M_SOOPTS); + (*m)->m_len = sizeof (int); + *mtod(*m, int *) = inp->inp_flags & INP_HDRINCL ? 1 : 0; + break; + #ifdef MROUTING - if (op == PRCO_SETOPT) { - error = ip_mrouter_cmd(optname, so, *m); - if (*m) - (void)m_free(*m); - } else - error = EINVAL; - return (error); -#else - if (op == PRCO_SETOPT && *m) - (void)m_free(*m); - return (EOPNOTSUPP); + case MRT_VERSION: + case MRT_ASSERT: + error = ip_mrouter_get(so, optname, m); + break; #endif + + default: + error = ip_ctloutput(op, so, level, optname, m); + break; + } + break; } - return (ip_ctloutput(op, so, level, optname, m)); + return (error); +} + +int +rip_bind(inp, nam) + struct inpcb *inp; + struct mbuf *nam; +{ + struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); + + if (nam->m_len != sizeof(*addr)) + return (EINVAL); + if (ifnet.tqh_first == 0) + return (EADDRNOTAVAIL); + if (addr->sin_family != AF_INET && + addr->sin_family != AF_IMPLINK) + return (EAFNOSUPPORT); + if (!in_nullhost(addr->sin_addr) && + ifa_ifwithaddr(sintosa(addr)) == 0) + return (EADDRNOTAVAIL); + inp->inp_laddr = addr->sin_addr; + return (0); +} + +int +rip_connect(inp, nam) + struct inpcb *inp; + struct mbuf *nam; +{ + struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); + + if (nam->m_len != sizeof(*addr)) + return (EINVAL); + if (ifnet.tqh_first == 0) + return (EADDRNOTAVAIL); + if (addr->sin_family != AF_INET && + addr->sin_family != AF_IMPLINK) + return (EAFNOSUPPORT); + inp->inp_faddr = addr->sin_addr; + return (0); +} + +void +rip_disconnect(inp) + struct inpcb *inp; +{ + + inp->inp_faddr = zeroin_addr; } u_long rip_sendspace = RIPSNDQ; @@ -238,44 +326,58 @@ u_long rip_recvspace = RIPRCVQ; /*ARGSUSED*/ int -rip_usrreq(so, req, m, nam, control) +rip_usrreq(so, req, m, nam, control, p) register struct socket *so; int req; struct mbuf *m, *nam, *control; + struct proc *p; { + register struct inpcb *inp; + int s; register int error = 0; - 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, p)); + + s = splsoftnet(); + inp = sotoinpcb(so); +#ifdef DIAGNOSTIC + if (req != PRU_SEND && req != PRU_SENDOOB && control) + panic("rip_usrreq: unexpected control mbuf"); +#endif + if (inp == 0 && req != PRU_ATTACH) { + error = EINVAL; + goto release; + } + switch (req) { case PRU_ATTACH: - if (inp) - panic("rip_attach"); - if ((so->so_state & SS_PRIV) == 0) { + if (inp != 0) { + error = EISCONN; + break; + } + if (p == 0 || (error = suser(p->p_ucred, &p->p_acflag))) { error = EACCES; break; } - if ((error = soreserve(so, rip_sendspace, rip_recvspace)) || - (error = in_pcballoc(so, &rawinpcb))) + if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { + error = soreserve(so, rip_sendspace, rip_recvspace); + if (error) + break; + } + error = in_pcballoc(so, &rawcbtable); + if (error) break; - inp = (struct inpcb *)so->so_pcb; - inp->inp_ip.ip_p = (int)nam; + inp = sotoinpcb(so); + 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 (inp == 0) - panic("rip_detach"); #ifdef MROUTING if (so == ip_mrouter) ip_mrouter_done(); @@ -284,50 +386,29 @@ rip_usrreq(so, req, m, nam, control) break; case PRU_BIND: - { - struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); + error = rip_bind(inp, nam); + break; - if (nam->m_len != sizeof(*addr)) { - error = EINVAL; - break; - } - if ((ifnet == 0) || - ((addr->sin_family != AF_INET) && - (addr->sin_family != AF_IMPLINK)) || - (addr->sin_addr.s_addr && - ifa_ifwithaddr((struct sockaddr *)addr) == 0)) { - error = EADDRNOTAVAIL; - break; - } - inp->inp_laddr = addr->sin_addr; + case PRU_LISTEN: + error = EOPNOTSUPP; break; - } - case PRU_CONNECT: - { - struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *); - if (nam->m_len != sizeof(*addr)) { - error = EINVAL; - break; - } - if (ifnet == 0) { - error = EADDRNOTAVAIL; - break; - } - if ((addr->sin_family != AF_INET) && - (addr->sin_family != AF_IMPLINK)) { - error = EAFNOSUPPORT; + case PRU_CONNECT: + error = rip_connect(inp, nam); + if (error) break; - } - inp->inp_faddr = addr->sin_addr; soisconnected(so); break; - } case PRU_CONNECT2: error = EOPNOTSUPP; break; + case PRU_DISCONNECT: + soisdisconnected(so); + rip_disconnect(inp); + break; + /* * Mark the connection as being incapable of further input. */ @@ -335,46 +416,59 @@ rip_usrreq(so, req, m, nam, control) socantsendmore(so); break; + case PRU_RCVD: + error = EOPNOTSUPP; + break; + /* * Ship a packet out. The appropriate raw output * routine handles any massaging necessary. */ case PRU_SEND: - { - register u_long dst; - - if (so->so_state & SS_ISCONNECTED) { - if (nam) { + if (control && control->m_len) { + m_freem(control); + m_freem(m); + error = EINVAL; + break; + } + { + if (nam) { + if ((so->so_state & SS_ISCONNECTED) != 0) { error = EISCONN; + goto die; + } + error = rip_connect(inp, nam); + if (error) { + die: + m_freem(m); break; } - dst = inp->inp_faddr.s_addr; } else { - if (nam == NULL) { + if ((so->so_state & SS_ISCONNECTED) == 0) { error = ENOTCONN; - break; + goto die; } - dst = mtod(nam, struct sockaddr_in *)->sin_addr.s_addr; } - error = rip_output(m, so, dst); - m = NULL; + error = rip_output(m, inp); + if (nam) + rip_disconnect(inp); + } break; - } case PRU_SENSE: /* * stat: don't bother with a blocksize. */ + splx(s); return (0); - /* - * Not supported. - */ case PRU_RCVOOB: - case PRU_RCVD: - case PRU_LISTEN: - case PRU_ACCEPT: + error = EOPNOTSUPP; + break; + case PRU_SENDOOB: + m_freem(control); + m_freem(m); error = EOPNOTSUPP; break; @@ -389,7 +483,8 @@ rip_usrreq(so, req, m, nam, control) default: panic("rip_usrreq"); } - if (m != NULL) - m_freem(m); + +release: + splx(s); return (error); }