projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
sun purge
[unix-history] / usr / src / sys / netinet / udp_usrreq.c
diff --git a/usr/src/sys/netinet/udp_usrreq.c b/usr/src/sys/netinet/udp_usrreq.c
index 0165184..3995898 100644 (file)
--- a/usr/src/sys/netinet/udp_usrreq.c
+++ b/usr/src/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/*     udp_usrreq.c    4.28    82/04/25        */
+/*     udp_usrreq.c    4.50    83/06/14        */
 
 #include "../h/param.h"
 #include "../h/dir.h"
 
 #include "../h/param.h"
 #include "../h/dir.h"
@@ -7,17 +7,19 @@
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
-#include "../net/in.h"
+#include "../h/errno.h"
+
 #include "../net/if.h"
 #include "../net/route.h"
 #include "../net/if.h"
 #include "../net/route.h"
-#include "../net/in_pcb.h"
-#include "../net/in_systm.h"
-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/ip_icmp.h"
-#include "../net/udp.h"
-#include "../net/udp_var.h"
-#include <errno.h>
+
+#include "../netinet/in.h"
+#include "../netinet/in_pcb.h"
+#include "../netinet/in_systm.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"
+#include "../netinet/ip_icmp.h"
+#include "../netinet/udp.h"
+#include "../netinet/udp_var.h"
 
 /*
  * UDP protocol implementation.
 
 /*
  * UDP protocol implementation.
@@ -26,7 +28,6 @@
 udp_init()
 {
 
 udp_init()
 {
 
-COUNT(UDP_INIT);
        udb.inp_next = udb.inp_prev = &udb;
 }
 
        udb.inp_next = udb.inp_prev = &udb;
 }
 
@@ -39,9 +40,8 @@ udp_input(m0)
        register struct udpiphdr *ui;
        register struct inpcb *inp;
        register struct mbuf *m;
        register struct udpiphdr *ui;
        register struct inpcb *inp;
        register struct mbuf *m;
-       int len, ulen;
+       int len;
 
 
-COUNT(UDP_INPUT);
        /*
         * Get IP and UDP header together in first mbuf.
         */
        /*
         * Get IP and UDP header together in first mbuf.
         */
@@ -59,8 +59,7 @@ COUNT(UDP_INPUT);
         * Make mbuf data length reflect UDP length.
         * If not enough data to reflect UDP length, drop.
         */
         * Make mbuf data length reflect UDP length.
         * If not enough data to reflect UDP length, drop.
         */
