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.29
retrieving revision 1.38
diff -u -p -r1.29 -r1.38
--- src/sys/netinet/raw_ip.c	1996/05/24 19:03:13	1.29
+++ src/sys/netinet/raw_ip.c	1997/11/16 20:58:18	1.38
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.29 1996/05/24 19:03:13 mycroft Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.38 1997/11/16 20:58:18 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1993
@@ -60,6 +60,10 @@
 
 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.
  */
@@ -77,10 +81,9 @@ void
 rip_init()
 {
 
-	in_pcbinit(&rawcbtable, 1);
+	in_pcbinit(&rawcbtable, 1, 1);
 }
 
-struct	sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET };
 /*
  * Setup generic address and protocol structures
  * for raw_input routine, then pass them along with
@@ -97,40 +100,56 @@ rip_input(m, va_alist)
 {
 	register struct ip *ip = mtod(m, struct ip *);
 	register struct inpcb *inp;
-	struct socket *last = 0;
+	struct inpcb *last = 0;
+	struct mbuf *opts = 0;
+	struct sockaddr_in ripsrc;
 
+	ripsrc.sin_family = AF_INET;
+	ripsrc.sin_len = sizeof(struct sockaddr_in);
 	ripsrc.sin_addr = ip->ip_src;
+	ripsrc.sin_port = 0;
+	bzero((caddr_t)ripsrc.sin_zero, sizeof(ripsrc.sin_zero));
+
 	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 != INADDR_ANY &&
-		    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 != INADDR_ANY &&
-		    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)) != NULL) {
-				if (sbappendaddr(&last->so_rcv,
-				    sintosa(&ripsrc), n,
-				    (struct mbuf *)0) == 0)
+				if (last->inp_flags & INP_CONTROLOPTS ||
+				    last->inp_socket->so_options & SO_TIMESTAMP)
+					ip_savecontrol(last, &opts, ip, n);
+				if (sbappendaddr(&last->inp_socket->so_rcv,
+				    sintosa(&ripsrc), n, opts) == 0) {
 					/* should notify about lost packet */
 					m_freem(n);
-				else
-					sorwakeup(last);
+					if (opts)
+						m_freem(opts);
+				} else
+					sorwakeup(last->inp_socket);
 			}
 		}
-		last = inp->inp_socket;
+		last = inp;
 	}
 	if (last) {
-		if (sbappendaddr(&last->so_rcv, sintosa(&ripsrc), m,
-		    (struct mbuf *)0) == 0)
+		if (last->inp_flags & INP_CONTROLOPTS ||
+		    last->inp_socket->so_options & SO_TIMESTAMP)
+			ip_savecontrol(last, &opts, ip, m);
+		if (sbappendaddr(&last->inp_socket->so_rcv,
+		    sintosa(&ripsrc), m, opts) == 0) {
 			m_freem(m);
-		else
-			sorwakeup(last);
+			if (opts)
+				m_freem(opts);
+		} else
+			sorwakeup(last->inp_socket);
 	} else {
 		m_freem(m);
 		ipstat.ips_noproto++;
@@ -162,13 +181,18 @@ rip_output(m, va_alist)
 	va_end(ap);
 
 	flags =
-	    (inp->inp_socket->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
+	    (inp->inp_socket->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST
+	    | IP_RETURNMTU;
 
 	/*
 	 * If the user handed us a complete IP packet, use it.
 	 * Otherwise, allocate an mbuf for a header and fill it in.
 	 */
 	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;
@@ -180,7 +204,15 @@ rip_output(m, va_alist)
 		ip->ip_ttl = MAXTTL;
 		opts = inp->inp_options;
 	} else {
+		if (m->m_pkthdr.len > IP_MAXPACKET) {
+			m_freem(m);
+			return (EMSGSIZE);
+		}
 		ip = mtod(m, struct ip *);
+		if (m->m_pkthdr.len != ip->ip_len) {
+			m_freem(m);
+			return (EINVAL);
+		}
 		if (ip->ip_id == 0)
 			ip->ip_id = htons(ip_id++);
 		opts = NULL;
@@ -188,7 +220,7 @@ rip_output(m, va_alist)
 		flags |= IP_RAWOUTPUT;
 		ipstat.ips_rawout++;
 	}
-	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));
 }
 
 /*
@@ -202,64 +234,69 @@ rip_ctloutput(op, so, level, optname, m)
 	struct mbuf **m;
 {
 	register struct inpcb *inp = sotoinpcb(so);
-#ifdef MROUTING
-	int error;
-#endif
+	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 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);
+	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;
-		case PRCO_GETOPT:
-			error = ip_mrouter_get(optname, so, m);
+
+#ifdef MROUTING
+		case MRT_VERSION:
+		case MRT_ASSERT:
+			error = ip_mrouter_get(so, optname, m);
 			break;
+#endif
+
 		default:
-			error = EINVAL;
+			error = ip_ctloutput(op, so, level, optname, m);
 			break;
 		}
-		return (error);
-#else
-		if (op == PRCO_SETOPT && *m)
-			m_free(*m);
-		return (EOPNOTSUPP);
-#endif
+		break;
 	}
-	return (ip_ctloutput(op, so, level, optname, m));
+	return (error);
 }
 
 int
@@ -276,7 +313,7 @@ rip_bind(inp, nam)
 	if (addr->sin_family != AF_INET &&
 	    addr->sin_family != AF_IMPLINK)
 		return (EAFNOSUPPORT);
-	if (addr->sin_addr.s_addr != INADDR_ANY &&
+	if (!in_nullhost(addr->sin_addr) &&
 	    ifa_ifwithaddr(sintosa(addr)) == 0)
 		return (EADDRNOTAVAIL);
 	inp->inp_laddr = addr->sin_addr;
@@ -306,7 +343,7 @@ rip_disconnect(inp)
 	struct inpcb *inp;
 {
 
-	inp->inp_faddr.s_addr = INADDR_ANY;
+	inp->inp_faddr = zeroin_addr;
 }
 
 u_long	rip_sendspace = RIPSNDQ;