diff options
author | Alexander Anikin <may213@yandex.ru> | 2018-04-17 13:33:36 +0300 |
---|---|---|
committer | Alexander Anikin <may213@yandex.ru> | 2018-04-18 13:46:30 +0300 |
commit | 95e8450194a4c6a1272ed738fedaabb7baa438f8 (patch) | |
tree | 61c88d14b720c6dc52b5a2fb760ef7290714c441 /addons/chan_ooh323.c | |
parent | 2a6072a9c414a8fb7ecb1b6598873e60ef8cadf2 (diff) |
chan_ooh323: introduce localras config parameter
Introduce localras parameter that specify source IP
for connecting to Gatekeeper. Useful for multihome configurations.
ASTERISK-25129 #close
Reported by: Dmitry Melekhov
Tested by: Dmitry Melekhov
Change-Id: I0b604b01793f3e02a776502659e07cd3fc7e3097
Diffstat (limited to 'addons/chan_ooh323.c')
-rw-r--r-- | addons/chan_ooh323.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index ffdbf6721..06096507f 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -355,6 +355,7 @@ static int gDTMFCodec = 101; static int gFAXdetect = FAXDETECT_CNG; static int gT38Support = T38_FAXGW; static char gGatekeeper[100]; +static char gRASIP[2+8*4+7]; /* Max for IPv6 addr */ static enum RasGatekeeperMode gRasGkMode = RasNoGatekeeper; static int gIsGateway = 0; @@ -2726,7 +2727,7 @@ static int ooh323_do_reload(void) if (gRasGkMode == RasUseSpecificGatekeeper || gRasGkMode == RasDiscoverGatekeeper) { ooGkClientInit(gRasGkMode, (gRasGkMode == RasUseSpecificGatekeeper) ? - gGatekeeper : 0, 0); + gGatekeeper : 0, gRASIP, 0); ooGkClientStart(gH323ep.gkClient); } @@ -2869,6 +2870,7 @@ int reload_config(int reload) gTRCLVL = OOTRCLVLERR; gRasGkMode = RasNoGatekeeper; gGatekeeper[0] = '\0'; + gRASIP[0] = '\0'; gRTPTimeout = 60; gNat = FALSE; gRTDRInterval = 0; @@ -3029,6 +3031,9 @@ int reload_config(int reload) gRasGkMode = RasUseSpecificGatekeeper; ast_copy_string(gGatekeeper, v->value, sizeof(gGatekeeper)); } + } else if (!strcasecmp(v->name, "localras")) { + ast_copy_string(gRASIP, v->value, sizeof(gRASIP)); + ast_verb(3, " == Setting RAS IP to %s\n", gRASIP); } else if (!strcasecmp(v->name, "logfile")) { ast_copy_string(gLogFile, v->value, sizeof(gLogFile)); } else if (!strcasecmp(v->name, "context")) { @@ -3924,9 +3929,9 @@ static int load_module(void) /* Gatekeeper */ if (gRasGkMode == RasUseSpecificGatekeeper) - ooGkClientInit(gRasGkMode, gGatekeeper, 0); + ooGkClientInit(gRasGkMode, gGatekeeper, gRASIP, 0); else if (gRasGkMode == RasDiscoverGatekeeper) - ooGkClientInit(gRasGkMode, 0, 0); + ooGkClientInit(gRasGkMode, 0, gRASIP, 0); /* Register callbacks */ ooH323EpSetH323Callbacks(h323Callbacks); @@ -4013,7 +4018,7 @@ static void *do_monitor(void *data) ooGkClientDestroy(); ast_verb(0, "Restart stopped gatekeeper client\n"); ooGkClientInit(gRasGkMode, (gRasGkMode == RasUseSpecificGatekeeper) ? - gGatekeeper : 0, 0); + gGatekeeper : 0, gRASIP, 0); ooGkClientStart(gH323ep.gkClient); } |