Initialize struct pr_userreqs in new/sparse style and fill in common

default elements in net_init_domain().

This makes it possible to grep these structures and see any bogosities.

2 files changed, 68 insertions, 126 deletions

diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket.c b/sys/netgraph/bluetooth/socket/ng_btsocket.c
index 9932b8c..e956315 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket.c
@@ -61,27 +61,17 @@ extern struct domain		ng_btsocket_domain;
  */
 
 static struct pr_usrreqs	ng_btsocket_hci_raw_usrreqs = {
-	ng_btsocket_hci_raw_abort,	/* abort */
-	pru_accept_notsupp,		/* accept */
-	ng_btsocket_hci_raw_attach,	/* attach */
-	ng_btsocket_hci_raw_bind,	/* bind */
-	ng_btsocket_hci_raw_connect,	/* connect */
-	pru_connect2_notsupp,		/* connect2 */
-	ng_btsocket_hci_raw_control,	/* control */
-	ng_btsocket_hci_raw_detach,	/* detach */
-	ng_btsocket_hci_raw_disconnect,	/* disconnect */
-	pru_listen_notsupp,		/* listen */
-	ng_btsocket_hci_raw_peeraddr,	/* peeraddr */
-	pru_rcvd_notsupp,		/* rcvd */
-	pru_rcvoob_notsupp,		/* rcvoob */
-	ng_btsocket_hci_raw_send,	/* send */
-	pru_sense_null,			/* send */
-	NULL,				/* shutdown */
-	ng_btsocket_hci_raw_sockaddr,	/* sockaddr */
-	sosend,
-	soreceive,
-	sopoll,
-	pru_sosetlabel_null
+	.pru_abort =		ng_btsocket_hci_raw_abort,
+	.pru_attach =		ng_btsocket_hci_raw_attach,
+	.pru_bind =		ng_btsocket_hci_raw_bind,
+	.pru_connect =		ng_btsocket_hci_raw_connect,
+	.pru_control =		ng_btsocket_hci_raw_control,
+	.pru_detach =		ng_btsocket_hci_raw_detach,
+	.pru_disconnect =	ng_btsocket_hci_raw_disconnect,
+	.pru_peeraddr =		ng_btsocket_hci_raw_peeraddr,
+	.pru_send =		ng_btsocket_hci_raw_send,
+	.pru_shutdown =		NULL,
+	.pru_sockaddr =		ng_btsocket_hci_raw_sockaddr,
 };
 
 /*
@@ -89,27 +79,17 @@ static struct pr_usrreqs	ng_btsocket_hci_raw_usrreqs = {
  */
 
 static struct pr_usrreqs	ng_btsocket_l2cap_raw_usrreqs = {
-	ng_btsocket_l2cap_raw_abort,	/* abort */
-	pru_accept_notsupp,		/* accept */
-	ng_btsocket_l2cap_raw_attach,	/* attach */
-	ng_btsocket_l2cap_raw_bind,	/* bind */
-	ng_btsocket_l2cap_raw_connect,	/* connect */
-	pru_connect2_notsupp,		/* connect2 */
-	ng_btsocket_l2cap_raw_control,	/* control */
-	ng_btsocket_l2cap_raw_detach,	/* detach */
-	ng_btsocket_l2cap_raw_disconnect, /* disconnect */
-        pru_listen_notsupp,		/* listen */
-	ng_btsocket_l2cap_raw_peeraddr,	/* peeraddr */
-	pru_rcvd_notsupp,		/* rcvd */
-	pru_rcvoob_notsupp,		/* rcvoob */
-	ng_btsocket_l2cap_raw_send,	/* send */
-	pru_sense_null,			/* send */
-	NULL,				/* shutdown */
-	ng_btsocket_l2cap_raw_sockaddr,	/* sockaddr */
-	sosend,
-	soreceive,
-	sopoll,
-	pru_sosetlabel_null
+	.pru_abort =		ng_btsocket_l2cap_raw_abort,
+	.pru_attach =		ng_btsocket_l2cap_raw_attach,
+	.pru_bind =		ng_btsocket_l2cap_raw_bind,
+	.pru_connect =		ng_btsocket_l2cap_raw_connect,
+	.pru_control =		ng_btsocket_l2cap_raw_control,
+	.pru_detach =		ng_btsocket_l2cap_raw_detach,
+	.pru_disconnect =	ng_btsocket_l2cap_raw_disconnect,
+	.pru_peeraddr =		ng_btsocket_l2cap_raw_peeraddr,
+	.pru_send =		ng_btsocket_l2cap_raw_send,
+	.pru_shutdown =		NULL,
+	.pru_sockaddr =		ng_btsocket_l2cap_raw_sockaddr,
 };
 
 /*
@@ -117,27 +97,19 @@ static struct pr_usrreqs	ng_btsocket_l2cap_raw_usrreqs = {
  */
 
 static struct pr_usrreqs	ng_btsocket_l2cap_usrreqs = {
-	ng_btsocket_l2cap_abort,	/* abort */
-	ng_btsocket_l2cap_accept,	/* accept */
-	ng_btsocket_l2cap_attach,	/* attach */
-	ng_btsocket_l2cap_bind,		/* bind */
-	ng_btsocket_l2cap_connect,	/* connect */
-	pru_connect2_notsupp,		/* connect2 */
-	ng_btsocket_l2cap_control,	/* control */
-	ng_btsocket_l2cap_detach,	/* detach */
-	ng_btsocket_l2cap_disconnect,	/* disconnect */
-        ng_btsocket_l2cap_listen,	/* listen */
-	ng_btsocket_l2cap_peeraddr,	/* peeraddr */
-	pru_rcvd_notsupp,		/* rcvd */
-	pru_rcvoob_notsupp,		/* rcvoob */
-	ng_btsocket_l2cap_send,		/* send */
-	pru_sense_null,			/* send */
-	NULL,				/* shutdown */
-	ng_btsocket_l2cap_sockaddr,	/* sockaddr */
-	sosend,
-	soreceive,
-	sopoll,
-	pru_sosetlabel_null
+	.pru_abort =		ng_btsocket_l2cap_abort,
+	.pru_accept =		ng_btsocket_l2cap_accept,
+	.pru_attach =		ng_btsocket_l2cap_attach,
+	.pru_bind =		ng_btsocket_l2cap_bind,
+	.pru_connect =		ng_btsocket_l2cap_connect,
+	.pru_control =		ng_btsocket_l2cap_control,
+	.pru_detach =		ng_btsocket_l2cap_detach,
+	.pru_disconnect =	ng_btsocket_l2cap_disconnect,
+        .pru_listen =		ng_btsocket_l2cap_listen,
+	.pru_peeraddr =		ng_btsocket_l2cap_peeraddr,
+	.pru_send =		ng_btsocket_l2cap_send,
+	.pru_shutdown =		NULL,
+	.pru_sockaddr =		ng_btsocket_l2cap_sockaddr,
 };
 
 /*
@@ -145,27 +117,19 @@ static struct pr_usrreqs	ng_btsocket_l2cap_usrreqs = {
  */
 
 static struct pr_usrreqs	ng_btsocket_rfcomm_usrreqs = {
-	ng_btsocket_rfcomm_abort,	/* abort */
-	ng_btsocket_rfcomm_accept,	/* accept */
-	ng_btsocket_rfcomm_attach,	/* attach */
-	ng_btsocket_rfcomm_bind,	/* bind */
-	ng_btsocket_rfcomm_connect,	/* connect */
-	pru_connect2_notsupp,		/* connect2 */
-	ng_btsocket_rfcomm_control,	/* control */
-	ng_btsocket_rfcomm_detach,	/* detach */
-	ng_btsocket_rfcomm_disconnect,	/* disconnect */
-        ng_btsocket_rfcomm_listen,	/* listen */
-	ng_btsocket_rfcomm_peeraddr,	/* peeraddr */
-	pru_rcvd_notsupp,		/* rcvd */
-	pru_rcvoob_notsupp,		/* rcvoob */
-	ng_btsocket_rfcomm_send,	/* send */
-	pru_sense_null,			/* send */
-	NULL,				/* shutdown */
-	ng_btsocket_rfcomm_sockaddr,	/* sockaddr */
-	sosend,
-	soreceive,
-	sopoll,
-	pru_sosetlabel_null
+	.pru_abort =		ng_btsocket_rfcomm_abort,
+	.pru_accept =		ng_btsocket_rfcomm_accept,
+	.pru_attach =		ng_btsocket_rfcomm_attach,
+	.pru_bind =		ng_btsocket_rfcomm_bind,
+	.pru_connect =		ng_btsocket_rfcomm_connect,
+	.pru_control =		ng_btsocket_rfcomm_control,
+	.pru_detach =		ng_btsocket_rfcomm_detach,
+	.pru_disconnect =	ng_btsocket_rfcomm_disconnect,
+        .pru_listen =		ng_btsocket_rfcomm_listen,
+	.pru_peeraddr =		ng_btsocket_rfcomm_peeraddr,
+	.pru_send =		ng_btsocket_rfcomm_send,
+	.pru_shutdown =		NULL,
+	.pru_sockaddr =		ng_btsocket_rfcomm_sockaddr,
 };
 
 /* 
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index 8a0fd29..8f2ea53 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -1006,51 +1006,29 @@ dummy_disconnect(struct socket *so)
  */
 
 static struct pr_usrreqs ngc_usrreqs = {
-	NULL,			/* abort */
-	pru_accept_notsupp,
-	ngc_attach,
-	ngc_bind,
-	ngc_connect,
-	pru_connect2_notsupp,
-	pru_control_notsupp,
-	ngc_detach,
-	dummy_disconnect,	/* disconnect */
-	pru_listen_notsupp,
-	NULL,			/* setpeeraddr */
-	pru_rcvd_notsupp,
-	pru_rcvoob_notsupp,
-	ngc_send,
-	pru_sense_null,
-	NULL,			/* shutdown */
-	ng_setsockaddr,
-	sosend,
-	soreceive,
-	sopoll,
-	pru_sosetlabel_null
+	.pru_abort =		NULL,
+	.pru_attach =		ngc_attach,
+	.pru_bind =		ngc_bind,
+	.pru_connect =		ngc_connect,
+	.pru_detach =		ngc_detach,
+	.pru_disconnect =	dummy_disconnect,
+	.pru_peeraddr =		NULL,
+	.pru_send =		ngc_send,
+	.pru_shutdown =		NULL,
+	.pru_sockaddr =		ng_setsockaddr,
 };
 
 static struct pr_usrreqs ngd_usrreqs = {
-	NULL,			/* abort */
-	pru_accept_notsupp,
-	ngd_attach,
-	NULL,			/* bind */
-	ngd_connect,
-	pru_connect2_notsupp,
-	pru_control_notsupp,
-	ngd_detach,
-	dummy_disconnect,	/* disconnect */
-	pru_listen_notsupp,
-	NULL,			/* setpeeraddr */
-	pru_rcvd_notsupp,
-	pru_rcvoob_notsupp,
-	ngd_send,
-	pru_sense_null,
-	NULL,			/* shutdown */
-	ng_setsockaddr,
-	sosend,
-	soreceive,
-	sopoll,
-	pru_sosetlabel_null
+	.pru_abort =		NULL,
+	.pru_attach =		ngd_attach,
+	.pru_bind =		NULL,
+	.pru_connect =		ngd_connect,
+	.pru_detach =		ngd_detach,
+	.pru_disconnect =	dummy_disconnect,
+	.pru_peeraddr =		NULL,
+	.pru_send =		ngd_send,
+	.pru_shutdown =		NULL,
+	.pru_sockaddr		ng_setsockaddr,
 };
 
 /*