Make externip work as documented. If no port is specified it will use the value of...

(closes issue #11858)
Reported by: hmodes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100833 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9f2cc3d83fe7546243af341a7f7d7602c80317d5..919dd358ba0ece45921470a7eeb4c5a83bea1c38 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19895,7 +19895,6 @@ static int reload_config(enum channelreloadreason reason)
        ourport_tcp = STANDARD_SIP_PORT;
        ourport_tls = STANDARD_TLS_PORT;
        bindaddr.sin_port = htons(STANDARD_SIP_PORT);
-       externip.sin_port = htons(STANDARD_SIP_PORT);
        global_srvlookup = DEFAULT_SRVLOOKUP;
        global_tos_sip = DEFAULT_TOS_SIP;
        global_tos_audio = DEFAULT_TOS_AUDIO;
@@ -20192,6 +20191,9 @@ static int reload_config(enum channelreloadreason reason)
                        if (ast_parse_arg(v->value, PARSE_INADDR, &externip))
                                ast_log(LOG_WARNING, "Invalid address for externip keyword: %s\n", v->value);
                        externexpire = 0;
+                       /* If no port was specified use the value of bindport */
+                       if (!externip.sin_port)
+                               externip.sin_port = bindaddr.sin_port;
                } else if (!strcasecmp(v->name, "externhost")) {
                        ast_copy_string(externhost, v->value, sizeof(externhost));
                        if (ast_parse_arg(externhost, PARSE_INADDR, &externip))