diff options
-rwxr-xr-x | ChangeLog | 6 | ||||
-rwxr-xr-x | channels/chan_iax2.c | 4 | ||||
-rwxr-xr-x | channels/chan_sip.c | 6 |
3 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2005-11-21 Kevin P. Fleming <kpfleming@digium.com> + + * channels/chan_sip.c (build_peer): ensure that case changes made to peer names are not ignored during reload operations + + * channels/chan_iax2.c (build_peer and build_user): ensure that case changes made to peer/user names are not ignored during reload operations + 2005-11-21 Russell Bryant <russell@digium.com> * Makefile: Revert previous change for Darwin. diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 0c4a8b958..87295d6a3 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -8104,7 +8104,7 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in if (!temponly) { peer = peerl.peers; while(peer) { - if (!strcasecmp(peer->name, name)) { + if (!strcmp(peer->name, name)) { break; } prev = peer; @@ -8297,7 +8297,7 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, in if (!temponly) { user = userl.users; while(user) { - if (!strcasecmp(user->name, name)) { + if (!strcmp(user->name, name)) { break; } prev = user; diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3d5e4544c..e6faa6b4e 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -11967,7 +11967,11 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int if (!realtime) /* Note we do NOT use find_peer here, to avoid realtime recursion */ - peer = ASTOBJ_CONTAINER_FIND_UNLINK(&peerl, name); + /* We also use a case-sensitive comparison (unlike find_peer) so + that case changes made to the peer name will be properly handled + during reload + */ + peer = ASTOBJ_CONTAINER_FIND_UNLINK_FULL(&peerl, name, name, 0, 0, strcmp); if (peer) { /* Already in the list, remove it and it will be added back (or FREE'd) */ |