bug fixes for LEASES from Rick Macklem

[unix-history] / usr / src / sys / kern / uipc_domain.c

diff --git a/usr/src/sys/kern/uipc_domain.c b/usr/src/sys/kern/uipc_domain.c
index 78df261..5f679c3 100644 (file)
--- a/usr/src/sys/kern/uipc_domain.c
+++ b/usr/src/sys/kern/uipc_domain.c
@@ -1,22 +1,27 @@
 /*
 /*

- * 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.

  *
  *

- *     @(#)uipc_domain.c       6.9 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ *     @(#)uipc_domain.c       7.16 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "socket.h"
-#include "protosw.h"
-#include "domain.h"
-#include "time.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/protosw.h>
+#include <sys/domain.h>
+#include <sys/mbuf.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <vm/vm.h>
+#include <sys/sysctl.h>

 
 #define        ADDDOMAIN(x)    { \
 
 #define        ADDDOMAIN(x)    { \

-       extern struct domain x/**/domain; \
-       x/**/domain.dom_next = domains; \
-       domains = &x/**/domain; \
+       extern struct domain __CONCAT(x,domain); \
+       __CONCAT(x,domain.dom_next) = domains; \
+       domains = &__CONCAT(x,domain); \

 }
 
 domaininit()
 }
 
 domaininit()


@@ -24,14 +29,22 @@ domaininit()
        register struct domain *dp;
        register struct protosw *pr;
 
        register struct domain *dp;
        register struct protosw *pr;
 

+#undef unix

 #ifndef lint
        ADDDOMAIN(unix);
 #ifndef lint
        ADDDOMAIN(unix);

+       ADDDOMAIN(route);

 #ifdef INET
        ADDDOMAIN(inet);
 #endif
 #ifdef NS
        ADDDOMAIN(ns);
 #endif
 #ifdef INET
        ADDDOMAIN(inet);
 #endif
 #ifdef NS
        ADDDOMAIN(ns);
 #endif

+#ifdef ISO
+       ADDDOMAIN(iso);
+#endif
+#ifdef CCITT
+       ADDDOMAIN(ccitt);
+#endif

 #include "imp.h"
 #if NIMP > 0
        ADDDOMAIN(imp);
 #include "imp.h"
 #if NIMP > 0
        ADDDOMAIN(imp);


@@ -45,6 +58,11 @@ domaininit()
                        if (pr->pr_init)
                                (*pr->pr_init)();
        }
                        if (pr->pr_init)
                                (*pr->pr_init)();
        }

+
+if (max_linkhdr < 16)          /* XXX */
+max_linkhdr = 16;
+       max_hdr = max_linkhdr + max_protohdr;
+       max_datalen = MHLEN - max_hdr;

        pffasttimo();
        pfslowtimo();
 }
        pffasttimo();
        pfslowtimo();
 }


@@ -93,6 +111,43 @@ found:
        return (maybe);
 }
 
        return (maybe);
 }
 

+net_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
+       int *name;
+       u_int namelen;
+       void *oldp;
+       size_t *oldlenp;
+       void *newp;
+       size_t newlen;
+       struct proc *p;
+{
+       register struct domain *dp;
+       register struct protosw *pr;
+       int family, protocol;
+
+       /*
+        * All sysctl names at this level are nonterminal;
+        * next two components are protocol family and protocol number,
+        * then at least one addition component.
+        */
+       if (namelen < 3)
+               return (EISDIR);                /* overloaded */
+       family = name[0];
+       protocol = name[1];
+
+       if (family == 0)
+               return (0);
+       for (dp = domains; dp; dp = dp->dom_next)
+               if (dp->dom_family == family)
+                       goto found;
+       return (ENOPROTOOPT);
+found:
+       for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
+               if (pr->pr_protocol == protocol && pr->pr_sysctl)
+                       return ((*pr->pr_sysctl)(name + 2, namelen - 2,
+                           oldp, oldlenp, newp, newlen));
+       return (ENOPROTOOPT);
+}
+

 pfctlinput(cmd, sa)
        int cmd;
        struct sockaddr *sa;
 pfctlinput(cmd, sa)
        int cmd;
        struct sockaddr *sa;


@@ -103,7 +158,7 @@ pfctlinput(cmd, sa)
        for (dp = domains; dp; dp = dp->dom_next)
                for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
                        if (pr->pr_ctlinput)
        for (dp = domains; dp; dp = dp->dom_next)
                for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
                        if (pr->pr_ctlinput)

-                               (*pr->pr_ctlinput)(cmd, sa);
+                               (*pr->pr_ctlinput)(cmd, sa, (caddr_t) 0);

 }
 
 pfslowtimo()
 }
 
 pfslowtimo()