/*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000-2013 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * 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 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
* limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
* Copyright 1996 Massachusetts Institute of Technology
#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
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,
+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");
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;
break;
case IFDATA_GENERAL:
-
bzero(&ifmd, sizeof(ifmd));
- snprintf(ifmd.ifmd_name, sizeof(ifmd.ifmd_name), "%s%d",
- ifp->if_name, ifp->if_unit);
+ /*
+ * Make sure the interface is in use
+ */
+ 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->if_data, &ifmd.ifmd_data);
+ 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;
-
+ 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)
break;
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;
}
int
sysctl_ifdata SYSCTL_HANDLER_ARGS /* XXX bad syntax! */
{
+#pragma unused(oidp)
int *name = (int *)arg1;
int error = 0;
u_int namelen = arg2;
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)
- return ENOENT;
+ (ifp = ifindex2ifnet[name[0]]) == NULL) {
+ ifnet_head_done();
+ 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
sysctl_ifalldata SYSCTL_HANDLER_ARGS /* XXX bad syntax! */
{
+#pragma unused(oidp)
int *name = (int *)arg1;
int error = 0;
u_int namelen = arg2;
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
projects / apple / xnu.git / blobdiff