epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

transfer back to windows

Browse Source
This commit is contained in:
Jeff Hill
2000-03-01 21:39:32 +00:00
parent db0f9d6541
commit ba31a14dda
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/libCom/osi/os/default/osdSock.c
View File

@@ -38,6 +38,7 @@
#define epicsExportSharedSymbols
#include "osiSock.h"
#include "epicsAssert.h"
#include "errlog.h"
#define DEBUG
#ifdef DEBUG
@@ -110,8 +111,8 @@ epicsShareFunc int epicsShareAPI hostToIPAddr
return -1;
}
void epicsShareAPI osiSockDiscoverInterfaces
(ELLLIST *pList, int socket, unsigned short port, const struct in_addr *pMatchAddr)
epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
(ELLLIST *pList, SOCKET socket, const osiSockAddr *pMatchAddr)
{
static const unsigned nelem = 100;
struct sockaddr_in *pInetAddr;
@@ -223,8 +224,26 @@ void epicsShareAPI osiSockDiscoverInterfaces
* if it isnt a wildcarded interface then look for
* an exact match
*/
if (pMatchAddr->s_addr != htonl(INADDR_ANY)) {
if (pInetAddr->sin_addr.s_addr != pMatchAddr->s_addr) {
if (pMatchAddr->ia.sin_addr.s_addr != htonl(INADDR_ANY)) {
if (pIfinfo->iiAddress.AddressIn.sin_addr.s_addr != pMatchAddr->ia.sin_addr.s_addr) {
continue;
}
}
}
if (pMatchAddr->sa.sa_family != AF_UNSPEC) {
if (pIfinfo->iiAddress.Address.sa_family != pMatchAddr->sa.sa_family) {
continue;
}
if (pIfinfo->iiAddress.Address.sa_family != AF_INET) {
continue;
}
if (pMatchAddr->sa.sa_family != AF_INET) {
continue;
}
if (pMatchAddr->ia.sin_addr.s_addr != htonl(INADDR_ANY)) {
if (pInetAddr->sin_addr.s_addr != pMatchAddr->ia.sin_addr.s_addr) {
ifDepenDebugPrintf ( ("osiSockDiscoverInterfaces(): net intf %s didnt match\n", pifreq->ifr_name) );
continue;
}
@@ -270,8 +289,7 @@ void epicsShareAPI osiSockDiscoverInterfaces
return;
}
pNewNode->destAddr = *pInetAddr;
pNewNode->destAddr.in.sin_port = htons (port);
pNewNode->addr.ia = *pInetAddr;
/*
* LOCK applied externally