changes for var. length sockaddrs, routing lookup changes,

[unix-history] / usr / src / sys / netns / idp_usrreq.c

diff --git a/usr/src/sys/netns/idp_usrreq.c b/usr/src/sys/netns/idp_usrreq.c
index 8b01bd4..e2278d9 100644 (file)
--- a/usr/src/sys/netns/idp_usrreq.c
+++ b/usr/src/sys/netns/idp_usrreq.c
@@ -1,8 +1,26 @@
-/*      idp_usrreq.c     6.2     85/05/31     */
+/*
+ * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, 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'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)idp_usrreq.c        7.6 (Berkeley) %G%
+ */

 
 #include "param.h"
 #include "dir.h"
 #include "user.h"
 
 #include "param.h"
 #include "dir.h"
 #include "user.h"

+#include "malloc.h"

 #include "mbuf.h"
 #include "protosw.h"
 #include "socket.h"
 #include "mbuf.h"
 #include "protosw.h"
 #include "socket.h"


@@ -15,6 +33,7 @@
 
 #include "ns.h"
 #include "ns_pcb.h"
 
 #include "ns.h"
 #include "ns_pcb.h"

+#include "ns_if.h"

 #include "idp.h"
 #include "idp_var.h"
 #include "ns_error.h"
 #include "idp.h"
 #include "idp_var.h"
 #include "ns_error.h"


@@ -23,25 +42,41 @@
  * IDP protocol implementation.
  */
 
  * IDP protocol implementation.
  */
 

-struct sockaddr_ns idp_ns = { AF_NS };
+struct sockaddr_ns idp_ns = { sizeof(idp_ns), AF_NS };

 
 

+/*
+ *  This may also be called for raw listeners.
+ */

 idp_input(m, nsp)
        struct mbuf *m;
        register struct nspcb *nsp;
 {
        register struct idp *idp = mtod(m, struct idp *);
 idp_input(m, nsp)
        struct mbuf *m;
        register struct nspcb *nsp;
 {
        register struct idp *idp = mtod(m, struct idp *);

-       if (nsp==0)
-               panic("Impossible idp_input");
+       struct ifnet *ifp = m->m_pkthdr.rcvif;

 
 

+       if (nsp==0)
+               panic("No nspcb");

        /*
         * Construct sockaddr format source address.
         * Stuff source address and datagram in user buffer.
         */
        idp_ns.sns_addr = idp->idp_sna;
        /*
         * Construct sockaddr format source address.
         * Stuff source address and datagram in user buffer.
         */
        idp_ns.sns_addr = idp->idp_sna;

+       if (ns_neteqnn(idp->idp_sna.x_net, ns_zeronet) && ifp) {
+               register struct ifaddr *ifa;
+
+               for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
+                       if (ifa->ifa_addr->sa_family == AF_NS) {
+                               idp_ns.sns_addr.x_net =
+                                       IA_SNS(ifa)->sns_addr.x_net;
+                               break;
+                       }
+               }
+       }

        nsp->nsp_rpt = idp->idp_pt;
        if ( ! (nsp->nsp_flags & NSP_RAWIN) ) {
                m->m_len -= sizeof (struct idp);
        nsp->nsp_rpt = idp->idp_pt;
        if ( ! (nsp->nsp_flags & NSP_RAWIN) ) {
                m->m_len -= sizeof (struct idp);

-               m->m_off += sizeof (struct idp);
+               m->m_pkthdr.len -= sizeof (struct idp);
+               m->m_data += sizeof (struct idp);

        }
        if (sbappendaddr(&nsp->nsp_socket->so_rcv, (struct sockaddr *)&idp_ns,
            m, (struct mbuf *)0) == 0)
        }
        if (sbappendaddr(&nsp->nsp_socket->so_rcv, (struct sockaddr *)&idp_ns,
            m, (struct mbuf *)0) == 0)


@@ -60,7 +95,32 @@ idp_abort(nsp)
        ns_pcbdisconnect(nsp);
        soisdisconnected(so);
 }
        ns_pcbdisconnect(nsp);
        soisdisconnected(so);
 }

