[asterisk-commits] twilson: trunk r360724 - in /trunk: addons/ apps/confbridge/ cdr/ channels/

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Mar 28 14:39:24 2012
New Revision: 360724

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=360724
Log:
Fix setting CDR variables in the hangup extension

A previous CDR fix for setting CDR variables during a bridge via
custom dialplan features broke setting CDR variables in the
hangup extension. This patch fixes the issue.

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

Merged revisions 358978 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 358989 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/addons/cdr_mysql.c
    trunk/addons/chan_ooh323.c
    trunk/apps/confbridge/conf_config_parser.c
    trunk/cdr/cdr_adaptive_odbc.c
    trunk/channels/chan_gtalk.c
    trunk/channels/chan_jingle.c

Modified: trunk/addons/cdr_mysql.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/cdr_mysql.c?view=diff&rev=360724&r1=360723&r2=360724
==============================================================================
--- trunk/addons/cdr_mysql.c (original)
+++ trunk/addons/cdr_mysql.c Wed Mar 28 14:39:24 2012
@@ -462,6 +462,7 @@
 		if (reload) {
 			AST_RWLIST_UNLOCK(&columns);
 		}
+		ast_config_destroy(cfg);
 		return AST_MODULE_LOAD_SUCCESS;
 	}
 
@@ -502,6 +503,7 @@
 		if (reload) {
 			AST_RWLIST_UNLOCK(&columns);
 		}
+		ast_config_destroy(cfg);
 		return AST_MODULE_LOAD_FAILURE;
 	}
 

Modified: trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_ooh323.c?view=diff&rev=360724&r1=360723&r2=360724
==============================================================================
--- trunk/addons/chan_ooh323.c (original)
+++ trunk/addons/chan_ooh323.c Wed Mar 28 14:39:24 2012
@@ -2720,6 +2720,7 @@
 			ast_copy_string(gIP, v->value, sizeof(gIP));
 			if (ast_parse_arg(v->value, PARSE_ADDR, &bindaddr)) {
 				ast_log(LOG_WARNING, "Invalid address: %s\n", v->value);
+				ast_config_destroy(cfg);
 				return 1;
 			}
 			if (ast_sockaddr_is_ipv6(&bindaddr)) {
@@ -2773,6 +2774,7 @@
          		pNewAlias = ast_calloc(1, sizeof(struct ooAliases));
 			if (!pNewAlias) {
 				ast_log(LOG_ERROR, "Failed to allocate memory for h323id alias\n");
+				ast_config_destroy(cfg);
 				return 1;
 			}
 	 		if (gAliasList == NULL) { /* first h323id - set as callerid if callerid is not set */
@@ -2787,6 +2789,7 @@
          		pNewAlias = ast_calloc(1, sizeof(struct ooAliases));
 			if (!pNewAlias) {
 				ast_log(LOG_ERROR, "Failed to allocate memory for e164 alias\n");
+				ast_config_destroy(cfg);
 				return 1;
 			}
 			pNewAlias->type =  T_H225AliasAddress_dialedDigits;
@@ -2798,6 +2801,7 @@
          		pNewAlias = ast_calloc(1, sizeof(struct ooAliases));
 			if (!pNewAlias) {
 				ast_log(LOG_ERROR, "Failed to allocate memory for email alias\n");
+				ast_config_destroy(cfg);
 				return 1;
 			}
 			pNewAlias->type =  T_H225AliasAddress_email_ID;

Modified: trunk/apps/confbridge/conf_config_parser.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/confbridge/conf_config_parser.c?view=diff&rev=360724&r1=360723&r2=360724
==============================================================================
--- trunk/apps/confbridge/conf_config_parser.c (original)
+++ trunk/apps/confbridge/conf_config_parser.c Wed Mar 28 14:39:24 2012
@@ -1311,6 +1311,7 @@
 	}
 
 	remove_all_delme();
+	ast_config_destroy(cfg);
 
 	return 0;
 }

Modified: trunk/cdr/cdr_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_adaptive_odbc.c?view=diff&rev=360724&r1=360723&r2=360724
==============================================================================
--- trunk/cdr/cdr_adaptive_odbc.c (original)
+++ trunk/cdr/cdr_adaptive_odbc.c Wed Mar 28 14:39:24 2012
@@ -286,6 +286,7 @@
 		else
 			ast_free(tableptr);
 	}
+	ast_config_destroy(cfg);
 	return res;
 }
 

Modified: trunk/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=360724&r1=360723&r2=360724
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Wed Mar 28 14:39:24 2012
@@ -2286,6 +2286,7 @@
 		cat = ast_category_browse(cfg, cat);
 	}
 
+	ast_config_destroy(cfg);
 	gtalk_update_externip();
 	gtalk_free_candidates(global_candidates);
 	return 1;

Modified: trunk/channels/chan_jingle.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_jingle.c?view=diff&rev=360724&r1=360723&r2=360724
==============================================================================
--- trunk/channels/chan_jingle.c (original)
+++ trunk/channels/chan_jingle.c Wed Mar 28 14:39:24 2012
@@ -1926,6 +1926,7 @@
 		}
 		cat = ast_category_browse(cfg, cat);
 	}
+	ast_config_destroy(cfg);
 	jingle_free_candidates(global_candidates);
 	return 1;
 }