summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2005-03-21 02:17:36 +0000
committerMark Spencer <markster@digium.com>2005-03-21 02:17:36 +0000
commitb0fa3b6450dc1177f73abf6496dc6366f7fa2573 (patch)
tree9777ba311d10ca82717a3efbfd1c1a859b41589f
parent8085c618c0edd754522e9c243cbaab8411592af3 (diff)
Update SIP/IAX documentation and code (Bug #3810)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5220 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-xchannels/chan_sip.c4
-rwxr-xr-xconfigs/iax.conf.sample3
2 files changed, 5 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f27eb4461..152efe562 100755
--- 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 b0ed7e1e7..473af71b5 100755
--- 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