-       ulen = ntohs((u_short)ui->ui_ulen);
-       len = sizeof (struct udphdr) + ulen;
+       len = ntohs((u_short)ui->ui_ulen);
        if (((struct ip *)ui)->ip_len != len) {
                if (len > ((struct ip *)ui)->ip_len) {
                        udpstat.udps_badlen++;
        if (((struct ip *)ui)->ip_len != len) {
                if (len > ((struct ip *)ui)->ip_len) {
                        udpstat.udps_badlen++;
@@ -76,27 +75,23 @@ COUNT(UDP_INPUT);
        if (udpcksum) {
                ui->ui_next = ui->ui_prev = 0;
                ui->ui_x1 = 0;
        if (udpcksum) {
                ui->ui_next = ui->ui_prev = 0;
                ui->ui_x1 = 0;
-               ui->ui_len = htons((u_short)(sizeof (struct udphdr) + ulen));
-               if (ui->ui_sum = in_cksum(m, len)) {
+               ui->ui_len = htons((u_short)len);
+               if (ui->ui_sum = in_cksum(m, len + sizeof (struct ip))) {
                        udpstat.udps_badsum++;
                        udpstat.udps_badsum++;
-                       printf("udp cksum %x\n", ui->ui_sum);
                        m_freem(m);
                        return;
                }
        }
 
        /*
                        m_freem(m);
                        return;
                }
        }
 
        /*
-        * Locate pcb for datagram.  On wildcard match, update
-        * control block to anchor network and host address.
+        * Locate pcb for datagram.
         */
        inp = in_pcblookup(&udb,
            ui->ui_src, ui->ui_sport, ui->ui_dst, ui->ui_dport,
                INPLOOKUP_WILDCARD);
        if (inp == 0) {
         */
        inp = in_pcblookup(&udb,
            ui->ui_src, ui->ui_sport, ui->ui_dst, ui->ui_dport,
                INPLOOKUP_WILDCARD);
        if (inp == 0) {
-               struct in_addr broadcastaddr;
-
-               broadcastaddr = if_makeaddr(ui->ui_dst.s_net, INADDR_ANY);
-               if (ui->ui_dst.s_addr == broadcastaddr.s_addr)
+               /* don't send ICMP response for broadcast packet */
+               if (in_lnaof(ui->ui_dst) == INADDR_ANY)
                        goto bad;
                icmp_error((struct ip *)ui, ICMP_UNREACH, ICMP_UNREACH_PORT);
                return;
                        goto bad;
                icmp_error((struct ip *)ui, ICMP_UNREACH, ICMP_UNREACH_PORT);
                return;
@@ -110,7 +105,8 @@ COUNT(UDP_INPUT);
        udp_in.sin_addr = ui->ui_src;
        m->m_len -= sizeof (struct udpiphdr);
        m->m_off += sizeof (struct udpiphdr);
        udp_in.sin_addr = ui->ui_src;
        m->m_len -= sizeof (struct udpiphdr);
        m->m_off += sizeof (struct udpiphdr);
-       if (sbappendaddr(&inp->inp_socket->so_rcv, (struct sockaddr *)&udp_in, m) == 0)
+       if (sbappendaddr(&inp->inp_socket->so_rcv, (struct sockaddr *)&udp_in,
+           m, (struct mbuf *)0) == 0)
                goto bad;
        sorwakeup(inp->inp_socket);
        return;
                goto bad;
        sorwakeup(inp->inp_socket);
        return;
@@ -133,7 +129,6 @@ udp_ctlinput(cmd, arg)
 {
        struct in_addr *sin;
        extern u_char inetctlerrmap[];
 {
        struct in_addr *sin;
        extern u_char inetctlerrmap[];
-COUNT(UDP_CTLINPUT);
 
        if (cmd < 0 || cmd > PRC_NCMDS)
                return;
 
        if (cmd < 0 || cmd > PRC_NCMDS)
                return;
@@ -153,7 +148,7 @@ COUNT(UDP_CTLINPUT);
 
        default:
                sin = &((struct icmp *)arg)->icmp_ip.ip_dst;
 
        default:
                sin = &((struct icmp *)arg)->icmp_ip.ip_dst;
-               in_pcbnotify(&udb, sin, inetctlerrmap[cmd], udp_abort);
+               in_pcbnotify(&udb, sin, (int)inetctlerrmap[cmd], udp_abort);
        }
 }
 
        }
 }
 
@@ -163,16 +158,17 @@ udp_output(inp, m0)
 {
        register struct mbuf *m;
        register struct udpiphdr *ui;
 {
        register struct mbuf *m;
        register struct udpiphdr *ui;
+       register struct socket *so;
        register int len = 0;
        register int len = 0;
+       int flags;
 
 
-COUNT(UDP_OUTPUT);
        /*
         * Calculate data length and get a mbuf
         * for UDP and IP headers.
         */
        for (m = m0; m; m = m->m_next)
                len += m->m_len;
        /*
         * Calculate data length and get a mbuf
         * for UDP and IP headers.
         */
        for (m = m0; m; m = m->m_next)
                len += m->m_len;
-       m = m_get(M_DONTWAIT);
+       m = m_get(M_DONTWAIT, MT_HEADER);
        if (m == 0) {
                m_freem(m0);
                return (ENOBUFS);
        if (m == 0) {
                m_freem(m0);
                return (ENOBUFS);
@@ -189,12 +185,12 @@ COUNT(UDP_OUTPUT);
        ui->ui_next = ui->ui_prev = 0;
        ui->ui_x1 = 0;
        ui->ui_pr = IPPROTO_UDP;
        ui->ui_next = ui->ui_prev = 0;
        ui->ui_x1 = 0;
        ui->ui_pr = IPPROTO_UDP;
-       ui->ui_len = sizeof (struct udpiphdr) + len;
+       ui->ui_len = len + sizeof (struct udphdr);
        ui->ui_src = inp->inp_laddr;
        ui->ui_dst = inp->inp_faddr;
        ui->ui_sport = inp->inp_lport;
        ui->ui_dport = inp->inp_fport;
        ui->ui_src = inp->inp_laddr;
        ui->ui_dst = inp->inp_faddr;
        ui->ui_sport = inp->inp_lport;
        ui->ui_dport = inp->inp_fport;
-       ui->ui_ulen = htons((u_short)len);
+       ui->ui_ulen = htons((u_short)ui->ui_len);
 
        /*
         * Stuff checksum and output datagram.
 
        /*
         * Stuff checksum and output datagram.
@@ -203,51 +199,82 @@ COUNT(UDP_OUTPUT);
        ui->ui_sum = in_cksum(m, sizeof (struct udpiphdr) + len);
        ((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len;
        ((struct ip *)ui)->ip_ttl = MAXTTL;
        ui->ui_sum = in_cksum(m, sizeof (struct udpiphdr) + len);
        ((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len;
        ((struct ip *)ui)->ip_ttl = MAXTTL;
-       return (ip_output(m, (struct mbuf *)0, 0,
-           inp->inp_socket->so_state & SS_PRIV));
+       so = inp->inp_socket;
+       flags = (so->so_options & SO_DONTROUTE) | (so->so_state & SS_PRIV);
+       return (ip_output(m, (struct mbuf *)0, (struct route *)0, flags));
 }
 
 }
 
-udp_usrreq(so, req, m, addr)
+/*ARGSUSED*/
+udp_usrreq(so, req, m, nam, rights)
        struct socket *so;
        int req;
        struct socket *so;
        int req;
-       struct mbuf *m;
-       caddr_t addr;
+       struct mbuf *m, *nam, *rights;
 {
        struct inpcb *inp = sotoinpcb(so);
        int error = 0;
 
 {
        struct inpcb *inp = sotoinpcb(so);
        int error = 0;
 
-COUNT(UDP_USRREQ);
-       if (inp == 0 && req != PRU_ATTACH)
-               return (EINVAL);
+       if (rights && rights->m_len) {
+               error = EINVAL;
+               goto release;
+       }
+       if (inp == NULL && req != PRU_ATTACH) {
+               error = EINVAL;
+               goto release;
+       }
        switch (req) {
 
        case PRU_ATTACH:
        switch (req) {
 
        case PRU_ATTACH:
-               if (inp != 0)
-                       return (EINVAL);
-               error = in_pcbattach(so, &udb, 2048, 2048,
-                               (struct sockaddr_in *)addr);
+               if (inp != NULL) {
+                       error = EINVAL;
+                       break;
+               }
+               error = in_pcballoc(so, &udb);
+               if (error)
+                       break;
+               error = soreserve(so, 2048, 2048);
+               if (error)
+                       break;
                break;
 
        case PRU_DETACH:
                break;
 
        case PRU_DETACH:
-               if (inp == 0)
-                       return (ENOTCONN);
+               if (inp == NULL) {
+                       error = ENOTCONN;
+                       break;
+               }
                in_pcbdetach(inp);
                break;
 
                in_pcbdetach(inp);
                break;
 
+       case PRU_BIND:
+               error = in_pcbbind(inp, nam);
+               break;
+
+       case PRU_LISTEN:
+               error = EOPNOTSUPP;
+               break;
+
        case PRU_CONNECT:
        case PRU_CONNECT:
-               if (inp->inp_faddr.s_addr)
-                       return (EISCONN);
-               error = in_pcbconnect(inp, (struct sockaddr_in *)addr);
+               if (inp->inp_faddr.s_addr != INADDR_ANY) {
+                       error = EISCONN;
+                       break;
+               }
+               error = in_pcbconnect(inp, nam);
                if (error == 0)
                        soisconnected(so);
                break;
 
                if (error == 0)
                        soisconnected(so);
                break;
 
+       case PRU_CONNECT2:
+               error = EOPNOTSUPP;
+               break;
+
        case PRU_ACCEPT:
        case PRU_ACCEPT:
-               return (EOPNOTSUPP);
+               error = EOPNOTSUPP;
+               break;
 
        case PRU_DISCONNECT:
 
        case PRU_DISCONNECT:
-               if (inp->inp_faddr.s_addr == 0)
-                       return (ENOTCONN);
+               if (inp->inp_faddr.s_addr == INADDR_ANY) {
+                       error = ENOTCONN;
+                       break;
+               }
                in_pcbdisconnect(inp);
                soisdisconnected(so);
                break;
                in_pcbdisconnect(inp);
                soisdisconnected(so);
                break;
@@ -259,19 +286,24 @@ COUNT(UDP_USRREQ);
        case PRU_SEND: {
                struct in_addr laddr;
 
        case PRU_SEND: {
                struct in_addr laddr;
 
-               if (addr) {
+               if (nam) {
                        laddr = inp->inp_laddr;
                        laddr = inp->inp_laddr;
-                       if (inp->inp_faddr.s_addr)
-                               return (EISCONN);
-                       error = in_pcbconnect(inp, (struct sockaddr_in *)addr);
+                       if (inp->inp_faddr.s_addr != INADDR_ANY) {
+                               error = EISCONN;
+                               break;
+                       }
+                       error = in_pcbconnect(inp, nam);
                        if (error)
                                break;
                } else {
                        if (error)
                                break;
                } else {
-                       if (inp->inp_faddr.s_addr == 0)
-                               return (ENOTCONN);
+                       if (inp->inp_faddr.s_addr == INADDR_ANY) {
+                               error = ENOTCONN;
+                               break;
+                       }
                }
                error = udp_output(inp, m);
                }
                error = udp_output(inp, m);
-               if (addr) {
+               m = NULL;
+               if (nam) {
                        in_pcbdisconnect(inp);
                        inp->inp_laddr = laddr;
                }
                        in_pcbdisconnect(inp);
                        inp->inp_laddr = laddr;
                }
@@ -284,15 +316,34 @@ COUNT(UDP_USRREQ);
                soisdisconnected(so);
                break;
 
                soisdisconnected(so);
                break;
 
+       case PRU_SOCKADDR:
+               in_setsockaddr(inp, nam);
+               break;
+
        case PRU_CONTROL:
        case PRU_CONTROL:
-               return (EOPNOTSUPP);
+               m = NULL;
+               error = EOPNOTSUPP;
+               break;
 
 
-       case PRU_SOCKADDR:
-               in_setsockaddr((struct sockaddr_in *)addr, inp);
+       case PRU_SENSE:
+               m = NULL;
+               /* fall thru... */
+
+       case PRU_RCVD:
+       case PRU_RCVOOB:
+       case PRU_SENDOOB:
+       case PRU_FASTTIMO:
+       case PRU_SLOWTIMO:
+       case PRU_PROTORCV:
+       case PRU_PROTOSEND:
+               error =  EOPNOTSUPP;
                break;
 
        default:
                panic("udp_usrreq");
        }
                break;
 
        default:
                panic("udp_usrreq");
        }
+release:
+       if (m != NULL)
+               m_freem(m);
        return (error);
 }
        return (error);
 }
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.