Sfoglia il codice sorgente

uri_db: clang-format for coherent indentation and coding style

Victor Seva 2 anni fa
parent
commit
8b36095424

+ 77 - 80
src/modules/uri_db/checks.c

@@ -23,17 +23,17 @@
 
 #include <string.h>
 #include "../../core/str.h"
-#include "../../core/dprint.h"               /* Debugging */
+#include "../../core/dprint.h"				 /* Debugging */
 #include "../../core/parser/digest/digest.h" /* get_authorized_cred */
 #include "../../core/parser/parse_from.h"
 #include "../../core/parser/parse_uri.h"
-#include "../../core/ut.h"                   /* Handy utilities */
-#include "../../lib/srdb1/db.h"                /* Database API */
+#include "../../core/ut.h"		/* Handy utilities */
+#include "../../lib/srdb1/db.h" /* Database API */
 #include "../../core/mod_fix.h"
 #include "uri_db.h"
 #include "checks.h"
 
-static db1_con_t* db_handle = 0;   /* Database connection handle */
+static db1_con_t *db_handle = 0; /* Database connection handle */
 static db_func_t uridb_dbf;
 
 
@@ -41,8 +41,8 @@ static db_func_t uridb_dbf;
  * Check if a header field contains the same username
  * as digest credentials
  */
