]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Remove remnants of a poorly merged commit. (92697)
authorJason Parker <jparker@digium.com>
Thu, 13 Dec 2007 16:23:50 +0000 (16:23 +0000)
committerJason Parker <jparker@digium.com>
Thu, 13 Dec 2007 16:23:50 +0000 (16:23 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92758 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 46c3b56aa873f325067b426858a8e18612ab6be6..19d3dba73b6b99f3d78b47fc2483b38494426ce7 100644 (file)
@@ -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(&regl, 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(&regl, 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;