mirror of
https://github.com/asterisk/asterisk.git
synced 2026-06-15 12:17:36 +00:00
Remove remnants of a poorly merged commit. (92697)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92758 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -18201,36 +18201,6 @@ static int reload_config(enum channelreloadreason reason)
|
||||
ASTOBJ_CONTAINER_MARKALL(&peerl);
|
||||
}
|
||||
|
||||
if (option_debug > 3)
|
||||
ast_log(LOG_DEBUG, "--------------- SIP reload started\n");
|
||||
|
||||
clear_realm_authentication(authl);
|
||||
clear_sip_domains();
|
||||
authl = NULL;
|
||||
|
||||
/* First, destroy all outstanding registry calls */
|
||||
/* This is needed, since otherwise active registry entries will not be destroyed */
|
||||
ASTOBJ_CONTAINER_TRAVERSE(®l, 1, do {
|
||||
ASTOBJ_RDLOCK(iterator);
|
||||
if (iterator->call) {
|
||||
if (option_debug > 2)
|
||||
ast_log(LOG_DEBUG, "Destroying active SIP dialog for registry %s@%s\n", iterator->username, iterator->hostname);
|
||||
/* This will also remove references to the registry */
|
||||
sip_destroy(iterator->call);
|
||||
}
|
||||
ASTOBJ_UNLOCK(iterator);
|
||||
|
||||
} while(0));
|
||||
|
||||
/* Then, actually destroy users and registry */
|
||||
ASTOBJ_CONTAINER_DESTROYALL(&userl, sip_destroy_user);
|
||||
if (option_debug > 3)
|
||||
ast_log(LOG_DEBUG, "--------------- Done destroying user list\n");
|
||||
ASTOBJ_CONTAINER_DESTROYALL(®l, sip_registry_destroy);
|
||||
if (option_debug > 3)
|
||||
ast_log(LOG_DEBUG, "--------------- Done destroying registry list\n");
|
||||
ASTOBJ_CONTAINER_MARKALL(&peerl);
|
||||
|
||||
/* Initialize copy of current global_regcontext for later use in removing stale contexts */
|
||||
ast_copy_string(oldcontexts, global_regcontext, sizeof(oldcontexts));
|
||||
oldregcontext = oldcontexts;
|
||||
|
||||
Reference in New Issue
Block a user