aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_iax2.c
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-27 00:03:23 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-27 00:03:23 +0000
commit55511078b7b85f7f18fc9ebf8bfff99028336ef9 (patch)
tree7d7cceaa322ea2489edd9dab0389ccbc30446ad8 /channels/chan_iax2.c
parent6fb60a304de08e30cc3e15228634d5120299ddf4 (diff)
Make the last context entry read in the dominant one. (issue #8918 reported by pj)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@52360 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
-rw-r--r--channels/chan_iax2.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 48b30549a..06c941c83 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -8359,13 +8359,11 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in
maskfound++;
inet_aton(v->value, &peer->mask);
} else if (!strcasecmp(v->name, "context")) {
- if (ast_strlen_zero(peer->context))
- ast_copy_string(peer->context, v->value, sizeof(peer->context));
+ ast_copy_string(peer->context, v->value, sizeof(peer->context));
} else if (!strcasecmp(v->name, "regexten")) {
ast_copy_string(peer->regexten, v->value, sizeof(peer->regexten));
} else if (!strcasecmp(v->name, "peercontext")) {
- if (ast_strlen_zero(peer->peercontext))
- ast_copy_string(peer->peercontext, v->value, sizeof(peer->peercontext));
+ ast_copy_string(peer->peercontext, v->value, sizeof(peer->peercontext));
} else if (!strcasecmp(v->name, "port")) {
if (ast_test_flag(peer, IAX_DYNAMIC))
peer->defaddr.sin_port = htons(atoi(v->value));