[asterisk-commits] oej: branch oej/tilghman-chanvar-backport r222101 - /team/oej/tilghman-chanva...

[SVN commits to the Asterisk project]

Author: oej
Date: Fri Oct  2 14:49:53 2009
New Revision: 222101

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222101
Log:
Oh dear

Modified:
    team/oej/tilghman-chanvar-backport/main/manager.c

Modified: team/oej/tilghman-chanvar-backport/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/tilghman-chanvar-backport/main/manager.c?view=diff&rev=222101&r1=222100&r2=222101
==============================================================================
--- team/oej/tilghman-chanvar-backport/main/manager.c (original)
+++ team/oej/tilghman-chanvar-backport/main/manager.c Fri Oct  2 14:49:53 2009
@@ -129,7 +129,7 @@
 #define ASTMAN_APPEND_BUF_INITSIZE   256
 
 	
-AST_THREADSTORAGE(manager_event_buf, manager_event_funcbuf);
+AST_THREADSTORAGE(manager_event_funcbuf, manager_event_funcbuf_init);
 
 static struct permalias {
 	int num;
@@ -272,7 +272,7 @@
 			//struct ast_dynamic_str *res = ast_dynamic_str_thread_get(&manager_event_funcbuf, 16);
 			//int ret;
 			//if (res && (ret = ast_func_read2(chan, var->name, &res, 0)) == 0) {
-				//val = ast_str_buffer(res);
+				//val = ast_dynamic_str_buffer(res);
 			//}
 		//} else {
 			val = pbx_builtin_getvar_helper(chan, var->name);
@@ -3104,6 +3104,7 @@
 	}
 	portno = DEFAULT_MANAGER_PORT;
 	displayconnects = 1;
+	free_channelvars();
 	cfg = ast_config_load("manager.conf");
 	if (!cfg) {
 		ast_log(LOG_NOTICE, "Unable to open management configuration manager.conf.  Call management disabled.\n");