svn commit: r274241 - in user/dchagin/lemul: gnu/lib/libdialog sys/dev/hyperv/netvsc sys/dev/ixl sys/dev/usb sys/dev/usb/serial sys/net sys/netgraph sys/netinet sys/netinet/cc sys/netinet6 sys/neti...
Dmitry Chagin
dchagin at FreeBSD.org
Fri Nov 7 16:23:08 UTC 2014
Author: dchagin
Date: Fri Nov 7 16:22:58 2014
New Revision: 274241
URL: https://svnweb.freebsd.org/changeset/base/274241
Log:
MFH.
Modified:
user/dchagin/lemul/gnu/lib/libdialog/Makefile
user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_net_vsc.c
user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_net_vsc.h
user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
user/dchagin/lemul/sys/dev/ixl/ixl_txrx.c
user/dchagin/lemul/sys/dev/usb/serial/u3g.c
user/dchagin/lemul/sys/dev/usb/usbdevs
user/dchagin/lemul/sys/net/bpf.c
user/dchagin/lemul/sys/net/flowtable.c
user/dchagin/lemul/sys/net/if.c
user/dchagin/lemul/sys/net/if_arp.h
user/dchagin/lemul/sys/net/if_bridge.c
user/dchagin/lemul/sys/net/if_ethersubr.c
user/dchagin/lemul/sys/net/if_fddisubr.c
user/dchagin/lemul/sys/net/if_gif.c
user/dchagin/lemul/sys/net/if_iso88025subr.c
user/dchagin/lemul/sys/net/if_mib.c
user/dchagin/lemul/sys/net/vnet.h
user/dchagin/lemul/sys/netgraph/ng_ether.c
user/dchagin/lemul/sys/netinet/cc/cc.c
user/dchagin/lemul/sys/netinet/cc/cc_cdg.c
user/dchagin/lemul/sys/netinet/cc/cc_chd.c
user/dchagin/lemul/sys/netinet/cc/cc_hd.c
user/dchagin/lemul/sys/netinet/cc/cc_htcp.c
user/dchagin/lemul/sys/netinet/cc/cc_vegas.c
user/dchagin/lemul/sys/netinet/if_ether.c
user/dchagin/lemul/sys/netinet/igmp.c
user/dchagin/lemul/sys/netinet/in.c
user/dchagin/lemul/sys/netinet/in_gif.c
user/dchagin/lemul/sys/netinet/in_pcb.c
user/dchagin/lemul/sys/netinet/in_rmx.c
user/dchagin/lemul/sys/netinet/ip_carp.c
user/dchagin/lemul/sys/netinet/ip_fastfwd.c
user/dchagin/lemul/sys/netinet/ip_icmp.c
user/dchagin/lemul/sys/netinet/ip_input.c
user/dchagin/lemul/sys/netinet/ip_ipsec.c
user/dchagin/lemul/sys/netinet/ip_mroute.c
user/dchagin/lemul/sys/netinet/raw_ip.c
user/dchagin/lemul/sys/netinet/tcp_hostcache.c
user/dchagin/lemul/sys/netinet/tcp_input.c
user/dchagin/lemul/sys/netinet/tcp_output.c
user/dchagin/lemul/sys/netinet/tcp_sack.c
user/dchagin/lemul/sys/netinet/tcp_subr.c
user/dchagin/lemul/sys/netinet/tcp_syncache.c
user/dchagin/lemul/sys/netinet/tcp_timewait.c
user/dchagin/lemul/sys/netinet/udp_usrreq.c
user/dchagin/lemul/sys/netinet6/in6_gif.c
user/dchagin/lemul/sys/netinet6/in6_proto.c
user/dchagin/lemul/sys/netinet6/in6_rmx.c
user/dchagin/lemul/sys/netinet6/ip6_ipsec.c
user/dchagin/lemul/sys/netinet6/mld6.c
user/dchagin/lemul/sys/netinet6/nd6.c
user/dchagin/lemul/sys/netinet6/scope6.c
user/dchagin/lemul/sys/netipsec/ipsec.c
user/dchagin/lemul/sys/netipsec/ipsec_input.c
user/dchagin/lemul/sys/netipsec/key.c
user/dchagin/lemul/sys/netipsec/xform_ah.c
user/dchagin/lemul/sys/netipsec/xform_esp.c
user/dchagin/lemul/sys/netipsec/xform_ipcomp.c
user/dchagin/lemul/sys/netipsec/xform_ipip.c
user/dchagin/lemul/sys/netpfil/ipfw/ip_fw2.c
user/dchagin/lemul/sys/netpfil/ipfw/ip_fw_dynamic.c
user/dchagin/lemul/sys/netpfil/ipfw/ip_fw_pfil.c
user/dchagin/lemul/sys/netpfil/pf/if_pfsync.c
Directory Properties:
user/dchagin/lemul/ (props changed)
user/dchagin/lemul/gnu/lib/ (props changed)
user/dchagin/lemul/sys/ (props changed)
user/dchagin/lemul/sys/dev/hyperv/ (props changed)
Modified: user/dchagin/lemul/gnu/lib/libdialog/Makefile
==============================================================================
--- user/dchagin/lemul/gnu/lib/libdialog/Makefile Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/gnu/lib/libdialog/Makefile Fri Nov 7 16:22:58 2014 (r274241)
@@ -13,6 +13,9 @@ SRCS= argv.c arrows.c buildlist.c butto
INCS= dialog.h dlg_colors.h dlg_config.h dlg_keys.h
MAN= dialog.3
+DPADD= ${LIBNCURSESW} ${LIBM}
+LDADD= -lncursesw -lm
+
CFLAGS+= -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused
.PATH: ${DIALOG}
WARNS?= 1
Modified: user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_net_vsc.c
==============================================================================
--- user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_net_vsc.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_net_vsc.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -529,7 +529,7 @@ hv_nv_connect_to_vsp(struct hv_device *d
int ret = 0;
device_t dev = device->device;
hn_softc_t *sc = device_get_softc(dev);
- struct ifnet *ifp = sc->arpcom.ac_ifp;
+ struct ifnet *ifp = sc->hn_ifp;
net_dev = hv_nv_get_outbound_net_device(device);
if (!net_dev) {
Modified: user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_net_vsc.h
==============================================================================
--- user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_net_vsc.h Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_net_vsc.h Fri Nov 7 16:22:58 2014 (r274241)
@@ -965,7 +965,6 @@ typedef struct {
*/
typedef struct hn_softc {
struct ifnet *hn_ifp;
- struct arpcom arpcom;
device_t hn_dev;
uint8_t hn_unit;
int hn_carrier;
Modified: user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -255,7 +255,7 @@ netvsc_attach(device_t dev)
sc->hn_dev_obj = device_ctx;
- ifp = sc->hn_ifp = sc->arpcom.ac_ifp = if_alloc(IFT_ETHER);
+ ifp = sc->hn_ifp = if_alloc(IFT_ETHER);
ifp->if_softc = sc;
if_initname(ifp, device_get_name(dev), device_get_unit(dev));
@@ -634,8 +634,6 @@ netvsc_recv(struct hv_device *device_ctx
}
ifp = sc->hn_ifp;
-
- ifp = sc->arpcom.ac_ifp;
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
return (0);
Modified: user/dchagin/lemul/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- user/dchagin/lemul/sys/dev/ixl/ixl_txrx.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/dev/ixl/ixl_txrx.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -1089,8 +1089,8 @@ int
ixl_init_rx_ring(struct ixl_queue *que)
{
struct rx_ring *rxr = &que->rxr;
-#if defined(INET6) || defined(INET)
struct ixl_vsi *vsi = que->vsi;
+#if defined(INET6) || defined(INET)
struct ifnet *ifp = vsi->ifp;
struct lro_ctrl *lro = &rxr->lro;
#endif
Modified: user/dchagin/lemul/sys/dev/usb/serial/u3g.c
==============================================================================
--- user/dchagin/lemul/sys/dev/usb/serial/u3g.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/dev/usb/serial/u3g.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -470,6 +470,8 @@ static const STRUCT_USB_HOST_ID u3g_devs
U3G_DEV(QUALCOMMINC, E2003, 0),
U3G_DEV(QUALCOMMINC, K3772_Z, 0),
U3G_DEV(QUALCOMMINC, K3772_Z_INIT, U3GINIT_SCSIEJECT),
+ U3G_DEV(QUALCOMMINC, MF195E, 0),
+ U3G_DEV(QUALCOMMINC, MF195E_INIT, U3GINIT_SCSIEJECT),
U3G_DEV(QUALCOMMINC, MF626, 0),
U3G_DEV(QUALCOMMINC, MF628, 0),
U3G_DEV(QUALCOMMINC, MF633R, 0),
Modified: user/dchagin/lemul/sys/dev/usb/usbdevs
==============================================================================
--- user/dchagin/lemul/sys/dev/usb/usbdevs Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/dev/usb/usbdevs Fri Nov 7 16:22:58 2014 (r274241)
@@ -3642,6 +3642,8 @@ product QUALCOMMINC E0086 0x0086 3G mode
product QUALCOMMINC SURFSTICK 0x0117 1&1 Surf Stick
product QUALCOMMINC K3772_Z_INIT 0x1179 K3772-Z Initial
product QUALCOMMINC K3772_Z 0x1181 K3772-Z
+product QUALCOMMINC MF195E_INIT 0x1514 MF195E initial
+product QUALCOMMINC MF195E 0x1516 MF195E
product QUALCOMMINC ZTE_STOR 0x2000 USB ZTE Storage
product QUALCOMMINC E2002 0x2002 3G modem
product QUALCOMMINC E2003 0x2003 3G modem
Modified: user/dchagin/lemul/sys/net/bpf.c
==============================================================================
--- user/dchagin/lemul/sys/net/bpf.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/bpf.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -180,8 +180,8 @@ static SYSCTL_NODE(_net_bpf, OID_AUTO, s
static VNET_DEFINE(int, bpf_optimize_writers) = 0;
#define V_bpf_optimize_writers VNET(bpf_optimize_writers)
-SYSCTL_VNET_INT(_net_bpf, OID_AUTO, optimize_writers,
- CTLFLAG_RW, &VNET_NAME(bpf_optimize_writers), 0,
+SYSCTL_INT(_net_bpf, OID_AUTO, optimize_writers, CTLFLAG_VNET | CTLFLAG_RW,
+ &VNET_NAME(bpf_optimize_writers), 0,
"Do not send packets until BPF program is set");
static d_open_t bpfopen;
Modified: user/dchagin/lemul/sys/net/flowtable.c
==============================================================================
--- user/dchagin/lemul/sys/net/flowtable.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/flowtable.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -171,7 +171,7 @@ static VNET_DEFINE(int, flowtable_enable
static SYSCTL_NODE(_net, OID_AUTO, flowtable, CTLFLAG_RD, NULL,
"flowtable");
-SYSCTL_VNET_INT(_net_flowtable, OID_AUTO, enable, CTLFLAG_RW,
+SYSCTL_INT(_net_flowtable, OID_AUTO, enable, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(flowtable_enable), 0, "enable flowtable caching.");
SYSCTL_UMA_MAX(_net_flowtable, OID_AUTO, maxflows, CTLFLAG_RW,
&flow_zone, "Maximum number of flows allowed");
Modified: user/dchagin/lemul/sys/net/if.c
==============================================================================
--- user/dchagin/lemul/sys/net/if.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/if.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -99,10 +99,6 @@
#include <compat/freebsd32/freebsd32.h>
#endif
-struct ifindex_entry {
- struct ifnet *ife_ifnet;
-};
-
SYSCTL_NODE(_net, PF_LINK, link, CTLFLAG_RW, 0, "Link layers");
SYSCTL_NODE(_net_link, 0, generic, CTLFLAG_RW, 0, "Generic link-management");
@@ -196,7 +192,7 @@ VNET_DEFINE(struct ifgrouphead, ifg_head
static VNET_DEFINE(int, if_indexlim) = 8;
/* Table of ifnet by index. */
-VNET_DEFINE(struct ifindex_entry *, ifindex_table);
+VNET_DEFINE(struct ifnet **, ifindex_table);
#define V_if_indexlim VNET(if_indexlim)
#define V_ifindex_table VNET(ifindex_table)
@@ -233,9 +229,9 @@ ifnet_byindex_locked(u_short idx)
if (idx > V_if_index)
return (NULL);
- if (V_ifindex_table[idx].ife_ifnet == IFNET_HOLD)
+ if (V_ifindex_table[idx] == IFNET_HOLD)
return (NULL);
- return (V_ifindex_table[idx].ife_ifnet);
+ return (V_ifindex_table[idx]);
}
struct ifnet *
@@ -282,7 +278,7 @@ retry:
* next slot.
*/
for (idx = 1; idx <= V_if_index; idx++) {
- if (V_ifindex_table[idx].ife_ifnet == NULL)
+ if (V_ifindex_table[idx] == NULL)
break;
}
@@ -303,9 +299,9 @@ ifindex_free_locked(u_short idx)
IFNET_WLOCK_ASSERT();
- V_ifindex_table[idx].ife_ifnet = NULL;
+ V_ifindex_table[idx] = NULL;
while (V_if_index > 0 &&
- V_ifindex_table[V_if_index].ife_ifnet == NULL)
+ V_ifindex_table[V_if_index] == NULL)
V_if_index--;
}
@@ -324,7 +320,7 @@ ifnet_setbyindex_locked(u_short idx, str
IFNET_WLOCK_ASSERT();
- V_ifindex_table[idx].ife_ifnet = ifp;
+ V_ifindex_table[idx] = ifp;
}
static void
@@ -402,7 +398,7 @@ if_grow(void)
{
int oldlim;
u_int n;
- struct ifindex_entry *e;
+ struct ifnet **e;
IFNET_WLOCK_ASSERT();
oldlim = V_if_indexlim;
@@ -2140,7 +2136,7 @@ do_link_state_change(void *arg, int pend
(*vlan_link_state_p)(ifp);
if ((ifp->if_type == IFT_ETHER || ifp->if_type == IFT_L2VLAN) &&
- IFP2AC(ifp)->ac_netgraph != NULL)
+ ifp->if_l2com != NULL)
(*ng_ether_link_state_p)(ifp, link_state);
if (ifp->if_carp)
(*carp_linkstate_p)(ifp);
Modified: user/dchagin/lemul/sys/net/if_arp.h
==============================================================================
--- user/dchagin/lemul/sys/net/if_arp.h Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/if_arp.h Fri Nov 7 16:22:58 2014 (r274241)
@@ -97,20 +97,6 @@ struct arpreq {
#define ATF_PUBL 0x08 /* publish entry (respond for other host) */
#define ATF_USETRAILERS 0x10 /* has requested trailers */
-#ifdef _KERNEL
-/*
- * Structure shared between the ethernet driver modules and
- * the address resolution code.
- */
-struct arpcom {
- struct ifnet *ac_ifp; /* network-visible interface */
- void *ac_netgraph; /* ng_ether(4) netgraph node info */
-};
-#define IFP2AC(ifp) ((struct arpcom *)(ifp->if_l2com))
-#define AC2IFP(ac) ((ac)->ac_ifp)
-
-#endif /* _KERNEL */
-
struct arpstat {
/* Normal things that happen: */
uint64_t txrequests; /* # of ARP requests sent by this host. */
Modified: user/dchagin/lemul/sys/net/if_bridge.c
==============================================================================
--- user/dchagin/lemul/sys/net/if_bridge.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/if_bridge.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -111,7 +111,7 @@ __FBSDID("$FreeBSD$");
#include <net/pfil.h>
#include <net/vnet.h>
-#include <netinet/in.h> /* for struct arpcom */
+#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
#include <netinet/ip.h>
@@ -125,7 +125,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_carp.h>
#endif
#include <machine/in_cksum.h>
-#include <netinet/if_ether.h> /* for struct arpcom */
+#include <netinet/if_ether.h>
#include <net/bridgestp.h>
#include <net/if_bridgevar.h>
#include <net/if_llc.h>
@@ -406,8 +406,8 @@ SYSCTL_INT(_net_link_bridge, OID_AUTO, i
static VNET_DEFINE(int, allow_llz_overlap) = 0;
#define V_allow_llz_overlap VNET(allow_llz_overlap)
-SYSCTL_VNET_INT(_net_link_bridge, OID_AUTO, allow_llz_overlap,
- CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(allow_llz_overlap), 0,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, allow_llz_overlap,
+ CTLFLAG_VNET | CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(allow_llz_overlap), 0,
"Allow overlap of link-local scope "
"zones of a bridge interface and the member interfaces");
Modified: user/dchagin/lemul/sys/net/if_ethersubr.c
==============================================================================
--- user/dchagin/lemul/sys/net/if_ethersubr.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/if_ethersubr.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -119,9 +119,6 @@ static int ether_resolvemulti(struct ifn
static void ether_reassign(struct ifnet *, struct vnet *, char *);
#endif
-/* XXX: should be in an arp support file, not here */
-static MALLOC_DEFINE(M_ARPCOM, "arpcom", "802.* interface internals");
-
#define ETHER_IS_BROADCAST(addr) \
(bcmp(etherbroadcastaddr, (addr), ETHER_ADDR_LEN) == 0)
@@ -330,7 +327,7 @@ ether_output(struct ifnet *ifp, struct m
#endif
/* Handle ng_ether(4) processing, if any */
- if (IFP2AC(ifp)->ac_netgraph != NULL) {
+ if (ifp->if_l2com != NULL) {
KASSERT(ng_ether_output_p != NULL,
("ng_ether_output_p is NULL"));
if ((error = (*ng_ether_output_p)(ifp, &m)) != 0) {
@@ -521,7 +518,7 @@ ether_input_internal(struct ifnet *ifp,
M_SETFIB(m, ifp->if_fib);
/* Allow ng_ether(4) to claim this frame. */
- if (IFP2AC(ifp)->ac_netgraph != NULL) {
+ if (ifp->if_l2com != NULL) {
KASSERT(ng_ether_input_p != NULL,
("%s: ng_ether_input_p is NULL", __func__));
m->m_flags &= ~M_PROMISC;
@@ -780,7 +777,7 @@ discard:
* hand the packet to it for last chance processing;
* otherwise dispose of it.
*/
- if (IFP2AC(ifp)->ac_netgraph != NULL) {
+ if (ifp->if_l2com != NULL) {
KASSERT(ng_ether_input_orphan_p != NULL,
("ng_ether_input_orphan_p is NULL"));
/*
@@ -866,7 +863,7 @@ ether_ifdetach(struct ifnet *ifp)
sdl = (struct sockaddr_dl *)(ifp->if_addr->ifa_addr);
uuid_ether_del(LLADDR(sdl));
- if (IFP2AC(ifp)->ac_netgraph != NULL) {
+ if (ifp->if_l2com != NULL) {
KASSERT(ng_ether_detach_p != NULL,
("ng_ether_detach_p is NULL"));
(*ng_ether_detach_p)(ifp);
@@ -881,7 +878,7 @@ void
ether_reassign(struct ifnet *ifp, struct vnet *new_vnet, char *unused __unused)
{
- if (IFP2AC(ifp)->ac_netgraph != NULL) {
+ if (ifp->if_l2com != NULL) {
KASSERT(ng_ether_detach_p != NULL,
("ng_ether_detach_p is NULL"));
(*ng_ether_detach_p)(ifp);
@@ -1092,46 +1089,8 @@ ether_resolvemulti(struct ifnet *ifp, st
}
}
-static void*
-ether_alloc(u_char type, struct ifnet *ifp)
-{
- struct arpcom *ac;
-
- ac = malloc(sizeof(struct arpcom), M_ARPCOM, M_WAITOK | M_ZERO);
- ac->ac_ifp = ifp;
-
- return (ac);
-}
-
-static void
-ether_free(void *com, u_char type)
-{
-
- free(com, M_ARPCOM);
-}
-
-static int
-ether_modevent(module_t mod, int type, void *data)
-{
-
- switch (type) {
- case MOD_LOAD:
- if_register_com_alloc(IFT_ETHER, ether_alloc, ether_free);
- break;
- case MOD_UNLOAD:
- if_deregister_com_alloc(IFT_ETHER);
- break;
- default:
- return EOPNOTSUPP;
- }
-
- return (0);
-}
-
static moduledata_t ether_mod = {
- "ether",
- ether_modevent,
- 0
+ .name = "ether",
};
void
Modified: user/dchagin/lemul/sys/net/if_fddisubr.c
==============================================================================
--- user/dchagin/lemul/sys/net/if_fddisubr.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/if_fddisubr.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -92,7 +92,6 @@ static void fddi_input(struct ifnet *ifp
* Encapsulate a packet of type family for the local net.
* Use trailer local net encapsulation if enough data in first
* packet leaves a multiple of 512 bytes of data in remainder.
- * Assumes that ifp is actually pointer to arpcom structure.
*/
static int
fddi_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
Modified: user/dchagin/lemul/sys/net/if_gif.c
==============================================================================
--- user/dchagin/lemul/sys/net/if_gif.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/if_gif.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -149,7 +149,7 @@ static SYSCTL_NODE(_net_link, IFT_GIF, g
#endif
static VNET_DEFINE(int, max_gif_nesting) = MAX_GIF_NEST;
#define V_max_gif_nesting VNET(max_gif_nesting)
-SYSCTL_VNET_INT(_net_link_gif, OID_AUTO, max_nesting, CTLFLAG_RW,
+SYSCTL_INT(_net_link_gif, OID_AUTO, max_nesting, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(max_gif_nesting), 0, "Max nested tunnels");
/*
@@ -163,8 +163,9 @@ static VNET_DEFINE(int, parallel_tunnels
static VNET_DEFINE(int, parallel_tunnels) = 0;
#endif
#define V_parallel_tunnels VNET(parallel_tunnels)
-SYSCTL_VNET_INT(_net_link_gif, OID_AUTO, parallel_tunnels, CTLFLAG_RW,
- &VNET_NAME(parallel_tunnels), 0, "Allow parallel tunnels?");
+SYSCTL_INT(_net_link_gif, OID_AUTO, parallel_tunnels,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(parallel_tunnels), 0,
+ "Allow parallel tunnels?");
/* copy from src/sys/net/if_ethersubr.c */
static const u_char etherbroadcastaddr[ETHER_ADDR_LEN] =
Modified: user/dchagin/lemul/sys/net/if_iso88025subr.c
==============================================================================
--- user/dchagin/lemul/sys/net/if_iso88025subr.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/if_iso88025subr.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -562,7 +562,6 @@ iso88025_input(ifp, m)
case LLC_TEST_P:
{
struct sockaddr sa;
- struct arpcom *ac;
struct iso88025_sockaddr_data *th2;
int i;
u_char c;
@@ -695,49 +694,8 @@ iso88025_resolvemulti (ifp, llsa, sa)
return (0);
}
-static MALLOC_DEFINE(M_ISO88025, "arpcom", "802.5 interface internals");
-
-static void*
-iso88025_alloc(u_char type, struct ifnet *ifp)
-{
- struct arpcom *ac;
-
- ac = malloc(sizeof(struct arpcom), M_ISO88025, M_WAITOK | M_ZERO);
- ac->ac_ifp = ifp;
-
- return (ac);
-}
-
-static void
-iso88025_free(void *com, u_char type)
-{
-
- free(com, M_ISO88025);
-}
-
-static int
-iso88025_modevent(module_t mod, int type, void *data)
-{
-
- switch (type) {
- case MOD_LOAD:
- if_register_com_alloc(IFT_ISO88025, iso88025_alloc,
- iso88025_free);
- break;
- case MOD_UNLOAD:
- if_deregister_com_alloc(IFT_ISO88025);
- break;
- default:
- return EOPNOTSUPP;
- }
-
- return (0);
-}
-
static moduledata_t iso88025_mod = {
- "iso88025",
- iso88025_modevent,
- 0
+ .name = "iso88025",
};
DECLARE_MODULE(iso88025, iso88025_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
Modified: user/dchagin/lemul/sys/net/if_mib.c
==============================================================================
--- user/dchagin/lemul/sys/net/if_mib.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/if_mib.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -67,9 +67,9 @@ SYSCTL_DECL(_net_link_generic);
static SYSCTL_NODE(_net_link_generic, IFMIB_SYSTEM, system, CTLFLAG_RW, 0,
"Variables global to all interfaces");
-SYSCTL_VNET_INT(_net_link_generic_system, IFMIB_IFCOUNT, ifcount, CTLFLAG_RD,
- &VNET_NAME(if_index), 0,
- "Number of configured interfaces");
+SYSCTL_INT(_net_link_generic_system, IFMIB_IFCOUNT, ifcount,
+ CTLFLAG_VNET | CTLFLAG_RD, &VNET_NAME(if_index), 0,
+ "Number of configured interfaces");
static int
sysctl_ifdata(SYSCTL_HANDLER_ARGS) /* XXX bad syntax! */
Modified: user/dchagin/lemul/sys/net/vnet.h
==============================================================================
--- user/dchagin/lemul/sys/net/vnet.h Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/net/vnet.h Fri Nov 7 16:22:58 2014 (r274241)
@@ -119,6 +119,7 @@ vnet_##name##_uninit(const void *unused)
VNET_SYSUNINIT(vnet_ ## name ## _uninit, SI_SUB_PROTO_IFATTACHDOMAIN, \
SI_ORDER_ANY, vnet_ ## name ## _uninit, NULL)
+#ifdef SYSCTL_OID
#define SYSCTL_VNET_PCPUSTAT(parent, nbr, name, type, array, desc) \
static int \
array##_sysctl(SYSCTL_HANDLER_ARGS) \
@@ -132,8 +133,9 @@ array##_sysctl(SYSCTL_HANDLER_ARGS)
sizeof(type) / sizeof(uint64_t)); \
return (SYSCTL_OUT(req, &s, sizeof(type))); \
} \
-SYSCTL_VNET_PROC(parent, nbr, name, CTLTYPE_OPAQUE | CTLFLAG_RW, NULL, \
- 0, array ## _sysctl, "I", desc)
+SYSCTL_PROC(parent, nbr, name, CTLFLAG_VNET | CTLTYPE_OPAQUE | CTLFLAG_RW, \
+ NULL, 0, array ## _sysctl, "I", desc)
+#endif /* SYSCTL_OID */
#ifdef VIMAGE
#include <sys/lock.h>
@@ -283,48 +285,6 @@ void vnet_data_copy(void *start, int si
void vnet_data_free(void *start_arg, int size);
/*
- * Sysctl variants for vnet-virtualized global variables. Include
- * <sys/sysctl.h> to expose these definitions.
- *
- * Note: SYSCTL_PROC() handler functions will need to resolve pointer
- * arguments themselves, if required.
- */
-#ifdef SYSCTL_OID
-#define SYSCTL_VNET_INT(parent, nbr, name, access, ptr, val, descr) \
- SYSCTL_OID(parent, nbr, name, \
- CTLTYPE_INT|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access), \
- ptr, val, sysctl_handle_int, "I", descr)
-#define SYSCTL_VNET_PROC(parent, nbr, name, access, ptr, arg, handler, \
- fmt, descr) \
- CTASSERT(((access) & CTLTYPE) != 0); \
- SYSCTL_OID(parent, nbr, name, CTLFLAG_VNET|(access), ptr, arg, \
- handler, fmt, descr)
-#define SYSCTL_VNET_OPAQUE(parent, nbr, name, access, ptr, len, fmt, \
- descr) \
- SYSCTL_OID(parent, nbr, name, \
- CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr, len, \
- sysctl_handle_opaque, fmt, descr)
-#define SYSCTL_VNET_STRING(parent, nbr, name, access, arg, len, descr) \
- SYSCTL_OID(parent, nbr, name, \
- CTLTYPE_STRING|CTLFLAG_VNET|(access), \
- arg, len, sysctl_handle_string, "A", descr)
-#define SYSCTL_VNET_STRUCT(parent, nbr, name, access, ptr, type, descr) \
- SYSCTL_OID(parent, nbr, name, \
- CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr, \
- sizeof(struct type), sysctl_handle_opaque, "S," #type, \
- descr)
-#define SYSCTL_VNET_UINT(parent, nbr, name, access, ptr, val, descr) \
- SYSCTL_OID(parent, nbr, name, \
- CTLTYPE_UINT|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access), \
- ptr, val, sysctl_handle_int, "IU", descr)
-#define VNET_SYSCTL_ARG(req, arg1) do { \
- if (arg1 != NULL) \
- arg1 = (void *)(TD_TO_VNET((req)->td)->vnet_data_base + \
- (uintptr_t)(arg1)); \
-} while (0)
-#endif /* SYSCTL_OID */
-
-/*
* Virtual sysinit mechanism, allowing network stack components to declare
* startup and shutdown methods to be run when virtual network stack
* instances are created and destroyed.
@@ -447,29 +407,6 @@ do { \
#define VNET(n) (n)
/*
- * When VIMAGE isn't compiled into the kernel, virtaulized SYSCTLs simply
- * become normal SYSCTLs.
- */
-#ifdef SYSCTL_OID
-#define SYSCTL_VNET_INT(parent, nbr, name, access, ptr, val, descr) \
- SYSCTL_INT(parent, nbr, name, access, ptr, val, descr)
-#define SYSCTL_VNET_PROC(parent, nbr, name, access, ptr, arg, handler, \
- fmt, descr) \
- SYSCTL_PROC(parent, nbr, name, access, ptr, arg, handler, fmt, \
- descr)
-#define SYSCTL_VNET_OPAQUE(parent, nbr, name, access, ptr, len, fmt, \
- descr) \
- SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr)
-#define SYSCTL_VNET_STRING(parent, nbr, name, access, arg, len, descr) \
- SYSCTL_STRING(parent, nbr, name, access, arg, len, descr)
-#define SYSCTL_VNET_STRUCT(parent, nbr, name, access, ptr, type, descr) \
- SYSCTL_STRUCT(parent, nbr, name, access, ptr, type, descr)
-#define SYSCTL_VNET_UINT(parent, nbr, name, access, ptr, val, descr) \
- SYSCTL_UINT(parent, nbr, name, access, ptr, val, descr)
-#define VNET_SYSCTL_ARG(req, arg1)
-#endif /* SYSCTL_OID */
-
-/*
* When VIMAGE isn't compiled into the kernel, VNET_SYSINIT/VNET_SYSUNINIT
* map into normal sysinits, which have the same ordering properties.
*/
Modified: user/dchagin/lemul/sys/netgraph/ng_ether.c
==============================================================================
--- user/dchagin/lemul/sys/netgraph/ng_ether.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netgraph/ng_ether.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -74,7 +74,7 @@
MODULE_VERSION(ng_ether, 1);
-#define IFP2NG(ifp) (IFP2AC((ifp))->ac_netgraph)
+#define IFP2NG(ifp) ((ifp)->if_l2com)
/* Per-node private data */
struct private {
Modified: user/dchagin/lemul/sys/netinet/cc/cc.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/cc/cc.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/cc/cc.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -318,7 +318,8 @@ SYSINIT(cc, SI_SUB_PROTO_IFATTACHDOMAIN,
SYSCTL_NODE(_net_inet_tcp, OID_AUTO, cc, CTLFLAG_RW, NULL,
"congestion control related settings");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc, OID_AUTO, algorithm, CTLTYPE_STRING|CTLFLAG_RW,
+SYSCTL_PROC(_net_inet_tcp_cc, OID_AUTO, algorithm,
+ CTLFLAG_VNET | CTLTYPE_STRING | CTLFLAG_RW,
NULL, 0, cc_default_algo, "A", "default congestion control algorithm");
SYSCTL_PROC(_net_inet_tcp_cc, OID_AUTO, available, CTLTYPE_STRING|CTLFLAG_RD,
Modified: user/dchagin/lemul/sys/netinet/cc/cc_cdg.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/cc/cc_cdg.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/cc/cc_cdg.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -659,39 +659,39 @@ SYSCTL_STRING(_net_inet_tcp_cc_cdg, OID_
CTLFLAG_RD, CDG_VERSION, sizeof(CDG_VERSION) - 1,
"Current algorithm/implementation version number");
-SYSCTL_VNET_UINT(_net_inet_tcp_cc_cdg, OID_AUTO, alpha_inc,
- CTLFLAG_RW, &VNET_NAME(cdg_alpha_inc), 0,
+SYSCTL_UINT(_net_inet_tcp_cc_cdg, OID_AUTO, alpha_inc,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(cdg_alpha_inc), 0,
"Increment the window increase factor alpha by 1 MSS segment every "
"alpha_inc RTTs during congestion avoidance mode.");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_cdg, OID_AUTO, beta_delay,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(cdg_beta_delay), 70,
+SYSCTL_PROC(_net_inet_tcp_cc_cdg, OID_AUTO, beta_delay,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, &VNET_NAME(cdg_beta_delay), 70,
&cdg_beta_handler, "IU",
"Delay-based window decrease factor as a percentage "
"(on delay-based backoff, w = w * beta_delay / 100)");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_cdg, OID_AUTO, beta_loss,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(cdg_beta_loss), 50,
+SYSCTL_PROC(_net_inet_tcp_cc_cdg, OID_AUTO, beta_loss,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, &VNET_NAME(cdg_beta_loss), 50,
&cdg_beta_handler, "IU",
"Loss-based window decrease factor as a percentage "
"(on loss-based backoff, w = w * beta_loss / 100)");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_cdg, OID_AUTO, exp_backoff_scale,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(cdg_exp_backoff_scale), 2,
- &cdg_exp_backoff_scale_handler, "IU",
+SYSCTL_PROC(_net_inet_tcp_cc_cdg, OID_AUTO, exp_backoff_scale,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW,
+ &VNET_NAME(cdg_exp_backoff_scale), 2, &cdg_exp_backoff_scale_handler, "IU",
"Scaling parameter for the probabilistic exponential backoff");
-SYSCTL_VNET_UINT(_net_inet_tcp_cc_cdg, OID_AUTO, smoothing_factor,
- CTLFLAG_RW, &VNET_NAME(cdg_smoothing_factor), 8,
+SYSCTL_UINT(_net_inet_tcp_cc_cdg, OID_AUTO, smoothing_factor,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(cdg_smoothing_factor), 8,
"Number of samples used for moving average smoothing (0 = no smoothing)");
-SYSCTL_VNET_UINT(_net_inet_tcp_cc_cdg, OID_AUTO, loss_compete_consec_cong,
- CTLFLAG_RW, &VNET_NAME(cdg_consec_cong), 5,
+SYSCTL_UINT(_net_inet_tcp_cc_cdg, OID_AUTO, loss_compete_consec_cong,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(cdg_consec_cong), 5,
"Number of consecutive delay-gradient based congestion episodes which will "
"trigger loss based CC compatibility");
-SYSCTL_VNET_UINT(_net_inet_tcp_cc_cdg, OID_AUTO, loss_compete_hold_backoff,
- CTLFLAG_RW, &VNET_NAME(cdg_hold_backoff), 5,
+SYSCTL_UINT(_net_inet_tcp_cc_cdg, OID_AUTO, loss_compete_hold_backoff,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(cdg_hold_backoff), 5,
"Number of consecutive delay-gradient based congestion episodes to hold "
"the window backoff for loss based CC compatibility");
Modified: user/dchagin/lemul/sys/netinet/cc/cc_chd.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/cc/cc_chd.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/cc/cc_chd.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -471,24 +471,27 @@ SYSCTL_DECL(_net_inet_tcp_cc_chd);
SYSCTL_NODE(_net_inet_tcp_cc, OID_AUTO, chd, CTLFLAG_RW, NULL,
"CAIA Hamilton delay-based congestion control related settings");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_chd, OID_AUTO, loss_fair,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(chd_loss_fair), 1, &chd_loss_fair_handler,
+SYSCTL_PROC(_net_inet_tcp_cc_chd, OID_AUTO, loss_fair,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW,
+ &VNET_NAME(chd_loss_fair), 1, &chd_loss_fair_handler,
"IU", "Flag to enable shadow window functionality.");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_chd, OID_AUTO, pmax,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(chd_pmax), 5, &chd_pmax_handler,
+SYSCTL_PROC(_net_inet_tcp_cc_chd, OID_AUTO, pmax,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW,
+ &VNET_NAME(chd_pmax), 5, &chd_pmax_handler,
"IU", "Per RTT maximum backoff probability as a percentage");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_chd, OID_AUTO, queue_threshold,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(chd_qthresh), 20, &chd_qthresh_handler,
+SYSCTL_PROC(_net_inet_tcp_cc_chd, OID_AUTO, queue_threshold,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW,
+ &VNET_NAME(chd_qthresh), 20, &chd_qthresh_handler,
"IU", "Queueing congestion threshold in ticks");
-SYSCTL_VNET_UINT(_net_inet_tcp_cc_chd, OID_AUTO, queue_min,
- CTLFLAG_RW, &VNET_NAME(chd_qmin), 5,
+SYSCTL_UINT(_net_inet_tcp_cc_chd, OID_AUTO, queue_min,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(chd_qmin), 5,
"Minimum queueing delay threshold in ticks");
-SYSCTL_VNET_UINT(_net_inet_tcp_cc_chd, OID_AUTO, use_max,
- CTLFLAG_RW, &VNET_NAME(chd_use_max), 1,
+SYSCTL_UINT(_net_inet_tcp_cc_chd, OID_AUTO, use_max,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(chd_use_max), 1,
"Use the maximum RTT seen within the measurement period (RTT) "
"as the basic delay measurement for the algorithm.");
Modified: user/dchagin/lemul/sys/netinet/cc/cc_hd.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/cc/cc_hd.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/cc/cc_hd.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -238,17 +238,18 @@ SYSCTL_DECL(_net_inet_tcp_cc_hd);
SYSCTL_NODE(_net_inet_tcp_cc, OID_AUTO, hd, CTLFLAG_RW, NULL,
"Hamilton delay-based congestion control related settings");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_hd, OID_AUTO, queue_threshold,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(hd_qthresh), 20, &hd_qthresh_handler,
- "IU", "queueing congestion threshold (qth) in ticks");
+SYSCTL_PROC(_net_inet_tcp_cc_hd, OID_AUTO, queue_threshold,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, &VNET_NAME(hd_qthresh), 20,
+ &hd_qthresh_handler, "IU", "queueing congestion threshold (qth) in ticks");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_hd, OID_AUTO, pmax,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(hd_pmax), 5, &hd_pmax_handler,
- "IU", "per packet maximum backoff probability as a percentage");
+SYSCTL_PROC(_net_inet_tcp_cc_hd, OID_AUTO, pmax,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, &VNET_NAME(hd_pmax), 5,
+ &hd_pmax_handler, "IU",
+ "per packet maximum backoff probability as a percentage");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_hd, OID_AUTO, queue_min,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(hd_qmin), 5, &hd_qmin_handler,
- "IU", "minimum queueing delay threshold (qmin) in ticks");
+SYSCTL_PROC(_net_inet_tcp_cc_hd, OID_AUTO, queue_min,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, &VNET_NAME(hd_qmin), 5,
+ &hd_qmin_handler, "IU", "minimum queueing delay threshold (qmin) in ticks");
DECLARE_CC_MODULE(hd, &hd_cc_algo);
MODULE_DEPEND(hd, ertt, 1, 1, 1);
Modified: user/dchagin/lemul/sys/netinet/cc/cc_htcp.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/cc/cc_htcp.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/cc/cc_htcp.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -512,9 +512,11 @@ htcp_ssthresh_update(struct cc_var *ccv)
SYSCTL_DECL(_net_inet_tcp_cc_htcp);
SYSCTL_NODE(_net_inet_tcp_cc, OID_AUTO, htcp, CTLFLAG_RW,
NULL, "H-TCP related settings");
-SYSCTL_VNET_UINT(_net_inet_tcp_cc_htcp, OID_AUTO, adaptive_backoff, CTLFLAG_RW,
- &VNET_NAME(htcp_adaptive_backoff), 0, "enable H-TCP adaptive backoff");
-SYSCTL_VNET_UINT(_net_inet_tcp_cc_htcp, OID_AUTO, rtt_scaling, CTLFLAG_RW,
- &VNET_NAME(htcp_rtt_scaling), 0, "enable H-TCP RTT scaling");
+SYSCTL_UINT(_net_inet_tcp_cc_htcp, OID_AUTO, adaptive_backoff,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(htcp_adaptive_backoff), 0,
+ "enable H-TCP adaptive backoff");
+SYSCTL_UINT(_net_inet_tcp_cc_htcp, OID_AUTO, rtt_scaling,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(htcp_rtt_scaling), 0,
+ "enable H-TCP RTT scaling");
DECLARE_CC_MODULE(htcp, &htcp_cc_algo);
Modified: user/dchagin/lemul/sys/netinet/cc/cc_vegas.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/cc/cc_vegas.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/cc/cc_vegas.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -295,13 +295,15 @@ SYSCTL_DECL(_net_inet_tcp_cc_vegas);
SYSCTL_NODE(_net_inet_tcp_cc, OID_AUTO, vegas, CTLFLAG_RW, NULL,
"Vegas related settings");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_vegas, OID_AUTO, alpha,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(vegas_alpha), 1, &vegas_alpha_handler,
- "IU", "vegas alpha, specified as number of \"buffers\" (0 < alpha < beta)");
+SYSCTL_PROC(_net_inet_tcp_cc_vegas, OID_AUTO, alpha,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW,
+ &VNET_NAME(vegas_alpha), 1, &vegas_alpha_handler, "IU",
+ "vegas alpha, specified as number of \"buffers\" (0 < alpha < beta)");
-SYSCTL_VNET_PROC(_net_inet_tcp_cc_vegas, OID_AUTO, beta,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(vegas_beta), 3, &vegas_beta_handler,
- "IU", "vegas beta, specified as number of \"buffers\" (0 < alpha < beta)");
+SYSCTL_PROC(_net_inet_tcp_cc_vegas, OID_AUTO, beta,
+ CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW,
+ &VNET_NAME(vegas_beta), 3, &vegas_beta_handler, "IU",
+ "vegas beta, specified as number of \"buffers\" (0 < alpha < beta)");
DECLARE_CC_MODULE(vegas, &vegas_cc_algo);
MODULE_DEPEND(vegas, ertt, 1, 1, 1);
Modified: user/dchagin/lemul/sys/netinet/if_ether.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/if_ether.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/if_ether.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -103,21 +103,21 @@ static VNET_DEFINE(int, arp_maxhold) = 1
#define V_arp_proxyall VNET(arp_proxyall)
#define V_arp_maxhold VNET(arp_maxhold)
-SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW,
+SYSCTL_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(arpt_keep), 0,
"ARP entry lifetime in seconds");
-SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, maxtries, CTLFLAG_RW,
+SYSCTL_INT(_net_link_ether_inet, OID_AUTO, maxtries, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(arp_maxtries), 0,
"ARP resolution attempts before returning error");
-SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW,
+SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(arp_proxyall), 0,
"Enable proxy ARP for all suitable requests");
-SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, wait, CTLFLAG_RW,
+SYSCTL_INT(_net_link_ether_inet, OID_AUTO, wait, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(arpt_down), 0,
"Incomplete ARP entry lifetime in seconds");
SYSCTL_VNET_PCPUSTAT(_net_link_ether_arp, OID_AUTO, stats, struct arpstat,
arpstat, "ARP statistics (struct arpstat, net/if_arp.h)");
-SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, maxhold, CTLFLAG_RW,
+SYSCTL_INT(_net_link_ether_inet, OID_AUTO, maxhold, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(arp_maxhold), 0,
"Number of packets to hold per ARP entry");
Modified: user/dchagin/lemul/sys/netinet/igmp.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/igmp.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/igmp.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -249,32 +249,32 @@ static VNET_DEFINE(int, igmp_default_ver
/*
* Virtualized sysctls.
*/
-SYSCTL_VNET_STRUCT(_net_inet_igmp, IGMPCTL_STATS, stats, CTLFLAG_RW,
+SYSCTL_STRUCT(_net_inet_igmp, IGMPCTL_STATS, stats, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(igmpstat), igmpstat, "");
-SYSCTL_VNET_INT(_net_inet_igmp, OID_AUTO, recvifkludge, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_igmp, OID_AUTO, recvifkludge, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(igmp_recvifkludge), 0,
"Rewrite IGMPv1/v2 reports from 0.0.0.0 to contain subnet address");
-SYSCTL_VNET_INT(_net_inet_igmp, OID_AUTO, sendra, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_igmp, OID_AUTO, sendra, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(igmp_sendra), 0,
"Send IP Router Alert option in IGMPv2/v3 messages");
-SYSCTL_VNET_INT(_net_inet_igmp, OID_AUTO, sendlocal, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_igmp, OID_AUTO, sendlocal, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(igmp_sendlocal), 0,
"Send IGMP membership reports for 224.0.0.0/24 groups");
-SYSCTL_VNET_INT(_net_inet_igmp, OID_AUTO, v1enable, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_igmp, OID_AUTO, v1enable, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(igmp_v1enable), 0,
"Enable backwards compatibility with IGMPv1");
-SYSCTL_VNET_INT(_net_inet_igmp, OID_AUTO, v2enable, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_igmp, OID_AUTO, v2enable, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(igmp_v2enable), 0,
"Enable backwards compatibility with IGMPv2");
-SYSCTL_VNET_INT(_net_inet_igmp, OID_AUTO, legacysupp, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_igmp, OID_AUTO, legacysupp, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(igmp_legacysupp), 0,
"Allow v1/v2 reports to suppress v3 group responses");
-SYSCTL_VNET_PROC(_net_inet_igmp, OID_AUTO, default_version,
- CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
+SYSCTL_PROC(_net_inet_igmp, OID_AUTO, default_version,
+ CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
&VNET_NAME(igmp_default_version), 0, sysctl_igmp_default_version, "I",
"Default version of IGMP to run on each interface");
-SYSCTL_VNET_PROC(_net_inet_igmp, OID_AUTO, gsrdelay,
- CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
+SYSCTL_PROC(_net_inet_igmp, OID_AUTO, gsrdelay,
+ CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
&VNET_NAME(igmp_gsrdelay.tv_sec), 0, sysctl_igmp_gsr, "I",
"Rate limit for IGMPv3 Group-and-Source queries in seconds");
Modified: user/dchagin/lemul/sys/netinet/in.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/in.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/in.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -76,7 +76,7 @@ static void in_purgemaddrs(struct ifnet
static VNET_DEFINE(int, nosameprefix);
#define V_nosameprefix VNET(nosameprefix)
-SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(nosameprefix), 0,
"Refuse to create same prefixes on different interfaces");
Modified: user/dchagin/lemul/sys/netinet/in_gif.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/in_gif.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/in_gif.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -85,7 +85,7 @@ struct protosw in_gif_protosw = {
VNET_DEFINE(int, ip_gif_ttl) = GIF_TTL;
#define V_ip_gif_ttl VNET(ip_gif_ttl)
-SYSCTL_VNET_INT(_net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(ip_gif_ttl), 0, "");
int
Modified: user/dchagin/lemul/sys/netinet/in_pcb.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/in_pcb.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/in_pcb.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -164,34 +164,38 @@ sysctl_net_ipport_check(SYSCTL_HANDLER_A
static SYSCTL_NODE(_net_inet_ip, IPPROTO_IP, portrange, CTLFLAG_RW, 0,
"IP Ports");
-SYSCTL_VNET_PROC(_net_inet_ip_portrange, OID_AUTO, lowfirst,
- CTLTYPE_INT|CTLFLAG_RW, &VNET_NAME(ipport_lowfirstauto), 0,
- &sysctl_net_ipport_check, "I", "");
-SYSCTL_VNET_PROC(_net_inet_ip_portrange, OID_AUTO, lowlast,
- CTLTYPE_INT|CTLFLAG_RW, &VNET_NAME(ipport_lowlastauto), 0,
- &sysctl_net_ipport_check, "I", "");
-SYSCTL_VNET_PROC(_net_inet_ip_portrange, OID_AUTO, first,
- CTLTYPE_INT|CTLFLAG_RW, &VNET_NAME(ipport_firstauto), 0,
- &sysctl_net_ipport_check, "I", "");
-SYSCTL_VNET_PROC(_net_inet_ip_portrange, OID_AUTO, last,
- CTLTYPE_INT|CTLFLAG_RW, &VNET_NAME(ipport_lastauto), 0,
- &sysctl_net_ipport_check, "I", "");
-SYSCTL_VNET_PROC(_net_inet_ip_portrange, OID_AUTO, hifirst,
- CTLTYPE_INT|CTLFLAG_RW, &VNET_NAME(ipport_hifirstauto), 0,
- &sysctl_net_ipport_check, "I", "");
-SYSCTL_VNET_PROC(_net_inet_ip_portrange, OID_AUTO, hilast,
- CTLTYPE_INT|CTLFLAG_RW, &VNET_NAME(ipport_hilastauto), 0,
- &sysctl_net_ipport_check, "I", "");
-SYSCTL_VNET_INT(_net_inet_ip_portrange, OID_AUTO, reservedhigh,
- CTLFLAG_RW|CTLFLAG_SECURE, &VNET_NAME(ipport_reservedhigh), 0, "");
-SYSCTL_VNET_INT(_net_inet_ip_portrange, OID_AUTO, reservedlow,
+SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowfirst,
+ CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW,
+ &VNET_NAME(ipport_lowfirstauto), 0, &sysctl_net_ipport_check, "I", "");
+SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowlast,
+ CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW,
+ &VNET_NAME(ipport_lowlastauto), 0, &sysctl_net_ipport_check, "I", "");
+SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, first,
+ CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW,
+ &VNET_NAME(ipport_firstauto), 0, &sysctl_net_ipport_check, "I", "");
+SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, last,
+ CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW,
+ &VNET_NAME(ipport_lastauto), 0, &sysctl_net_ipport_check, "I", "");
+SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hifirst,
+ CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW,
+ &VNET_NAME(ipport_hifirstauto), 0, &sysctl_net_ipport_check, "I", "");
+SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hilast,
+ CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW,
+ &VNET_NAME(ipport_hilastauto), 0, &sysctl_net_ipport_check, "I", "");
+SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, reservedhigh,
+ CTLFLAG_VNET | CTLFLAG_RW | CTLFLAG_SECURE,
+ &VNET_NAME(ipport_reservedhigh), 0, "");
+SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, reservedlow,
CTLFLAG_RW|CTLFLAG_SECURE, &VNET_NAME(ipport_reservedlow), 0, "");
-SYSCTL_VNET_INT(_net_inet_ip_portrange, OID_AUTO, randomized, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, randomized,
+ CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(ipport_randomized), 0, "Enable random port allocation");
-SYSCTL_VNET_INT(_net_inet_ip_portrange, OID_AUTO, randomcps, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, randomcps,
+ CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(ipport_randomcps), 0, "Maximum number of random port "
"allocations before switching to a sequental one");
-SYSCTL_VNET_INT(_net_inet_ip_portrange, OID_AUTO, randomtime, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, randomtime,
+ CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(ipport_randomtime), 0,
"Minimum time to keep sequental port "
"allocation before switching to a random one");
Modified: user/dchagin/lemul/sys/netinet/in_rmx.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/in_rmx.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/in_rmx.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -134,21 +134,21 @@ in_matroute(void *v_arg, struct radix_no
static VNET_DEFINE(int, rtq_reallyold) = 60*60; /* one hour is "really old" */
#define V_rtq_reallyold VNET(rtq_reallyold)
-SYSCTL_VNET_INT(_net_inet_ip, IPCTL_RTEXPIRE, rtexpire, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip, IPCTL_RTEXPIRE, rtexpire, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(rtq_reallyold), 0,
"Default expiration time on dynamically learned routes");
/* never automatically crank down to less */
static VNET_DEFINE(int, rtq_minreallyold) = 10;
#define V_rtq_minreallyold VNET(rtq_minreallyold)
-SYSCTL_VNET_INT(_net_inet_ip, IPCTL_RTMINEXPIRE, rtminexpire, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip, IPCTL_RTMINEXPIRE, rtminexpire, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(rtq_minreallyold), 0,
"Minimum time to attempt to hold onto dynamically learned routes");
/* 128 cached routes is "too many" */
static VNET_DEFINE(int, rtq_toomany) = 128;
#define V_rtq_toomany VNET(rtq_toomany)
-SYSCTL_VNET_INT(_net_inet_ip, IPCTL_RTMAXCACHE, rtmaxcache, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip, IPCTL_RTMAXCACHE, rtmaxcache, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(rtq_toomany), 0,
"Upper limit on dynamically learned routes");
Modified: user/dchagin/lemul/sys/netinet/ip_carp.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/ip_carp.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/ip_carp.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -216,18 +216,21 @@ static VNET_DEFINE(int, carp_ifdown_adj)
static int carp_demote_adj_sysctl(SYSCTL_HANDLER_ARGS);
SYSCTL_NODE(_net_inet, IPPROTO_CARP, carp, CTLFLAG_RW, 0, "CARP");
-SYSCTL_VNET_INT(_net_inet_carp, OID_AUTO, allow, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_carp, OID_AUTO, allow, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(carp_allow), 0, "Accept incoming CARP packets");
-SYSCTL_VNET_INT(_net_inet_carp, OID_AUTO, preempt, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_carp, OID_AUTO, preempt, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(carp_preempt), 0, "High-priority backup preemption mode");
-SYSCTL_VNET_INT(_net_inet_carp, OID_AUTO, log, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_carp, OID_AUTO, log, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(carp_log), 0, "CARP log level");
-SYSCTL_VNET_PROC(_net_inet_carp, OID_AUTO, demotion, CTLTYPE_INT|CTLFLAG_RW,
+SYSCTL_PROC(_net_inet_carp, OID_AUTO, demotion,
+ CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW,
0, 0, carp_demote_adj_sysctl, "I",
"Adjust demotion factor (skew of advskew)");
-SYSCTL_VNET_INT(_net_inet_carp, OID_AUTO, senderr_demotion_factor, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_carp, OID_AUTO, senderr_demotion_factor,
+ CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(carp_senderr_adj), 0, "Send error demotion factor adjustment");
-SYSCTL_VNET_INT(_net_inet_carp, OID_AUTO, ifdown_demotion_factor, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_carp, OID_AUTO, ifdown_demotion_factor,
+ CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(carp_ifdown_adj), 0,
"Interface down demotion factor adjustment");
Modified: user/dchagin/lemul/sys/netinet/ip_fastfwd.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/ip_fastfwd.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/ip_fastfwd.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -111,7 +111,7 @@ __FBSDID("$FreeBSD$");
static VNET_DEFINE(int, ipfastforward_active);
#define V_ipfastforward_active VNET(ipfastforward_active)
-SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, fastforwarding, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip, OID_AUTO, fastforwarding, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(ipfastforward_active), 0, "Enable fast IP forwarding");
static struct sockaddr_in *
Modified: user/dchagin/lemul/sys/netinet/ip_icmp.c
==============================================================================
--- user/dchagin/lemul/sys/netinet/ip_icmp.c Fri Nov 7 16:16:37 2014 (r274240)
+++ user/dchagin/lemul/sys/netinet/ip_icmp.c Fri Nov 7 16:22:58 2014 (r274241)
@@ -82,13 +82,13 @@ __FBSDID("$FreeBSD$");
*/
static VNET_DEFINE(int, icmplim) = 200;
#define V_icmplim VNET(icmplim)
-SYSCTL_VNET_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(icmplim), 0,
"Maximum number of ICMP responses per second");
static VNET_DEFINE(int, icmplim_output) = 1;
#define V_icmplim_output VNET(icmplim_output)
-SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO, icmplim_output, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_icmp, OID_AUTO, icmplim_output, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(icmplim_output), 0,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list