+/*
+ * Drop connection, reporting
+ * the specified error.
+ */
+struct nspcb *
+idp_drop(nsp, errno)
+       register struct nspcb *nsp;
+       int errno;
+{
+       struct socket *so = nsp->nsp_socket;

 
 

+       /*
+        * someday, in the xerox world
+        * we will generate error protocol packets
+        * announcing that the socket has gone away.
+        */
+       /*if (TCPS_HAVERCVDSYN(tp->t_state)) {
+               tp->t_state = TCPS_CLOSED;
+               (void) tcp_output(tp);
+       }*/
+       so->so_error = errno;
+       ns_pcbdisconnect(nsp);
+       soisdisconnected(so);
+}
+
+int noIdpRoute;

 idp_output(nsp, m0)
        struct nspcb *nsp;
        struct mbuf *m0;
 idp_output(nsp, m0)
        struct nspcb *nsp;
        struct mbuf *m0;


@@ -86,7 +146,8 @@ idp_output(nsp, m0)
        
        if (len & 1) {
                m = mprev;
        
        if (len & 1) {
                m = mprev;

-               if (m->m_len + m->m_off < MMAXOFF) {
+               if ((m->m_flags & M_EXT) == 0 &&
+                       (m->m_len + m->m_data < &m->m_dat[MLEN])) {

                        m->m_len++;
                } else {
                        struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
                        m->m_len++;
                } else {
                        struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);


@@ -96,28 +157,23 @@ idp_output(nsp, m0)
                                return (ENOBUFS);
                        }
                        m1->m_len = 1;
                                return (ENOBUFS);
                        }
                        m1->m_len = 1;

-                       m1->m_off = MMAXOFF - 1;

                        * mtod(m1, char *) = 0;
                        m->m_next = m1;
                }
                        * mtod(m1, char *) = 0;
                        m->m_next = m1;
                }

+               m0->m_pkthdr.len++;

        }
 
        /*
         * Fill in mbuf with extended IDP header
         * and addresses and length put into network format.
         */
        }
 
        /*
         * Fill in mbuf with extended IDP header
         * and addresses and length put into network format.
         */

+       m = m0;

        if (nsp->nsp_flags & NSP_RAWOUT) {
        if (nsp->nsp_flags & NSP_RAWOUT) {

-               m = m0;

                idp = mtod(m, struct idp *);
        } else {
                idp = mtod(m, struct idp *);
        } else {

-               m = m_get(M_DONTWAIT, MT_HEADER);
-               if (m == 0) {
-                       m_freem(m0);
+               M_PREPEND(m, sizeof (struct idp), M_DONTWAIT);
+               if (m == 0)

                        return (ENOBUFS);
                        return (ENOBUFS);

-               }
-               m->m_off = MMAXOFF - sizeof (struct idp);
-               m->m_len = sizeof (struct idp);
-               m->m_next = m0;

                idp = mtod(m, struct idp *);
                idp->idp_tc = 0;
                idp->idp_pt = nsp->nsp_dpt;
                idp = mtod(m, struct idp *);
                idp->idp_tc = 0;
                idp->idp_pt = nsp->nsp_dpt;


@@ -144,22 +200,50 @@ idp_output(nsp, m0)
                    (so->so_options & SO_BROADCAST) | NS_ROUTETOIF));
        /*
         * Use cached route for previous datagram if
                    (so->so_options & SO_BROADCAST) | NS_ROUTETOIF));
        /*
         * Use cached route for previous datagram if

-        * this is also to the same destination. 
+        * possible.  If the previous net was the same
+        * and the interface was a broadcast medium, or
+        * if the previous destination was identical,
+        * then we are ok.

         *
         * NB: We don't handle broadcasts because that
         *     would require 3 subroutine calls.
         */
        ro = &nsp->nsp_route;
         *
         * NB: We don't handle broadcasts because that
         *     would require 3 subroutine calls.
         */
        ro = &nsp->nsp_route;

