(cherry picked from commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043)
... | ... |
@@ -1,7 +1,7 @@ |
1 | 1 |
/* |
2 | 2 |
* Copyright (C) 2001-2003 FhG Fokus |
3 | 3 |
* Copyright (C) 2007-2008 1&1 Internet AG |
4 |
- * |
|
4 |
+ * |
|
5 | 5 |
* This file is part of Kamailio, a free SIP server. |
6 | 6 |
* |
7 | 7 |
* Kamailio is free software; you can redistribute it and/or modify |
... | ... |
@@ -14,8 +14,8 @@ |
14 | 14 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | 15 |
* GNU General Public License for more details. |
16 | 16 |
* |
17 |
- * You should have received a copy of the GNU General Public License |
|
18 |
- * along with this program; if not, write to the Free Software |
|
17 |
+ * You should have received a copy of the GNU General Public License |
|
18 |
+ * along with this program; if not, write to the Free Software |
|
19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | 20 |
*/ |
21 | 21 |
|
... | ... |
@@ -294,7 +294,7 @@ db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t p |
294 | 294 |
LM_ERR("The configured db_url is too long\n"); |
295 | 295 |
return 0; |
296 | 296 |
} |
297 |
- |
|
297 |
+ |
|
298 | 298 |
/* this is the root memory for this database connection. */ |
299 | 299 |
res = (db1_con_t*)pkg_malloc(con_size); |
300 | 300 |
if (!res) { |
... | ... |
@@ -14,8 +14,8 @@ |
14 | 14 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | 15 |
* GNU General Public License for more details. |
16 | 16 |
* |
17 |
- * You should have received a copy of the GNU General Public License |
|
18 |
- * along with this program; if not, write to the Free Software |
|
17 |
+ * You should have received a copy of the GNU General Public License |
|
18 |
+ * along with this program; if not, write to the Free Software |
|
19 | 19 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | 20 |
*/ |
21 | 21 |
|
... | ... |
@@ -36,6 +36,7 @@ |
36 | 36 |
* are used as a connection handle from modules uses the db API. |
37 | 37 |
*/ |
38 | 38 |
typedef struct { |
39 |
+ long cpid; /*!< connection process id */ |
|
39 | 40 |
const str* table; /*!< Default table that should be used */ |
40 | 41 |
const char *tquote; /*!< Char to quote special tokens (table/column names) */ |
41 | 42 |
unsigned long tail; /*!< Variable length tail, database module specific */ |
... | ... |
@@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { |
60 | 60 |
REQUEST_ROUTE|ONREPLY_ROUTE}, |
61 | 61 |
{"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, |
62 | 62 |
REQUEST_ROUTE|ONREPLY_ROUTE}, |
63 |
- {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, |
|
63 |
+ {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, |
|
64 | 64 |
REQUEST_ROUTE|ONREPLY_ROUTE}, |
65 | 65 |
{"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, |
66 | 66 |
{0, 0, 0, 0, 0, 0} |