fixed R3.13 for Linux's new socklen_t

src/ca/conn.c

@@ -31,6 +31,9 @@
 /*									*/
 /*
  * $Log$
+ * Revision 1.43.4.2  1999/09/02 21:16:42  jhill
+ * fixed missing paramter to checkConnWatchDogs() func
+ *
  * Revision 1.43.4.1  1999/07/15 20:33:46  jhill
  * added congestion thresh to search sched alg
  *
@@ -619,9 +622,9 @@ void mark_server_available (const struct sockaddr_in *pnet_addr)
 	 * from replying at once.
 	 */
 	{
-  	  	struct sockaddr_in	saddr;
-		int			saddr_length = sizeof(saddr);
-		int			status;
+  	  	struct sockaddr_in  saddr;
+		osiSocklen_t        saddr_length = sizeof(saddr);
+		int                 status;
 
 		status = getsockname(
 				piiuCast->sock_chan,

src/cas/io/bsdSocket/casIntfIO.cc

@@ -6,6 +6,9 @@
 //
 //
 // $Log$
+// Revision 1.7  1998/06/18 00:11:09  jhill
+// use ipAddrToA
+//
 // Revision 1.6  1998/06/16 02:35:51  jhill
 // use aToIPAddr and auto attach to winsock if its a static build
 //
@@ -54,7 +57,7 @@ caStatus casIntfIO::init(const caNetAddr &addrIn, casDGClient &dgClientIn,
 	int yes = TRUE;
 	int status;
 	caStatus stat;
-	int addrSize;
+	osiSocklen_t addrSize;
 
 	if (!bsdSockAttach()) {
 		return S_cas_internal;

src/include/os/Linux/osiSock.h

@@ -48,6 +48,7 @@ typedef int                     SOCKET;
 #define socket_close(S)         close(S)
 #define socket_ioctl(A,B,C)     ioctl(A,B,C)
 typedef int osiSockIoctl_t;
+typedef socklen_t osiSocklen_t;
 
 #define FD_IN_FDSET(FD) ((FD)<FD_SETSIZE)
 

src/include/os/WIN32/osiSock.h

@@ -18,6 +18,7 @@ extern "C" {
 #define socket_close(S)		closesocket(S)
 #define socket_ioctl(A,B,C)	ioctlsocket(A,B,C)
 typedef u_long FAR osiSockIoctl_t;
+typedef int osiSocklen_t;
 
 #define MAXHOSTNAMELEN		75
 #define IPPORT_USERRESERVED	5000U

src/include/os/alpha/osiSock.h

@@ -44,6 +44,7 @@ typedef int                     SOCKET;
 #define socket_close(S)         close(S)
 #define socket_ioctl(A,B,C)     ioctl(A,B,C)
 typedef int osiSockIoctl_t;
+typedef int osiSocklen_t;
 
 #define FD_IN_FDSET(FD) ((FD)<FD_SETSIZE&&(FD)>=0)
 

src/include/os/cygwin32/osiSock.h

@@ -40,6 +40,7 @@ typedef int                     SOCKET;
 #define socket_close(S)         close(S)
 #define socket_ioctl(A,B,C)     ioctl(A,B,C)
 typedef int osiSockIoctl_t;
+typedef int osiSocklen_t;
 
 #define FD_IN_FDSET(FD) ((FD)<FD_SETSIZE&&(FD)>=0)
 

src/include/os/hp700/osiSock.h

@@ -46,6 +46,7 @@ typedef int                     SOCKET;
 #define socket_close(S)         close(S)
 #define socket_ioctl(A,B,C)     ioctl(A,B,C)
 typedef int osiSockIoctl_t;
+typedef int osiSocklen_t;
 
 #define FD_IN_FDSET(FD) ((FD)<FD_SETSIZE&&(FD)>=0)
 

src/include/os/sgi/osiSock.h

@@ -43,6 +43,7 @@ typedef int                     SOCKET;
 #define socket_close(S)         close(S)
 #define socket_ioctl(A,B,C)     ioctl(A,B,C)
 typedef int osiSockIoctl_t;
+typedef int osiSocklen_t;
 
 #define FD_IN_FDSET(FD) ((FD)<FD_SETSIZE&&(FD)>=0)
 

src/include/os/solaris/osiSock.h

@@ -54,6 +54,7 @@ typedef int                     SOCKET;
 #define socket_close(S)         close(S)
 #define socket_ioctl(A,B,C)     ioctl(A,B,C)
 typedef int osiSockIoctl_t;
+typedef int osiSocklen_t;
 
 #define FD_IN_FDSET(FD) ((FD)<FD_SETSIZE&&(FD)>=0)
 

src/include/os/sun4/osiSock.h

@@ -106,6 +106,7 @@ typedef int                     SOCKET;
 #define socket_close(S)         close(S)
 #define socket_ioctl(A,B,C)     ioctl(A,B,C)
 typedef int osiSockIoctl_t;
+typedef int osiSocklen_t;
 
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN 64

src/include/os/vms/osiSock.h

@@ -114,6 +114,7 @@ typedef int                     SOCKET;
 #	define socket_ioctl(A,B,C) ioctl(A,B,C)
 #endif
 typedef int osiSockIoctl_t;
+typedef int osiSocklen_t;
 
 #if defined(WINTCP) /* Wallangong */
 	extern int uerrno;

src/include/os/vxWorks/osiSock.h

@@ -36,6 +36,7 @@ typedef int                     SOCKET;
  */
 #define socket_ioctl(A,B,C)     ioctl(A,B,(int)C)
 typedef int osiSockIoctl_t;
+typedef int osiSocklen_t;
 
 #define FD_IN_FDSET(FD) ((FD)<FD_SETSIZE&&(FD)>=0)