diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-01-27 00:10:19 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-01-27 00:10:19 +0000 |
| commit | 8e755c25ca89e07850a00f51db6812bf68648b96 (patch) | |
| tree | 82fd44158feec725f0998f42da5975afe0dc3a78 /channels | |
| parent | 2d3301a1ed4e9aed463ccfa06b5c387cb83c691c (diff) | |
Merged revisions 52370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r52370 | file | 2007-01-26 19:08:18 -0500 (Fri, 26 Jan 2007) | 10 lines
Merged revisions 52360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r52360 | file | 2007-01-26 19:03:23 -0500 (Fri, 26 Jan 2007) | 2 lines
Make the last context entry read in the dominant one. (issue #8918 reported by pj)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52371 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c63b15541..865c13ab0 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -8531,13 +8531,11 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st maskfound++; inet_aton(v->value, &peer->mask); } else if (!strcasecmp(v->name, "context")) { - if (ast_strlen_zero(peer->context)) - ast_string_field_set(peer, context, v->value); + ast_string_field_set(peer, context, v->value); } else if (!strcasecmp(v->name, "regexten")) { ast_string_field_set(peer, regexten, v->value); } else if (!strcasecmp(v->name, "peercontext")) { - if (ast_strlen_zero(peer->peercontext)) - ast_string_field_set(peer, peercontext, v->value); + ast_string_field_set(peer, peercontext, v->value); } else if (!strcasecmp(v->name, "port")) { if (ast_test_flag(peer, IAX_DYNAMIC)) peer->defaddr.sin_port = htons(atoi(v->value)); |