git:master:241edc7a: uri_db Refers to wrong version of subscriber table, fix error message
Module: kamailio Branch: master Commit: 241edc7abfbbab24eb068e944b6a875485236a12 URL: https://github.com/kamailio/kamailio/commit/241edc7abfbbab24eb068e944b6a8754...
Author: Olle E. Johansson oej@edvina.net Committer: Olle E. Johansson oej@edvina.net Date: 2016-04-21T22:01:01+02:00
uri_db Refers to wrong version of subscriber table, fix error message
---
Modified: modules/uri_db/checks.c Modified: modules/uri_db/checks.h Modified: modules/uri_db/uridb_mod.c Modified: modules/uri_db/uridb_mod.h
---
Diff: https://github.com/kamailio/kamailio/commit/241edc7abfbbab24eb068e944b6a8754... Patch: https://github.com/kamailio/kamailio/commit/241edc7abfbbab24eb068e944b6a8754...
---
diff --git a/modules/uri_db/checks.c b/modules/uri_db/checks.c index 5971d7e..afd3cc8 100644 --- a/modules/uri_db/checks.c +++ b/modules/uri_db/checks.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Various URI checks * * Copyright (C) 2001-2004 FhG FOKUS @@ -21,12 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * -------- - * 2003-02-26: Created by janakj - * 2004-03-20: has_totag introduced (jiri) - * 2004-06-07 updated to the new DB api, added uridb_db_{bind,init,close,ver} - * (andrei) */
#include <string.h> diff --git a/modules/uri_db/checks.h b/modules/uri_db/checks.h index 53bbbec..36b9ec3 100644 --- a/modules/uri_db/checks.h +++ b/modules/uri_db/checks.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Various URI checks * * Copyright (C) 2001-2004 FhG FOKUS @@ -21,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * -------- - * 2003-03-26 created by janakj */
diff --git a/modules/uri_db/uridb_mod.c b/modules/uri_db/uridb_mod.c index 880ec7a..e0284c8 100644 --- a/modules/uri_db/uridb_mod.c +++ b/modules/uri_db/uridb_mod.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Various URI related functions * * Copyright (C) 2001-2003 FhG Fokus @@ -21,14 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * ------- - * 2003-03-11: New module interface (janakj) - * 2003-03-16: flags export parameter added (janakj) - * 2003-03-19 replaces all mallocs/frees w/ pkg_malloc/pkg_free (andrei) - * 2003-04-05: default_uri #define used (jiri) - * 2004-03-20: has_totag introduced (jiri) - * 2004-06-07 updated to the new DB api (andrei) */
@@ -51,7 +41,7 @@ MODULE_VERSION * an backwards incompatible way */ #define URI_TABLE_VERSION 1 -#define SUBSCRIBER_TABLE_VERSION 6 +#define SUBSCRIBER_TABLE_VERSION 8
static void destroy(void); /* Module destroy function */ static int child_init(int rank); /* Per-child initialization function */ @@ -171,13 +161,13 @@ static int mod_init(void) } else { if (use_uri_table) { if (ver != URI_TABLE_VERSION) { - LM_ERR("Invalid table version of the uri table\n"); - return -1; + LM_ERR("Invalid table version of the uri table. Expected %d, database is %d\n", URI_TABLE_VERSION, ver); + return -1; } } else { if (ver != SUBSCRIBER_TABLE_VERSION) { - LM_ERR("Invalid table version of the subscriber table\n"); - return -1; + LM_ERR("Invalid table version of the subscriber table. Expected %d, database is %d\n", SUBSCRIBER_TABLE_VERSION, ver); + return -1; } } } diff --git a/modules/uri_db/uridb_mod.h b/modules/uri_db/uridb_mod.h index a53973f..9bd6e49 100644 --- a/modules/uri_db/uridb_mod.h +++ b/modules/uri_db/uridb_mod.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Various URI related functions * * Copyright (C) 2001-2004 FhG FOKUS @@ -21,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * -------- - * 2003-02-26: created by janakj */
-
Olle E. Johansson