fixed R3.13 for Linux's new socklen_t
This commit is contained in:
+7
-4
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user