[asterisk-commits] jrose: branch 1.6.2 r313047 - /branches/1.6.2/main/features.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Apr  7 08:23:01 2011
New Revision: 313047

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=313047
Log:
Makes parking lots clear and rebuild properly when features reload is invoked from CLI

Before, default parkinglot in context parkedcalls with ext 700 would always be present and when reload was invoked, the previous parkinglots would not be cleared.

(closes issue #18801)
Reported by: mickecarlsson

Review: https://reviewboard.asterisk.org/r/1161/

Modified:
    branches/1.6.2/main/features.c

Modified: branches/1.6.2/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/features.c?view=diff&rev=313047&r1=313046&r2=313047
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Thu Apr  7 08:23:01 2011
@@ -4189,6 +4189,17 @@
 		"applicationmap"
 	};
 
+	/* Clear the existing parkinglots in the parkinglots container. */
+	{
+		struct ast_parkinglot *p;
+		struct ao2_iterator iter = ao2_iterator_init(parkinglots, 0);
+		while ((p = ao2_iterator_next(&iter))) {
+			ao2_unlink(parkinglots, p);
+			ao2_ref(p,-1);
+		}
+		ao2_iterator_destroy(&iter);
+	}
+
 	if (default_parkinglot) {
 		strcpy(old_parking_con, default_parkinglot->parking_con);
 		strcpy(old_parking_ext, parking_ext);
@@ -4242,7 +4253,19 @@
 		ast_log(LOG_WARNING,"Could not load features.conf\n");
 		return 0;
 	}
-	for (var = ast_variable_browse(cfg, "general"); var; var = var->next) {
+
+	if ((var = ast_variable_browse(cfg, "general"))) {
+		/* Find a general context in features.conf, we need to clear our existing default context */
+		/* Can't outright destroy the parking lot because it's needed in a little while. */
+		if ((con = ast_context_find(default_parkinglot->parking_con))) {
+			ast_context_destroy(con, registrar);
+		}
+		if ((con = ast_context_find(default_parkinglot->parking_con_dial))) {
+			ast_context_destroy(con, registrar);
+		}
+	} 
+
+	for (; var; var = var->next) {
 		if (!strcasecmp(var->name, "parkext")) {
 			ast_copy_string(parking_ext, var->value, sizeof(parking_ext));
 		} else if (!strcasecmp(var->name, "context")) {