sysctl(9) cleanup checkpoint: amd64 GENERIC builds cleanly.
Commit the netgraph piece.
This commit is contained in:
parent
4a2ce5903f
commit
f29fc08590
|
@ -114,7 +114,7 @@ SYSCTL_PROC(_net_bluetooth_hci, OID_AUTO, connection_timeout,
|
||||||
bluetooth_set_hci_connect_timeout_value,
|
bluetooth_set_hci_connect_timeout_value,
|
||||||
"I", "HCI connect timeout (sec)");
|
"I", "HCI connect timeout (sec)");
|
||||||
|
|
||||||
SYSCTL_INT(_net_bluetooth_hci, OID_AUTO, max_neighbor_age, CTLFLAG_RW,
|
SYSCTL_UINT(_net_bluetooth_hci, OID_AUTO, max_neighbor_age, CTLFLAG_RW,
|
||||||
&bluetooth_hci_max_neighbor_age_value, 600,
|
&bluetooth_hci_max_neighbor_age_value, 600,
|
||||||
"Maximal HCI neighbor cache entry age (sec)");
|
"Maximal HCI neighbor cache entry age (sec)");
|
||||||
|
|
||||||
|
|
|
@ -125,19 +125,19 @@ static int ng_btsocket_hci_raw_curpps;
|
||||||
SYSCTL_DECL(_net_bluetooth_hci_sockets);
|
SYSCTL_DECL(_net_bluetooth_hci_sockets);
|
||||||
SYSCTL_NODE(_net_bluetooth_hci_sockets, OID_AUTO, raw, CTLFLAG_RW,
|
SYSCTL_NODE(_net_bluetooth_hci_sockets, OID_AUTO, raw, CTLFLAG_RW,
|
||||||
0, "Bluetooth raw HCI sockets family");
|
0, "Bluetooth raw HCI sockets family");
|
||||||
SYSCTL_INT(_net_bluetooth_hci_sockets_raw, OID_AUTO, debug_level, CTLFLAG_RW,
|
SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, debug_level, CTLFLAG_RW,
|
||||||
&ng_btsocket_hci_raw_debug_level, NG_BTSOCKET_WARN_LEVEL,
|
&ng_btsocket_hci_raw_debug_level, NG_BTSOCKET_WARN_LEVEL,
|
||||||
"Bluetooth raw HCI sockets debug level");
|
"Bluetooth raw HCI sockets debug level");
|
||||||
SYSCTL_INT(_net_bluetooth_hci_sockets_raw, OID_AUTO, ioctl_timeout, CTLFLAG_RW,
|
SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, ioctl_timeout, CTLFLAG_RW,
|
||||||
&ng_btsocket_hci_raw_ioctl_timeout, 5,
|
&ng_btsocket_hci_raw_ioctl_timeout, 5,
|
||||||
"Bluetooth raw HCI sockets ioctl timeout");
|
"Bluetooth raw HCI sockets ioctl timeout");
|
||||||
SYSCTL_INT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_len, CTLFLAG_RD,
|
SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_len, CTLFLAG_RD,
|
||||||
&ng_btsocket_hci_raw_queue.len, 0,
|
&ng_btsocket_hci_raw_queue.len, 0,
|
||||||
"Bluetooth raw HCI sockets input queue length");
|
"Bluetooth raw HCI sockets input queue length");
|
||||||
SYSCTL_INT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_maxlen, CTLFLAG_RD,
|
SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_maxlen, CTLFLAG_RD,
|
||||||
&ng_btsocket_hci_raw_queue.maxlen, 0,
|
&ng_btsocket_hci_raw_queue.maxlen, 0,
|
||||||
"Bluetooth raw HCI sockets input queue max. length");
|
"Bluetooth raw HCI sockets input queue max. length");
|
||||||
SYSCTL_INT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_drops, CTLFLAG_RD,
|
SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, queue_drops, CTLFLAG_RD,
|
||||||
&ng_btsocket_hci_raw_queue.drops, 0,
|
&ng_btsocket_hci_raw_queue.drops, 0,
|
||||||
"Bluetooth raw HCI sockets input queue drops");
|
"Bluetooth raw HCI sockets input queue drops");
|
||||||
|
|
||||||
|
|
|
@ -110,19 +110,19 @@ static int ng_btsocket_l2cap_curpps;
|
||||||
SYSCTL_DECL(_net_bluetooth_l2cap_sockets);
|
SYSCTL_DECL(_net_bluetooth_l2cap_sockets);
|
||||||
SYSCTL_NODE(_net_bluetooth_l2cap_sockets, OID_AUTO, seq, CTLFLAG_RW,
|
SYSCTL_NODE(_net_bluetooth_l2cap_sockets, OID_AUTO, seq, CTLFLAG_RW,
|
||||||
0, "Bluetooth SEQPACKET L2CAP sockets family");
|
0, "Bluetooth SEQPACKET L2CAP sockets family");
|
||||||
SYSCTL_INT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, debug_level,
|
SYSCTL_UINT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, debug_level,
|
||||||
CTLFLAG_RW,
|
CTLFLAG_RW,
|
||||||
&ng_btsocket_l2cap_debug_level, NG_BTSOCKET_WARN_LEVEL,
|
&ng_btsocket_l2cap_debug_level, NG_BTSOCKET_WARN_LEVEL,
|
||||||
"Bluetooth SEQPACKET L2CAP sockets debug level");
|
"Bluetooth SEQPACKET L2CAP sockets debug level");
|
||||||
SYSCTL_INT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_len,
|
SYSCTL_UINT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_len,
|
||||||
CTLFLAG_RD,
|
CTLFLAG_RD,
|
||||||
&ng_btsocket_l2cap_queue.len, 0,
|
&ng_btsocket_l2cap_queue.len, 0,
|
||||||
"Bluetooth SEQPACKET L2CAP sockets input queue length");
|
"Bluetooth SEQPACKET L2CAP sockets input queue length");
|
||||||
SYSCTL_INT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_maxlen,
|
SYSCTL_UINT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_maxlen,
|
||||||
CTLFLAG_RD,
|
CTLFLAG_RD,
|
||||||
&ng_btsocket_l2cap_queue.maxlen, 0,
|
&ng_btsocket_l2cap_queue.maxlen, 0,
|
||||||
"Bluetooth SEQPACKET L2CAP sockets input queue max. length");
|
"Bluetooth SEQPACKET L2CAP sockets input queue max. length");
|
||||||
SYSCTL_INT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_drops,
|
SYSCTL_UINT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, queue_drops,
|
||||||
CTLFLAG_RD,
|
CTLFLAG_RD,
|
||||||
&ng_btsocket_l2cap_queue.drops, 0,
|
&ng_btsocket_l2cap_queue.drops, 0,
|
||||||
"Bluetooth SEQPACKET L2CAP sockets input queue drops");
|
"Bluetooth SEQPACKET L2CAP sockets input queue drops");
|
||||||
|
|
|
@ -125,23 +125,23 @@ static int ng_btsocket_l2cap_raw_curpps;
|
||||||
SYSCTL_DECL(_net_bluetooth_l2cap_sockets);
|
SYSCTL_DECL(_net_bluetooth_l2cap_sockets);
|
||||||
SYSCTL_NODE(_net_bluetooth_l2cap_sockets, OID_AUTO, raw, CTLFLAG_RW,
|
SYSCTL_NODE(_net_bluetooth_l2cap_sockets, OID_AUTO, raw, CTLFLAG_RW,
|
||||||
0, "Bluetooth raw L2CAP sockets family");
|
0, "Bluetooth raw L2CAP sockets family");
|
||||||
SYSCTL_INT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, debug_level,
|
SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, debug_level,
|
||||||
CTLFLAG_RW,
|
CTLFLAG_RW,
|
||||||
&ng_btsocket_l2cap_raw_debug_level, NG_BTSOCKET_WARN_LEVEL,
|
&ng_btsocket_l2cap_raw_debug_level, NG_BTSOCKET_WARN_LEVEL,
|
||||||
"Bluetooth raw L2CAP sockets debug level");
|
"Bluetooth raw L2CAP sockets debug level");
|
||||||
SYSCTL_INT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, ioctl_timeout,
|
SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, ioctl_timeout,
|
||||||
CTLFLAG_RW,
|
CTLFLAG_RW,
|
||||||
&ng_btsocket_l2cap_raw_ioctl_timeout, 5,
|
&ng_btsocket_l2cap_raw_ioctl_timeout, 5,
|
||||||
"Bluetooth raw L2CAP sockets ioctl timeout");
|
"Bluetooth raw L2CAP sockets ioctl timeout");
|
||||||
SYSCTL_INT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_len,
|
SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_len,
|
||||||
CTLFLAG_RD,
|
CTLFLAG_RD,
|
||||||
&ng_btsocket_l2cap_raw_queue.len, 0,
|
&ng_btsocket_l2cap_raw_queue.len, 0,
|
||||||
"Bluetooth raw L2CAP sockets input queue length");
|
"Bluetooth raw L2CAP sockets input queue length");
|
||||||
SYSCTL_INT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_maxlen,
|
SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_maxlen,
|
||||||
CTLFLAG_RD,
|
CTLFLAG_RD,
|
||||||
&ng_btsocket_l2cap_raw_queue.maxlen, 0,
|
&ng_btsocket_l2cap_raw_queue.maxlen, 0,
|
||||||
"Bluetooth raw L2CAP sockets input queue max. length");
|
"Bluetooth raw L2CAP sockets input queue max. length");
|
||||||
SYSCTL_INT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_drops,
|
SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, queue_drops,
|
||||||
CTLFLAG_RD,
|
CTLFLAG_RD,
|
||||||
&ng_btsocket_l2cap_raw_queue.drops, 0,
|
&ng_btsocket_l2cap_raw_queue.drops, 0,
|
||||||
"Bluetooth raw L2CAP sockets input queue drops");
|
"Bluetooth raw L2CAP sockets input queue drops");
|
||||||
|
|
|
@ -202,11 +202,11 @@ static int ng_btsocket_rfcomm_curpps;
|
||||||
SYSCTL_DECL(_net_bluetooth_rfcomm_sockets);
|
SYSCTL_DECL(_net_bluetooth_rfcomm_sockets);
|
||||||
SYSCTL_NODE(_net_bluetooth_rfcomm_sockets, OID_AUTO, stream, CTLFLAG_RW,
|
SYSCTL_NODE(_net_bluetooth_rfcomm_sockets, OID_AUTO, stream, CTLFLAG_RW,
|
||||||
0, "Bluetooth STREAM RFCOMM sockets family");
|
0, "Bluetooth STREAM RFCOMM sockets family");
|
||||||
SYSCTL_INT(_net_bluetooth_rfcomm_sockets_stream, OID_AUTO, debug_level,
|
SYSCTL_UINT(_net_bluetooth_rfcomm_sockets_stream, OID_AUTO, debug_level,
|
||||||
CTLFLAG_RW,
|
CTLFLAG_RW,
|
||||||
&ng_btsocket_rfcomm_debug_level, NG_BTSOCKET_INFO_LEVEL,
|
&ng_btsocket_rfcomm_debug_level, NG_BTSOCKET_INFO_LEVEL,
|
||||||
"Bluetooth STREAM RFCOMM sockets debug level");
|
"Bluetooth STREAM RFCOMM sockets debug level");
|
||||||
SYSCTL_INT(_net_bluetooth_rfcomm_sockets_stream, OID_AUTO, timeout,
|
SYSCTL_UINT(_net_bluetooth_rfcomm_sockets_stream, OID_AUTO, timeout,
|
||||||
CTLFLAG_RW,
|
CTLFLAG_RW,
|
||||||
&ng_btsocket_rfcomm_timo, 60,
|
&ng_btsocket_rfcomm_timo, 60,
|
||||||
"Bluetooth STREAM RFCOMM sockets timeout");
|
"Bluetooth STREAM RFCOMM sockets timeout");
|
||||||
|
|
|
@ -109,19 +109,19 @@ static int ng_btsocket_sco_curpps;
|
||||||
SYSCTL_DECL(_net_bluetooth_sco_sockets);
|
SYSCTL_DECL(_net_bluetooth_sco_sockets);
|
||||||
SYSCTL_NODE(_net_bluetooth_sco_sockets, OID_AUTO, seq, CTLFLAG_RW,
|
SYSCTL_NODE(_net_bluetooth_sco_sockets, OID_AUTO, seq, CTLFLAG_RW,
|
||||||
0, "Bluetooth SEQPACKET SCO sockets family");
|
0, "Bluetooth SEQPACKET SCO sockets family");
|
||||||
SYSCTL_INT(_net_bluetooth_sco_sockets_seq, OID_AUTO, debug_level,
|
SYSCTL_UINT(_net_bluetooth_sco_sockets_seq, OID_AUTO, debug_level,
|
||||||
CTLFLAG_RW,
|
CTLFLAG_RW,
|
||||||
&ng_btsocket_sco_debug_level, NG_BTSOCKET_WARN_LEVEL,
|
&ng_btsocket_sco_debug_level, NG_BTSOCKET_WARN_LEVEL,
|
||||||
"Bluetooth SEQPACKET SCO sockets debug level");
|
"Bluetooth SEQPACKET SCO sockets debug level");
|
||||||
SYSCTL_INT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_len,
|
SYSCTL_UINT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_len,
|
||||||
CTLFLAG_RD,
|
CTLFLAG_RD,
|
||||||
&ng_btsocket_sco_queue.len, 0,
|
&ng_btsocket_sco_queue.len, 0,
|
||||||
"Bluetooth SEQPACKET SCO sockets input queue length");
|
"Bluetooth SEQPACKET SCO sockets input queue length");
|
||||||
SYSCTL_INT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_maxlen,
|
SYSCTL_UINT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_maxlen,
|
||||||
CTLFLAG_RD,
|
CTLFLAG_RD,
|
||||||
&ng_btsocket_sco_queue.maxlen, 0,
|
&ng_btsocket_sco_queue.maxlen, 0,
|
||||||
"Bluetooth SEQPACKET SCO sockets input queue max. length");
|
"Bluetooth SEQPACKET SCO sockets input queue max. length");
|
||||||
SYSCTL_INT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_drops,
|
SYSCTL_UINT(_net_bluetooth_sco_sockets_seq, OID_AUTO, queue_drops,
|
||||||
CTLFLAG_RD,
|
CTLFLAG_RD,
|
||||||
&ng_btsocket_sco_queue.drops, 0,
|
&ng_btsocket_sco_queue.drops, 0,
|
||||||
"Bluetooth SEQPACKET SCO sockets input queue drops");
|
"Bluetooth SEQPACKET SCO sockets input queue drops");
|
||||||
|
|
|
@ -150,10 +150,10 @@ NETGRAPH_INIT_ORDERED(socket, &typestruct, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY);
|
||||||
|
|
||||||
/* Buffer space */
|
/* Buffer space */
|
||||||
static u_long ngpdg_sendspace = 20 * 1024; /* really max datagram size */
|
static u_long ngpdg_sendspace = 20 * 1024; /* really max datagram size */
|
||||||
SYSCTL_INT(_net_graph, OID_AUTO, maxdgram, CTLFLAG_RW,
|
SYSCTL_ULONG(_net_graph, OID_AUTO, maxdgram, CTLFLAG_RW,
|
||||||
&ngpdg_sendspace , 0, "Maximum outgoing Netgraph datagram size");
|
&ngpdg_sendspace , 0, "Maximum outgoing Netgraph datagram size");
|
||||||
static u_long ngpdg_recvspace = 20 * 1024;
|
static u_long ngpdg_recvspace = 20 * 1024;
|
||||||
SYSCTL_INT(_net_graph, OID_AUTO, recvspace, CTLFLAG_RW,
|
SYSCTL_ULONG(_net_graph, OID_AUTO, recvspace, CTLFLAG_RW,
|
||||||
&ngpdg_recvspace , 0, "Maximum space for incoming Netgraph datagrams");
|
&ngpdg_recvspace , 0, "Maximum space for incoming Netgraph datagrams");
|
||||||
|
|
||||||
/* List of all sockets (for netstat -f netgraph) */
|
/* List of all sockets (for netstat -f netgraph) */
|
||||||
|
|
Loading…
Reference in New Issue