From 1b5ab42c21c9b248f35d956ca3af53e193c81824 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 17 May 2023 16:37:14 +0200 Subject: [PATCH] speeddial: clang-format for coherent indentation and coding style --- src/modules/speeddial/sdlookup.c | 110 +++++++++++++----------------- src/modules/speeddial/sdlookup.h | 4 +- src/modules/speeddial/speeddial.c | 87 +++++++++++------------ src/modules/speeddial/speeddial.h | 20 +++--- 4 files changed, 100 insertions(+), 121 deletions(-) diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index e26bc37bb80..305d08f2b78 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -34,13 +34,13 @@ #include "speeddial.h" #include "sdlookup.h" -#define MAX_USERURI_SIZE 256 +#define MAX_USERURI_SIZE 256 static char useruri_buf[MAX_USERURI_SIZE]; /** * Rewrite Request-URI */ -static inline int rewrite_ruri(struct sip_msg* _m, char* _s) +static inline int rewrite_ruri(struct sip_msg *_m, char *_s) { struct action act; struct run_act_ctx ra_ctx; @@ -50,8 +50,7 @@ static inline int rewrite_ruri(struct sip_msg* _m, char* _s) act.val[0].type = STRING_ST; act.val[0].u.string = _s; init_run_actions_ctx(&ra_ctx); - if (do_action(&ra_ctx, &act, _m) < 0) - { + if(do_action(&ra_ctx, &act, _m) < 0) { LM_ERR("do_action failed\n"); return -1; } @@ -61,7 +60,7 @@ static inline int rewrite_ruri(struct sip_msg* _m, char* _s) /** * */ -int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) +int sd_lookup_owner(sip_msg_t *_msg, str *stable, str *sowner) { str user_s, table_s, uri_s; int nr_keys; @@ -70,10 +69,9 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_key_t db_keys[4]; db_val_t db_vals[4]; db_key_t db_cols[1]; - db1_res_t* db_res = NULL; + db1_res_t *db_res = NULL; - if(stable==NULL || stable->s==NULL || stable->len<=0) - { + if(stable == NULL || stable->s == NULL || stable->len <= 0) { LM_ERR("invalid table parameter"); return -1; } @@ -81,14 +79,12 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) /* init */ nr_keys = 0; - db_cols[0]=&new_uri_column; + db_cols[0] = &new_uri_column; - if(sowner!=NULL && sowner->s!=NULL && sowner->len>0) - { + if(sowner != NULL && sowner->s != NULL && sowner->len > 0) { uri_s = *sowner; memset(&turi, 0, sizeof(struct sip_uri)); - if(parse_uri(uri_s.s, uri_s.len, &turi)!=0) - { + if(parse_uri(uri_s.s, uri_s.len, &turi) != 0) { LM_ERR("bad owner SIP address!\n"); goto err_server; } @@ -96,64 +92,60 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) puri = &turi; } else { /* take username@domain from From header */ - if ( (puri = parse_from_uri(_msg ))==NULL ) - { + if((puri = parse_from_uri(_msg)) == NULL) { LM_ERR("failed to parse FROM header\n"); goto err_server; } } - db_keys[nr_keys]=&user_column; + db_keys[nr_keys] = &user_column; db_vals[nr_keys].type = DB1_STR; db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val.s = puri->user.s; db_vals[nr_keys].val.str_val.len = puri->user.len; nr_keys++; - if(use_domain>=1) - { - db_keys[nr_keys]=&domain_column; + if(use_domain >= 1) { + db_keys[nr_keys] = &domain_column; db_vals[nr_keys].type = DB1_STR; db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val.s = puri->host.s; db_vals[nr_keys].val.str_val.len = puri->host.len; - if (dstrip_s.s!=NULL && dstrip_s.len>0 - && dstrip_s.lenhost.len - && strncasecmp(puri->host.s,dstrip_s.s,dstrip_s.len)==0) - { - db_vals[nr_keys].val.str_val.s += dstrip_s.len; + if(dstrip_s.s != NULL && dstrip_s.len > 0 + && dstrip_s.len < puri->host.len + && strncasecmp(puri->host.s, dstrip_s.s, dstrip_s.len) == 0) { + db_vals[nr_keys].val.str_val.s += dstrip_s.len; db_vals[nr_keys].val.str_val.len -= dstrip_s.len; } nr_keys++; } /* take sd from r-uri */ - if (parse_sip_msg_uri(_msg) < 0) - { + if(parse_sip_msg_uri(_msg) < 0) { LM_ERR("failed to parsing Request-URI\n"); goto err_server; } - db_keys[nr_keys]=&sd_user_column; + db_keys[nr_keys] = &sd_user_column; db_vals[nr_keys].type = DB1_STR; db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val.s = _msg->parsed_uri.user.s; db_vals[nr_keys].val.str_val.len = _msg->parsed_uri.user.len; nr_keys++; - if(use_domain>=2) - { - db_keys[nr_keys]=&sd_domain_column; + if(use_domain >= 2) { + db_keys[nr_keys] = &sd_domain_column; db_vals[nr_keys].type = DB1_STR; db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val.s = _msg->parsed_uri.host.s; db_vals[nr_keys].val.str_val.len = _msg->parsed_uri.host.len; - if (dstrip_s.s!=NULL && dstrip_s.len>0 - && dstrip_s.len<_msg->parsed_uri.host.len - && strncasecmp(_msg->parsed_uri.host.s,dstrip_s.s,dstrip_s.len)==0) - { - db_vals[nr_keys].val.str_val.s += dstrip_s.len; + if(dstrip_s.s != NULL && dstrip_s.len > 0 + && dstrip_s.len < _msg->parsed_uri.host.len + && strncasecmp( + _msg->parsed_uri.host.s, dstrip_s.s, dstrip_s.len) + == 0) { + db_vals[nr_keys].val.str_val.s += dstrip_s.len; db_vals[nr_keys].val.str_val.len -= dstrip_s.len; } nr_keys++; @@ -161,8 +153,9 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_funcs.use_table(db_handle, &table_s); if(db_funcs.query(db_handle, db_keys, NULL, db_vals, db_cols, - nr_keys /*no keys*/, 1 /*no cols*/, NULL, &db_res)!=0 || db_res==NULL) - { + nr_keys /*no keys*/, 1 /*no cols*/, NULL, &db_res) + != 0 + || db_res == NULL) { LM_ERR("failed to query database\n"); goto err_server; } @@ -175,39 +168,37 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) return -1; } - user_s.s = useruri_buf+4; - switch(RES_ROWS(db_res)[0].values[0].type) - { + user_s.s = useruri_buf + 4; + switch(RES_ROWS(db_res)[0].values[0].type) { case DB1_STRING: strcpy(user_s.s, - (char*)RES_ROWS(db_res)[0].values[0].val.string_val); + (char *)RES_ROWS(db_res)[0].values[0].val.string_val); user_s.len = strlen(user_s.s); - break; + break; case DB1_STR: strncpy(user_s.s, - (char*)RES_ROWS(db_res)[0].values[0].val.str_val.s, - RES_ROWS(db_res)[0].values[0].val.str_val.len); + (char *)RES_ROWS(db_res)[0].values[0].val.str_val.s, + RES_ROWS(db_res)[0].values[0].val.str_val.len); user_s.len = RES_ROWS(db_res)[0].values[0].val.str_val.len; user_s.s[user_s.len] = '\0'; - break; + break; case DB1_BLOB: strncpy(user_s.s, - (char*)RES_ROWS(db_res)[0].values[0].val.blob_val.s, - RES_ROWS(db_res)[0].values[0].val.blob_val.len); + (char *)RES_ROWS(db_res)[0].values[0].val.blob_val.s, + RES_ROWS(db_res)[0].values[0].val.blob_val.len); user_s.len = RES_ROWS(db_res)[0].values[0].val.blob_val.len; user_s.s[user_s.len] = '\0'; - break; + break; default: LM_ERR("unknown type of DB new_uri column\n"); - if (db_funcs.free_result(db_handle, db_res) < 0) { + if(db_funcs.free_result(db_handle, db_res) < 0) { LM_DBG("failed to free result of query\n"); } goto err_server; } /* check 'sip:' */ - if(user_s.len<4 || strncmp(user_s.s, "sip:", 4)) - { + if(user_s.len < 4 || strncmp(user_s.s, "sip:", 4)) { memcpy(useruri_buf, "sip:", 4); user_s.s -= 4; user_s.len += 4; @@ -216,14 +207,13 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) /** * Free the result because we don't need it anymore */ - if (db_funcs.free_result(db_handle, db_res) < 0) { + if(db_funcs.free_result(db_handle, db_res) < 0) { LM_DBG("failed to free result of query\n"); } /* set the URI */ LM_DBG("URI of sd from R-URI [%s]\n", user_s.s); - if(rewrite_ruri(_msg, user_s.s)<0) - { + if(rewrite_ruri(_msg, user_s.s) < 0) { LM_ERR("failed to replace the R-URI\n"); goto err_server; } @@ -237,20 +227,18 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) /** * */ -int w_sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) +int w_sd_lookup(struct sip_msg *_msg, char *_table, char *_owner) { str table_s, uri_s; - if(_table==NULL || fixup_get_svalue(_msg, (gparam_p)_table, &table_s)!=0) - { + if(_table == NULL + || fixup_get_svalue(_msg, (gparam_p)_table, &table_s) != 0) { LM_ERR("invalid table parameter"); return -1; } - if(_owner) - { - if(fixup_get_svalue(_msg, (gparam_p)_owner, &uri_s)!=0) - { + if(_owner) { + if(fixup_get_svalue(_msg, (gparam_p)_owner, &uri_s) != 0) { LM_ERR("invalid owner uri parameter"); return -1; } diff --git a/src/modules/speeddial/sdlookup.h b/src/modules/speeddial/sdlookup.h index 582afd4cb9c..4980342afff 100644 --- a/src/modules/speeddial/sdlookup.h +++ b/src/modules/speeddial/sdlookup.h @@ -26,7 +26,7 @@ #include "../../core/parser/msg_parser.h" -int w_sd_lookup(struct sip_msg* _msg, char* _table, char* _owner); -int sd_lookup_owner(struct sip_msg* _msg, str* _stable, str* _sowner); +int w_sd_lookup(struct sip_msg *_msg, char *_table, char *_owner); +int sd_lookup_owner(struct sip_msg *_msg, str *_stable, str *_sowner); #endif /* _SDLOOKUP_H_ */ diff --git a/src/modules/speeddial/speeddial.c b/src/modules/speeddial/speeddial.c index f251744a70d..b4d1c09cab2 100644 --- a/src/modules/speeddial/speeddial.c +++ b/src/modules/speeddial/speeddial.c @@ -48,58 +48,53 @@ static int child_init(int rank); static int mod_init(void); /* Module parameter variables */ -static str db_url = str_init(DEFAULT_RODB_URL); -str user_column = str_init("username"); -str domain_column = str_init("domain"); -str sd_user_column = str_init("sd_username"); +static str db_url = str_init(DEFAULT_RODB_URL); +str user_column = str_init("username"); +str domain_column = str_init("domain"); +str sd_user_column = str_init("sd_username"); str sd_domain_column = str_init("sd_domain"); -str new_uri_column = str_init("new_uri"); -int use_domain = 0; -static str domain_prefix = {NULL, 0}; +str new_uri_column = str_init("new_uri"); +int use_domain = 0; +static str domain_prefix = {NULL, 0}; str dstrip_s = {NULL, 0}; -db_func_t db_funcs; /* Database functions */ -db1_con_t* db_handle=0; /* Database connection handle */ +db_func_t db_funcs; /* Database functions */ +db1_con_t *db_handle = 0; /* Database connection handle */ /* Exported functions */ -static cmd_export_t cmds[] = { - {"sd_lookup", (cmd_function)w_sd_lookup, 1, fixup_spve_null, 0, - REQUEST_ROUTE}, - {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, 0, - REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0} -}; +static cmd_export_t cmds[] = {{"sd_lookup", (cmd_function)w_sd_lookup, 1, + fixup_spve_null, 0, REQUEST_ROUTE}, + {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, 0, + REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0}}; /* Exported parameters */ -static param_export_t params[] = { - {"db_url", PARAM_STR, &db_url }, - {"user_column", PARAM_STR, &user_column }, - {"domain_column", PARAM_STR, &domain_column }, - {"sd_user_column", PARAM_STR, &sd_user_column }, - {"sd_domain_column", PARAM_STR, &sd_domain_column }, - {"new_uri_column", PARAM_STR, &new_uri_column }, - {"use_domain", INT_PARAM, &use_domain }, - {"domain_prefix", PARAM_STR, &domain_prefix }, - {0, 0, 0} -}; +static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, + {"user_column", PARAM_STR, &user_column}, + {"domain_column", PARAM_STR, &domain_column}, + {"sd_user_column", PARAM_STR, &sd_user_column}, + {"sd_domain_column", PARAM_STR, &sd_domain_column}, + {"new_uri_column", PARAM_STR, &new_uri_column}, + {"use_domain", INT_PARAM, &use_domain}, + {"domain_prefix", PARAM_STR, &domain_prefix}, {0, 0, 0}}; /* Module interface */ struct module_exports exports = { - "speeddial", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* child initialization function */ - destroy /* destroy function */ + "speeddial", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported RPC functions */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + child_init, /* child initialization function */ + destroy /* destroy function */ }; @@ -108,17 +103,15 @@ 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 */ db_handle = db_funcs.init(&db_url); - if (!db_handle) - { + if(!db_handle) { LM_ERR("failed to connect database\n"); return -1; } return 0; - } @@ -128,18 +121,16 @@ static int child_init(int rank) static int mod_init(void) { /* Find a database module */ - if (db_bind_mod(&db_url, &db_funcs)) - { + if(db_bind_mod(&db_url, &db_funcs)) { LM_ERR("failed to bind database module\n"); return -1; } - if (!DB_CAPABILITY(db_funcs, DB_CAP_QUERY)) - { + if(!DB_CAPABILITY(db_funcs, DB_CAP_QUERY)) { LM_ERR("Database modules does not " - "provide all functions needed by SPEEDDIAL module\n"); + "provide all functions needed by SPEEDDIAL module\n"); return -1; } - if (domain_prefix.s && domain_prefix.len > 0) { + if(domain_prefix.s && domain_prefix.len > 0) { dstrip_s.s = domain_prefix.s; dstrip_s.len = domain_prefix.len; } @@ -153,7 +144,7 @@ static int mod_init(void) */ static void destroy(void) { - if (db_handle) + if(db_handle) db_funcs.close(db_handle); } diff --git a/src/modules/speeddial/speeddial.h b/src/modules/speeddial/speeddial.h index 49dbd6d0eff..29162106b9d 100644 --- a/src/modules/speeddial/speeddial.h +++ b/src/modules/speeddial/speeddial.h @@ -30,15 +30,15 @@ /* Module parameters variables */ -extern str user_column; /* 'username' column name */ -extern str domain_column; /* 'domain' column name */ -extern str sd_user_column; /* 'sd_username' column name */ -extern str sd_domain_column; /* 'sd_domain' column name */ -extern str new_uri_column; /* 'new_uri' column name */ -extern int use_domain; /* use or not the domain for sd lookup */ -extern str dstrip_s; - -extern db_func_t db_funcs; /* Database functions */ -extern db1_con_t* db_handle; /* Database connection handle */ +extern str user_column; /* 'username' column name */ +extern str domain_column; /* 'domain' column name */ +extern str sd_user_column; /* 'sd_username' column name */ +extern str sd_domain_column; /* 'sd_domain' column name */ +extern str new_uri_column; /* 'new_uri' column name */ +extern int use_domain; /* use or not the domain for sd lookup */ +extern str dstrip_s; + +extern db_func_t db_funcs; /* Database functions */ +extern db1_con_t *db_handle; /* Database connection handle */ #endif /* _SPEEDDIAL_H_ */