[asterisk-commits] oej: branch group/multiparking r104053 - /team/group/multiparking/main/

[SVN commits to the Asterisk project]

Author: oej
Date: Sat Feb 23 09:56:03 2008
New Revision: 104053

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104053
Log:
More configuration stuff. Maybe we can get this done before dinner.

Modified:
    team/group/multiparking/main/features.c

Modified: team/group/multiparking/main/features.c
URL: http://svn.digium.com/view/asterisk/team/group/multiparking/main/features.c?view=diff&rev=104053&r1=104052&r2=104053
==============================================================================
--- team/group/multiparking/main/features.c (original)
+++ team/group/multiparking/main/features.c Sat Feb 23 09:56:03 2008
@@ -3169,9 +3169,14 @@
 
 int ast_features_reload(void)
 {
-	load_config();
-
-	return RESULT_SUCCESS;
+	/* Release parking lot list */
+	ASTOBJ_CONTAINER_MARKALL(&parkinglots);
+
+	/* Reload configuration */
+	res = load_config();
+	
+	ASTOBJ_CONTAINER_PRUNE_MARKED(&parkinglots, parkinglot_destroy);
+	return res;
 }
 
 static char *handle_features_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -3186,7 +3191,7 @@
 	case CLI_GENERATE:
 		return NULL;
         }
-	load_config();
+	ast_features_reload();
 
 	return CLI_SUCCESS;
 }
@@ -3708,8 +3713,8 @@
 
 	ast_register_application2(app_bridge, bridge_exec, bridge_synopsis, bridge_descrip, NULL);
 
-	memset(parking_ext, 0, sizeof(parking_ext));
-	memset(parking_con, 0, sizeof(parking_con));
+
+	ASTOBJ_CONTAINER_INIT(&parkinglots);
 
 	if ((res = load_config()))
 		return res;