Module: sip-router Branch: master Commit: e437fdeacce0b07180b4d445a2eb2e920731fcb0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e437fdea...

Author: Henning Westerholt henning.westerholt@1und1.de Committer: Henning Westerholt henning.westerholt@1und1.de Date: Wed Jul 15 14:50:02 2009 +0200

bugfix in cr and userblacklist modules (kamailio r5894) - fix error in module initialization which happened if a custom table name was configured in carrierroute and also userblacklist - it was reported as table version mismatch, which was of course really misleading - many thanks to Uriel Rozenbaum (uriel dot rozenbaum at gmail dot com) for his help in debugging this problem with a sample cfg and a binary build

---

modules/carrierroute/db_carrierroute.h | 6 +++--- modules_k/userblacklist/db_userblacklist.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/carrierroute/db_carrierroute.h b/modules/carrierroute/db_carrierroute.h index cebc30e..8fc4f7b 100644 --- a/modules/carrierroute/db_carrierroute.h +++ b/modules/carrierroute/db_carrierroute.h @@ -71,7 +71,7 @@ extern str carrierroute_description_col; /* table version */ extern const unsigned int carrierroute_version;

-#define carrierfailureroute_DB_TABLE { "carrierfailureroute_table", STR_PARAM, &carrierroute_table.s }, +#define carrierfailureroute_DB_TABLE { "carrierfailureroute_table", STR_PARAM, &carrierfailureroute_table.s },

extern str carrierfailureroute_table;

@@ -101,7 +101,7 @@ extern str carrierfailureroute_description_col; /* table version */ extern const unsigned int carrierfailureroute_version;

-#define carrier_name_DB_TABLE { "carrier_name_table", STR_PARAM, &carrierroute_table.s }, +#define carrier_name_DB_TABLE { "carrier_name_table", STR_PARAM, &carrier_name_table.s },

extern str carrier_name_table;

@@ -115,7 +115,7 @@ extern str carrier_name_carrier_col; /* table version */ extern const unsigned int carrier_name_version;

-#define domain_name_DB_TABLE { "domain_name_table", STR_PARAM, &carrierroute_table.s }, +#define domain_name_DB_TABLE { "domain_name_table", STR_PARAM, &domain_name_table.s },

extern str domain_name_table;

diff --git a/modules_k/userblacklist/db_userblacklist.h b/modules_k/userblacklist/db_userblacklist.h index cfe49a7..e7be1e6 100644 --- a/modules_k/userblacklist/db_userblacklist.h +++ b/modules_k/userblacklist/db_userblacklist.h @@ -57,7 +57,7 @@ extern str userblacklist_whitelist_col; /* table version */ extern const unsigned int userblacklist_version;

-#define globalblacklist_DB_TABLE { "globalblacklist_table", STR_PARAM, &userblacklist_table.s }, +#define globalblacklist_DB_TABLE { "globalblacklist_table", STR_PARAM, &globalblacklist_table.s },

extern str globalblacklist_table;