[asterisk-commits] kpfleming: branch group/new_loader_completion r37954 - in /team/group/new_loa...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Jul 19 12:41:35 2006
New Revision: 37954

URL: http://svn.digium.com/view/asterisk?rev=37954&view=rev
Log:
manual update to trunk

Modified:
    team/group/new_loader_completion/   (props changed)
    team/group/new_loader_completion/channels/chan_iax2.c
    team/group/new_loader_completion/config.c
    team/group/new_loader_completion/res/res_config_odbc.c
    team/group/new_loader_completion/res/res_config_pgsql.c

Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 19 12:41:35 2006
@@ -1,1 +1,1 @@
-/trunk:1-37938
+/trunk:1-37953

Modified: team/group/new_loader_completion/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_iax2.c?rev=37954&r1=37953&r2=37954&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_iax2.c (original)
+++ team/group/new_loader_completion/channels/chan_iax2.c Wed Jul 19 12:41:35 2006
@@ -145,7 +145,7 @@
 static char language[MAX_LANGUAGE] = "";
 static char regcontext[AST_MAX_CONTEXT] = "";
 
-static int maxauthreq = 0;
+static int maxauthreq = 3;
 static int max_retries = 4;
 static int ping_time = 20;
 static int lagrq_time = 10;
@@ -8703,6 +8703,8 @@
 	min_reg_expire = IAX_DEFAULT_REG_EXPIRE;
 	max_reg_expire = IAX_DEFAULT_REG_EXPIRE;
 
+	maxauthreq = 3;
+
 	v = ast_variable_browse(cfg, "general");
 
 	/* Seed initial tos value */

Modified: team/group/new_loader_completion/config.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/config.c?rev=37954&r1=37953&r2=37954&view=diff
==============================================================================
--- team/group/new_loader_completion/config.c (original)
+++ team/group/new_loader_completion/config.c Wed Jul 19 12:41:35 2006
@@ -346,6 +346,7 @@
 		cur = cur->next;
 	}
 
+	prev = NULL;
 	cur = category->root;
 	while (cur) {
 		if (!strcasecmp(cur->name, variable)) {
@@ -392,6 +393,7 @@
 		cur = cur->next;
 	}
 
+	prev = NULL;
 	cur = category->root;
 	while (cur) {
 		if (!strcasecmp(cur->name, variable)) {
@@ -438,6 +440,8 @@
 		prev = cat;
 		cat = cat->next;
 	}
+
+	prev = NULL;
 	cat = cfg->root;
 	while(cat) {
 		if (!strcasecmp(cat->name, category)) {

Modified: team/group/new_loader_completion/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_config_odbc.c?rev=37954&r1=37953&r2=37954&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_config_odbc.c (original)
+++ team/group/new_loader_completion/res/res_config_odbc.c Wed Jul 19 12:41:35 2006
@@ -537,7 +537,7 @@
 
 	while ((res = SQLFetch(stmt)) != SQL_NO_DATA) {
 		if (!strcmp (q.var_name, "#include")) {
-			if (!ast_config_internal_load(q.var_val, cfg)) {
+			if (!ast_config_internal_load(q.var_val, cfg, 0)) {
 				SQLFreeHandle(SQL_HANDLE_STMT, stmt);
 				odbc_release_obj(obj);
 				return NULL;

Modified: team/group/new_loader_completion/res/res_config_pgsql.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_config_pgsql.c?rev=37954&r1=37953&r2=37954&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_config_pgsql.c (original)
+++ team/group/new_loader_completion/res/res_config_pgsql.c Wed Jul 19 12:41:35 2006
@@ -512,7 +512,7 @@
 			char *field_var_val = PQgetvalue(result, rowIndex, 2);
 			char *field_cat_metric = PQgetvalue(result, rowIndex, 3);
 			if (!strcmp(field_var_name, "#include")) {
-				if (!ast_config_internal_load(field_var_val, cfg)) {
+				if (!ast_config_internal_load(field_var_val, cfg, 0)) {
 					PQclear(result);
 					ast_mutex_unlock(&pgsql_lock);
 					return NULL;