Fix port numbers in IAX2 and iax2prov (bug #2261)

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 4f1ce01..9aab5dc 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6601,10 +6601,9 @@ static int set_config(char *config_file, struct sockaddr_in* sin){
        }
        v = ast_variable_browse(cfg, "general");
        while(v) {
-               if (!strcasecmp(v->name, "port")){ 
-                               ast_log(LOG_WARNING, "Ignoring port for now\n");
-#if 0                          
+               if (!strcasecmp(v->name, "bindport")){ 
                        sin->sin_port = ntohs(atoi(v->value));
+#if 0                          
                        if(last_port==0){
                                last_port=sin->sin_port;
 #if    0

diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index 08964eb..7f7189a 100755 (executable)
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -289,7 +289,7 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg,
                                        foundportno = 1;
                                } else {
                                        cur->serverport = x;
-                                       foundserverportno = 0;
+                                       foundserverportno = 1;
                                }
                        } else
                                ast_log(LOG_WARNING, "Ignoring invalid %s '%s' for '%s' at line %d\n", v->name, v->value, s, v->lineno);

diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index ab822d5..5ca6f90 100755 (executable)
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -7,7 +7,7 @@
 ; local addresses).
 ;
 [general]
-;port=5036
+;bindport=4569
 ;bindaddr=192.168.0.1
 ;
 ; Set iaxcompat to yes if you plan to use layered