kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "chan_ooh323: introduce localras config parameter"

Browse Source
This commit is contained in:
Jenkins2
2018-04-26 11:42:06 -05:00
committed by Gerrit Code Review
parent fa7a551235 95e8450194
commit 8c1400bb57
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
addons/ooh323c/src/ooGkClient.c
View File

@@ -49,7 +49,7 @@ static ASN1OBJID gProtocolID = {
};
int ooGkClientInit(enum RasGatekeeperMode eGkMode,
char *szGkAddr, int iGkPort )
char *szGkAddr, char *szRasAddr, int iGkPort )
{
ooGkClient *pGkClient=NULL;
OOInterface *cur=NULL;
@@ -69,7 +69,11 @@ int ooGkClientInit(enum RasGatekeeperMode eGkMode,
pGkClient->rrqRetries = 0;
pGkClient->grqRetries = 0;
strcpy(pGkClient->localRASIP, gH323ep.signallingIP);
if (szRasAddr && *szRasAddr) {
strcpy(pGkClient->localRASIP, szRasAddr);
} else {
strcpy(pGkClient->localRASIP, gH323ep.signallingIP);
}
#ifndef _WIN32
if(!strcmp(pGkClient->localRASIP, "0.0.0.0") ||
!strcmp(pGkClient->localRASIP, "127.0.0.1"))
@@ -90,7 +94,6 @@ int ooGkClientInit(enum RasGatekeeperMode eGkMode,
}
if(cur)
{
OOTRACEINFO2("Using local RAS Ip address %s\n", cur->addr);
strcpy(pGkClient->localRASIP, cur->addr);
}
else{
@@ -98,6 +101,7 @@ int ooGkClientInit(enum RasGatekeeperMode eGkMode,
return OO_FAILED;
}
}
OOTRACEINFO2("Using local RAS Ip address %s\n", pGkClient->localRASIP);
#endif
if(OO_OK != ooGkClientSetGkMode(pGkClient, eGkMode, szGkAddr, iGkPort))
{

2
addons/ooh323c/src/ooGkClient.h
View File

@@ -223,7 +223,7 @@ struct OOH323CallData;
*
*/
EXTERN int ooGkClientInit
(enum RasGatekeeperMode eGkMode, char *szGkAddr, int iGkPort );
(enum RasGatekeeperMode eGkMode, char *szGkAddr, char *szRasAddr, int iGkPort );
/**
* This function is used to print the gatekeeper client configuration