diff --git a/src/ca/conn.c b/src/ca/conn.c index e18dac0c0..092595198 100644 --- a/src/ca/conn.c +++ b/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, diff --git a/src/cas/io/bsdSocket/casIntfIO.cc b/src/cas/io/bsdSocket/casIntfIO.cc index 2ddda6777..e18ef69ca 100644 --- a/src/cas/io/bsdSocket/casIntfIO.cc +++ b/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; diff --git a/src/include/os/Linux/osiSock.h b/src/include/os/Linux/osiSock.h index 85d44bd78..4bda2841f 100644 --- a/src/include/os/Linux/osiSock.h +++ b/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)=0) diff --git a/src/include/os/cygwin32/osiSock.h b/src/include/os/cygwin32/osiSock.h index 9bb3c8c0c..99630a1a2 100644 --- a/src/include/os/cygwin32/osiSock.h +++ b/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)=0) diff --git a/src/include/os/hp700/osiSock.h b/src/include/os/hp700/osiSock.h index 791d002fa..5d6760b93 100644 --- a/src/include/os/hp700/osiSock.h +++ b/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)=0) diff --git a/src/include/os/sgi/osiSock.h b/src/include/os/sgi/osiSock.h index 73e9631fd..81a0567b9 100644 --- a/src/include/os/sgi/osiSock.h +++ b/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)=0) diff --git a/src/include/os/solaris/osiSock.h b/src/include/os/solaris/osiSock.h index 55f1a7c5e..2a2da4a16 100644 --- a/src/include/os/solaris/osiSock.h +++ b/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)=0) diff --git a/src/include/os/sun4/osiSock.h b/src/include/os/sun4/osiSock.h index 317e690a3..1b31affae 100644 --- a/src/include/os/sun4/osiSock.h +++ b/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 diff --git a/src/include/os/vms/osiSock.h b/src/include/os/vms/osiSock.h index b4a64b874..31b83942b 100644 --- a/src/include/os/vms/osiSock.h +++ b/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; diff --git a/src/include/os/vxWorks/osiSock.h b/src/include/os/vxWorks/osiSock.h index 196f93d50..d32a4f563 100644 --- a/src/include/os/vxWorks/osiSock.h +++ b/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)=0)