Convert all pr_usrreqs structure initializations to the .name = data format.
authorMatthew Dillon <dillon@dragonflybsd.org>
Sat, 21 Apr 2007 02:26:48 +0000 (02:26 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Sat, 21 Apr 2007 02:26:48 +0000 (02:26 +0000)
21 files changed:
sys/kern/uipc_usrreq.c
sys/net/raw_usrreq.c
sys/net/rtsock.c
sys/netgraph/socket/ng_socket.c
sys/netinet/ip_divert.c
sys/netinet/raw_ip.c
sys/netinet/sctp_usrreq.c
sys/netinet/tcp_usrreq.c
sys/netinet/udp_usrreq.c
sys/netinet6/raw_ip6.c
sys/netinet6/sctp6_usrreq.c
sys/netinet6/udp6_usrreq.c
sys/netproto/atalk/ddp_usrreq.c
sys/netproto/atm/atm_aal5.c
sys/netproto/atm/atm_usrreq.c
sys/netproto/ipsec/keysock.c
sys/netproto/ipx/ipx_usrreq.c
sys/netproto/ipx/spx_usrreq.c
sys/netproto/natm/natm.c
sys/netproto/ns/idp_usrreq.c
sys/netproto/ns/spp_usrreq.c

index 0f84d37..5ea586d 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.54.2.10 2003/03/04 17:28:09 nectar Exp $
- * $DragonFly: src/sys/kern/uipc_usrreq.c,v 1.32 2006/12/23 23:47:54 swildner Exp $
+ * $DragonFly: src/sys/kern/uipc_usrreq.c,v 1.33 2007/04/21 02:26:46 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -438,11 +438,26 @@ uipc_sockaddr(struct socket *so, struct sockaddr **nam)
 }
 
 struct pr_usrreqs uipc_usrreqs = {
-       uipc_abort, uipc_accept, uipc_attach, uipc_bind, uipc_connect,
-       uipc_connect2, pru_control_notsupp, uipc_detach, uipc_disconnect,
-       uipc_listen, uipc_peeraddr, uipc_rcvd, pru_rcvoob_notsupp,
-       uipc_send, uipc_sense, uipc_shutdown, uipc_sockaddr,
-       sosend, soreceive, sopoll
+       .pru_abort = uipc_abort,
+       .pru_accept = uipc_accept,
+       .pru_attach = uipc_attach,
+       .pru_bind = uipc_bind,
+       .pru_connect = uipc_connect,
+       .pru_connect2 = uipc_connect2,
+       .pru_control = pru_control_notsupp,
+       .pru_detach = uipc_detach,
+       .pru_disconnect = uipc_disconnect,
+       .pru_listen = uipc_listen,
+       .pru_peeraddr = uipc_peeraddr,
+       .pru_rcvd = uipc_rcvd,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = uipc_send,
+       .pru_sense = uipc_sense,
+       .pru_shutdown = uipc_shutdown,
+       .pru_sockaddr = uipc_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 int
index baf81c7..a4a288b 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)raw_usrreq.c        8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.18 1999/08/28 00:48:28 peter Exp $
- * $DragonFly: src/sys/net/raw_usrreq.c,v 1.11 2006/01/14 11:05:17 swildner Exp $
+ * $DragonFly: src/sys/net/raw_usrreq.c,v 1.12 2007/04/21 02:26:47 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -285,9 +285,25 @@ raw_usockaddr(struct socket *so, struct sockaddr **nam)
 }
 
 struct pr_usrreqs raw_usrreqs = {
-       raw_uabort, pru_accept_notsupp, raw_uattach, raw_ubind, raw_uconnect,
-       pru_connect2_notsupp, pru_control_notsupp, raw_udetach, 
-       raw_udisconnect, pru_listen_notsupp, raw_upeeraddr, pru_rcvd_notsupp,
-       pru_rcvoob_notsupp, raw_usend, pru_sense_null, raw_ushutdown,
-       raw_usockaddr, sosend, soreceive, sopoll
+       .pru_abort = raw_uabort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = raw_uattach,
+       .pru_bind = raw_ubind,
+       .pru_connect = raw_uconnect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = pru_control_notsupp,
+       .pru_detach = raw_udetach, 
+       .pru_disconnect = raw_udisconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = raw_upeeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = raw_usend,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = raw_ushutdown,
+       .pru_sockaddr = raw_usockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
+
index ba42ebf..c672971 100644 (file)
@@ -64,7 +64,7 @@
  *
  *     @(#)rtsock.c    8.7 (Berkeley) 10/12/95
  * $FreeBSD: src/sys/net/rtsock.c,v 1.44.2.11 2002/12/04 14:05:41 ru Exp $
- * $DragonFly: src/sys/net/rtsock.c,v 1.37 2007/03/04 18:51:59 swildner Exp $
+ * $DragonFly: src/sys/net/rtsock.c,v 1.38 2007/04/21 02:26:47 dillon Exp $
  */
 
 #include "opt_sctp.h"
@@ -307,11 +307,26 @@ rts_sockaddr(struct socket *so, struct sockaddr **nam)
 }
 
 static struct pr_usrreqs route_usrreqs = {
-       rts_abort, pru_accept_notsupp, rts_attach, rts_bind, rts_connect,
-       pru_connect2_notsupp, pru_control_notsupp, rts_detach, rts_disconnect,
-       pru_listen_notsupp, rts_peeraddr, pru_rcvd_notsupp, pru_rcvoob_notsupp,
-       rts_send, pru_sense_null, rts_shutdown, rts_sockaddr,
-       sosend, soreceive, sopoll
+       .pru_abort = rts_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = rts_attach,
+       .pru_bind = rts_bind,
+       .pru_connect = rts_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = pru_control_notsupp,
+       .pru_detach = rts_detach,
+       .pru_disconnect = rts_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = rts_peeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = rts_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = rts_shutdown,
+       .pru_sockaddr = rts_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 static __inline sa_family_t
index 28343aa..55373ed 100644 (file)
@@ -37,7 +37,7 @@
  * Author: Julian Elischer <julian@freebsd.org>
  *
  * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.11.2.6 2002/07/02 22:17:18 archie Exp $
- * $DragonFly: src/sys/netgraph/socket/ng_socket.c,v 1.11 2005/06/22 01:33:30 dillon Exp $
+ * $DragonFly: src/sys/netgraph/socket/ng_socket.c,v 1.12 2007/04/21 02:26:47 dillon Exp $
  * $Whistle: ng_socket.c,v 1.28 1999/11/01 09:24:52 julian Exp $
  */
 
@@ -890,49 +890,49 @@ ngs_rmnode(node_p node)
  */
 
 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,
-       NULL,                   /* 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_abort = NULL,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = ngc_attach,
+       .pru_bind = ngc_bind,
+       .pru_connect = ngc_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = pru_control_notsupp,
+       .pru_detach = ngc_detach,
+       .pru_disconnect = NULL,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = NULL,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = ngc_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = NULL,
+       .pru_sockaddr = ng_setsockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 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,
-       NULL,                   /* 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_abort = NULL,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = ngd_attach,
+       .pru_bind = NULL,
+       .pru_connect = ngd_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = pru_control_notsupp,
+       .pru_detach = ngd_detach,
+       .pru_disconnect = NULL,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = NULL,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = ngd_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = NULL,
+       .pru_sockaddr = ng_setsockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 /*
index 89228a7..1db6083 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.42.2.6 2003/01/23 21:06:45 sam Exp $
- * $DragonFly: src/sys/netinet/ip_divert.c,v 1.26 2006/12/20 18:14:43 dillon Exp $
+ * $DragonFly: src/sys/netinet/ip_divert.c,v 1.27 2007/04/21 02:26:48 dillon Exp $
  */
 
 #include "opt_inet.h"
@@ -453,9 +453,24 @@ SYSCTL_PROC(_net_inet_divert, OID_AUTO, pcblist, CTLFLAG_RD, &divcbinfo, 0,
            in_pcblist_global, "S,xinpcb", "List of active divert sockets");
 
 struct pr_usrreqs div_usrreqs = {
-       div_abort, pru_accept_notsupp, div_attach, div_bind,
-       pru_connect_notsupp, pru_connect2_notsupp, in_control, div_detach,
-       div_disconnect, pru_listen_notsupp, in_setpeeraddr, pru_rcvd_notsupp,
-       pru_rcvoob_notsupp, div_send, pru_sense_null, div_shutdown,
-       in_setsockaddr, sosend, soreceive, sopoll
+       .pru_abort = div_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = div_attach,
+       .pru_bind = div_bind,
+       .pru_connect = pru_connect_notsupp,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = in_control,
+       .pru_detach = div_detach,
+       .pru_disconnect = div_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = in_setpeeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = div_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = div_shutdown,
+       .pru_sockaddr = in_setsockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
index 0f2d9b1..30c0d8d 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)raw_ip.c    8.7 (Berkeley) 5/15/95
  * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.64.2.16 2003/08/24 08:24:38 hsu Exp $
- * $DragonFly: src/sys/netinet/raw_ip.c,v 1.24 2007/04/04 06:13:26 dillon Exp $
+ * $DragonFly: src/sys/netinet/raw_ip.c,v 1.25 2007/04/21 02:26:48 dillon Exp $
  */
 
 #include "opt_inet6.h"
@@ -639,9 +639,24 @@ SYSCTL_PROC(_net_inet_raw, OID_AUTO/*XXX*/, pcblist, CTLFLAG_RD, &ripcbinfo, 0,
            in_pcblist_global, "S,xinpcb", "List of active raw IP sockets");
 
 struct pr_usrreqs rip_usrreqs = {
-       rip_abort, pru_accept_notsupp, rip_attach, rip_bind, rip_connect,
-       pru_connect2_notsupp, in_control, rip_detach, rip_disconnect,
-       pru_listen_notsupp, in_setpeeraddr, pru_rcvd_notsupp,
-       pru_rcvoob_notsupp, rip_send, pru_sense_null, rip_shutdown,
-       in_setsockaddr, sosend, soreceive, sopoll
+       .pru_abort = rip_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = rip_attach,
+       .pru_bind = rip_bind,
+       .pru_connect = rip_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = in_control,
+       .pru_detach = rip_detach,
+       .pru_disconnect = rip_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = in_setpeeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = rip_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = rip_shutdown,
+       .pru_sockaddr = in_setsockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
index 0352a67..d7a3133 100644 (file)
@@ -1,5 +1,5 @@
 /*     $KAME: sctp_usrreq.c,v 1.47 2005/03/06 16:04:18 itojun Exp $    */
-/*     $DragonFly: src/sys/netinet/sctp_usrreq.c,v 1.10 2006/12/22 23:57:52 swildner Exp $     */
+/*     $DragonFly: src/sys/netinet/sctp_usrreq.c,v 1.11 2007/04/21 02:26:48 dillon Exp $       */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -4324,26 +4324,26 @@ sctp_peeraddr(struct socket *so, struct mbuf *nam)
 
 #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
 struct pr_usrreqs sctp_usrreqs = {
-       sctp_abort,
-       sctp_accept,
-       sctp_attach,
-       sctp_bind,
-       sctp_connect,
-       pru_connect2_notsupp,
-       in_control,
-       sctp_detach,
-       sctp_disconnect,
-       sctp_listen,
-       sctp_peeraddr,
-       sctp_usr_recvd,
-       pru_rcvoob_notsupp,
-       sctp_send,
-       pru_sense_null,
-       sctp_shutdown,
-       sctp_ingetaddr,
-       sctp_sosend,
-       soreceive,
-       sopoll
+       .pru_abort = sctp_abort,
+       .pru_accept = sctp_accept,
+       .pru_attach = sctp_attach,
+       .pru_bind = sctp_bind,
+       .pru_connect = sctp_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = in_control,
+       .pru_detach = sctp_detach,
+       .pru_disconnect = sctp_disconnect,
+       .pru_listen = sctp_listen,
+       .pru_peeraddr = sctp_peeraddr,
+       .pru_rcvd = sctp_usr_recvd,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = sctp_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = sctp_shutdown,
+       .pru_sockaddr = sctp_ingetaddr,
+       .pru_sosend = sctp_sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 #else
index e8f49fa..7f60e74 100644 (file)
@@ -65,7 +65,7 @@
  *
  *     From: @(#)tcp_usrreq.c  8.2 (Berkeley) 1/3/94
  * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.51.2.17 2002/10/11 11:46:44 ume Exp $
- * $DragonFly: src/sys/netinet/tcp_usrreq.c,v 1.40 2007/03/04 18:51:59 swildner Exp $
+ * $DragonFly: src/sys/netinet/tcp_usrreq.c,v 1.41 2007/04/21 02:26:48 dillon Exp $
  */
 
 #include "opt_ipsec.h"
@@ -807,20 +807,50 @@ tcp_usr_rcvoob(struct socket *so, struct mbuf *m, int flags)
 
 /* xxx - should be const */
 struct pr_usrreqs tcp_usrreqs = {
-       tcp_usr_abort, tcp_usr_accept, tcp_usr_attach, tcp_usr_bind,
-       tcp_usr_connect, pru_connect2_notsupp, in_control, tcp_usr_detach,
-       tcp_usr_disconnect, tcp_usr_listen, in_setpeeraddr, tcp_usr_rcvd,
-       tcp_usr_rcvoob, tcp_usr_send, pru_sense_null, tcp_usr_shutdown,
-       in_setsockaddr, sosend, soreceive, sopoll
+       .pru_abort = tcp_usr_abort,
+       .pru_accept = tcp_usr_accept,
+       .pru_attach = tcp_usr_attach,
+       .pru_bind = tcp_usr_bind,
+       .pru_connect = tcp_usr_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = in_control,
+       .pru_detach = tcp_usr_detach,
+       .pru_disconnect = tcp_usr_disconnect,
+       .pru_listen = tcp_usr_listen,
+       .pru_peeraddr = in_setpeeraddr,
+       .pru_rcvd = tcp_usr_rcvd,
+       .pru_rcvoob = tcp_usr_rcvoob,
+       .pru_send = tcp_usr_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = tcp_usr_shutdown,
+       .pru_sockaddr = in_setsockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 #ifdef INET6
 struct pr_usrreqs tcp6_usrreqs = {
-       tcp_usr_abort, tcp6_usr_accept, tcp_usr_attach, tcp6_usr_bind,
-       tcp6_usr_connect, pru_connect2_notsupp, in6_control, tcp_usr_detach,
-       tcp_usr_disconnect, tcp6_usr_listen, in6_mapped_peeraddr, tcp_usr_rcvd,
-       tcp_usr_rcvoob, tcp_usr_send, pru_sense_null, tcp_usr_shutdown,
-       in6_mapped_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = tcp_usr_abort,
+       .pru_accept = tcp6_usr_accept,
+       .pru_attach = tcp_usr_attach,
+       .pru_bind = tcp6_usr_bind,
+       .pru_connect = tcp6_usr_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = in6_control,
+       .pru_detach = tcp_usr_detach,
+       .pru_disconnect = tcp_usr_disconnect,
+       .pru_listen = tcp6_usr_listen,
+       .pru_peeraddr = in6_mapped_peeraddr,
+       .pru_rcvd = tcp_usr_rcvd,
+       .pru_rcvoob = tcp_usr_rcvoob,
+       .pru_send = tcp_usr_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = tcp_usr_shutdown,
+       .pru_sockaddr = in6_mapped_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 #endif /* INET6 */
 
index 128c035..3cd357a 100644 (file)
@@ -65,7 +65,7 @@
  *
  *     @(#)udp_usrreq.c        8.6 (Berkeley) 5/23/95
  * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.64.2.18 2003/01/24 05:11:34 sam Exp $
- * $DragonFly: src/sys/netinet/udp_usrreq.c,v 1.40 2007/04/04 06:13:26 dillon Exp $
+ * $DragonFly: src/sys/netinet/udp_usrreq.c,v 1.41 2007/04/21 02:26:48 dillon Exp $
  */
 
 #include "opt_ipsec.h"
@@ -964,10 +964,25 @@ udp_shutdown(struct socket *so)
 }
 
 struct pr_usrreqs udp_usrreqs = {
-       udp_abort, pru_accept_notsupp, udp_attach, udp_bind, udp_connect,
-       pru_connect2_notsupp, in_control, udp_detach, udp_disconnect,
-       pru_listen_notsupp, in_setpeeraddr, pru_rcvd_notsupp,
-       pru_rcvoob_notsupp, udp_send, pru_sense_null, udp_shutdown,
-       in_setsockaddr, sosendudp, soreceive, sopoll
+       .pru_abort = udp_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = udp_attach,
+       .pru_bind = udp_bind,
+       .pru_connect = udp_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = in_control,
+       .pru_detach = udp_detach,
+       .pru_disconnect = udp_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = in_setpeeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = udp_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = udp_shutdown,
+       .pru_sockaddr = in_setsockaddr,
+       .pru_sosend = sosendudp,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
index bd2c0b9..a965b25 100644 (file)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.7.2.7 2003/01/24 05:11:35 sam Exp $
- * $DragonFly: src/sys/netinet6/raw_ip6.c,v 1.23 2006/12/29 18:02:56 victor Exp $
+ * $DragonFly: src/sys/netinet6/raw_ip6.c,v 1.24 2007/04/21 02:26:48 dillon Exp $
  */
 
 /*
@@ -721,9 +721,24 @@ 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_abort = rip6_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = rip6_attach,
+       .pru_bind = rip6_bind,
+       .pru_connect = rip6_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = in6_control,
+       .pru_detach = rip6_detach,
+       .pru_disconnect = rip6_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = in6_setpeeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = rip6_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = rip6_shutdown,
+       .pru_sockaddr = in6_setsockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
index 3950bd1..f5dae59 100644 (file)
@@ -1,5 +1,5 @@
 /*     $KAME: sctp6_usrreq.c,v 1.35 2004/08/17 06:28:03 t-momose Exp $ */
-/*     $DragonFly: src/sys/netinet6/sctp6_usrreq.c,v 1.8 2006/12/22 23:57:53 swildner Exp $    */
+/*     $DragonFly: src/sys/netinet6/sctp6_usrreq.c,v 1.9 2007/04/21 02:26:48 dillon Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -1625,11 +1625,26 @@ sctp6_getpeeraddr(struct socket *so, struct mbuf *nam)
 
 #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
 struct pr_usrreqs sctp6_usrreqs = {
-       sctp6_abort, sctp_accept, sctp6_attach, sctp6_bind,
-       sctp6_connect, pru_connect2_notsupp, in6_control,
-       sctp6_detach, sctp6_disconnect, sctp_listen, sctp6_getpeeraddr,
-       sctp_usr_recvd, pru_rcvoob_notsupp, sctp6_send, pru_sense_null,
-       sctp_shutdown, sctp6_in6getaddr, sctp_sosend, soreceive, sopoll
+       .pru_abort = sctp6_abort,
+       .pru_accept = sctp_accept,
+       .pru_attach = sctp6_attach,
+       .pru_bind = sctp6_bind,
+       .pru_connect = sctp6_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = in6_control,
+       .pru_detach = sctp6_detach,
+       .pru_disconnect = sctp6_disconnect,
+       .pru_listen = sctp_listen,
+       .pru_peeraddr = sctp6_getpeeraddr,
+       .pru_rcvd = sctp_usr_recvd,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = sctp6_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = sctp_shutdown,
+       .pru_sockaddr = sctp6_in6getaddr,
+       .pru_sosend = sctp_sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 #else
index 795e7da..382fa2f 100644 (file)
@@ -1,5 +1,5 @@
 /*     $FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.6.2.13 2003/01/24 05:11:35 sam Exp $       */
-/*     $DragonFly: src/sys/netinet6/udp6_usrreq.c,v 1.24 2006/12/29 18:02:56 victor Exp $      */
+/*     $DragonFly: src/sys/netinet6/udp6_usrreq.c,v 1.25 2007/04/21 02:26:48 dillon Exp $      */
 /*     $KAME: udp6_usrreq.c,v 1.27 2001/05/21 05:45:10 jinmei Exp $    */
 
 /*
@@ -769,9 +769,25 @@ bad:
 }
 
 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
+       .pru_abort = udp6_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = udp6_attach,
+       .pru_bind = udp6_bind,
+       .pru_connect = udp6_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = in6_control,
+       .pru_detach = udp6_detach,
+       .pru_disconnect = udp6_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = in6_mapped_peeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = udp6_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = udp_shutdown,
+       .pru_sockaddr = in6_mapped_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
+
index 4b9dfc6..57e6ea4 100644 (file)
@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $DragonFly: src/sys/netproto/atalk/ddp_usrreq.c,v 1.10 2006/01/14 13:36:39 swildner Exp $
+ * $DragonFly: src/sys/netproto/atalk/ddp_usrreq.c,v 1.11 2007/04/21 02:26:48 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -559,24 +559,24 @@ ddp_clean(void)
 #endif
 
 struct pr_usrreqs ddp_usrreqs = {
-       ddp_abort,
-       pru_accept_notsupp,
-       ddp_attach,
-       ddp_bind,
-       ddp_connect,
-       pru_connect2_notsupp,
-       at_control,
-       ddp_detach,
-       ddp_disconnect,
-       pru_listen_notsupp,
-       at_setpeeraddr,
-       pru_rcvd_notsupp,
-       pru_rcvoob_notsupp,
-       ddp_send,
-       pru_sense_null,
-       ddp_shutdown,
-       at_setsockaddr,
-       sosend,
-       soreceive,
-       sopoll
+       .pru_abort = ddp_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = ddp_attach,
+       .pru_bind = ddp_bind,
+       .pru_connect = ddp_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = at_control,
+       .pru_detach = ddp_detach,
+       .pru_disconnect = ddp_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = at_setpeeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = ddp_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = ddp_shutdown,
+       .pru_sockaddr = at_setsockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
index 12695cd..35799f4 100644 (file)
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *     @(#) $FreeBSD: src/sys/netatm/atm_aal5.c,v 1.6 1999/10/09 23:24:59 green Exp $
- *     @(#) $DragonFly: src/sys/netproto/atm/atm_aal5.c,v 1.11 2006/12/05 23:31:57 dillon Exp $
+ *     @(#) $DragonFly: src/sys/netproto/atm/atm_aal5.c,v 1.12 2007/04/21 02:26:48 dillon Exp $
  */
 
 /*
@@ -77,26 +77,26 @@ static caddr_t      atm_aal5_getname (void *);
  * New-style socket request routines
  */
 struct pr_usrreqs      atm_aal5_usrreqs = {
-       atm_aal5_abort,                 /* pru_abort */
-       atm_aal5_accept,                /* pru_accept */
-       atm_aal5_attach,                /* pru_attach */
-       atm_aal5_bind,                  /* pru_bind */
-       atm_aal5_connect,               /* pru_connect */
-       pru_connect2_notsupp,           /* pru_connect2 */
-       atm_aal5_control,               /* pru_control */
-       atm_aal5_detach,                /* pru_detach */
-       atm_aal5_disconnect,            /* pru_disconnect */
-       atm_aal5_listen,                /* pru_listen */
-       atm_aal5_peeraddr,              /* pru_peeraddr */
-       pru_rcvd_notsupp,               /* pru_rcvd */
-       pru_rcvoob_notsupp,             /* pru_rcvoob */
-       atm_aal5_send,                  /* pru_send */
-       atm_aal5_sense,                 /* pru_sense */
-       atm_aal5_shutdown,              /* pru_shutdown */
-       atm_aal5_sockaddr,              /* pru_sockaddr */
-       sosend,                         /* pru_sosend */
-       soreceive,                      /* pru_soreceive */
-       sopoll                          /* pru_sopoll */
+       .pru_abort = atm_aal5_abort,
+       .pru_accept = atm_aal5_accept,
+       .pru_attach = atm_aal5_attach,
+       .pru_bind = atm_aal5_bind,
+       .pru_connect = atm_aal5_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = atm_aal5_control,
+       .pru_detach = atm_aal5_detach,
+       .pru_disconnect = atm_aal5_disconnect,
+       .pru_listen = atm_aal5_listen,
+       .pru_peeraddr = atm_aal5_peeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = atm_aal5_send,
+       .pru_sense = atm_aal5_sense,
+       .pru_shutdown = atm_aal5_shutdown,
+       .pru_sockaddr = atm_aal5_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 /*
index 2b48e2c..d8efe7c 100644 (file)
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *     @(#) $FreeBSD: src/sys/netatm/atm_usrreq.c,v 1.6 1999/08/28 00:48:39 peter Exp $
- *     @(#) $DragonFly: src/sys/netproto/atm/atm_usrreq.c,v 1.12 2006/01/14 13:36:39 swildner Exp $
+ *     @(#) $DragonFly: src/sys/netproto/atm/atm_usrreq.c,v 1.13 2007/04/21 02:26:48 dillon Exp $
  */
 
 /*
@@ -50,23 +50,26 @@ static int  atm_dgram_info (caddr_t);
  * New-style socket request routines
  */
 struct pr_usrreqs      atm_dgram_usrreqs = {
-       atm_proto_notsupp1,             /* pru_abort */
-       pru_accept_notsupp,             /* pru_accept */
-       atm_dgram_attach,               /* pru_attach */
-       atm_proto_notsupp2,             /* pru_bind */
-       pru_connect_notsupp,            /* pru_connect */
-       pru_connect2_notsupp,           /* pru_connect2 */
-       atm_dgram_control,              /* pru_control */
-       atm_proto_notsupp1,             /* pru_detach */
-       atm_proto_notsupp1,             /* pru_disconnect */
-       pru_listen_notsupp,             /* pru_listen */
-       atm_proto_notsupp3,             /* pru_peeraddr */
-       pru_rcvd_notsupp,               /* pru_rcvd */
-       pru_rcvoob_notsupp,             /* pru_rcvoob */
-       atm_proto_notsupp4,             /* pru_send */
-       pru_sense_null,                 /* pru_sense */
-       atm_proto_notsupp1,             /* pru_shutdown */
-       atm_proto_notsupp3,             /* pru_sockaddr */
+       .pru_abort = atm_proto_notsupp1,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = atm_dgram_attach,
+       .pru_bind = atm_proto_notsupp2,
+       .pru_connect = pru_connect_notsupp,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = atm_dgram_control,
+       .pru_detach = atm_proto_notsupp1,
+       .pru_disconnect = atm_proto_notsupp1,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = atm_proto_notsupp3,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = atm_proto_notsupp4,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = atm_proto_notsupp1,
+       .pru_sockaddr = atm_proto_notsupp3,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 /*
index acd7e73..f992f95 100644 (file)
@@ -1,5 +1,5 @@
 /*     $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $    */
-/*     $DragonFly: src/sys/netproto/ipsec/keysock.c,v 1.15 2006/12/22 23:57:54 swildner Exp $  */
+/*     $DragonFly: src/sys/netproto/ipsec/keysock.c,v 1.16 2007/04/21 02:26:48 dillon Exp $    */
 /*     $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $        */
 
 /*
@@ -533,13 +533,26 @@ key_sockaddr(struct socket *so, struct sockaddr **nam)
 }
 
 struct pr_usrreqs key_usrreqs = {
-       key_abort, pru_accept_notsupp, key_attach, key_bind,
-       key_connect,
-       pru_connect2_notsupp, pru_control_notsupp, key_detach,
-       key_disconnect, pru_listen_notsupp, key_peeraddr,
-       pru_rcvd_notsupp,
-       pru_rcvoob_notsupp, key_send, pru_sense_null, key_shutdown,
-       key_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = key_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = key_attach,
+       .pru_bind = key_bind,
+       .pru_connect = key_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = pru_control_notsupp,
+       .pru_detach = key_detach,
+       .pru_disconnect = key_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = key_peeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = key_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = key_shutdown,
+       .pru_sockaddr = key_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 /* sysctl */
index 1ad3fe8..c75ac08 100644 (file)
@@ -34,7 +34,7 @@
  *     @(#)ipx_usrreq.c
  *
  * $FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.26.2.1 2001/02/22 09:44:18 bp Exp $
- * $DragonFly: src/sys/netproto/ipx/ipx_usrreq.c,v 1.10 2006/01/14 13:36:40 swildner Exp $
+ * $DragonFly: src/sys/netproto/ipx/ipx_usrreq.c,v 1.11 2007/04/21 02:26:48 dillon Exp $
  */
 
 #include "opt_ipx.h"
@@ -90,19 +90,49 @@ static      int ripx_attach(struct socket *so, int proto,
 static int ipx_output(struct ipxpcb *ipxp, struct mbuf *m0);
 
 struct pr_usrreqs ipx_usrreqs = {
-       ipx_usr_abort, pru_accept_notsupp, ipx_attach, ipx_bind,
-       ipx_connect, pru_connect2_notsupp, ipx_control, ipx_detach,
-       ipx_disconnect, pru_listen_notsupp, ipx_peeraddr, pru_rcvd_notsupp,
-       pru_rcvoob_notsupp, ipx_send, pru_sense_null, ipx_shutdown,
-       ipx_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = ipx_usr_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = ipx_attach,
+       .pru_bind = ipx_bind,
+       .pru_connect = ipx_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = ipx_control,
+       .pru_detach = ipx_detach,
+       .pru_disconnect = ipx_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = ipx_peeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = ipx_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = ipx_shutdown,
+       .pru_sockaddr = ipx_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 struct pr_usrreqs ripx_usrreqs = {
-       ipx_usr_abort, pru_accept_notsupp, ripx_attach, ipx_bind,
-       ipx_connect, pru_connect2_notsupp, ipx_control, ipx_detach,
-       ipx_disconnect, pru_listen_notsupp, ipx_peeraddr, pru_rcvd_notsupp,
-       pru_rcvoob_notsupp, ipx_send, pru_sense_null, ipx_shutdown,
-       ipx_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = ipx_usr_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = ripx_attach,
+       .pru_bind = ipx_bind,
+       .pru_connect = ipx_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = ipx_control,
+       .pru_detach = ipx_detach,
+       .pru_disconnect = ipx_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = ipx_peeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = ipx_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = ipx_shutdown,
+       .pru_sockaddr = ipx_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 /*
index c306101..6a2e589 100644 (file)
@@ -34,7 +34,7 @@
  *     @(#)spx_usrreq.h
  *
  * $FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.27.2.1 2001/02/22 09:44:18 bp Exp $
- * $DragonFly: src/sys/netproto/ipx/spx_usrreq.c,v 1.18 2006/12/22 23:57:54 swildner Exp $
+ * $DragonFly: src/sys/netproto/ipx/spx_usrreq.c,v 1.19 2007/04/21 02:26:48 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -109,19 +109,49 @@ static    int spx_sp_attach(struct socket *so, int proto,
                          struct pru_attach_info *ai);
 
 struct pr_usrreqs spx_usrreqs = {
-       spx_usr_abort, spx_accept, spx_attach, spx_bind,
-       spx_connect, pru_connect2_notsupp, ipx_control, spx_detach,
-       spx_usr_disconnect, spx_listen, ipx_peeraddr, spx_rcvd,
-       spx_rcvoob, spx_send, pru_sense_null, spx_shutdown,
-       ipx_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = spx_usr_abort,
+       .pru_accept = spx_accept,
+       .pru_attach = spx_attach,
+       .pru_bind = spx_bind,
+       .pru_connect = spx_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = ipx_control,
+       .pru_detach = spx_detach,
+       .pru_disconnect = spx_usr_disconnect,
+       .pru_listen = spx_listen,
+       .pru_peeraddr = ipx_peeraddr,
+       .pru_rcvd = spx_rcvd,
+       .pru_rcvoob = spx_rcvoob,
+       .pru_send = spx_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = spx_shutdown,
+       .pru_sockaddr = ipx_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 struct pr_usrreqs spx_usrreq_sps = {
-       spx_usr_abort, spx_accept, spx_sp_attach, spx_bind,
-       spx_connect, pru_connect2_notsupp, ipx_control, spx_detach,
-       spx_usr_disconnect, spx_listen, ipx_peeraddr, spx_rcvd,
-       spx_rcvoob, spx_send, pru_sense_null, spx_shutdown,
-       ipx_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = spx_usr_abort,
+       .pru_accept = spx_accept,
+       .pru_attach = spx_sp_attach,
+       .pru_bind = spx_bind,
+       .pru_connect = spx_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = ipx_control,
+       .pru_detach = spx_detach,
+       .pru_disconnect = spx_usr_disconnect,
+       .pru_listen = spx_listen,
+       .pru_peeraddr = ipx_peeraddr,
+       .pru_rcvd = spx_rcvd,
+       .pru_rcvoob = spx_rcvoob,
+       .pru_send = spx_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = spx_shutdown,
+       .pru_sockaddr = ipx_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 static MALLOC_DEFINE(M_SPX_Q, "ipx_spx_q", "IPX Packet Management");
index 56a419a..6155ba5 100644 (file)
@@ -1,6 +1,6 @@
 /*     $NetBSD: natm.c,v 1.5 1996/11/09 03:26:26 chuck Exp $   */
 /* $FreeBSD: src/sys/netnatm/natm.c,v 1.12 2000/02/13 03:32:03 peter Exp $ */
-/* $DragonFly: src/sys/netproto/natm/natm.c,v 1.23 2006/12/22 23:57:54 swildner Exp $ */
+/* $DragonFly: src/sys/netproto/natm/natm.c,v 1.24 2007/04/21 02:26:48 dillon Exp $ */
 
 /*
  *
@@ -419,12 +419,26 @@ natm_usr_sockaddr(struct socket *so, struct sockaddr **nam)
 
 /* xxx - should be const */
 struct pr_usrreqs natm_usrreqs = {
-       natm_usr_abort, pru_accept_notsupp, natm_usr_attach, natm_usr_bind,
-       natm_usr_connect, pru_connect2_notsupp, natm_usr_control,
-       natm_usr_detach, natm_usr_disconnect, pru_listen_notsupp,
-       natm_usr_peeraddr, pru_rcvd_notsupp, pru_rcvoob_notsupp,
-       natm_usr_send, pru_sense_null, natm_usr_shutdown,
-       natm_usr_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = natm_usr_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = natm_usr_attach,
+       .pru_bind = natm_usr_bind,
+       .pru_connect = natm_usr_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = natm_usr_control,
+       .pru_detach = natm_usr_detach,
+       .pru_disconnect = natm_usr_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = natm_usr_peeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = natm_usr_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = natm_usr_shutdown,
+       .pru_sockaddr = natm_usr_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 #else  /* !FREEBSD_USRREQS */
index c9180f7..5057d2b 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)idp_usrreq.c        8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netns/idp_usrreq.c,v 1.9 1999/08/28 00:49:47 peter Exp $
- * $DragonFly: src/sys/netproto/ns/idp_usrreq.c,v 1.12 2006/01/14 13:36:40 swildner Exp $
+ * $DragonFly: src/sys/netproto/ns/idp_usrreq.c,v 1.13 2007/04/21 02:26:48 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -586,18 +586,48 @@ idp_shutdown(struct socket *so)
 }
 
 struct pr_usrreqs idp_usrreqs = {
-       idp_usr_abort, pru_accept_notsupp, idp_attach, idp_bind,
-       idp_connect, pru_connect2_notsupp, ns_control, idp_detach,
-       idp_usr_disconnect, pru_listen_notsupp, idp_peeraddr, pru_rcvd_notsupp,
-       pru_rcvoob_notsupp, idp_send, pru_sense_null, idp_shutdown,
-       idp_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = idp_usr_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = idp_attach,
+       .pru_bind = idp_bind,
+       .pru_connect = idp_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = ns_control,
+       .pru_detach = idp_detach,
+       .pru_disconnect = idp_usr_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = idp_peeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = idp_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = idp_shutdown,
+       .pru_sockaddr = idp_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 struct pr_usrreqs idp_raw_usrreqs = {
-       idp_usr_abort, pru_accept_notsupp, idp_raw_attach, idp_bind,
-       idp_connect, pru_connect2_notsupp, ns_control, idp_detach,
-       idp_usr_disconnect, pru_listen_notsupp, idp_peeraddr, pru_rcvd_notsupp,
-       pru_rcvoob_notsupp, idp_send, pru_sense_null, idp_shutdown,
-       idp_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = idp_usr_abort,
+       .pru_accept = pru_accept_notsupp,
+       .pru_attach = idp_raw_attach,
+       .pru_bind = idp_bind,
+       .pru_connect = idp_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = ns_control,
+       .pru_detach = idp_detach,
+       .pru_disconnect = idp_usr_disconnect,
+       .pru_listen = pru_listen_notsupp,
+       .pru_peeraddr = idp_peeraddr,
+       .pru_rcvd = pru_rcvd_notsupp,
+       .pru_rcvoob = pru_rcvoob_notsupp,
+       .pru_send = idp_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = idp_shutdown,
+       .pru_sockaddr = idp_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
index 4de828e..c1982c6 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)spp_usrreq.c        8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netns/spp_usrreq.c,v 1.11 1999/08/28 00:49:53 peter Exp $
- * $DragonFly: src/sys/netproto/ns/spp_usrreq.c,v 1.20 2006/12/22 23:57:54 swildner Exp $
+ * $DragonFly: src/sys/netproto/ns/spp_usrreq.c,v 1.21 2007/04/21 02:26:48 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -1623,19 +1623,49 @@ spp_sockaddr(struct socket *so, struct sockaddr **nam)
 }
 
 struct pr_usrreqs spp_usrreqs = {
-       spp_usr_abort, spp_accept, spp_attach, spp_bind,
-       spp_connect, pru_connect2_notsupp, ns_control, spp_detach,
-       spp_usr_disconnect, spp_listen, spp_peeraddr, spp_rcvd,
-       spp_rcvoob, spp_send, pru_sense_null, spp_shutdown,
-       spp_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = spp_usr_abort,
+       .pru_accept = spp_accept,
+       .pru_attach = spp_attach,
+       .pru_bind = spp_bind,
+       .pru_connect = spp_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = ns_control,
+       .pru_detach = spp_detach,
+       .pru_disconnect = spp_usr_disconnect,
+       .pru_listen = spp_listen,
+       .pru_peeraddr = spp_peeraddr,
+       .pru_rcvd = spp_rcvd,
+       .pru_rcvoob = spp_rcvoob,
+       .pru_send = spp_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = spp_shutdown,
+       .pru_sockaddr = spp_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 struct pr_usrreqs spp_usrreqs_sp = {
-       spp_usr_abort, spp_accept, spp_attach_sp, spp_bind,
-       spp_connect, pru_connect2_notsupp, ns_control, spp_detach,
-       spp_usr_disconnect, spp_listen, spp_peeraddr, spp_rcvd,
-       spp_rcvoob, spp_send, pru_sense_null, spp_shutdown,
-       spp_sockaddr, sosend, soreceive, sopoll
+       .pru_abort = spp_usr_abort,
+       .pru_accept = spp_accept,
+       .pru_attach = spp_attach_sp,
+       .pru_bind = spp_bind,
+       .pru_connect = spp_connect,
+       .pru_connect2 = pru_connect2_notsupp,
+       .pru_control = ns_control,
+       .pru_detach = spp_detach,
+       .pru_disconnect = spp_usr_disconnect,
+       .pru_listen = spp_listen,
+       .pru_peeraddr = spp_peeraddr,
+       .pru_rcvd = spp_rcvd,
+       .pru_rcvoob = spp_rcvoob,
+       .pru_send = spp_send,
+       .pru_sense = pru_sense_null,
+       .pru_shutdown = spp_shutdown,
+       .pru_sockaddr = spp_sockaddr,
+       .pru_sosend = sosend,
+       .pru_soreceive = soreceive,
+       .pru_sopoll = sopoll
 };
 
 /*