From f8f6cbba927c69012c21cc4922b799a377f52f4f Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sun, 14 Sep 1997 03:10:42 +0000 Subject: [PATCH] Update network code to use poll support. --- sys/net/raw_usrreq.c | 4 ++-- sys/net/rtsock.c | 4 ++-- sys/netatalk/ddp_pcb.c | 2 +- sys/netatalk/ddp_usrreq.c | 2 +- sys/netinet/ip_divert.c | 4 ++-- sys/netinet/raw_ip.c | 4 ++-- sys/netinet/tcp_usrreq.c | 4 ++-- sys/netinet/udp_usrreq.c | 4 ++-- sys/netipx/ipx_usrreq.c | 6 +++--- sys/netipx/spx_usrreq.c | 6 +++--- sys/netnatm/natm.c | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c index 08d02d590f55..8d2d001ea820 100644 --- a/sys/net/raw_usrreq.c +++ b/sys/net/raw_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: raw_usrreq.c,v 1.13 1997/08/02 14:32:40 bde Exp $ + * $Id: raw_usrreq.c,v 1.14 1997/08/16 19:15:27 wollman Exp $ */ #include @@ -298,5 +298,5 @@ struct pr_usrreqs raw_usrreqs = { 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, soselect + raw_usockaddr, sosend, soreceive, sopoll }; diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index c9a3759245df..9801332b8d06 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.5 (Berkeley) 11/2/94 - * $Id: rtsock.c,v 1.32 1997/08/16 19:15:32 wollman Exp $ + * $Id: rtsock.c,v 1.33 1997/09/02 01:18:49 bde Exp $ */ @@ -265,7 +265,7 @@ static struct pr_usrreqs route_usrreqs = { 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, soselect + sosend, soreceive, sopoll }; /*ARGSUSED*/ diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c index 14ac37e1cc8a..5e53deba58a9 100644 --- a/sys/netatalk/ddp_pcb.c +++ b/sys/netatalk/ddp_pcb.c @@ -590,5 +590,5 @@ struct pr_usrreqs ddp_usrreqs = { at_setsockaddr, sosend, soreceive, - soselect + sopoll }; diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c index 14ac37e1cc8a..5e53deba58a9 100644 --- a/sys/netatalk/ddp_usrreq.c +++ b/sys/netatalk/ddp_usrreq.c @@ -590,5 +590,5 @@ struct pr_usrreqs ddp_usrreqs = { at_setsockaddr, sosend, soreceive, - soselect + sopoll }; diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 820889ec4ca6..d9ab18d06016 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ip_divert.c,v 1.13 1997/08/02 14:32:50 bde Exp $ + * $Id: ip_divert.c,v 1.14 1997/09/13 15:40:55 peter Exp $ */ #include @@ -358,5 +358,5 @@ struct pr_usrreqs div_usrreqs = { 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, soselect + in_setsockaddr, sosend, soreceive, sopoll }; diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 0afd76402244..1faba0d35f5e 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $Id: raw_ip.c,v 1.47 1997/08/02 14:32:54 bde Exp $ + * $Id: raw_ip.c,v 1.48 1997/08/16 19:15:37 wollman Exp $ */ #include @@ -510,5 +510,5 @@ struct pr_usrreqs rip_usrreqs = { 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, soselect + in_setsockaddr, sosend, soreceive, sopoll }; diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index ab2f3b680822..9412727a3923 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94 - * $Id: tcp_usrreq.c,v 1.32 1997/08/02 14:32:58 bde Exp $ + * $Id: tcp_usrreq.c,v 1.33 1997/08/16 19:15:40 wollman Exp $ */ #include @@ -456,7 +456,7 @@ struct pr_usrreqs tcp_usrreqs = { 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, soselect + in_setsockaddr, sosend, soreceive, sopoll }; /* diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 22b24501b2a3..b6666130ae51 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $Id: udp_usrreq.c,v 1.38 1997/04/27 20:01:16 wollman Exp $ + * $Id: udp_usrreq.c,v 1.39 1997/08/16 19:15:41 wollman Exp $ */ #include @@ -603,5 +603,5 @@ struct pr_usrreqs udp_usrreqs = { 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, sosend, soreceive, soselect + in_setsockaddr, sosend, soreceive, sopoll }; diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c index afc42106ae19..44eb0dbf3baf 100644 --- a/sys/netipx/ipx_usrreq.c +++ b/sys/netipx/ipx_usrreq.c @@ -33,7 +33,7 @@ * * @(#)ipx_usrreq.c * - * $Id: ipx_usrreq.c,v 1.15 1997/06/26 19:35:58 jhay Exp $ + * $Id: ipx_usrreq.c,v 1.16 1997/08/16 19:15:45 wollman Exp $ */ #include @@ -87,7 +87,7 @@ struct pr_usrreqs ipx_usrreqs = { 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, soselect + ipx_sockaddr, sosend, soreceive, sopoll }; struct pr_usrreqs ripx_usrreqs = { @@ -95,7 +95,7 @@ struct pr_usrreqs ripx_usrreqs = { 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, soselect + ipx_sockaddr, sosend, soreceive, sopoll }; /* diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c index b980d36be5f3..2d87df002121 100644 --- a/sys/netipx/spx_usrreq.c +++ b/sys/netipx/spx_usrreq.c @@ -33,7 +33,7 @@ * * @(#)spx_usrreq.h * - * $Id: spx_usrreq.c,v 1.15 1997/08/16 19:15:47 wollman Exp $ + * $Id: spx_usrreq.c,v 1.16 1997/09/02 01:19:15 bde Exp $ */ #include @@ -109,7 +109,7 @@ struct pr_usrreqs spx_usrreqs = { 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, soselect + ipx_sockaddr, sosend, soreceive, sopoll }; struct pr_usrreqs spx_usrreq_sps = { @@ -117,7 +117,7 @@ struct pr_usrreqs spx_usrreq_sps = { 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, soselect + ipx_sockaddr, sosend, soreceive, sopoll }; void diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c index 0866be1d8c86..14624020d8db 100644 --- a/sys/netnatm/natm.c +++ b/sys/netnatm/natm.c @@ -424,7 +424,7 @@ struct pr_usrreqs natm_usrreqs = { 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, soselect + natm_usr_sockaddr, sosend, soreceive, sopoll }; #else /* !FREEBSD_USRREQS */