sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
313 discussions

git:master:7b2175dd: secfilter: simplify secf_get_contact()

by Jose Luis Verdeguer

Module: kamailio Branch: master Commit: 7b2175dde6335926934e88b21533f8fa4cc5e7e3 URL: https://github.com/kamailio/kamailio/commit/7b2175dde6335926934e88b21533f8f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-20T10:51:03+01:00 secfilter: simplify secf_get_contact() --- Modified: src/modules/secfilter/secfilter_hdr.c --- Diff: https://github.com/kamailio/kamailio/commit/7b2175dde6335926934e88b21533f8f… Patch: https://github.com/kamailio/kamailio/commit/7b2175dde6335926934e88b21533f8f… --- diff --git a/src/modules/secfilter/secfilter_hdr.c b/src/modules/secfilter/secfilter_hdr.c index 4880b6a534..7e3a4feeb4 100644 --- a/src/modules/secfilter/secfilter_hdr.c +++ b/src/modules/secfilter/secfilter_hdr.c @@ -141,40 +141,32 @@ int secf_get_to(struct sip_msg *msg, str *name, str *user, str *domain) /* get 'contact' header */ int secf_get_contact(struct sip_msg *msg, str *user, str *domain) { - str contact = {NULL, 0}; - struct sip_uri parsed_uri; + struct sip_uri uri; + contact_t *contact; - if(msg == NULL) - return -1; - if(msg->contact == NULL) + if((parse_headers(msg, HDR_CONTACT_F, 0) == -1) || !msg->contact) + return 1; + + if(!msg->contact->parsed && parse_contact(msg->contact) < 0) { + LM_ERR("cannot parse the Contact header\n"); return 1; - if(!msg->contact->parsed && (parse_contact(msg->contact) < 0)) { - LM_ERR("Error parsing contact header (%.*s)\n", msg->contact->body.len, - msg->contact->body.s); - return -1; - } - if(((contact_body_t *)msg->contact->parsed)->contacts - && ((contact_body_t *)msg->contact->parsed)->contacts->uri.s != NULL - && ((contact_body_t *)msg->contact->parsed)->contacts->uri.len - > 0) { - contact.s = ((contact_body_t *)msg->contact->parsed)->contacts->uri.s; - contact.len = - ((contact_body_t *)msg->contact->parsed)->contacts->uri.len; } - if(contact.s == NULL) + + contact = ((contact_body_t *)msg->contact->parsed)->contacts; + if(!contact) { return 1; + } - if(parse_uri(contact.s, contact.len, &parsed_uri) < 0) { - LM_ERR("Error parsing contact uri header (%.*s)\n", contact.len, - contact.s); - return -1; + if(parse_uri(contact->uri.s, contact->uri.len, &uri) < 0) { + LM_ERR("cannot parse the Contact URI\n"); + return 1; } - user->s = parsed_uri.user.s; - user->len = parsed_uri.user.len; + user->s = uri.user.s; + user->len = uri.user.len; - domain->s = parsed_uri.host.s; - domain->len = parsed_uri.host.len; + domain->s = uri.host.s; + domain->len = uri.host.len; return 0; }

5 years, 11 months

git:master:6180cf1b: secfilter: reduce code copy&paste

by Jose Luis Verdeguer

