[svn-commits] eliel: branch group/appdocsxml r153180 - in /team/group/appdocsxml: ./ channe...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Oct 31 13:39:57 CDT 2008
Author: eliel
Date: Fri Oct 31 13:39:57 2008
New Revision: 153180
URL: http://svn.digium.com/view/asterisk?view=rev&rev=153180
Log:
Fix conflict and continue.
Modified:
team/group/appdocsxml/ (props changed)
team/group/appdocsxml/CHANGES
team/group/appdocsxml/channels/chan_sip.c
team/group/appdocsxml/configs/func_odbc.conf.sample
team/group/appdocsxml/funcs/func_odbc.c
Propchange: team/group/appdocsxml/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/appdocsxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct 31 13:39:57 2008
@@ -1,1 +1,1 @@
-/trunk:1-153096
+/trunk:1-153179
Modified: team/group/appdocsxml/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/CHANGES?view=diff&rev=153180&r1=153179&r2=153180
==============================================================================
--- team/group/appdocsxml/CHANGES (original)
+++ team/group/appdocsxml/CHANGES Fri Oct 31 13:39:57 2008
@@ -26,6 +26,8 @@
* Permit the syntax and synopsis fields of the corresponding dialplan
functions to be individually set from func_odbc.conf.
* Added debugging CLI functions to func_odbc, 'odbc read' and 'odbc write'.
+ * func_odbc now may specify an insert query to execute, when the write query
+ affects 0 rows (usually indicating that no such row exists).
Applications
------------
Modified: team/group/appdocsxml/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/channels/chan_sip.c?view=diff&rev=153180&r1=153179&r2=153180
==============================================================================
--- team/group/appdocsxml/channels/chan_sip.c (original)
+++ team/group/appdocsxml/channels/chan_sip.c Fri Oct 31 13:39:57 2008
@@ -21929,6 +21929,14 @@
ast_log(LOG_WARNING, "Qualification of peer '%s' should be 'yes', 'no', or a number of milliseconds at line %d of sip.conf\n", peer->name, v->lineno);
peer->maxms = 0;
}
+ if (realtime && !ast_test_flag(&global_flags[1], SIP_PAGE2_RTCACHEFRIENDS) && peer->maxms > 0) {
+ /* This would otherwise cause a network storm, where the
+ * qualify response refreshes the peer from the database,
+ * which in turn causes another qualify to be sent, ad
+ * infinitum. */
+ ast_log(LOG_WARNING, "Qualify is incompatible with dynamic uncached realtime. Please either turn rtcachefriends on or turn qualify off on peer '%s'\n", peer->name);
+ peer->maxms = 0;
+ }
} else if (!strcasecmp(v->name, "qualifyfreq")) {
int i;
if (sscanf(v->value, "%d", &i) == 1)
Modified: team/group/appdocsxml/configs/func_odbc.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/configs/func_odbc.conf.sample?view=diff&rev=153180&r1=153179&r2=153180
==============================================================================
--- team/group/appdocsxml/configs/func_odbc.conf.sample (original)
+++ team/group/appdocsxml/configs/func_odbc.conf.sample Fri Oct 31 13:39:57 2008
@@ -31,6 +31,8 @@
; readhandle. "dsn" is a synonym for "writehandle".
; readsql The statement to execute when reading from the function class.
; writesql The statement to execute when writing to the function class.
+; insertsql The statement to execute when writing to the function class
+; succeeds, but initially indicates that 0 rows were affected.
; prefix Normally, all function classes are prefixed with "ODBC" to keep
; them uniquely named. You may choose to change this prefix, which
; may be useful to segregate a collection of certain function
Modified: team/group/appdocsxml/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/funcs/func_odbc.c?view=diff&rev=153180&r1=153179&r2=153180
==============================================================================
--- team/group/appdocsxml/funcs/func_odbc.c (original)
+++ team/group/appdocsxml/funcs/func_odbc.c Fri Oct 31 13:39:57 2008
@@ -112,6 +112,7 @@
char writehandle[5][30];
char sql_read[2048];
char sql_write[2048];
+ char sql_insert[2048];
unsigned int flags;
int rowlimit;
struct ast_custom_function *acf;
@@ -141,6 +142,7 @@
static int resultcount = 0;
AST_THREADSTORAGE(sql_buf);
+AST_THREADSTORAGE(sql2_buf);
AST_THREADSTORAGE(coldata_buf);
AST_THREADSTORAGE(colnames_buf);
@@ -165,15 +167,32 @@
res = SQLAllocHandle (SQL_HANDLE_STMT, obj->con, &stmt);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
- ast_log(LOG_WARNING, "SQL Alloc Handle failed!\n");
+ ast_log(LOG_WARNING, "SQL Alloc Handle failed (%d)!\n", res);
return NULL;
}
res = SQLExecDirect(stmt, (unsigned char *)sql, SQL_NTS);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
- ast_log(LOG_WARNING, "SQL Exec Direct failed![%s]\n", sql);
+ if (res == SQL_ERROR) {
+ int i;
+ SQLINTEGER nativeerror=0, numfields=0;
+ SQLSMALLINT diagbytes=0;
+ unsigned char state[10], diagnostic[256];
+
+ SQLGetDiagField(SQL_HANDLE_STMT, stmt, 1, SQL_DIAG_NUMBER, &numfields, SQL_IS_INTEGER, &diagbytes);
+ for (i = 0; i < numfields; i++) {
+ SQLGetDiagRec(SQL_HANDLE_STMT, stmt, i + 1, state, &nativeerror, diagnostic, sizeof(diagnostic), &diagbytes);
+ ast_log(LOG_WARNING, "SQL Execute returned an error %d: %s: %s (%d)\n", res, state, diagnostic, diagbytes);
+ if (i > 10) {
+ ast_log(LOG_WARNING, "Oh, that was good. There are really %d diagnostics?\n", (int)numfields);
+ break;
+ }
+ }
+ }
+
+ ast_log(LOG_WARNING, "SQL Exec Direct failed (%d)![%s]\n", res, sql);
SQLCloseCursor(stmt);
- SQLFreeHandle (SQL_HANDLE_STMT, stmt);
+ SQLFreeHandle(SQL_HANDLE_STMT, stmt);
return NULL;
}
@@ -198,6 +217,8 @@
SQLHSTMT stmt = NULL;
SQLLEN rows=0;
struct ast_str *buf = ast_str_thread_get(&sql_buf, 16);
+ struct ast_str *insertbuf = ast_str_thread_get(&sql2_buf, 16);
+ const char *status = "FAILURE";
if (!buf) {
return -1;
@@ -213,7 +234,7 @@
if (!query) {
ast_log(LOG_ERROR, "No such function '%s'\n", cmd);
AST_RWLIST_UNLOCK(&queries);
- ast_free(buf);
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status);
return -1;
}
@@ -226,6 +247,7 @@
ast_autoservice_start(chan);
ast_str_make_space(&buf, strlen(query->sql_write) * 2 + 300);
+ ast_str_make_space(&insertbuf, strlen(query->sql_insert) * 2 + 300);
/* Parse our arguments */
t = value ? ast_strdupa(value) : "";
@@ -235,9 +257,11 @@
AST_RWLIST_UNLOCK(&queries);
if (chan)
ast_autoservice_stop(chan);
- if (bogus_chan)
+ if (bogus_chan) {
ast_channel_free(chan);
- ast_free(buf);
+ } else {
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status);
+ }
return -1;
}
@@ -258,6 +282,7 @@
pbx_builtin_pushvar_helper(chan, "VALUE", value ? value : "");
pbx_substitute_variables_helper(chan, query->sql_write, buf->str, buf->len - 1);
+ pbx_substitute_variables_helper(chan, query->sql_insert, insertbuf->str, insertbuf->len - 1);
/* Restore prior values */
for (i = 0; i < args.argc; i++) {
@@ -277,16 +302,32 @@
if (obj)
stmt = ast_odbc_direct_execute(obj, generic_execute, buf);
}
- if (stmt)
+ if (stmt) {
+ status = "SUCCESS";
+ SQLRowCount(stmt, &rows);
break;
+ }
+ }
+
+ if (stmt && rows == 0 && !ast_strlen_zero(insertbuf->str)) {
+ SQLCloseCursor(stmt);
+ SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+ for (dsn = 0; dsn < 5; dsn++) {
+ if (!ast_strlen_zero(query->writehandle[dsn])) {
+ obj = ast_odbc_request_obj(query->writehandle[dsn], 0);
+ if (obj) {
+ stmt = ast_odbc_direct_execute(obj, generic_execute, insertbuf);
+ }
+ }
+ if (stmt) {
+ status = "FAILOVER";
+ SQLRowCount(stmt, &rows);
+ break;
+ }
+ }
}
AST_RWLIST_UNLOCK(&queries);
-
- if (stmt) {
- /* Rows affected */
- SQLRowCount(stmt, &rows);
- }
/* Output the affected rows, for all cases. In the event of failure, we
* flag this as -1 rows. Note that this is different from 0 affected rows
@@ -294,6 +335,7 @@
* not change. */
snprintf(varname, sizeof(varname), "%d", (int)rows);
pbx_builtin_setvar_helper(chan, "ODBCROWS", varname);
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status);
if (stmt) {
SQLCloseCursor(stmt);
@@ -306,7 +348,6 @@
ast_autoservice_stop(chan);
if (bogus_chan)
ast_channel_free(chan);
- ast_free(buf);
return 0;
}
@@ -328,8 +369,10 @@
struct odbc_datastore *resultset = NULL;
struct odbc_datastore_row *row = NULL;
struct ast_str *sql = ast_str_thread_get(&sql_buf, 16);
+ const char *status = "FAILURE";
if (!sql) {
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status);
return -1;
}
@@ -344,7 +387,7 @@
ast_log(LOG_ERROR, "No such function '%s'\n", cmd);
AST_RWLIST_UNLOCK(&queries);
pbx_builtin_setvar_helper(chan, "ODBCROWS", rowcount);
- ast_free(sql);
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status);
return -1;
}
@@ -410,7 +453,6 @@
if (bogus_chan) {
ast_channel_free(chan);
}
- ast_free(sql);
return -1;
}
@@ -427,7 +469,6 @@
if (bogus_chan) {
ast_channel_free(chan);
}
- ast_free(sql);
return -1;
}
@@ -439,20 +480,24 @@
res1 = 0;
buf[0] = '\0';
ast_copy_string(rowcount, "0", sizeof(rowcount));
+ status = "NODATA";
} else {
ast_log(LOG_WARNING, "Error %d in FETCH [%s]\n", res, sql->str);
+ status = "FETCHERROR";
}
SQLCloseCursor(stmt);
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
pbx_builtin_setvar_helper(chan, "ODBCROWS", rowcount);
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status);
if (chan)
ast_autoservice_stop(chan);
if (bogus_chan)
ast_channel_free(chan);
- ast_free(sql);
return res1;
}
+
+ status = "SUCCESS";
for (y = 0; y < rowlimit; y++) {
for (x = 0; x < colcount; x++) {
@@ -499,11 +544,11 @@
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
pbx_builtin_setvar_helper(chan, "ODBCROWS", rowcount);
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", "MEMERROR");
if (chan)
ast_autoservice_stop(chan);
if (bogus_chan)
ast_channel_free(chan);
- ast_free(sql);
return -1;
}
resultset = tmp;
@@ -555,6 +600,7 @@
row = ast_calloc(1, sizeof(*row) + buflen);
if (!row) {
ast_log(LOG_ERROR, "Unable to allocate space for more rows in this resultset.\n");
+ status = "MEMERROR";
goto end_acf_read;
}
strcpy((char *)row + sizeof(*row), buf);
@@ -574,6 +620,7 @@
end_acf_read:
snprintf(rowcount, sizeof(rowcount), "%d", y);
pbx_builtin_setvar_helper(chan, "ODBCROWS", rowcount);
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status);
pbx_builtin_setvar_helper(chan, "~ODBCFIELDS~", colnames->str);
if (resultset) {
int uid;
@@ -583,6 +630,7 @@
odbc_store = ast_datastore_alloc(&odbc_info, buf);
if (!odbc_store) {
ast_log(LOG_ERROR, "Rows retrieved, but unable to store it in the channel. Results fail.\n");
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", "MEMERROR");
odbc_datastore_free(resultset);
SQLCloseCursor(stmt);
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
@@ -591,7 +639,6 @@
ast_autoservice_stop(chan);
if (bogus_chan)
ast_channel_free(chan);
- ast_free(sql);
return -1;
}
odbc_store->data = resultset;
@@ -604,7 +651,6 @@
ast_autoservice_stop(chan);
if (bogus_chan)
ast_channel_free(chan);
- ast_free(sql);
return 0;
}
@@ -747,6 +793,10 @@
return EINVAL;
}
+ if ((tmp = ast_variable_retrieve(cfg, catg, "insertsql"))) {
+ ast_copy_string((*query)->sql_insert, tmp, sizeof((*query)->sql_insert));
+ }
+
/* Allow escaping of embedded commas in fields to be turned off */
ast_set_flag((*query), OPT_ESCAPECOMMAS);
if ((tmp = ast_variable_retrieve(cfg, catg, "escapecommas"))) {
@@ -820,13 +870,20 @@
if (!ast_strlen_zero((*query)->sql_read) && !ast_strlen_zero((*query)->sql_write)) {
ast_string_field_build((*query)->acf, desc,
- "Runs the following query, as defined in func_odbc.conf, performing\n"
- "substitution of the arguments into the query as specified by ${ARG1},\n"
- "${ARG2}, ... ${ARGn}. When setting the function, the values are provided\n"
- "either in whole as ${VALUE} or parsed as ${VAL1}, ${VAL2}, ... ${VALn}.\n"
- "\nRead:\n%s\n\nWrite:\n%s\n",
- (*query)->sql_read,
- (*query)->sql_write);
+ "Runs the following query, as defined in func_odbc.conf, performing\n"
+ "substitution of the arguments into the query as specified by ${ARG1},\n"
+ "${ARG2}, ... ${ARGn}. When setting the function, the values are provided\n"
+ "either in whole as ${VALUE} or parsed as ${VAL1}, ${VAL2}, ... ${VALn}.\n"
+ "%s"
+ "\nRead:\n%s\n\nWrite:\n%s\n%s%s%s",
+ ast_strlen_zero((*query)->sql_insert) ? "" :
+ "If the write query affects no rows, the insert query will be\n"
+ "performed.\n",
+ (*query)->sql_read,
+ (*query)->sql_write,
+ ast_strlen_zero((*query)->sql_insert) ? "" : "Insert:\n",
+ ast_strlen_zero((*query)->sql_insert) ? "" : (*query)->sql_insert,
+ ast_strlen_zero((*query)->sql_insert) ? "" : "\n");
} else if (!ast_strlen_zero((*query)->sql_read)) {
ast_string_field_build((*query)->acf, desc,
"Runs the following query, as defined in func_odbc.conf, performing\n"
@@ -834,19 +891,25 @@
"${ARG2}, ... ${ARGn}. This function may only be read, not set.\n\nSQL:\n%s\n",
(*query)->sql_read);
} else if (!ast_strlen_zero((*query)->sql_write)) {
- ast_string_field_build((*query)->acf, desc,
- "Runs the following query, as defined in func_odbc.conf, performing\n"
- "substitution of the arguments into the query as specified by ${ARG1},\n"
- "${ARG2}, ... ${ARGn}. The values are provided either in whole as\n"
- "${VALUE} or parsed as ${VAL1}, ${VAL2}, ... ${VALn}.\n"
- "This function may only be set.\nSQL:\n%s\n",
- (*query)->sql_write);
+ ast_string_field_build((*query)->acf, desc,
+ "Runs the following query, as defined in func_odbc.conf, performing\n"
+ "substitution of the arguments into the query as specified by ${ARG1},\n"
+ "${ARG2}, ... ${ARGn}. The values are provided either in whole as\n"
+ "${VALUE} or parsed as ${VAL1}, ${VAL2}, ... ${VALn}.\n"
+ "This function may only be set.\n%sSQL:\n%s\n%s%s%s",
+ ast_strlen_zero((*query)->sql_insert) ? "" :
+ "If the write query affects no rows, the insert query will be\n"
+ "performed.\n",
+ (*query)->sql_write,
+ ast_strlen_zero((*query)->sql_insert) ? "" : "Insert:\n",
+ ast_strlen_zero((*query)->sql_insert) ? "" : (*query)->sql_insert,
+ ast_strlen_zero((*query)->sql_insert) ? "" : "\n");
} else {
ast_string_field_free_memory((*query)->acf);
ast_free((char *)(*query)->acf->name);
ast_free((*query)->acf);
ast_free(*query);
- ast_log(LOG_WARNING, "Section %s was found, but there was no SQL to execute. Ignoring.\n", catg);
+ ast_log(LOG_WARNING, "Section '%s' was found, but there was no SQL to execute. Ignoring.\n", catg);
return EINVAL;
}
More information about the svn-commits
mailing list