aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-27 00:07:40 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-27 00:07:40 +0000
commit7231d65950d6d1325d10711d4a16257f403ee1c8 (patch)
tree8f176cffceab49cab01b133e5bcf1c70e842abd3 /channels
parent75fcbfff8fff0bab2e24eaacf1855000edac4a96 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@52369 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-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));