Module: kamailio Branch: master Commit: 6180cf1b9ee1c5655c8915e7dfaca8e3b785eb90 URL: https://github.com/kamailio/kamailio/commit/6180cf1b9ee1c5655c8915e7dfaca8e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-20T10:51:03+01:00 secfilter: reduce code copy&paste --- Modified: src/modules/secfilter/secfilter_db.c --- Diff: https://github.com/kamailio/kamailio/commit/6180cf1b9ee1c5655c8915e7dfaca8e… Patch: https://github.com/kamailio/kamailio/commit/6180cf1b9ee1c5655c8915e7dfaca8e… --- diff --git a/src/modules/secfilter/secfilter_db.c b/src/modules/secfilter/secfilter_db.c index 31bb0cc0fa..f6f4665640 100644 --- a/src/modules/secfilter/secfilter_db.c +++ b/src/modules/secfilter/secfilter_db.c @@ -40,7 +40,7 @@ static str table_version_col = str_init("table_version"); /* Check module version */ int check_version(void) { - int version = 0; + int version = 0, res = 0; db_key_t db_keys[1]; db_val_t db_vals[1]; db_key_t db_cols[1]; @@ -71,17 +71,15 @@ int check_version(void) db_handle, db_keys, NULL, db_vals, db_cols, 1, 1, NULL, &db_res) < 0) { LM_ERR("Failed to query database\n"); - db_funcs.close(db_handle); - return -1; + res = -1; + goto done; } if(RES_ROW_N(db_res) == 0) { LM_ERR("No version value found in database. It must be %d\n", mod_version); - if(db_res != NULL && db_funcs.free_result(db_handle, db_res) < 0) - LM_DBG("Failed to free the result\n"); - db_funcs.close(db_handle); - return -1; + res = -1; + goto done; } /* Get the version value */ @@ -90,17 +88,16 @@ int check_version(void) if(version != mod_version) { LM_ERR("Wrong version value. Correct version is %d but found %d\n", mod_version, version); - if(db_res != NULL && db_funcs.free_result(db_handle, db_res) < 0) - LM_DBG("Failed to free the result\n"); - db_funcs.close(db_handle); - return -1; + res = -1; + goto done; } +done: if(db_res != NULL && db_funcs.free_result(db_handle, db_res) < 0) LM_DBG("Failed to free the result\n"); db_funcs.close(db_handle); - return 0; + return res; }

5 years, 11 months

git:master:d8f595fe: core: fix compilation warnings

by Victor Seva

Module: kamailio Branch: master Commit: d8f595fe4bb4cec6049e86202b95e40ae849b165 URL: https://github.com/kamailio/kamailio/commit/d8f595fe4bb4cec6049e86202b95e40… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-20T00:26:20+01:00 core: fix compilation warnings > core/tcp_main.c:1135:13: warning: result of comparison of constant 18446744073709551615 with expression of type 'uint32_t' (aka 'unsigned int') is always false [-Wtautological-constant-out-of-range-compare] > if (port == ULONG_MAX || port == 0 || port >= (1 << 16)) { > ~~~~ ^ ~~~~~~~~~ > core/tcp_main.c:1147:13: warning: result of comparison of constant 18446744073709551615 with expression of type 'uint32_t' (aka 'unsigned int') is always false [-Wtautological-constant-out-of-range-compare] > if (port == ULONG_MAX || port == 0 || port >= (1 << 16)) { > ~~~~ ^ ~~~~~~~~~ > 2 warnings generated. --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d8f595fe4bb4cec6049e86202b95e40… Patch: https://github.com/kamailio/kamailio/commit/d8f595fe4bb4cec6049e86202b95e40… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 2ab169ab6b..212a3aad19 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1132,7 +1132,7 @@ int tcpconn_read_haproxy(struct tcp_connection *c) { /* Parse the source port */ port = strtoul(p, &end, 10); - if (port == ULONG_MAX || port == 0 || port >= (1 << 16)) { + if (port == UINT32_MAX || port == 0 || port >= (1 << 16)) { return -1; /* invalid port number */ } c->rcv.src_port = port; @@ -1144,7 +1144,7 @@ int tcpconn_read_haproxy(struct tcp_connection *c) { /* Parse the destination port */ port = strtoul(p, NULL, 10); - if (port == ULONG_MAX || port == 0 || port >= (1 << 16)) { + if (port == UINT32_MAX || port == 0 || port >= (1 << 16)) { return -1; /* invalid port number */ } c->rcv.dst_port = port;

5 years, 11 months

git:master:89e89e02: cnxcc: fix compilation warnings

by Victor Seva

