Skip to content

Commit

Permalink
speeddial: clang-format for coherent indentation and coding style
Browse files Browse the repository at this point in the history
  • Loading branch information
@linuxmaniac
linuxmaniac committed May 18, 2023
1 parent f2cca4f commit 1b5ab42
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 121 deletions.
110 changes: 49 additions & 61 deletions src/modules/speeddial/sdlookup.c
View file
Expand Up @@ -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;
Expand All @@ -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;
}
Expand All @@ -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;
Expand All @@ -70,99 +69,93 @@ 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;
}
table_s = *stable;

/* 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;
}
LM_DBG("using user id [%.*s]\n", uri_s.len, uri_s.s);
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.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;
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++;
}

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;
}
Expand All @@ -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;
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/modules/speeddial/sdlookup.h
View file
Expand Up @@ -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_ */

0 comments on commit 1b5ab42

Please sign in to comment.