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, 23 insertions, 10 deletions

diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 6495a13..680c529 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -782,9 +782,15 @@ rip6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
 }
 
 struct pr_usrreqs rip6_usrreqs = {
-	rip6_abort, pru_accept_notsupp, rip6_attach, rip6_bind, rip6_connect,
-	pru_connect2_notsupp, in6_control, rip6_detach, rip6_disconnect,
-	pru_listen_notsupp, in6_setpeeraddr, pru_rcvd_notsupp,
-	pru_rcvoob_notsupp, rip6_send, pru_sense_null, rip6_shutdown,
-	in6_setsockaddr, sosend, soreceive, sopoll, pru_sosetlabel_null
+	.pru_abort =		rip6_abort,
+	.pru_attach =		rip6_attach,
+	.pru_bind =		rip6_bind,
+	.pru_connect =		rip6_connect,
+	.pru_control =		in6_control,
+	.pru_detach =		rip6_detach,
+	.pru_disconnect =	rip6_disconnect,
+	.pru_peeraddr =		in6_setpeeraddr,
+	.pru_send =		rip6_send,
+	.pru_shutdown =		rip6_shutdown,
+	.pru_sockaddr =		in6_setsockaddr,
 };
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index 6b1dc25..43c11f3 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -804,9 +804,16 @@ out:
 }
 
 struct pr_usrreqs udp6_usrreqs = {
-	udp6_abort, pru_accept_notsupp, udp6_attach, udp6_bind, udp6_connect,
-	pru_connect2_notsupp, in6_control, udp6_detach, udp6_disconnect,
-	pru_listen_notsupp, in6_mapped_peeraddr, pru_rcvd_notsupp,
-	pru_rcvoob_notsupp, udp6_send, pru_sense_null, udp_shutdown,
-	in6_mapped_sockaddr, sosend, soreceive, sopoll, in_pcbsosetlabel
+	.pru_abort =		udp6_abort,
+	.pru_attach =		udp6_attach,
+	.pru_bind =		udp6_bind,
+	.pru_connect =		udp6_connect,
+	.pru_control =		in6_control,
+	.pru_detach =		udp6_detach,
+	.pru_disconnect =	udp6_disconnect,
+	.pru_peeraddr =		in6_mapped_peeraddr,
+	.pru_send =		udp6_send,
+	.pru_shutdown =		udp_shutdown,
+	.pru_sockaddr =		in6_mapped_sockaddr,
+	.pru_sosetlabel =	in_pcbsosetlabel
 };