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/branches/1.4@52370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Joshua Colp 19 years ago
parent bc43c82f05
commit 6b462c95c9

@ -8375,13 +8375,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));

Loading…
Cancel
Save