From ff21da6b4854afa7a1daa6c89e4e6005a7ba51b3 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 6 Mar 2001 00:33:50 +0000
Subject: [PATCH] fixed R3.13 for Linux's new socklen_t

---
 src/ca/iocinf.c                     | 11 +++++++----
 src/ca/repeater.c                   |  2 +-
 src/cas/io/bsdSocket/casDGIntfIO.cc |  2 +-
 src/rsrv/cast_server.c              |  4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/ca/iocinf.c b/src/ca/iocinf.c
index e236a7ed9..610338445 100644
--- a/src/ca/iocinf.c
+++ b/src/ca/iocinf.c
@@ -48,6 +48,9 @@
 /*			kernels that support multicast			*/
 /*
  * $Log$
+ * Revision 1.84.4.1  1999/07/15 20:50:23  jhill
+ * fixed infinite loop when ENOBUFS returned by sendto()
+ *
  * Revision 1.85  1999/07/15 20:15:30  jhill
  * fixed infinite loop when ENOBUFS returned by sendto()
  *
@@ -1247,10 +1250,10 @@ LOCAL void ca_process_tcp(struct ioc_in_use *piiu)
  */
 LOCAL void udp_recv_msg(struct ioc_in_use *piiu)
 {
-  	int			status;
-  	int			reply_size;
-	struct udpmsglog	*pmsglog;
-	unsigned long		bytesAvailable;
+  	int status;
+  	osiSocklen_t reply_size;
+	struct udpmsglog *pmsglog;
+	unsigned long bytesAvailable;
 	
 	if(piiu->state!=iiu_connected){
 		return;
diff --git a/src/ca/repeater.c b/src/ca/repeater.c
index e942c2f89..dbf44e9a2 100644
--- a/src/ca/repeater.c
+++ b/src/ca/repeater.c
@@ -101,7 +101,7 @@ void epicsShareAPI ca_repeater()
   	SOCKET sock;
 	struct sockaddr_in from;
   	struct sockaddr_in local;
-  	int from_size = sizeof from;
+  	osiSocklen_t from_size = sizeof from;
 	unsigned short port;
 	makeSocketReturn msr;
 
diff --git a/src/cas/io/bsdSocket/casDGIntfIO.cc b/src/cas/io/bsdSocket/casDGIntfIO.cc
index 08ca2fd02..3cff361c1 100644
--- a/src/cas/io/bsdSocket/casDGIntfIO.cc
+++ b/src/cas/io/bsdSocket/casDGIntfIO.cc
@@ -296,7 +296,7 @@ xRecvStatus casDGIntfIO::osdRecv(char *pBuf, bufSizeT size,
 	bufSizeT &actualSize, caNetAddr &fromOut)
 {
 	int status;
-	int addrSize;
+	osiSocklen_t addrSize;
 	struct sockaddr from;
 
 	if (this->sockState!=casOnLine) {
diff --git a/src/rsrv/cast_server.c b/src/rsrv/cast_server.c
index 13caa03aa..5d36116f9 100644
--- a/src/rsrv/cast_server.c
+++ b/src/rsrv/cast_server.c
@@ -100,7 +100,7 @@ int cast_server(void)
     FAST int                status;
     int                     count=0;
     struct sockaddr_in      new_recv_addr;
-    int                     recv_addr_size;
+    osiSocklen_t            recv_addr_size;
     unsigned short          port;
     int                     nchars;
 
@@ -227,7 +227,7 @@ int cast_server(void)
                 status = bcmp(
                     (char *)&prsrv_cast_client->addr, 
                     (char *)&new_recv_addr, 
-                    recv_addr_size);
+                    (int) recv_addr_size);
                 if(status){ 	
                     /* 
                      * if the address is different