-static inline int check_username(struct sip_msg* _m, struct sip_uri *_uri,
-								str* _username, str* _realm)
+static inline int check_username(
+		struct sip_msg *_m, struct sip_uri *_uri, str *_username, str *_realm)
 {
 	str username;
 	str realm;
@@ -50,37 +50,38 @@ static inline int check_username(struct sip_msg* _m, struct sip_uri *_uri,
 	db_key_t keys[3];
 	db_val_t vals[3];
 	db_key_t cols[1];
-	db1_res_t* res = NULL;
+	db1_res_t *res = NULL;
 
-	if (!_uri) {
+	if(!_uri) {
 		LM_ERR("Bad parameter\n");
 		return -1;
 	}
 
 	/* Parse To/From URI */
 	/* Make sure that the URI contains username */
-	if (!_uri->user.len) {
+	if(!_uri->user.len) {
 		LM_ERR("Username not found in URI\n");
 		return -4;
 	}
 
 	/* use digest credentials if no other credentials are supplied */
-	if (!_username || !_realm) {
-		struct hdr_field* h;
-		auth_body_t* c;
+	if(!_username || !_realm) {
+		struct hdr_field *h;
+		auth_body_t *c;
 
 		/* Get authorized digest credentials */
 		get_authorized_cred(_m->authorization, &h);
-		if (!h) {
+		if(!h) {
 			get_authorized_cred(_m->proxy_auth, &h);
-			if (!h) {
+			if(!h) {
 				LM_ERR("No authorized credentials found (error in scripts)\n");
-				LM_ERR("Call {www,proxy}_authorize before calling check_* functions!\n");
+				LM_ERR("Call {www,proxy}_authorize before calling check_* "
+					   "functions!\n");
 				return -2;
 			}
 		}
 
-		c = (auth_body_t*)(h->parsed);
+		c = (auth_body_t *)(h->parsed);
 
 		username = c->digest.username.user;
 		realm = *GET_REALM(&c->digest);
@@ -94,8 +95,8 @@ static inline int check_username(struct sip_msg* _m, struct sip_uri *_uri,
 	 * usernames for a single, thus a user can have several different usernames
 	 * (which are different from digest username and it will still match)
 	 */
-	if (use_uri_table) {
-		if (uridb_dbf.use_table(db_handle, &db_table) < 0) {
+	if(use_uri_table) {
+		if(uridb_dbf.use_table(db_handle, &db_table) < 0) {
 			LM_ERR("Error while trying to use uri table\n");
 			return -7;
 		}
@@ -112,8 +113,7 @@ static inline int check_username(struct sip_msg* _m, struct sip_uri *_uri,
 		VAL_STR(vals + 1) = realm;
 		VAL_STR(vals + 2) = _uri->user;
 
-		if (uridb_dbf.query(db_handle, keys, 0, vals, cols, 3, 1, 0, &res) < 0)
-		{
+		if(uridb_dbf.query(db_handle, keys, 0, vals, cols, 3, 1, 0, &res) < 0) {
 			LM_ERR("Error while querying database\n");
 			return -8;
 		}
@@ -122,14 +122,14 @@ static inline int check_username(struct sip_msg* _m, struct sip_uri *_uri,
 		 * there is an entry for given digest username and URI username
 		 * and thus this combination is allowed and the function will match
 		 */
-		if (RES_ROW_N(res) == 0) {
-			LM_DBG("From/To user '%.*s' is spoofed\n",
-				    _uri->user.len, ZSW(_uri->user.s));
+		if(RES_ROW_N(res) == 0) {
+			LM_DBG("From/To user '%.*s' is spoofed\n", _uri->user.len,
+					ZSW(_uri->user.s));
 			uridb_dbf.free_result(db_handle, res);
 			return -9;
 		} else {
-			LM_DBG("From/To user '%.*s' and auth user match\n",
-				   _uri->user.len, ZSW(_uri->user.s));
+			LM_DBG("From/To user '%.*s' and auth user match\n", _uri->user.len,
+					ZSW(_uri->user.s));
 			uridb_dbf.free_result(db_handle, res);
 			return 1;
 		}
@@ -137,8 +137,8 @@ static inline int check_username(struct sip_msg* _m, struct sip_uri *_uri,
 		/* URI table not used, simply compare digest username and From/To
 		 * username, the comparison is case insensitive
 		 */
-		if (_uri->user.len == username.len) {
-			if (!strncasecmp(_uri->user.s, username.s, _uri->user.len)) {
+		if(_uri->user.len == username.len) {
+			if(!strncasecmp(_uri->user.s, username.s, _uri->user.len)) {
 				LM_DBG("Digest username and URI username match\n");
 				return 1;
 			}
@@ -153,13 +153,13 @@ static inline int check_username(struct sip_msg* _m, struct sip_uri *_uri,
 /*
  * Check username part in To header field
  */
-int ki_check_to(struct sip_msg* _m)
+int ki_check_to(struct sip_msg *_m)
 {
-	if (!_m->to && ((parse_headers(_m, HDR_TO_F, 0) == -1) || (!_m->to))) {
+	if(!_m->to && ((parse_headers(_m, HDR_TO_F, 0) == -1) || (!_m->to))) {
 		LM_ERR("Error while parsing To header field\n");
 		return -1;
 	}
-	if (parse_to_uri(_m)==NULL) {
+	if(parse_to_uri(_m) == NULL) {
 		LM_ERR("Error while parsing To header URI\n");
 		return -1;
 	}
@@ -171,7 +171,7 @@ int ki_check_to(struct sip_msg* _m)
 /*
  * Check username part in To header field
  */
-int check_to(struct sip_msg* _m, char* _s1, char* _s2)
+int check_to(struct sip_msg *_m, char *_s1, char *_s2)
 {
 	return ki_check_to(_m);
 }
@@ -179,13 +179,13 @@ int check_to(struct sip_msg* _m, char* _s1, char* _s2)
 /*
  * Check username part in From header field
  */
-int ki_check_from(struct sip_msg* _m)
+int ki_check_from(struct sip_msg *_m)
 {
-	if (parse_from_header(_m) < 0) {
+	if(parse_from_header(_m) < 0) {
 		LM_ERR("Error while parsing From header field\n");
 		return -1;
 	}
-	if(parse_from_uri(_m)==NULL) {
+	if(parse_from_uri(_m) == NULL) {
 		LM_ERR("Error while parsing From header URI\n");
 		return -1;
 	}
@@ -197,7 +197,7 @@ int ki_check_from(struct sip_msg* _m)
 /*
  * Check username part in From header field
  */
-int check_from(struct sip_msg* _m, char* _s1, char* _s2)
+int check_from(struct sip_msg *_m, char *_s1, char *_s2)
 {
 	return ki_check_from(_m);
 }
@@ -206,58 +206,55 @@ int check_from(struct sip_msg* _m, char* _s1, char* _s2)
  * Checks username part of the supplied sip URI.
  * Optinal with supplied credentials.
  */
-int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername,
-		str *srealm)
+int ki_check_uri_realm(
+		struct sip_msg *msg, str *suri, str *susername, str *srealm)
 {
 	struct sip_uri parsed_uri;
 
-	if(suri==NULL || suri->s==NULL || suri->len<=0) {
+	if(suri == NULL || suri->s == NULL || suri->len <= 0) {
 		LM_ERR("invalid uri parameter\n");
 		return -1;
 	}
 
-	if (parse_uri(suri->s, suri->len, &parsed_uri) != 0)
-	{
+	if(parse_uri(suri->s, suri->len, &parsed_uri) != 0) {
 		LM_ERR("Error while parsing URI: %.*s\n", suri->len, suri->s);
 		return -1;
 	}
 
-	if(susername==NULL || susername->len<=0 || srealm==NULL || srealm->len<=0) {
+	if(susername == NULL || susername->len <= 0 || srealm == NULL
+			|| srealm->len <= 0) {
 		return check_username(msg, &parsed_uri, NULL, NULL);
 	}
 
 	return check_username(msg, &parsed_uri, susername, srealm);
 }
 
-int ki_check_uri(struct sip_msg* msg, str *suri)
+int ki_check_uri(struct sip_msg *msg, str *suri)
 {
 	return ki_check_uri_realm(msg, suri, NULL, NULL);
 }
 
-int check_uri(struct sip_msg* msg, char* uri, char* username, char* realm)
+int check_uri(struct sip_msg *msg, char *uri, char *username, char *realm)
 {
 	str suri;
 	str susername;
 	str srealm;
 
-	if (get_str_fparam(&suri, msg, (fparam_t*) uri) != 0)
-	{
+	if(get_str_fparam(&suri, msg, (fparam_t *)uri) != 0) {
 		LM_ERR("Error while getting URI value\n");
 		return -1;
 	}
 
-	if (!username || !realm) {
+	if(!username || !realm) {
 		return ki_check_uri_realm(msg, &suri, NULL, NULL);
 	}
 
-	if (get_str_fparam(&susername, msg, (fparam_t*) username) != 0)
-	{
+	if(get_str_fparam(&susername, msg, (fparam_t *)username) != 0) {
 		LM_ERR("Error while getting username value\n");
 		return -1;
 	}
 
-	if (get_str_fparam(&srealm, msg, (fparam_t*) realm) != 0)
-	{
+	if(get_str_fparam(&srealm, msg, (fparam_t *)realm) != 0) {
 		LM_ERR("Error while getting realm value\n");
 		return -1;
 	}
@@ -267,25 +264,25 @@ int check_uri(struct sip_msg* msg, char* uri, char* username, char* realm)
 /*
  * Check if uri belongs to a local user
  */
-int ki_does_uri_exist(struct sip_msg* _msg)
+int ki_does_uri_exist(struct sip_msg *_msg)
 {
 	db_key_t keys[2];
 	db_val_t vals[2];
 	db_key_t cols[1];
-	db1_res_t* res = NULL;
+	db1_res_t *res = NULL;
 
-	if(db_handle==NULL) {
+	if(db_handle == NULL) {
 		LM_ERR("database connection does not exist\n");
 		return -1;
 	}
 
-	if (parse_sip_msg_uri(_msg) < 0) {
+	if(parse_sip_msg_uri(_msg) < 0) {
 		LM_ERR("Error while parsing URI\n");
 		return -1;
 	}
 
-	if (use_uri_table) {
-		if (uridb_dbf.use_table(db_handle, &db_table) < 0) {
+	if(use_uri_table) {
+		if(uridb_dbf.use_table(db_handle, &db_table) < 0) {
 			LM_ERR("Error while trying to use uri table\n");
 			return -2;
 		}
@@ -293,7 +290,7 @@ int ki_does_uri_exist(struct sip_msg* _msg)
 		keys[1] = &uridb_domain_col;
 		cols[0] = &uridb_uriuser_col;
 	} else {
-		if (uridb_dbf.use_table(db_handle, &db_table) < 0) {
+		if(uridb_dbf.use_table(db_handle, &db_table) < 0) {
 			LM_ERR("Error while trying to use subscriber table\n");
 			return -3;
 		}
@@ -307,13 +304,14 @@ int ki_does_uri_exist(struct sip_msg* _msg)
 	VAL_STR(vals) = _msg->parsed_uri.user;
 	VAL_STR(vals + 1) = _msg->parsed_uri.host;
 
-	if (uridb_dbf.query(db_handle, keys, 0, vals, cols, (use_domain ? 2 : 1),
-				1, 0, &res) < 0) {
+	if(uridb_dbf.query(
+			   db_handle, keys, 0, vals, cols, (use_domain ? 2 : 1), 1, 0, &res)
+			< 0) {
 		LM_ERR("Error while querying database\n");
 		return -4;
 	}
 
-	if (RES_ROW_N(res) == 0) {
+	if(RES_ROW_N(res) == 0) {
 		LM_DBG("User in request uri does not exist\n");
 		uridb_dbf.free_result(db_handle, res);
 		return -5;
@@ -328,21 +326,21 @@ int ki_does_uri_exist(struct sip_msg* _msg)
 /*
  * Check if uri belongs to a local user
  */
-int does_uri_exist(struct sip_msg* _msg, char* _s1, char* _s2)
+int does_uri_exist(struct sip_msg *_msg, char *_s1, char *_s2)
 {
 	return ki_does_uri_exist(_msg);
 }
 
 
-int uridb_db_init(const str* db_url)
+int uridb_db_init(const str *db_url)
 {
-	if (uridb_dbf.init==0){
+	if(uridb_dbf.init == 0) {
 		LM_BUG("null dbf\n");
 		return -1;
 	}
 
-	db_handle=uridb_dbf.init(db_url);
-	if (db_handle==0){
+	db_handle = uridb_dbf.init(db_url);
+	if(db_handle == 0) {
 		LM_ERR("unable to connect to the database\n");
 		return -1;
 	}
@@ -350,15 +348,14 @@ int uridb_db_init(const str* db_url)
 }
 
 
-
-int uridb_db_bind(const str* db_url)
+int uridb_db_bind(const str *db_url)
 {
-	if (db_bind_mod(db_url, &uridb_dbf)<0){
+	if(db_bind_mod(db_url, &uridb_dbf) < 0) {
 		LM_ERR("unable to bind to the database module\n");
 		return -1;
 	}
 
-	if (!DB_CAPABILITY(uridb_dbf, DB_CAP_QUERY)) {
+	if(!DB_CAPABILITY(uridb_dbf, DB_CAP_QUERY)) {
 		LM_ERR("Database module does not implement the 'query' function\n");
 		return -1;
 	}
@@ -369,42 +366,42 @@ int uridb_db_bind(const str* db_url)
 
 void uridb_db_close(void)
 {
-	if (db_handle && uridb_dbf.close){
+	if(db_handle && uridb_dbf.close) {
 		uridb_dbf.close(db_handle);
-		db_handle=0;
+		db_handle = 0;
 	}
 }
 
 
-int uridb_db_ver(const str* db_url)
+int uridb_db_ver(const str *db_url)
 {
-	db1_con_t* dbh;
+	db1_con_t *dbh;
 	int ver;
 
-	if (use_uri_table) {
+	if(use_uri_table) {
 		ver = URI_TABLE_VERSION;
 	} else {
 		ver = SUBSCRIBER_TABLE_VERSION;
 	}
 
-	if (uridb_dbf.init==0){
+	if(uridb_dbf.init == 0) {
 		LM_BUG("unbound database\n");
 		return -1;
 	}
 
-	dbh=uridb_dbf.init(db_url);
-	if (dbh==0){
+	dbh = uridb_dbf.init(db_url);
+	if(dbh == 0) {
 		LM_ERR("unable to open database connection\n");
 		return -1;
 	}
-	if (db_check_table_version(&uridb_dbf, dbh, &db_table, ver) < 0) {
+	if(db_check_table_version(&uridb_dbf, dbh, &db_table, ver) < 0) {
 		DB_TABLE_VERSION_ERROR(db_table);
 		uridb_dbf.close(dbh);
-		dbh=0;
+		dbh = 0;
 		return -1;
 	}
 	uridb_dbf.close(dbh);
-	dbh=0;
+	dbh = 0;
 
 	return 0;
 }

+ 13 - 12
src/modules/uri_db/checks.h

@@ -32,38 +32,39 @@
  * Check if To header field contains the same username
  * as digest credentials
  */
-int check_to(struct sip_msg* _msg, char* _str1, char* _str2);
+int check_to(struct sip_msg *_msg, char *_str1, char *_str2);
 
 
 /*
  * Check if From header field contains the same username
  * as digest credentials
  */
-int check_from(struct sip_msg* _msg, char* _str1, char* _str2);
+int check_from(struct sip_msg *_msg, char *_str1, char *_str2);
 
 
 /*
  * Checks username part of the supplied sip URI.
  * Optinal with supplied credentials.
  */
-int check_uri(struct sip_msg* msg, char* uri, char* username, char* realm);
+int check_uri(struct sip_msg *msg, char *uri, char *username, char *realm);
 
 
 /*
  * Check if uri belongs to a local user, contributed by Juha Heinanen
  */
-int does_uri_exist(struct sip_msg* _msg, char* _table, char* _s2);
+int does_uri_exist(struct sip_msg *_msg, char *_table, char *_s2);
 
 
-int uridb_db_init(const str* db_url);
-int uridb_db_bind(const str* db_url);
+int uridb_db_init(const str *db_url);
+int uridb_db_bind(const str *db_url);
 void uridb_db_close(void);
-int uridb_db_ver(const str* db_url);
+int uridb_db_ver(const str *db_url);
 
-int ki_check_to(struct sip_msg* _m);
-int ki_check_from(struct sip_msg* _m);
-int ki_check_uri(struct sip_msg* msg, str *suri);
-int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srealm);
-int ki_does_uri_exist(struct sip_msg* _msg);
+int ki_check_to(struct sip_msg *_m);
+int ki_check_from(struct sip_msg *_m);
+int ki_check_uri(struct sip_msg *msg, str *suri);
+int ki_check_uri_realm(
+		struct sip_msg *msg, str *suri, str *susername, str *srealm);
+int ki_does_uri_exist(struct sip_msg *_msg);
 
 #endif /* CHECKS_H */

+ 49 - 54
src/modules/uri_db/uri_db.c

@@ -38,9 +38,9 @@
 MODULE_VERSION
 
 
-static void destroy(void);       /* Module destroy function */
+static void destroy(void);		 /* Module destroy function */
 static int child_init(int rank); /* Per-child initialization function */
-static int mod_init(void);       /* Module initialization function */
+static int mod_init(void);		 /* Module initialization function */
 
 
 #define URI_TABLE "uri"
@@ -53,66 +53,60 @@ static int mod_init(void);       /* Module initialization function */
 /*
  * Module parameter variables
  */
-static str db_url         = str_init(DEFAULT_RODB_URL);
-str db_table              = str_init(SUBSCRIBER_TABLE);
-str uridb_user_col        = str_init(USER_COL);
-str uridb_domain_col      = str_init(DOMAIN_COL);
-str uridb_uriuser_col     = str_init(URI_USER_COL);
+static str db_url = str_init(DEFAULT_RODB_URL);
+str db_table = str_init(SUBSCRIBER_TABLE);
+str uridb_user_col = str_init(USER_COL);
+str uridb_domain_col = str_init(DOMAIN_COL);
+str uridb_uriuser_col = str_init(URI_USER_COL);
 
-int use_uri_table = 0;     /* Should uri table be used */
-int use_domain = 0;        /* Should does_uri_exist honor the domain part ? */
+int use_uri_table = 0; /* Should uri table be used */
+int use_domain = 0;	   /* Should does_uri_exist honor the domain part ? */
 
-static int fixup_exist(void** param, int param_no);
+static int fixup_exist(void **param, int param_no);
 
-static int w_check_uri1(struct sip_msg* _m, char* _uri, char* _s);
+static int w_check_uri1(struct sip_msg *_m, char *_uri, char *_s);
 
 /*
  * Exported functions
  */
 static cmd_export_t cmds[] = {
-	{"check_to",       (cmd_function)check_to,       0, 0, 0,
-		REQUEST_ROUTE},
-	{"check_from",     (cmd_function)check_from,     0, 0, 0,
-		REQUEST_ROUTE},
-	{"check_uri",      (cmd_function)w_check_uri1,   1, fixup_spve_null, 0,
-		REQUEST_ROUTE},
-	{"check_uri",      (cmd_function)check_uri,      3, fixup_spve_all, 0,
-		REQUEST_ROUTE},
-	{"does_uri_exist", (cmd_function)does_uri_exist, 0, 0, fixup_exist,
-		REQUEST_ROUTE|LOCAL_ROUTE},
-	{0, 0, 0, 0, 0, 0}
-};
+		{"check_to", (cmd_function)check_to, 0, 0, 0, REQUEST_ROUTE},
+		{"check_from", (cmd_function)check_from, 0, 0, 0, REQUEST_ROUTE},
+		{"check_uri", (cmd_function)w_check_uri1, 1, fixup_spve_null, 0,
+				REQUEST_ROUTE},
+		{"check_uri", (cmd_function)check_uri, 3, fixup_spve_all, 0,
+				REQUEST_ROUTE},
+		{"does_uri_exist", (cmd_function)does_uri_exist, 0, 0, fixup_exist,
+				REQUEST_ROUTE | LOCAL_ROUTE},
+		{0, 0, 0, 0, 0, 0}};
 
 
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
-	{"db_url",                   PARAM_STR, &db_url               },
-	{"db_table",                 PARAM_STR, &db_table             },
-	{"user_column",              PARAM_STR, &uridb_user_col       },
-	{"domain_column",            PARAM_STR, &uridb_domain_col     },
-	{"uriuser_column",           PARAM_STR, &uridb_uriuser_col    },
-	{"use_uri_table",            INT_PARAM, &use_uri_table          },
-	{"use_domain",               INT_PARAM, &use_domain             },
-	{0, 0, 0}
-};
+static param_export_t params[] = {{"db_url", PARAM_STR, &db_url},
+		{"db_table", PARAM_STR, &db_table},
+		{"user_column", PARAM_STR, &uridb_user_col},
+		{"domain_column", PARAM_STR, &uridb_domain_col},
+		{"uriuser_column", PARAM_STR, &uridb_uriuser_col},
+		{"use_uri_table", INT_PARAM, &use_uri_table},
+		{"use_domain", INT_PARAM, &use_domain}, {0, 0, 0}};
 
 
 /*
  * Module interface
  */
 struct module_exports exports = {
-	"uri_db",   /* module name */
-	DEFAULT_DLFLAGS, /* dlopen flags */
-	cmds,       /* exported functions */
-	params,     /* exported parameters */
-	0 ,         /* exported rpc functions */
-	0,          /* exported pseudo-variables */
-	0,          /* response handling function */
-	mod_init,   /* module init function */
-	child_init, /* child init function */
-	destroy     /* module destroy function */
+		"uri_db",		 /* module name */
+		DEFAULT_DLFLAGS, /* dlopen flags */
+		cmds,			 /* exported functions */
+		params,			 /* exported parameters */
+		0,				 /* exported rpc functions */
+		0,				 /* exported pseudo-variables */
+		0,				 /* response handling function */
+		mod_init,		 /* module init function */
+		child_init,		 /* child init function */
+		destroy			 /* module destroy function */
 };
 
 
@@ -121,10 +115,10 @@ struct module_exports exports = {
  */
 static int child_init(int rank)
 {
-	if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN)
+	if(rank == PROC_INIT || rank == PROC_MAIN || rank == PROC_TCP_MAIN)
 		return 0; /* do nothing for the main process */
 
-	if (db_url.len)
+	if(db_url.len)
 		return uridb_db_init(&db_url);
 	else
 		return 0;
@@ -136,22 +130,22 @@ static int child_init(int rank)
  */
 static int mod_init(void)
 {
-	if (db_url.len == 0) {
-		if (use_uri_table) {
+	if(db_url.len == 0) {
+		if(use_uri_table) {
 			LM_ERR("configuration error - no database URL, "
-				"but use_uri_table is set!\n");
+				   "but use_uri_table is set!\n");
 			return -1;
 		}
 		return 0;
 	}
 
-	if (uridb_db_bind(&db_url)) {
+	if(uridb_db_bind(&db_url)) {
 		LM_ERR("No database module found\n");
 		return -1;
 	}
 
 	/* Check table version */
-	if (uridb_db_ver(&db_url) < 0) {
+	if(uridb_db_ver(&db_url) < 0) {
 		LM_ERR("Error during database table version check");
 		return -1;
 	}
@@ -165,17 +159,18 @@ static void destroy(void)
 }
 
 
-static int fixup_exist(void** param, int param_no)
+static int fixup_exist(void **param, int param_no)
 {
-	if (db_url.len == 0) {
-		LM_ERR("configuration error - does_uri_exist() called with no database URL!\n");
+	if(db_url.len == 0) {
+		LM_ERR("configuration error - does_uri_exist() called with no database "
+			   "URL!\n");
 		return E_CFG;
 	}
 	return 0;
 }
 
 
-static int w_check_uri1(struct sip_msg* msg, char* uri, char* _s)
+static int w_check_uri1(struct sip_msg *msg, char *uri, char *_s)
 {
 	return check_uri(msg, uri, NULL, NULL);
 }

+ 7 - 7
src/modules/uri_db/uri_db.h

@@ -35,17 +35,17 @@
  * table version needs to be the same as auth_db use.
  */
 #define URI_TABLE_VERSION 1
-#define SUBSCRIBER_TABLE_VERSION 7	/* From auth_db */
+#define SUBSCRIBER_TABLE_VERSION 7 /* From auth_db */
 
 
 /*
  * Module parameters variables
  */
-extern str db_table;                  /**< Name of URI table */
-extern str uridb_user_col;            /**< Name of username column in URI table */
-extern str uridb_domain_col;          /**< Name of domain column in URI table */
-extern str uridb_uriuser_col;         /**< Name of uri_user column in URI table */
-extern int use_uri_table;             /**< Whether or not should be uri table used */
-extern int use_domain;                /**< Should does_uri_exist honor the domain part ? */
+extern str db_table;		  /**< Name of URI table */
+extern str uridb_user_col;	  /**< Name of username column in URI table */
+extern str uridb_domain_col;  /**< Name of domain column in URI table */
+extern str uridb_uriuser_col; /**< Name of uri_user column in URI table */
+extern int use_uri_table;	  /**< Whether or not should be uri table used */
+extern int use_domain; /**< Should does_uri_exist honor the domain part ? */
 
 #endif /* URI_MOD_H */