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

loopback address address matching

Browse Source
This commit is contained in:
Jeff Hill
2002-07-13 01:02:40 +00:00
parent 14d6d70ba9
commit c15de09b8e
2 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libCom/osi/os/WIN32/osdNetIntf.c
View File

@@ -132,6 +132,20 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
DWORD cbBytesReturned;
osiSockAddrNode *pNewNode;
if ( pMatchAddr->sa.sa_family == AF_INET ) {
if ( pMatchAddr->ia.sin_addr.s_addr == htonl (INADDR_LOOPBACK) ) {
pNewNode = (osiSockAddrNode *) calloc (1, sizeof (*pNewNode) );
if ( pNewNode == NULL ) {
return;
}
pNewNode->addr.ia.sin_family = AF_INET;
pNewNode->addr.ia.sin_port = 0u;
pNewNode->addr.ia.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
ellAdd ( pList, &pNewNode->node );
return;
}
}
/* only valid for winsock 2 and above */
if (wsaMajorVersion() < 2 ) {
fprintf(stderr, "Need to set EPICS_CA_AUTO_ADDR_LIST=NO for winsock 1\n");
@@ -165,11 +179,8 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
continue;
}
/*
* dont use the loop back interface
*/
if (pIfinfo->iiFlags & IFF_LOOPBACK) {
continue;
continue;
}
/*
@@ -208,7 +219,8 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
return;
}
if (pIfinfo->iiAddress.Address.sa_family == AF_INET && pIfinfo->iiFlags & IFF_BROADCAST) {
if (pIfinfo->iiAddress.Address.sa_family == AF_INET &&
pIfinfo->iiFlags & IFF_BROADCAST) {
const unsigned mask = pIfinfo->iiNetmask.AddressIn.sin_addr.s_addr;
const unsigned bcast = pIfinfo->iiBroadcastAddress.AddressIn.sin_addr.s_addr;
const unsigned addr = pIfinfo->iiAddress.AddressIn.sin_addr.s_addr;

17
src/libCom/osi/os/default/osdNetIntf.c
View File

@@ -62,6 +62,21 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
struct ifreq *pifreq;
struct ifreq *pnextifreq;
osiSockAddrNode *pNewNode;
if ( pMatchAddr->sa.sa_family == AF_INET ) {
if ( pMatchAddr->ia.sin_addr.s_addr == htonl (INADDR_LOOPBACK) ) {
pNewNode = (osiSockAddrNode *) calloc (1, sizeof (*pNewNode) );
if ( pNewNode == NULL ) {
errlogPrintf ( "osiSockDiscoverBroadcastAddresses(): no memory available for configuration\n" );
return;
}
pNewNode->addr.ia.sin_family = AF_INET;
pNewNode->addr.ia.sin_port = 0u;
pNewNode->addr.ia.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
ellAdd ( pList, &pNewNode->node );
return;
}
}
/*
* use pool so that we avoid using too much stack space
@@ -134,7 +149,7 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
}
/*
* dont use the loop back interface
* dont use the loop back interface
*/
if ( pifreq->ifr_flags & IFF_LOOPBACK ) {
ifDepenDebugPrintf ( ("osiSockDiscoverBroadcastAddresses(): ignoring loopback interface: \"%s\"\n", pifreq->ifr_name) );