-       if (ro->ro_rt &&
-               ((*(long *)&nsp->nsp_lastnet)!=ns_netof(idp->idp_dna)) &&
-               !(ns_hosteq(satons_addr(ro->ro_dst), idp->idp_dna))) {
-               RTFREE(ro->ro_rt);
-               ro->ro_rt = (struct rtentry *)0;
-               nsp->nsp_lastnet = idp->idp_dna.x_net;
+#ifdef ancient_history
+       /*
+        * I think that this will all be handled in ns_pcbconnect!
+        */
+       if (ro->ro_rt) {
+               if(ns_neteq(nsp->nsp_lastdst, idp->idp_dna)) {
+                       /*
+                        * This assumes we have no GH type routes
+                        */
+                       if (ro->ro_rt->rt_flags & RTF_HOST) {
+                               if (!ns_hosteq(nsp->nsp_lastdst, idp->idp_dna))
+                                       goto re_route;
+
+                       }
+                       if ((ro->ro_rt->rt_flags & RTF_GATEWAY) == 0) {
+                               register struct ns_addr *dst =
+                                               &satons_addr(ro->ro_dst);
+                               dst->x_host = idp->idp_dna.x_host;
+                       }
+                       /* 
+                        * Otherwise, we go through the same gateway
+                        * and dst is already set up.
+                        */
+               } else {
+               re_route:
+                       RTFREE(ro->ro_rt);
+                       ro->ro_rt = (struct rtentry *)0;
+               }

        }
        }

+       nsp->nsp_lastdst = idp->idp_dna;
+#endif ancient_history
+       if (noIdpRoute) ro = 0;

        return (ns_output(m, ro, so->so_options & SO_BROADCAST));
 }
        return (ns_output(m, ro, so->so_options & SO_BROADCAST));
 }

-/*ARGSUSED*/
+/* ARGSUSED */

 idp_ctloutput(req, so, level, name, value)
        int req, level;
        struct socket *so;
 idp_ctloutput(req, so, level, name, value)
        int req, level;
        struct socket *so;


@@ -169,33 +253,38 @@ idp_ctloutput(req, so, level, name, value)
        register struct mbuf *m;
        struct nspcb *nsp = sotonspcb(so);
        int mask, error = 0;
        register struct mbuf *m;
        struct nspcb *nsp = sotonspcb(so);
        int mask, error = 0;

+       extern long ns_pexseq;

 
 

