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

committed a fix for mantis 302

Browse Source
This commit is contained in:
Jeff Hill
2008-09-19 23:27:52 +00:00
parent a6f4c7efd9
commit 2bf9959e11
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ca/iocinf.cpp
View File

@@ -74,7 +74,8 @@ static char *getToken ( const char **ppString, char *pBuf, unsigned bufSIze )
* addAddrToChannelAccessAddressList ()
*/
extern "C" void epicsShareAPI addAddrToChannelAccessAddressList
( ELLLIST *pList, const ENV_PARAM *pEnv, unsigned short port )
( ELLLIST *pList, const ENV_PARAM *pEnv,
unsigned short port, int ignoreNonDefaultPort )
{
osiSockAddrNode *pNewNode;
const char *pStr;
@@ -96,6 +97,10 @@ extern "C" void epicsShareAPI addAddrToChannelAccessAddressList
continue;
}
if ( ignoreNonDefaultPort && addr.sin_port != port ) {
continue;
}
pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
if (pNewNode==NULL) {
fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
@@ -235,7 +240,7 @@ extern "C" void epicsShareAPI configureChannelAccessAddressList
}
}
}
addAddrToChannelAccessAddressList ( &tmpList, &EPICS_CA_ADDR_LIST, port );
addAddrToChannelAccessAddressList ( &tmpList, &EPICS_CA_ADDR_LIST, port, FALSE );
removeDuplicateAddresses ( pList, &tmpList, 0 );
}