netsend-proto-and-obsd-includes-20021010

Put in a prototype for osi_NetSend(), and try to fix all versions
 of rx_knet.c.  Sorry if I broke yours.
Fix includes for OpenBSD.

diff --git a/src/rx/AIX/rx_knet.c b/src/rx/AIX/rx_knet.c
index 6bab2e84af1401803cc3680ee323ad969e912343..16a0648f0e58c03963ae07c7cab248f6639a67fb 100644 (file)
--- a/src/rx/AIX/rx_knet.c
+++ b/src/rx/AIX/rx_knet.c
@@ -289,13 +289,9 @@ void shutdown_rxkernel(void)
  * and just queue those.  XXX
  */
 
-osi_NetSend(asocket, addr, dvec, nvec, asize, istack)
-register struct socket *asocket;
-struct iovec *dvec;
-int nvec;
-register afs_int32 asize;
-struct sockaddr_in *addr;
-int istack;
+int
+osi_NetSend(osi_socket asocket, struct sockaddr_in *addr,
+           struct iovec *dvec, int nvec, afs_int32 asize, int istack)
 {
     register struct mbuf *tm, *um;
     register afs_int32 code;

diff --git a/src/rx/DARWIN/rx_knet.c b/src/rx/DARWIN/rx_knet.c
index 4f45512ce17f3053c42092c33f80fe5d1afeabfb..abc1a72623ae6d15891700ac247af862a018d9eb 100644 (file)
--- a/src/rx/DARWIN/rx_knet.c
+++ b/src/rx/DARWIN/rx_knet.c
@@ -103,13 +103,8 @@ void osi_StopListener(void)
 
 
 int 
-osi_NetSend(asocket, addr, dvec, nvecs, alength, istack)
-     register struct socket *asocket;
-     struct iovec *dvec;
-     int nvecs;
-     register afs_int32 alength;
-     struct sockaddr_in *addr;
-     int istack;
+osi_NetSend(osi_socket asocket, struct sockaddr_in *addr,
+           struct iovec *dvec, int nvecs, afs_int32 alength, int istack)
 {
     register afs_int32 code;
     int s;

diff --git a/src/rx/DUX/rx_knet.c b/src/rx/DUX/rx_knet.c
index ed10a3c55a7ba66c9c9a1c5c240fa8d9e319a9a7..30dd0ddf89f5d65ad33b12f063d6f9b433987f91 100644 (file)
--- a/src/rx/DUX/rx_knet.c
+++ b/src/rx/DUX/rx_knet.c
@@ -209,13 +209,8 @@ register struct sockbuf *sb; {
 }
 
 int 
-osi_NetSend(asocket, addr, dvec, nvec, asize, istack)
-     register struct socket *asocket;
-     struct iovec *dvec;
-     int nvec;
-     register afs_int32 asize;
-     struct sockaddr_in *addr;
-     int istack;
+osi_NetSend(osi_socket asocket, struct sockaddr_in *addr,
+           struct iovec *dvec, int nvec, afs_int32 asize, int istack)
 {
     register struct mbuf *tm, *um;
     register afs_int32 code;

diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c
index 357655c3117bf813f549bd60ffa64acaae8e9b1b..1e39a94a223d418877c5a60a28e8a68dc482090e 100644 (file)
--- a/src/rx/FBSD/rx_knet.c
+++ b/src/rx/FBSD/rx_knet.c
@@ -98,13 +98,8 @@ void osi_StopListener(void)
 }
 
 int 
-osi_NetSend(asocket, addr, dvec, nvecs, alength, istack)
-     register struct socket *asocket;
-     struct iovec *dvec;
-     int nvecs;
-     register afs_int32 alength;
-     struct sockaddr_in *addr;
-     int istack;
+osi_NetSend(osi_socket asocket, struct sockaddr_in *addr,
+           struct iovec *dvec, int nvecs, afs_int32 alength, int istack)
 {
     register afs_int32 code;
     int s;
@@ -351,13 +346,8 @@ register struct sockbuf *sb; {
 /* We only have to do all the mbuf management ourselves if we can be called at
    interrupt time. in RXK_LISTENER_ENV, we can just call sosend() */
 int 
-osi_NetSend(asocket, addr, dvec, nvec, asize, istack)
-     register struct socket *asocket;
-     struct iovec *dvec;
-     int nvec;
-     register afs_int32 asize;
-     struct sockaddr_in *addr;
-     int istack;
+osi_NetSend(osi_socket asocket, struct sockaddr_in *addr,
+           struct iovec *dvec, int nvec, afs_int32 asize, int istack)
 {
     register struct mbuf *tm, *um;
     register afs_int32 code;

diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c
index de29795df39ebac52c00b4479140e7af75e21d3d..331e874fb69006c7496a28a3ffcdec027ab8c5a4 100644 (file)
--- a/src/rx/LINUX/rx_knet.c
+++ b/src/rx/LINUX/rx_knet.c
@@ -71,8 +71,8 @@ int rxk_FreeSocket(register struct socket *asocket)
  * 0 = success
  * non-zero = failure
  */
-int osi_NetSend(struct socket *sop, struct sockaddr_in *to,
-               struct iovec *iov, int iovcnt, int size, int istack)
+int osi_NetSend(osi_socket sop, struct sockaddr_in *to,
+               struct iovec *iov, int iovcnt, afs_int32 size, int istack)
 {
     KERNEL_SPACE_DECL;
     struct msghdr msg;

diff --git a/src/rx/NBSD/rx_knet.c b/src/rx/NBSD/rx_knet.c
index 543b84b7b1360c686216a8cca5711e207a13e059..12da423ddab18992efd92d45875e79c2e9376665 100644 (file)
--- a/src/rx/NBSD/rx_knet.c
+++ b/src/rx/NBSD/rx_knet.c
@@ -102,14 +102,9 @@ void osi_StopListener(void)
  */
 
 
-int 
-osi_NetSend(asocket, addr, dvec, nvecs, alength, istack)
-     register struct socket *asocket;
-     struct iovec *dvec;
-     int nvecs;
-     register afs_int32 alength;
-     struct sockaddr_in *addr;
-     int istack;
+int
+osi_NetSend(osi_socket asocket, struct sockaddr_in *addr,
+           struct iovec *dvec, int nvecs, afs_int32 alength, int istack)
 {
     register afs_int32 code;
     int s;

diff --git a/src/rx/SOLARIS/rx_knet.c b/src/rx/SOLARIS/rx_knet.c
index 47795942fbec2a53912649971bb370caf5480c19..3625eea54cd729fcf7798e9f6050d6d4b4c1dfa9 100644 (file)
--- a/src/rx/SOLARIS/rx_knet.c
+++ b/src/rx/SOLARIS/rx_knet.c
@@ -312,8 +312,8 @@ int osi_FreeSocket(register struct osi_socket *asocket)
     return 0;
 }
 
-int osi_NetSend(struct osi_socket *asocket, struct sockaddr_in *addr, 
-       struct iovec dvec[], int nvecs, afs_int32 asize, int istack) 
+int osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, 
+       struct iovec *dvec, int nvecs, afs_int32 asize, int istack) 
 {
     struct sonode *so = (struct sonode *)asocket;
     struct nmsghdr msg;
@@ -536,8 +536,8 @@ int osi_FreeSocket(register struct osi_socket *asocket)
 }
 
 
-int osi_NetSend(register struct osi_socket *asocket, struct sockaddr_in *addr, 
-       struct iovec dvec[], int nvecs, register afs_int32 asize, int istack) 
+int osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, 
+               struct iovec *dvec, int nvecs, afs_int32 asize, int istack) 
 {
     int i;
     int code;

diff --git a/src/rx/UKERNEL/rx_knet.c b/src/rx/UKERNEL/rx_knet.c
index c9f30d14cc3450ee0c015fc1c51d512ba5ddfd6c..2b405677ed3cee188e0ee573e4986b1debe64063 100644 (file)
--- a/src/rx/UKERNEL/rx_knet.c
+++ b/src/rx/UKERNEL/rx_knet.c
@@ -265,7 +265,7 @@ void osi_StopListener(void)
     rxk_FreeSocket((struct usr_socket *)rx_socket);
 }
 
-int osi_NetSend(struct osi_socket *sockp, struct sockaddr_in *addr, 
+int osi_NetSend(osi_socket sockp, struct sockaddr_in *addr, 
        struct iovec *iov, int nio, afs_int32 size, int stack) 
 {
     int rc;

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index f6ef47f96dd279920e18f0fb7f91b21ce89ce2d0..bcf87317a6dfecc5fe6a94e4b05d4fc1d800c288 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -33,34 +33,41 @@ typedef unsigned short                  etap_event_t;
 #include "../h/disp.h"
 #endif
 #include "../h/socket.h"
-#ifndef AFS_LINUX22_ENV
+#if !defined(AFS_LINUX22_ENV) && !defined(AFS_OBSD_ENV)
 #include "../h/socketvar.h"
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV)
 #include "../h/domain.h"
 #include "../h/dir.h"
 #include "../h/buf.h"
 #include "../h/mbuf.h"
-#else
-#if defined(AFS_XBSD_ENV)
+#else /* !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) */
+#if defined(AFS_FBSD_ENV)
 #include "../h/dirent.h"
 #include "../h/socket.h"
 #include "../h/domain.h"
 #include "../h/buf.h"
 #include "../h/mbuf.h"
-#endif /* AFS_XBSD_ENV */
-#endif
-#endif /* AFS_LINUX22_ENV */
+#endif /* AFS_FBSD_ENV */
+#endif /* !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) */
+#endif /* !defined(AFS_LINUX22_ENV) && !defined(AFS_OBSD_ENV) */
 #ifdef AFS_SGI62_ENV
 #include "../h/hashing.h"
 #endif
 #ifdef AFS_FBSD_ENV
 #include "../h/sysctl.h"
 #endif
+#ifdef AFS_OBSD_ENV
+#include "../h/socket.h"
+#include "../h/domain.h"
+#include "../h/buf.h"
+#include "../net/if.h"
+#include "../h/signalvar.h"
+#endif /* AFS_OBSD_ENV */
 #include "../netinet/in.h"
 #include "../net/route.h"
 #include "../netinet/in_systm.h"
 #include "../netinet/ip.h"
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV) && !defined(AFS_OBSD_ENV)
 #include "../netinet/in_pcb.h"
 #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
 #ifndef AFS_LINUX22_ENV
@@ -82,9 +89,11 @@ struct coda_inode_info {};
 #include "../h/sched.h"
 #include "../h/netdevice.h"
 #else
+#if !defined(AFS_OBSD_ENV)
 #include "../h/proc.h"
 #include "../h/file.h"
 #endif
+#endif
 #include "../net/if.h"
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
 #include "../netinet/in_var.h"
@@ -105,6 +114,9 @@ struct coda_inode_info {};
 #include "../afs/sysincludes.h"
 #include "../afs/afsincludes.h"
 #endif
+#if defined(AFS_OBSD_ENV)
+#include "../netinet/in_pcb.h"
+#endif
 
 #define        MAXRXPORTS  20
 typedef unsigned short rxk_ports_t[MAXRXPORTS];

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index 294316ec7ef58da75071e4e9975b92114954c37c..195b09e3818cdddcd3066c1f9eb2f3553e6cf84a 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -916,7 +916,7 @@ struct rx_packet *rxi_SplitJumboPacket(register struct rx_packet *p, afs_int32 h
 
 #ifndef KERNEL
 /* Send a udp datagram */
-int osi_NetSend(osi_socket socket, char *addr, struct iovec *dvec, int nvecs, 
+int osi_NetSend(osi_socket socket, void *addr, struct iovec *dvec, int nvecs, 
        int length, int istack)
 {
     struct msghdr msg;
@@ -932,7 +932,7 @@ int osi_NetSend(osi_socket socket, char *addr, struct iovec *dvec, int nvecs,
     return 0;
 }
 #elif !defined(UKERNEL)
-/* osi_NetSend is defined in afs/afs_osinet.c
+/*
  * message receipt is done in rxk_input or rx_put.
  */
 

diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h
index 12152e93715754ad14aaf613d09edd18352e45f9..f072ef2884917ce94608dd92e1587a88eb463dd7 100644 (file)
--- a/src/rx/rx_prototypes.h
+++ b/src/rx/rx_prototypes.h
@@ -288,12 +288,9 @@ extern void afs_cv_timedwait(afs_kcondvar_t *cv, afs_kmutex_t *l, int waittime);
 /* rx_knet.c */
 extern struct osi_socket *rxk_NewSocket(short aport);
 extern int rxk_FreeSocket(register osi_socket asocket);
-#if 0
-/* definitions are all different at the moment */
-#ifdef KERNEL
-extern int osi_NetSend(struct socket *sop, struct sockaddr_in *to,
-                struct iovec *iov, int iovcnt, int size, int istack);
-#endif
+#if defined(KERNEL) && !defined(AFS_SGI_ENV)
+extern int osi_NetSend(osi_socket asocket, struct sockaddr_in *addr,
+                      struct iovec *dvec, int nvecs, afs_int32 asize, int istack);
 #endif
 extern int osi_NetReceive(osi_socket so, struct sockaddr_in *addr,
                    struct iovec *dvec, int nvecs, int *lengthp);
@@ -377,7 +374,7 @@ extern int rxi_ReadPacket(int socket, register struct rx_packet *p, afs_uint32 *
 extern struct rx_packet *rxi_SplitJumboPacket(register struct rx_packet *p, afs_int32 host, 
         short port, int first);
 #ifndef KERNEL
-extern int osi_NetSend(osi_socket socket, char *addr, struct iovec *dvec, int nvecs, 
+extern int osi_NetSend(osi_socket socket, void *addr, struct iovec *dvec, int nvecs, 
         int length, int istack);
 #endif
 extern struct rx_packet *rxi_ReceiveDebugPacket(register struct rx_packet *ap,