From 0816ea014208f28f451d29fd34db27c5c400e1c2 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 15 Apr 2005 19:37:14 +0000 Subject: [PATCH] STABLE14-kill-struct-osisocket-20050415 FIXES 18079 more complete version of what's in the patch, kill all refs to struct osi_socket in favor of just osi_socket from psomogyi@gamax.hu (cherry picked from commit 2dc87bcf1e632444b163eea94172b77e7d376d5c) --- src/rx/IRIX/rx_knet.c | 2 +- src/rx/LINUX/rx_knet.c | 6 +++--- src/rx/SOLARIS/rx_knet.c | 26 +++++++++++++------------- src/rx/UKERNEL/rx_knet.c | 6 +++--- src/rx/rx_kcommon.c | 16 ++++++++-------- src/rx/rx_prototypes.h | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/rx/IRIX/rx_knet.c b/src/rx/IRIX/rx_knet.c index 64ce0d78e9..60098e56a6 100644 --- a/src/rx/IRIX/rx_knet.c +++ b/src/rx/IRIX/rx_knet.c @@ -416,7 +416,7 @@ rxi_GetIFInfo() #ifdef AFS_SGI65_ENV osi_NetSend(asocket, addr, dvec, nvec, asize, istack) - register struct osi_socket *asocket; + register osi_socket *asocket; struct iovec *dvec; int nvec; register afs_int32 asize; diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c index 5e9b46d77f..8103b4d1de 100644 --- a/src/rx/LINUX/rx_knet.c +++ b/src/rx/LINUX/rx_knet.c @@ -29,7 +29,7 @@ RCSID /* rxk_NewSocket * open and bind RX socket */ -struct osi_socket * +osi_socket * rxk_NewSocketHost(afs_uint32 ahost, short aport) { struct socket *sockp; @@ -70,10 +70,10 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) sockp->ops->setsockopt(sockp, SOL_IP, IP_MTU_DISCOVER, (char *)&pmtu, sizeof(pmtu)); TO_KERNEL_SPACE(); - return (struct osi_socket *)sockp; + return (osi_socket *)sockp; } -struct osi_socket * +osi_socket * rxk_NewSocket(short aport) { return rxk_NewSocketHost(htonl(INADDR_ANY), aport); diff --git a/src/rx/SOLARIS/rx_knet.c b/src/rx/SOLARIS/rx_knet.c index 7c247e7f50..85eaa5f7c9 100644 --- a/src/rx/SOLARIS/rx_knet.c +++ b/src/rx/SOLARIS/rx_knet.c @@ -221,7 +221,7 @@ rxi_FindIfMTU(afs_uint32 addr) struct sockaddr_in rx_sockaddr; /* Allocate a new socket at specified port in network byte order. */ -struct osi_socket * +osi_socket * rxk_NewSocketHost(afs_uint32 ahost, short aport) { vnode_t *accessvp; @@ -315,17 +315,17 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) return NULL; } - return (struct osi_socket *)so; + return (osi_socket *)so; } -struct osi_socket * +osi_socket * rxk_NewSocket(short aport) { return rxk_NewSocketHost(htonl(INADDR_ANY), aport); } int -osi_FreeSocket(register struct osi_socket *asocket) +osi_FreeSocket(register osi_socket *asocket) { extern int rxk_ListenerPid; struct sonode *so = (struct sonode *)asocket; @@ -509,7 +509,7 @@ rxi_GetIFInfo() dev_t afs_udp_rdev = (dev_t) 0; /* Allocate a new socket at specified port in network byte order. */ -struct osi_socket * +osi_socket * rxk_NewSocketHost(afs_uint32 ahost, short aport) { TIUSER *udp_tiptr; @@ -523,7 +523,7 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) afs_udp_rdev = makedevice(11 /*CLONE*/, ddi_name_to_major("udp")); code = t_kopen(NULL, afs_udp_rdev, FREAD | FWRITE, &udp_tiptr, CRED()); if (code) { - return (struct osi_socket *)0; + return (osi_socket *)0; } code = t_kalloc(udp_tiptr, T_BIND, T_ADDR, (char **)&reqp); @@ -534,7 +534,7 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) if (code) { t_kfree(udp_tiptr, (char *)reqp, T_BIND); t_kclose(udp_tiptr, 0); - return (struct osi_socket *)0; + return (osi_socket *)0; } reqp->addr.len = sizeof(struct sockaddr_in); @@ -548,13 +548,13 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) t_kfree(udp_tiptr, (char *)reqp, T_BIND); t_kfree(udp_tiptr, (char *)rspp, T_BIND); t_kclose(udp_tiptr, 0); - return (struct osi_socket *)0; + return (osi_socket *)0; } if (memcmp(reqp->addr.buf, rspp->addr.buf, rspp->addr.len)) { t_kfree(udp_tiptr, (char *)reqp, T_BIND); t_kfree(udp_tiptr, (char *)rspp, T_BIND); t_kclose(udp_tiptr, 0); - return (struct osi_socket *)0; + return (osi_socket *)0; } t_kfree(udp_tiptr, (char *)reqp, T_BIND); t_kfree(udp_tiptr, (char *)rspp, T_BIND); @@ -568,17 +568,17 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) q->q_next->q_hiwat = rx_UdpBufSize; RD(q)->q_hiwat = rx_UdpBufSize; - return (struct osi_socket *)udp_tiptr; + return (osi_socket *)udp_tiptr; } -struct osi_socket * +osi_socket * rxk_NewSocket(short aport) { return rxk_NewSocketHost(htonl(INADDR_ANY), aport); } int -osi_FreeSocket(register struct osi_socket *asocket) +osi_FreeSocket(register osi_socket *asocket) { extern int rxk_ListenerPid; TIUSER *udp_tiptr = (TIUSER *) asocket; @@ -681,7 +681,7 @@ osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, struct iovec *dvec, int -osi_NetReceive(struct osi_socket *asocket, struct sockaddr_in *addr, +osi_NetReceive(osi_socket *asocket, struct sockaddr_in *addr, struct iovec *dvec, int nvecs, int *alength) { int i; diff --git a/src/rx/UKERNEL/rx_knet.c b/src/rx/UKERNEL/rx_knet.c index f7af535e09..2727fd173b 100644 --- a/src/rx/UKERNEL/rx_knet.c +++ b/src/rx/UKERNEL/rx_knet.c @@ -169,7 +169,7 @@ rx_ServerProc(void) * routines. Allocate the socket buffer here, but don't open it until * we start the receiver threads. */ -struct osi_socket * +osi_socket * rxk_NewSocketHost(afs_uint32 ahost, short aport) { struct usr_socket *usockp; @@ -179,10 +179,10 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) usockp->sock = -1; - return (struct osi_socket *)usockp; + return (osi_socket *)usockp; } -struct osi_socket * +osi_socket * rxk_NewSocket(short aport) { return rxk_NewSocketHost(htonl(INADDR_ANY), aport); diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index 4687409226..34c7c03799 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -30,7 +30,7 @@ int (*rxk_PacketArrivalProc) (register struct rx_packet * ahandle, register stru int (*rxk_GetPacketProc) (char **ahandle, int asize); #endif -struct osi_socket *rxk_NewSocketHost(afs_uint32 ahost, short aport); +osi_socket *rxk_NewSocketHost(afs_uint32 ahost, short aport); extern struct interfaceAddr afs_cb_interface; rxk_ports_t rxk_ports; @@ -105,9 +105,9 @@ rxk_shutdownPorts(void) osi_socket rxi_GetHostUDPSocket(u_int host, u_short port) { - struct osi_socket *sockp; - sockp = (struct osi_socket *)rxk_NewSocketHost(host, port); - if (sockp == (struct osi_socket *)0) + osi_socket *sockp; + sockp = (osi_socket *)rxk_NewSocketHost(host, port); + if (sockp == (osi_socket *)0) return OSI_NULLSOCKET; rxk_AddPort(port, (char *)sockp); return (osi_socket) sockp; @@ -761,7 +761,7 @@ rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp) /* rxk_NewSocket creates a new socket on the specified port. The port is * in network byte order. */ -struct osi_socket * +osi_socket * rxk_NewSocketHost(afs_uint32 ahost, short aport) { register afs_int32 code; @@ -905,17 +905,17 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) #if defined(AFS_DARWIN_ENV) && defined(KERNEL_FUNNEL) thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL); #endif - return (struct osi_socket *)newSocket; + return (osi_socket *)newSocket; bad: AFS_GLOCK(); #if defined(AFS_DARWIN_ENV) && defined(KERNEL_FUNNEL) thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL); #endif - return (struct osi_socket *)0; + return (osi_socket *)0; } -struct osi_socket * +osi_socket * rxk_NewSocket(short aport) { return rxk_NewSocketHost(0, aport); diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h index dc2d359b38..766ef165c3 100644 --- a/src/rx/rx_prototypes.h +++ b/src/rx/rx_prototypes.h @@ -335,7 +335,7 @@ extern int rxi_GetIFInfo(void); extern int rxk_FreeSocket(register struct socket *asocket); #endif #ifndef AFS_NT40_ENV -extern struct osi_socket *rxk_NewSocket(short aport); +extern osi_socket *rxk_NewSocket(short aport); #endif #endif extern int rxk_ReadPacket(osi_socket so, struct rx_packet *p, int *host,