kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return the number of rows affected by a SQL insert, rather than an object ID.

Browse Source 
The realtime API specifies that the store callback is supposed to return the number
of rows affected. res_config_pgsql was instead returning an Oid cast as an int, which
during any nominal execution would be cast to 0. Returning 0 when more than 0 rows were
inserted causes problems to the function's callers.

To give an idea of how strange code can be, this is the necessary code change to fix
a device state issue reported against chan_pjsip in Asterisk 12+. The issue was that
the registrar would attempt to insert contacts into the database. Because of the 0
return from res_config_pgsql, the registrar would think that the contact was not successfully
inserted, even though it actually was. As such, even though the contact was query-able
and it was possible to call the endpoint, Asterisk would "think" the endpoint was unregistered,
meaning it would report the device state as UNAVAILABLE instead of NOT_INUSE.

The necessary fix applies to all versions of Asterisk, so even though the bug reported
only applies to Asterisk 12+, the code correction is being inserted into 1.8+.

Closes issue ASTERISK-23707
Reported by Mark Michelson
........

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

Merged revisions 413225 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 413226 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413227 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2014-05-02 20:07:08 +00:00
parent 119599407b
commit ff1658ed3b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_config_pgsql.c
View File

@@ -921,7 +921,7 @@ static int update2_pgsql(const char *database, const char *tablename, const stru
static int store_pgsql(const char *database, const char *table, const struct ast_variable *fields) static int store_pgsql(const char *database, const char *table, const struct ast_variable *fields)
{ {
RAII_VAR(PGresult *, result, NULL, PQclear); RAII_VAR(PGresult *, result, NULL, PQclear);
Oid insertid; int numrows;
struct ast_str *buf = ast_str_thread_get(&escapebuf_buf, 256); struct ast_str *buf = ast_str_thread_get(&escapebuf_buf, 256);
struct ast_str *sql1 = ast_str_thread_get(&sql_buf, 256); struct ast_str *sql1 = ast_str_thread_get(&sql_buf, 256);
struct ast_str *sql2 = ast_str_thread_get(&where_buf, 256); struct ast_str *sql2 = ast_str_thread_get(&where_buf, 256);
@@ -978,10 +978,10 @@ static int store_pgsql(const char *database, const char *table, const struct ast
return -1; return -1;
} }
insertid = PQoidValue(result); numrows = atoi(PQcmdTuples(result));
ast_mutex_unlock(&pgsql_lock); ast_mutex_unlock(&pgsql_lock);
ast_debug(1, "PostgreSQL RealTime: row inserted on table: %s, id: %u\n", table, insertid); ast_debug(1, "PostgreSQL RealTime: row inserted on table: %s.", table);
/* From http://dev.pgsql.com/doc/pgsql/en/pgsql-affected-rows.html /* From http://dev.pgsql.com/doc/pgsql/en/pgsql-affected-rows.html
* An integer greater than zero indicates the number of rows affected * An integer greater than zero indicates the number of rows affected
@@ -989,8 +989,9 @@ static int store_pgsql(const char *database, const char *table, const struct ast
* -1 indicates that the query returned an error (although, if the query failed, it should have been caught above.) * -1 indicates that the query returned an error (although, if the query failed, it should have been caught above.)
*/ */
if (insertid >= 0) if (numrows >= 0) {
return (int) insertid; return numrows;
}
return -1; return -1;
} }