Module: kamailio Branch: master Commit: 89e89e023d923d2dbec694509b9f958bbed6d3ad URL: https://github.com/kamailio/kamailio/commit/89e89e023d923d2dbec694509b9f958… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-20T00:16:25+01:00 cnxcc: fix compilation warnings > warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat] --- Modified: src/modules/cnxcc/cnxcc_redis.c --- Diff: https://github.com/kamailio/kamailio/commit/89e89e023d923d2dbec694509b9f958… Patch: https://github.com/kamailio/kamailio/commit/89e89e023d923d2dbec694509b9f958… --- diff --git a/src/modules/cnxcc/cnxcc_redis.c b/src/modules/cnxcc/cnxcc_redis.c index 4aad3b48a8..2b9d803ad6 100644 --- a/src/modules/cnxcc/cnxcc_redis.c +++ b/src/modules/cnxcc/cnxcc_redis.c @@ -233,7 +233,7 @@ static int __redis_select_db(redisContext *ctxt, int db) if(!rpl) LM_ERR("%s\n", ctxt->errstr); else { - LM_ERR("%.*s\n", rpl->len, rpl->str); + LM_ERR("%.*s\n", (int)rpl->len, rpl->str); freeReplyObject(rpl); } return -1; @@ -254,7 +254,7 @@ static int __redis_exec( if(!*rpl) LM_ERR("%s\n", _data.redis->ctxt->errstr); else { - LM_ERR("%.*s\n", (*rpl)->len, (*rpl)->str); + LM_ERR("%.*s\n", (int)(*rpl)->len, (*rpl)->str); freeReplyObject(*rpl); } @@ -384,7 +384,7 @@ int redis_get_str(credit_data_t *credit_data, const char *instruction, } if(rpl->len <= 0) { - LM_ERR("RPL len is equal to %d\n", rpl->len); + LM_ERR("RPL len is equal to %d\n", (int)rpl->len); goto done; }

5 years, 11 months

git:master:7d9d9fe2: ndb_redis: fix compilation warnings

by Victor Seva

Module: kamailio Branch: master Commit: 7d9d9fe21a121a38d4a3861ce252a1a485a35c71 URL: https://github.com/kamailio/kamailio/commit/7d9d9fe21a121a38d4a3861ce252a1a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-20T00:06:45+01:00 ndb_redis: fix compilation warnings > warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat] --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/7d9d9fe21a121a38d4a3861ce252a1a… Patch: https://github.com/kamailio/kamailio/commit/7d9d9fe21a121a38d4a3861ce252a1a… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index f923878284..7e3ddb0d8c 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -758,7 +758,7 @@ int check_cluster_reply(redisReply *reply, redisc_server_t **rsrv) char spec_new[100]; if(redis_cluster_param) { - LM_DBG("Redis replied: \"%.*s\"\n", reply->len, reply->str); + LM_DBG("Redis replied: \"%.*s\"\n", (int)reply->len, reply->str); if((reply->len > 7) && (strncmp(reply->str, "MOVED", 5) == 0)) { port = 6379; if(strchr(reply->str, ':') > 0) { @@ -769,7 +769,7 @@ int check_cluster_reply(redisReply *reply, redisc_server_t **rsrv) LM_DBG("Port \"%.*s\" [%i] => %i\n", tmpstr.len, tmpstr.s, tmpstr.len, port); } else { - LM_ERR("No Port in REDIS MOVED Reply (%.*s)\n", reply->len, + LM_ERR("No Port in REDIS MOVED Reply (%.*s)\n", (int)reply->len, reply->str); return 0; } @@ -778,7 +778,7 @@ int check_cluster_reply(redisReply *reply, redisc_server_t **rsrv) addr.s = strchr(reply->str + 6, ' ') + 1; LM_DBG("Host \"%.*s\" [%i]\n", addr.len, addr.s, addr.len); } else { - LM_ERR("No Host in REDIS MOVED Reply (%.*s)\n", reply->len, + LM_ERR("No Host in REDIS MOVED Reply (%.*s)\n", (int)reply->len, reply->str); return 0; }

5 years, 11 months

git:master:da18d99e: topos_redis: fix compilation warnings

by Victor Seva

