Update SIP/IAX documentation and code (Bug #3810)

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f27eb4461923909df8631df4ec921946f3520bb3..152efe562214a5a8140c21b0c2c5c8384a933ef8 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9787,7 +9787,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int
                        } else if (!strcasecmp(v->name, "mask")) {
                                maskfound++;
                                inet_aton(v->value, &peer->mask);
-                       } else if (!strcasecmp(v->name, "port") || !strcasecmp(v->name, "bindport")) {
+                       } else if (!strcasecmp(v->name, "port")) {
                                if (!realtime && ast_test_flag(peer, SIP_DYNAMIC))
                                        peer->defaddr.sin_port = htons(atoi(v->value));
                                else
@@ -10116,7 +10116,7 @@ static int reload_config(void)
                                tos = 0;
                        else
                                ast_log(LOG_WARNING, "Invalid tos value at line %d, should be 'lowdelay', 'throughput', 'reliability', 'mincost', or 'none'\n", v->lineno);
-               } else if (!strcasecmp(v->name, "port")) {
+               } else if (!strcasecmp(v->name, "bindport")) {
                        if (sscanf(v->value, "%i", &ourport) == 1) {
                                bindaddr.sin_port = htons(ourport);
                        } else {

diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index b0ed7e1e75c54b4f779151d3b54b1640b4ae6807..473af71b536272d6cb04beaeeb1bca5adfbc3f4b 100755 (executable)
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -11,6 +11,9 @@
 ;
 [general]
 ;bindport=4569                 ; bindport and bindaddr may be specified
+;                               ; NOTE: bindport must be specified BEFORE bindaddr
+;                               ; or may be specified on a specific bindaddr if followed by
+;                               ; colon and port (e.g. bindaddr=192.168.0.1:4569)
 ;bindaddr=192.168.0.1          ; more than once to bind to multiple
 ;                               ; addresses, but the first will be the 
 ;                               ; default