-       if (nsp == NULL) {
-               error = EINVAL;
-               goto release;
-       }
+       if (nsp == NULL)
+               return (EINVAL);

 
        switch (req) {
 
        switch (req) {

+

        case PRCO_GETOPT:
        case PRCO_GETOPT:

-               if (value==NULL) {
-                       error = EINVAL;
-                       goto release;
-               }
+               if (value==NULL)
+                       return (EINVAL);

                m = m_get(M_DONTWAIT, MT_DATA);
                m = m_get(M_DONTWAIT, MT_DATA);

+               if (m==NULL)
+                       return (ENOBUFS);

                switch (name) {
                switch (name) {

+
+               case SO_ALL_PACKETS:
+                       mask = NSP_ALL_PACKETS;
+                       goto get_flags;
+

                case SO_HEADERS_ON_INPUT:
                        mask = NSP_RAWIN;
                        goto get_flags;
                case SO_HEADERS_ON_INPUT:
                        mask = NSP_RAWIN;
                        goto get_flags;

+                       

                case SO_HEADERS_ON_OUTPUT:
                        mask = NSP_RAWOUT;
                get_flags:
                        m->m_len = sizeof(short);
                case SO_HEADERS_ON_OUTPUT:
                        mask = NSP_RAWOUT;
                get_flags:
                        m->m_len = sizeof(short);

-                       m->m_off = MMAXOFF - sizeof(short);

                        *mtod(m, short *) = nsp->nsp_flags & mask;
                        break;
                        *mtod(m, short *) = nsp->nsp_flags & mask;
                        break;

+

                case SO_DEFAULT_HEADERS:
                        m->m_len = sizeof(struct idp);
                case SO_DEFAULT_HEADERS:
                        m->m_len = sizeof(struct idp);

-                       m->m_off = MMAXOFF - sizeof(struct idp);

                        {
                                register struct idp *idp = mtod(m, struct idp *);
                                idp->idp_len = 0;
                        {
                                register struct idp *idp = mtod(m, struct idp *);
                                idp->idp_len = 0;


@@ -205,16 +294,31 @@ idp_ctloutput(req, so, level, name, value)
                                idp->idp_dna = nsp->nsp_faddr;
                                idp->idp_sna = nsp->nsp_laddr;
                        }
                                idp->idp_dna = nsp->nsp_faddr;
                                idp->idp_sna = nsp->nsp_laddr;
                        }

+                       break;
+
+               case SO_SEQNO:
+                       m->m_len = sizeof(long);
+                       *mtod(m, long *) = ns_pexseq++;
+                       break;
+
+               default:
+                       error = EINVAL;

                }
                *value = m;
                break;
                }
                *value = m;
                break;

+

        case PRCO_SETOPT:
                switch (name) {
        case PRCO_SETOPT:
                switch (name) {

-                       int mask, *ok;
+                       int *ok;
+
+               case SO_ALL_PACKETS:
+                       mask = NSP_ALL_PACKETS;
+                       goto set_head;

 
                case SO_HEADERS_ON_INPUT:
                        mask = NSP_RAWIN;
                        goto set_head;
 
                case SO_HEADERS_ON_INPUT:
                        mask = NSP_RAWIN;
                        goto set_head;

+

                case SO_HEADERS_ON_OUTPUT:
                        mask = NSP_RAWOUT;
                set_head:
                case SO_HEADERS_ON_OUTPUT:
                        mask = NSP_RAWOUT;
                set_head:


@@ -226,25 +330,28 @@ idp_ctloutput(req, so, level, name, value)
                                        nsp->nsp_flags &= ~mask;
                        } else error = EINVAL;
                        break;
                                        nsp->nsp_flags &= ~mask;
                        } else error = EINVAL;
                        break;

+

                case SO_DEFAULT_HEADERS:
                        {
                                register struct idp *idp
                                    = mtod(*value, struct idp *);
                                nsp->nsp_dpt = idp->idp_pt;
                        }
                case SO_DEFAULT_HEADERS:
                        {
                                register struct idp *idp
                                    = mtod(*value, struct idp *);
                                nsp->nsp_dpt = idp->idp_pt;
                        }

-#ifdef NSIP

                        break;
                        break;

+#ifdef NSIP
+

                case SO_NSIP_ROUTE:
                        error = nsip_route(*value);
                        break;
 #endif NSIP
                case SO_NSIP_ROUTE:
                        error = nsip_route(*value);
                        break;
 #endif NSIP

+               default:
+                       error = EINVAL;

                }
                if (value && *value)
                        m_freem(*value);
                break;
        }
                }
                if (value && *value)
                        m_freem(*value);
                break;
        }

-       release:
-               return(error);
+       return (error);

 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/


@@ -277,7 +384,7 @@ idp_usrreq(so, req, m, nam, rights)
                error = ns_pcballoc(so, &nspcb);
                if (error)
                        break;
                error = ns_pcballoc(so, &nspcb);
                if (error)
                        break;

-               error = soreserve(so, 2048, 2048);
+               error = soreserve(so, (u_long) 2048, (u_long) 2048);

                if (error)
                        break;
                break;
                if (error)
                        break;
                break;


@@ -428,7 +535,7 @@ idp_raw_usrreq(so, req, m, nam, rights)
                error = ns_pcballoc(so, &nsrawpcb);
                if (error)
                        break;
                error = ns_pcballoc(so, &nsrawpcb);
                if (error)
                        break;

-               error = soreserve(so, 2048, 2048);
+               error = soreserve(so, (u_long) 2048, (u_long) 2048);

                if (error)
                        break;
                nsp = sotonspcb(so);
                if (error)
                        break;
                nsp = sotonspcb(so);


@@ -438,6 +545,6 @@ idp_raw_usrreq(so, req, m, nam, rights)
        default:
                error = idp_usrreq(so, req, m, nam, rights);
        }
        default:
                error = idp_usrreq(so, req, m, nam, rights);
        }

-       return(error);
+       return (error);

 }
 
 }