branch for network release (byte order #ifdefs)

[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 b09b947..9245aa3 100644 (file)
--- a/usr/src/sys/netinet/udp_usrreq.c
+++ b/usr/src/sys/netinet/udp_usrreq.c
@@ -1,9 +1,15 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)udp_usrreq.c        6.14 (Berkeley) %G%
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *     @(#)udp_usrreq.c        7.5 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -38,16 +44,24 @@ udp_init()
        udb.inp_next = udb.inp_prev = &udb;
 }
 
        udb.inp_next = udb.inp_prev = &udb;
 }
 

+#ifndef        COMPAT_42

 int    udpcksum = 1;
 int    udpcksum = 1;

+#else
+int    udpcksum = 0;           /* XXX */
+#endif
+int    udp_ttl = UDP_TTL;
+

 struct sockaddr_in udp_in = { AF_INET };
 
 struct sockaddr_in udp_in = { AF_INET };
 

-udp_input(m0)
+udp_input(m0, ifp)

        struct mbuf *m0;
        struct mbuf *m0;

+       struct ifnet *ifp;

 {
        register struct udpiphdr *ui;
        register struct inpcb *inp;
        register struct mbuf *m;
        int len;
 {
        register struct udpiphdr *ui;
        register struct inpcb *inp;
        register struct mbuf *m;
        int len;

+       struct ip ip;

 
        /*
         * Get IP and UDP header together in first mbuf.
 
        /*
         * Get IP and UDP header together in first mbuf.


@@ -73,8 +87,12 @@ udp_input(m0)
                        goto bad;
                }
                m_adj(m, len - ((struct ip *)ui)->ip_len);
                        goto bad;
                }
                m_adj(m, len - ((struct ip *)ui)->ip_len);

-               /* (struct ip *)ui->ip_len = len; */
+               /* ((struct ip *)ui)->ip_len = len; */

        }
        }

+       /*
+        * Save a copy of the IP header in case we want restore it for ICMP.
+        */
+       ip = *(struct ip*)ui;

 
        /*
         * Checksum extended UDP header and data.
 
        /*
         * Checksum extended UDP header and data.


@@ -100,7 +118,9 @@ udp_input(m0)
                /* don't send ICMP response for broadcast packet */
                if (in_broadcast(ui->ui_dst))
                        goto bad;
                /* don't send ICMP response for broadcast packet */
                if (in_broadcast(ui->ui_dst))
                        goto bad;

-               icmp_error((struct ip *)ui, ICMP_UNREACH, ICMP_UNREACH_PORT);
+               *(struct ip *)ui = ip;
+               icmp_error((struct ip *)ui, ICMP_UNREACH, ICMP_UNREACH_PORT,
+                   ifp);

                return;
        }
 
                return;
        }
 


@@ -121,63 +141,62 @@ bad:
        m_freem(m);
 }
 
        m_freem(m);
 }
 

-udp_abort(inp)
-       struct inpcb *inp;
+/*
+ * Notify a udp user of an asynchronous error;
+ * just wake up so that he can collect error status.
+ */
+udp_notify(inp)
+       register struct inpcb *inp;

 {
 {

-       struct socket *so = inp->inp_socket;

 
 

-       in_pcbdisconnect(inp);
-       soisdisconnected(so);
+       sorwakeup(inp->inp_socket);
+       sowwakeup(inp->inp_socket);

 }
 
 }
 

-udp_ctlinput(cmd, arg)
+udp_ctlinput(cmd, sa)

        int cmd;
        int cmd;

-       caddr_t arg;
+       struct sockaddr *sa;

 {
 {

-       struct in_addr *in;

        extern u_char inetctlerrmap[];
        extern u_char inetctlerrmap[];

+       struct sockaddr_in *sin;

        int in_rtchange();
 
        int in_rtchange();
 

-       if (cmd < 0 || cmd > PRC_NCMDS)
+       if ((unsigned)cmd > PRC_NCMDS)
+               return;
+       if (sa->sa_family != AF_INET && sa->sa_family != AF_IMPLINK)
+               return;
+       sin = (struct sockaddr_in *)sa;
+       if (sin->sin_addr.s_addr == INADDR_ANY)

                return;
                return;

+

        switch (cmd) {
 
        switch (cmd) {
 

-       case PRC_ROUTEDEAD:
+       case PRC_QUENCH:

                break;
 
                break;
 

+       case PRC_ROUTEDEAD:

        case PRC_REDIRECT_NET:
        case PRC_REDIRECT_HOST:
        case PRC_REDIRECT_NET:
        case PRC_REDIRECT_HOST:

-               in = &((struct icmp *)arg)->icmp_ip.ip_dst;
-               in_pcbnotify(&udb, in, 0, in_rtchange);
+       case PRC_REDIRECT_TOSNET:
+       case PRC_REDIRECT_TOSHOST:
+               in_pcbnotify(&udb, &sin->sin_addr, 0, in_rtchange);

                break;
 
                break;
 

-       case PRC_IFDOWN:
-               in = &((struct sockaddr_in *)arg)->sin_addr;
-               goto notify;
-
-       case PRC_HOSTDEAD:
-       case PRC_HOSTUNREACH:
-               in = (struct in_addr *)arg;
-               goto notify;
-

        default:
                if (inetctlerrmap[cmd] == 0)
                        return;         /* XXX */
        default:
                if (inetctlerrmap[cmd] == 0)
                        return;         /* XXX */

-               in = &((struct icmp *)arg)->icmp_ip.ip_dst;
-notify:
-               in_pcbnotify(&udb, in, (int)inetctlerrmap[cmd], udp_abort);
+               in_pcbnotify(&udb, &sin->sin_addr, (int)inetctlerrmap[cmd],
+                       udp_notify);

        }
 }
 
 udp_output(inp, m0)
        }
 }
 
 udp_output(inp, m0)

