xnu-4903.241.1.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 dd35ed62a58a275e4a120c1608673c18b3969d1b..92544dd1e744e0214344da96b20c9cc434e8d6fc 100644 (file)
--- a/bsd/net/if_mib.c
+++ b/bsd/net/if_mib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2009 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2013 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -65,8 +65,7 @@
 
 #include <net/if.h>
 #include <net/if_mib.h>
-
-#if NETMIBS
+#include <net/if_var.h>
 
 /*
  * A sysctl(3) MIB for generic interface information.  This information
@@ -96,39 +95,25 @@ SYSCTL_DECL(_net_link_generic);
 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,
+SYSCTL_INT(_net_link_generic_system, IFMIB_IFCOUNT, ifcount, CTLFLAG_RD | CTLFLAG_LOCKED,
           &if_index, 0, "Number of configured interfaces");
 
 static int sysctl_ifdata SYSCTL_HANDLER_ARGS;
-SYSCTL_NODE(_net_link_generic, IFMIB_IFDATA, ifdata, CTLFLAG_RD,
+SYSCTL_NODE(_net_link_generic, IFMIB_IFDATA, ifdata, CTLFLAG_RD | CTLFLAG_LOCKED,
             sysctl_ifdata, "Interface table");
 
 static int sysctl_ifalldata SYSCTL_HANDLER_ARGS;
-SYSCTL_NODE(_net_link_generic, IFMIB_IFALLDATA, ifalldata, CTLFLAG_RD,
+SYSCTL_NODE(_net_link_generic, IFMIB_IFALLDATA, ifalldata, CTLFLAG_RD | CTLFLAG_LOCKED,
             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 *);
 
-int 
+int
 make_ifmibdata(struct ifnet *ifp, int *name, struct sysctl_req *req)
 {
        struct ifmibdata        ifmd;
        int error = 0;
-       
+
        switch(name[1]) {
        default:
                error = ENOENT;
@@ -139,23 +124,18 @@ make_ifmibdata(struct ifnet *ifp, int *name, struct sysctl_req *req)
                /*
                 * Make sure the interface is in use
                 */
-               if (ifp->if_refcnt > 0) {
-                       snprintf(ifmd.ifmd_name, sizeof(ifmd.ifmd_name), "%s%d",
-                               ifp->if_name, ifp->if_unit);
-       
+               if (ifnet_is_attached(ifp, 0)) {
+                       snprintf(ifmd.ifmd_name, sizeof(ifmd.ifmd_name), "%s",
+                               if_name(ifp));
+
 #define COPY(fld) ifmd.ifmd_##fld = ifp->if_##fld
                        COPY(pcount);
                        COPY(flags);
                        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;
-                       ifmd.ifmd_snd_drops = ifp->if_snd.ifq_drops;
-#if PKT_PRIORITY
-                       /* stuff these into unused fields for now */
-                       ifmd.ifmd_filler[0] = ifp->if_obgpackets;
-                       ifmd.ifmd_filler[1] = ifp->if_obgbytes;
-#endif /* PKT_PRIORITY */
+                       ifmd.ifmd_snd_len = IFCQ_LEN(&ifp->if_snd);
+                       ifmd.ifmd_snd_maxlen = IFCQ_MAXLEN(&ifp->if_snd);
+                       ifmd.ifmd_snd_drops = ifp->if_snd.ifcq_dropcnt.packets;
                }
                error = SYSCTL_OUT(req, &ifmd, sizeof ifmd);
                if (error || !req->newptr)
@@ -194,8 +174,32 @@ make_ifmibdata(struct ifnet *ifp, int *name, struct sysctl_req *req)
                        break;
 #endif /* IF_MIB_WR */
                break;
+
+       case IFDATA_SUPPLEMENTAL: {
+               struct ifmibdata_supplemental *ifmd_supp;
+
+               if ((ifmd_supp = _MALLOC(sizeof (*ifmd_supp), M_TEMP,
+                   M_NOWAIT | M_ZERO)) == NULL) {
+                       error = ENOMEM;
+                       break;
+               }
+
+               if_copy_traffic_class(ifp, &ifmd_supp->ifmd_traffic_class);
+               if_copy_data_extended(ifp, &ifmd_supp->ifmd_data_extended);
+               if_copy_packet_stats(ifp, &ifmd_supp->ifmd_packet_stats);
+               if_copy_rxpoll_stats(ifp, &ifmd_supp->ifmd_rxpoll_stats);
+
+               if (req->oldptr == USER_ADDR_NULL)
+                       req->oldlen = sizeof (*ifmd_supp);
+
+               error = SYSCTL_OUT(req, ifmd_supp, MIN(sizeof (*ifmd_supp),
+                   req->oldlen));
+
+               _FREE(ifmd_supp, M_TEMP);
+               break;
+       }
        }
-       
+
        return error;
 }
 
@@ -209,23 +213,24 @@ sysctl_ifdata SYSCTL_HANDLER_ARGS /* XXX bad syntax! */
        struct ifnet *ifp;
 
        if (namelen != 2)
-               return EINVAL;
+               return (EINVAL);
+
        ifnet_head_lock_shared();
        if (name[0] <= 0 || name[0] > if_index ||
-           (ifp = ifindex2ifnet[name[0]]) == NULL ||
-           ifp->if_refcnt == 0) {
+           (ifp = ifindex2ifnet[name[0]]) == NULL) {
                ifnet_head_done();
-               return ENOENT;
+               return (ENOENT);
        }
+       ifnet_reference(ifp);
        ifnet_head_done();
 
        ifnet_lock_shared(ifp);
-       
        error = make_ifmibdata(ifp, name, req);
-       
        ifnet_lock_done(ifp);
-       
-       return error;
+
+       ifnet_release(ifp);
+
+       return (error);
 }
 
 int
@@ -238,20 +243,18 @@ sysctl_ifalldata SYSCTL_HANDLER_ARGS /* XXX bad syntax! */
        struct ifnet *ifp;
 
        if (namelen != 2)
-               return EINVAL;
+               return (EINVAL);
 
        ifnet_head_lock_shared();
        TAILQ_FOREACH(ifp, &ifnet_head, if_link) {
                ifnet_lock_shared(ifp);
-               
+
                error = make_ifmibdata(ifp, name, req);
-               
+
                ifnet_lock_done(ifp);
-               if (error)
+               if (error != 0)
                        break;
        }
        ifnet_head_done();
        return error;
 }
-
-#endif