Module: kamailio Branch: master Commit: da18d99e509c86ac21f04cf36184cadfe16fce83 URL: https://github.com/kamailio/kamailio/commit/da18d99e509c86ac21f04cf36184cad… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-20T00:09:39+01:00 topos_redis: fix compilation warnings > warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat] --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/da18d99e509c86ac21f04cf36184cad… Patch: https://github.com/kamailio/kamailio/commit/da18d99e509c86ac21f04cf36184cad… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 4ba31f404a..2f78d21dce 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -654,7 +654,7 @@ int tps_redis_load_invite_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) sval.s = NULL; switch(rrpl->element[i]->type) { case REDIS_REPLY_STRING: - LM_DBG("r[%d]: s[%.*s]\n", i, rrpl->element[i]->len, + LM_DBG("r[%d]: s[%.*s]\n", i, (int)rrpl->element[i]->len, rrpl->element[i]->str); sval.s = rrpl->element[i]->str; sval.len = rrpl->element[i]->len; @@ -802,7 +802,7 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, sval.s = NULL; switch(rrpl->element[i]->type) { case REDIS_REPLY_STRING: - LM_DBG("r[%d]: s[%.*s]\n", i, rrpl->element[i]->len, + LM_DBG("r[%d]: s[%.*s]\n", i, (int)rrpl->element[i]->len, rrpl->element[i]->str); sval.s = rrpl->element[i]->str; sval.len = rrpl->element[i]->len; @@ -1005,7 +1005,7 @@ int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) sval.s = NULL; switch(rrpl->element[i]->type) { case REDIS_REPLY_STRING: - LM_DBG("r[%d]: s[%.*s]\n", i, rrpl->element[i]->len, + LM_DBG("r[%d]: s[%.*s]\n", i, (int)rrpl->element[i]->len, rrpl->element[i]->str); sval.s = rrpl->element[i]->str; sval.len = rrpl->element[i]->len;

5 years, 11 months

[kamailio/kamailio] secfilter: free initial struct of shared memory on mod_destroy (#1769)

by Victor Seva

seems that ``secf_data`` was never freed You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1769 -- Commit Summary -- * secfilter: free initial struct of shared memory on mod_destroy -- File Changes -- M src/modules/secfilter/secfilter.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1769.patch https://github.com/kamailio/kamailio/pull/1769.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1769

5 years, 11 months

git:master:eb374d71: secfilter: free initial struct of shared memory on mod_destroy

by Jose Luis Verdeguer

Module: kamailio Branch: master Commit: eb374d7167e9be15dca0a30a402418fb5993bf69 URL: https://github.com/kamailio/kamailio/commit/eb374d7167e9be15dca0a30a402418f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-19T18:43:28+01:00 secfilter: free initial struct of shared memory on mod_destroy --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/eb374d7167e9be15dca0a30a402418f… Patch: https://github.com/kamailio/kamailio/commit/eb374d7167e9be15dca0a30a402418f… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 4719513556..94d592e434 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -664,6 +664,8 @@ static void mod_destroy(void) free_data(); /* Destroy lock */ lock_destroy(&secf_data->lock); + shm_free(secf_data); + secf_data = NULL; }

5 years, 11 months

git:master:bfbbc231: secfilter: clang-format

by Victor Seva

Module: kamailio Branch: master Commit: bfbbc2311530a5d9ef0d2cde0aef01f652acbc93 URL: https://github.com/kamailio/kamailio/commit/bfbbc2311530a5d9ef0d2cde0aef01f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-19T18:18:54+01:00 secfilter: clang-format --- Modified: src/modules/secfilter/secfilter.c Modified: src/modules/secfilter/secfilter_db.c Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/bfbbc2311530a5d9ef0d2cde0aef01f… Patch: https://github.com/kamailio/kamailio/commit/bfbbc2311530a5d9ef0d2cde0aef01f…

5 years, 11 months

Re: [sr-dev] [kamailio/kamailio] dialog: safety checks for local cseq and contact vars (79946bb)

by Cui Gang

I found your commit in branch master, "dialog: check for cseq value only when getting it for caller/request". And I tested, It works well ! Could you commit that patch to branch 5.2? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/79946bbb6d1731f503fc378ae38311b…

5 years, 11 months

← Newer
1
...
15
16
17
18
19
20
21
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018