-       struct inpcb *inp;
+       register struct inpcb *inp;

        struct mbuf *m0;
 {
        register struct mbuf *m;
        register struct udpiphdr *ui;
        struct mbuf *m0;
 {
        register struct mbuf *m;
        register struct udpiphdr *ui;

-       register struct socket *so;

        register int len = 0;
        register int len = 0;

-       register struct route *ro;

 
        /*
         * Calculate data length and get a mbuf
 
        /*
         * Calculate data length and get a mbuf


@@ -215,30 +234,12 @@ udp_output(inp, m0)
        ui->ui_sum = 0;
        if (udpcksum) {
            if ((ui->ui_sum = in_cksum(m, sizeof (struct udpiphdr) + len)) == 0)
        ui->ui_sum = 0;
        if (udpcksum) {
            if ((ui->ui_sum = in_cksum(m, sizeof (struct udpiphdr) + len)) == 0)

-               ui->ui_sum = -1;
+               ui->ui_sum = 0xffff;

        }
        ((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len;
        }
        ((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len;

-       ((struct ip *)ui)->ip_ttl = MAXTTL;
-       so = inp->inp_socket;
-       if (so->so_options & SO_DONTROUTE)
-               return (ip_output(m, (struct mbuf *)0, (struct route *)0,
-                   (so->so_options & SO_BROADCAST) | IP_ROUTETOIF));
-       /*
-        * Use cached route for previous datagram if
-        * this is also to the same destination. 
-        *
-        * NB: We don't handle broadcasts because that
-        *     would require 3 subroutine calls.
-        */
-       ro = &inp->inp_route;
-#define        satosin(sa)     ((struct sockaddr_in *)(sa))
-       if (ro->ro_rt &&
-           satosin(&ro->ro_dst)->sin_addr.s_addr != ui->ui_dst.s_addr) {
-               RTFREE(ro->ro_rt);
-               ro->ro_rt = (struct rtentry *)0;
-       }
-       return (ip_output(m, (struct mbuf *)0, ro, 
-           so->so_options & SO_BROADCAST));
+       ((struct ip *)ui)->ip_ttl = udp_ttl;
+       return (ip_output(m, inp->inp_options, &inp->inp_route,
+           inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST)));

 }
 
 int    udp_sendspace = 2048;           /* really max datagram size */
 }
 
 int    udp_sendspace = 2048;           /* really max datagram size */


@@ -280,10 +281,6 @@ udp_usrreq(so, req, m, nam, rights)
                break;
 
        case PRU_DETACH:
                break;
 
        case PRU_DETACH:

-               if (inp == NULL) {
-                       error = ENOTCONN;
-                       break;
-               }

                in_pcbdetach(inp);
                break;
 
                in_pcbdetach(inp);
                break;
 


@@ -319,7 +316,7 @@ udp_usrreq(so, req, m, nam, rights)
                        break;
                }
                in_pcbdisconnect(inp);
                        break;
                }
                in_pcbdisconnect(inp);

-               soisdisconnected(so);
+               so->so_state &= ~SS_ISCONNECTED;                /* XXX */

                break;
 
        case PRU_SHUTDOWN:
                break;
 
        case PRU_SHUTDOWN:


@@ -362,9 +359,8 @@ udp_usrreq(so, req, m, nam, rights)
                break;
 
        case PRU_ABORT:
                break;
 
        case PRU_ABORT:

-               in_pcbdetach(inp);
-               sofree(so);

                soisdisconnected(so);
                soisdisconnected(so);

+               in_pcbdetach(inp);

                break;
 
        case PRU_SOCKADDR:
                break;
 
        case PRU_SOCKADDR: