add ioctl to resynch bad sector table; no union in kernel or standalone

[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 bf23e11..8cbb8f2 100644 (file)
--- a/usr/src/sys/netns/idp_usrreq.c
+++ b/usr/src/sys/netns/idp_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) 1984, 1985, 1986, 1987 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *      @(#)idp_usrreq.c       6.10 (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.
+ *
+ *      @(#)idp_usrreq.c       7.2 (Berkeley) %G%

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


@@ -49,7 +55,7 @@ idp_input(m, nsp, ifp)
         * Stuff source address and datagram in user buffer.
         */
        idp_ns.sns_addr = idp->idp_sna;
         * Stuff source address and datagram in user buffer.
         */
        idp_ns.sns_addr = idp->idp_sna;

-       if (ns_netof(idp->idp_sna)==0 && ifp) {
+       if (ns_neteqnn(idp->idp_sna.x_net, ns_zeronet) && ifp) {

                register struct ifaddr *ia;
 
                for (ia = ifp->if_addrlist; ia; ia = ia->ifa_next) {
                register struct ifaddr *ia;
 
                for (ia = ifp->if_addrlist; ia; ia = ia->ifa_next) {


@@ -162,7 +168,9 @@ idp_output(nsp, m0)
                        m_freem(m0);
                        return (ENOBUFS);
                }
                        m_freem(m0);
                        return (ENOBUFS);
                }

-               m->m_off = MMAXOFF - sizeof (struct idp);
+               m->m_off = MMAXOFF - sizeof (struct idp) - 2;
+                               /* adjust to start on longword bdry
+                                  for NSIP on gould */

                m->m_len = sizeof (struct idp);
                m->m_next = m0;
                idp = mtod(m, struct idp *);
                m->m_len = sizeof (struct idp);
                m->m_next = m0;
                idp = mtod(m, struct idp *);


@@ -293,6 +301,10 @@ idp_ctloutput(req, so, level, name, value)
                        m->m_len = sizeof(long);
                        m->m_off = MMAXOFF - sizeof(long);
                        *mtod(m, long *) = ns_pexseq++;
                        m->m_len = sizeof(long);
                        m->m_off = MMAXOFF - sizeof(long);
                        *mtod(m, long *) = ns_pexseq++;

+                       break;
+
+               default:
+                       error = EINVAL;

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


@@ -327,12 +339,15 @@ idp_ctloutput(req, so, level, name, value)
                                    = mtod(*value, struct idp *);
                                nsp->nsp_dpt = idp->idp_pt;
                        }
                                    = mtod(*value, struct idp *);
                                nsp->nsp_dpt = idp->idp_pt;
                        }

-#ifdef NSIP

                        break;
                        break;

+#ifdef NSIP

 
                case SO_NSIP_ROUTE:
                        error = nsip_route(*value);
 
                case SO_NSIP_ROUTE:
                        error = nsip_route(*value);

+                       break;

 #endif NSIP
 #endif NSIP

+               default:
+                       error = EINVAL;

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