xnu-1456.1.26.tar.gz

[apple/xnu.git] / bsd / net / if_mib.c

diff --git a/bsd/net/if_mib.c b/bsd/net/if_mib.c
index d78dabb5bba86123e7187ad584d8123eaca55896..b4abc7f16c522a6cc23ecfc92a49b0662e8dbdb4 100644 (file)
--- a/bsd/net/if_mib.c
+++ b/bsd/net/if_mib.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright 1996 Massachusetts Institute of Technology
@@ -87,7 +93,7 @@
 
 SYSCTL_DECL(_net_link_generic);
 
-SYSCTL_NODE(_net_link_generic, IFMIB_SYSTEM, system, CTLFLAG_RD, 0,
+SYSCTL_NODE(_net_link_generic, IFMIB_SYSTEM, system, CTLFLAG_RD|CTLFLAG_LOCKED, 0,
            "Variables global to all interfaces");
 
 SYSCTL_INT(_net_link_generic_system, IFMIB_IFCOUNT, ifcount, CTLFLAG_RD,
@@ -101,6 +107,20 @@ static int sysctl_ifalldata SYSCTL_HANDLER_ARGS;
 SYSCTL_NODE(_net_link_generic, IFMIB_IFALLDATA, ifalldata, CTLFLAG_RD,
             sysctl_ifalldata, "Interface table");
 
+extern int dlil_multithreaded_input;
+SYSCTL_INT(_net_link_generic_system, OID_AUTO, multi_threaded_input, CTLFLAG_RW,
+                   &dlil_multithreaded_input , 0, "Uses multiple input thread for DLIL input");
+#ifdef IFNET_INPUT_SANITY_CHK
+extern int dlil_input_sanity_check;
+SYSCTL_INT(_net_link_generic_system, OID_AUTO, dlil_input_sanity_check, CTLFLAG_RW,
+                   &dlil_input_sanity_check , 0, "Turn on sanity checking in DLIL input");
+#endif
+
+extern int dlil_verbose;
+SYSCTL_INT(_net_link_generic_system, OID_AUTO, dlil_verbose, CTLFLAG_RW,
+           &dlil_verbose, 0, "Log DLIL error messages");
+
+
 static int make_ifmibdata(struct ifnet *, int *, struct sysctl_req *);
 
 
@@ -124,7 +144,7 @@ make_ifmibdata(struct ifnet *ifp, int *name, struct sysctl_req *req)
 #define COPY(fld) ifmd.ifmd_##fld = ifp->if_##fld
                COPY(pcount);
                COPY(flags);
-               if_data_internal_to_if_data64(&ifp->if_data, &ifmd.ifmd_data);
+               if_data_internal_to_if_data64(ifp, &ifp->if_data, &ifmd.ifmd_data);
 #undef COPY
                ifmd.ifmd_snd_len = ifp->if_snd.ifq_len;
                ifmd.ifmd_snd_maxlen = ifp->if_snd.ifq_maxlen;
@@ -182,10 +202,13 @@ sysctl_ifdata SYSCTL_HANDLER_ARGS /* XXX bad syntax! */
 
        if (namelen != 2)
                return EINVAL;
-
+       ifnet_head_lock_shared();
        if (name[0] <= 0 || name[0] > if_index ||
-           (ifp = ifindex2ifnet[name[0]]) == NULL)
+           (ifp = ifindex2ifnet[name[0]]) == NULL) {
+               ifnet_head_done();
                return ENOENT;
+       }
+       ifnet_head_done();
 
        ifnet_lock_shared(ifp);