sr-dev February 2022

sr-dev@lists.kamailio.org

17 participants
242 discussions

git:5.5:43b94264: src/Makefile: Also stop compiling kamcmd from here

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 43b94264f81e54625ee90faa7f52b006b67a1b61 URL: https://github.com/kamailio/kamailio/commit/43b94264f81e54625ee90faa7f52b00… Author: Adrian Bunk <bunk(a)debian.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:03:19+01:00 src/Makefile: Also stop compiling kamcmd from here (cherry picked from commit c1335157c53ca014bbeec6de312f42d955221d58) --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/43b94264f81e54625ee90faa7f52b00… Patch: https://github.com/kamailio/kamailio/commit/43b94264f81e54625ee90faa7f52b00… --- diff --git a/src/Makefile b/src/Makefile index 11be15fb2b..a6380c2283 100644 --- a/src/Makefile +++ b/src/Makefile @@ -202,7 +202,7 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) # list of utils directories that should be compiled by make utils -C_COMPILE_UTILS= ../utils/kamcmd +C_COMPILE_UTILS= # kamcmd is now installed by ctl # list of binaries that should be installed alongside # (they should be created after make utils, see C_COMPILE_UTILS) C_INSTALL_BIN= # kamcmd is now installed by ctl

2 years, 10 months

git:5.5:b0a327f7: presence: safety checks for user and domain in ps_ptable_search()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b0a327f79d14d1c40742ba1177dd5bdcffc02c6d URL: https://github.com/kamailio/kamailio/commit/b0a327f79d14d1c40742ba1177dd5bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:03:08+01:00 presence: safety checks for user and domain in ps_ptable_search() - GH #3008 (cherry picked from commit c47ec08d8d4a14dc190091ccb79ace62ea6674e3) --- Modified: src/modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/b0a327f79d14d1c40742ba1177dd5bd… Patch: https://github.com/kamailio/kamailio/commit/b0a327f79d14d1c40742ba1177dd5bd… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index c313b01cf0..5d0f0a9568 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -1247,6 +1247,11 @@ ps_presentity_t *ps_ptable_search(ps_presentity_t *ptm, int mmode, int rmode) uint32_t idx = 0; int pmax = 0; + if(ptm->user.s==NULL || ptm->domain.s==NULL) { + LM_WARN("no user or domain for presentity\n"); + return NULL; + } + ptm->hashid = core_case_hash(&ptm->user, &ptm->domain, 0); idx = core_hash_idx(ptm->hashid, _ps_ptable->ssize);

2 years, 10 months

git:5.5:6c3b7c0e: ims_dialog: updated test conditions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 6c3b7c0e2ee3e0d397f1781f385eb78483fdd67f URL: https://github.com/kamailio/kamailio/commit/6c3b7c0e2ee3e0d397f1781f385eb78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:49+01:00 ims_dialog: updated test conditions - GH #3014 (cherry picked from commit a8d56242da48708949149c11c06d031b5c2fad49) --- Modified: src/modules/ims_dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/6c3b7c0e2ee3e0d397f1781f385eb78… Patch: https://github.com/kamailio/kamailio/commit/6c3b7c0e2ee3e0d397f1781f385eb78… --- diff --git a/src/modules/ims_dialog/dlg_hash.c b/src/modules/ims_dialog/dlg_hash.c index bc32282d9e..cfe0148e7b 100644 --- a/src/modules/ims_dialog/dlg_hash.c +++ b/src/modules/ims_dialog/dlg_hash.c @@ -253,7 +253,7 @@ void destroy_dlg(struct dlg_cell *dlg) { shm_free(var); } - if (&(dlg->dlg_entry_out)) { + if (dlg->dlg_entry_out.first) { lock_get(dlg->dlg_out_entries_lock); destroy_entry_out(&(dlg->dlg_entry_out)); lock_release(dlg->dlg_out_entries_lock);

2 years, 10 months

git:5.5:10cfb3ea: db_perlvdb: removed unnecessary condition

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 10cfb3ea0e80cfbaa5745093d471a58997a633ff URL: https://github.com/kamailio/kamailio/commit/10cfb3ea0e80cfbaa5745093d471a58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:32+01:00 db_perlvdb: removed unnecessary condition (cherry picked from commit d3daed0a617024fde1efabbcdab27dc4c5c140c8) --- Modified: src/modules/db_perlvdb/perlvdb_conv.c --- Diff: https://github.com/kamailio/kamailio/commit/10cfb3ea0e80cfbaa5745093d471a58… Patch: https://github.com/kamailio/kamailio/commit/10cfb3ea0e80cfbaa5745093d471a58… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index f263774658..fcf7b024a5 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -57,9 +57,8 @@ AV *conds2perlarray(const db_key_t* keys, const db_op_t* ops, const db_val_t* va for (i = 0; i < n; i++) { if (ops) { - if (ops + i) - if (*(ops + i)) - element = cond2perlcond(*(keys + i), + if (*(ops + i)) + element = cond2perlcond(*(keys + i), *(ops + i), vals + i); } else { /* OP_EQ is defined in Kamailio _and_ perl. Includes collide :( */

2 years, 10 months

git:5.5:56d9073e: xhttp_pi: wrap freeing and setting to null in curly braces

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 56d9073ef2dd61f6ab48602fe2af77e3c090e290 URL: https://github.com/kamailio/kamailio/commit/56d9073ef2dd61f6ab48602fe2af77e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:17+01:00 xhttp_pi: wrap freeing and setting to null in curly braces - GH #3012 (cherry picked from commit 37580a25694d5e5b0b4c89a92d1ba2d8b77aacba) --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/56d9073ef2dd61f6ab48602fe2af77e… Patch: https://github.com/kamailio/kamailio/commit/56d9073ef2dd61f6ab48602fe2af77e… --- diff --git a/src/modules/xhttp_pi/xhttp_pi_fnc.c b/src/modules/xhttp_pi/xhttp_pi_fnc.c index 5610e319bb..f5c2fdd78b 100644 --- a/src/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/src/modules/xhttp_pi/xhttp_pi_fnc.c @@ -2901,7 +2901,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx) case 0: LM_ERR("no record on clause key [%.*s]\n", command->c_keys[0]->len, command->c_keys[0]->s); - if(c_vals) pkg_free(c_vals); c_vals = NULL; + if(c_vals) { pkg_free(c_vals); c_vals = NULL; } goto finish_page; case 1: LM_DBG("got [%d] rows for key [%.*s]\n",

2 years, 10 months

git:5.5:5d05de90: presence: fixed format-truncation warning GH #3013

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 5d05de900de0145a22a5bf044267d9b0c0ceb712 URL: https://github.com/kamailio/kamailio/commit/5d05de900de0145a22a5bf044267d9b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:02+01:00 presence: fixed format-truncation warning GH #3013 (cherry picked from commit c1b14f49ead9a29711cde5334155819cd1c6c90d) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5d05de900de0145a22a5bf044267d9b… Patch: https://github.com/kamailio/kamailio/commit/5d05de900de0145a22a5bf044267d9b… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 09751bbc15..98c0711d0b 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -564,8 +564,8 @@ static int child_init(int rank) int i; for(i = 0; i < pres_notifier_processes; i++) { - char tmp[21]; - snprintf(tmp, 21, "PRESENCE NOTIFIER %d", i); + char tmp[30]; + snprintf(tmp, 30, "PRESENCE NOTIFIER %d", i); pres_notifier_id[i] = i; if(fork_basic_utimer(PROC_TIMER, tmp, 1, pres_timer_send_notify,

2 years, 10 months

git:5.5:86c897fa: rls: fixed format-truncation warning GH #3013

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 86c897fac37d2a78b8122b4c62ec87a2371fd9d4 URL: https://github.com/kamailio/kamailio/commit/86c897fac37d2a78b8122b4c62ec87a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:45+01:00 rls: fixed format-truncation warning GH #3013 (cherry picked from commit e921fc8ed7a6c9fdeb532179a77503cd67799487) --- Modified: src/modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/86c897fac37d2a78b8122b4c62ec87a… Patch: https://github.com/kamailio/kamailio/commit/86c897fac37d2a78b8122b4c62ec87a… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index 19ecce0ca2..63c69a64c6 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -684,8 +684,8 @@ static int child_init(int rank) for (i = 0; i < rls_notifier_processes; i++) { - char tmp[16]; - snprintf(tmp, 16, "RLS NOTIFIER %d", i); + char tmp[25]; + snprintf(tmp, 25, "RLS NOTIFIER %d", i); rls_notifier_id[i] = i; if (fork_basic_utimer(PROC_TIMER, tmp, 1,

2 years, 10 months

git:5.5:2c3de1ae: kazoo: fixed misleading-indentation warning GH #3012

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 2c3de1aebc526939c12fa501509d12ce1728b9a8 URL: https://github.com/kamailio/kamailio/commit/2c3de1aebc526939c12fa501509d12c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:30+01:00 kazoo: fixed misleading-indentation warning GH #3012 (cherry picked from commit 2b9706aca33b8ca34d3d9c58b80527956c92dd7a) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/2c3de1aebc526939c12fa501509d12c… Patch: https://github.com/kamailio/kamailio/commit/2c3de1aebc526939c12fa501509d12c… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 5685f5a845..ecbac752b4 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -796,9 +796,9 @@ void kz_amqp_connection_close(kz_amqp_conn_ptr rmq) { } void kz_amqp_channel_close(kz_amqp_conn_ptr rmq, amqp_channel_t channel) { - LM_DBG("Close rmq channel\n"); - if (!rmq) - return; + LM_DBG("Close rmq channel\n"); + if (!rmq) + return; LM_DBG("close channel: %d rmq(%p)->channel(%d)\n", getpid(), (void *)rmq, channel); kz_amqp_error("closing channel", amqp_channel_close(rmq->conn, channel, AMQP_REPLY_SUCCESS)); @@ -1121,11 +1121,11 @@ int kz_amqp_pipe_send(str *str_exchange, str *str_routing_key, str *str_payload) if(cmd) kz_amqp_free_pipe_cmd(cmd); - if(json_obj) - json_object_put(json_obj); + if(json_obj) + json_object_put(json_obj); - if(s_local_routing_key) - pkg_free(s_local_routing_key); + if(s_local_routing_key) + pkg_free(s_local_routing_key); return ret; } @@ -2009,14 +2009,13 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange binding->bind = bind; bindings_count++; - return 1; + return 1; error: - if(binding != NULL) - shm_free(binding); + if(binding != NULL) + shm_free(binding); return -1; - }

2 years, 10 months

git:5.5:99b9324f: ims_charging: fixed misleading-indentation warning GH #3012

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 99b9324fc2f682288e358304602cdc8fb2bc32a1 URL: https://github.com/kamailio/kamailio/commit/99b9324fc2f682288e358304602cdc8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:12+01:00 ims_charging: fixed misleading-indentation warning GH #3012 (cherry picked from commit d94879b06f9bbb9d6ffa2dcaae5b213f169f2d5a) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/99b9324fc2f682288e358304602cdc8… Patch: https://github.com/kamailio/kamailio/commit/99b9324fc2f682288e358304602cdc8… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 05dc7f29c6..b8c15da445 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1575,23 +1575,23 @@ static int create_cca_result_code(int result) { static int create_cca_fui_avps(int action, str* redirecturi) { int_str action_avp_val, action_avp_name, redirecturi_avp_val, redirecturi_avp_name; - action_avp_name.s.s = RO_AVP_CCA_FUI_ACTION; - action_avp_name.s.len = RO_AVP_CCA_FUI_ACTION_LENGTH; + action_avp_name.s.s = RO_AVP_CCA_FUI_ACTION; + action_avp_name.s.len = RO_AVP_CCA_FUI_ACTION_LENGTH; redirecturi_avp_name.s.s = RO_AVP_CCA_FUI_REDIRECT_URI; - redirecturi_avp_name.s.len = RO_AVP_CCA_FUI_REDIRECT_URI_LENGTH; - char buf[10]; + redirecturi_avp_name.s.len = RO_AVP_CCA_FUI_REDIRECT_URI_LENGTH; + char buf[10]; int rc; - action_avp_val.n = action; - action_avp_val.s.len = snprintf(buf, 10, "%i", action); - action_avp_val.s.s = buf; + action_avp_val.n = action; + action_avp_val.s.len = snprintf(buf, 10, "%i", action); + action_avp_val.s.s = buf; - rc = add_avp(AVP_NAME_STR|AVP_VAL_STR, action_avp_name, action_avp_val); + rc = add_avp(AVP_NAME_STR|AVP_VAL_STR, action_avp_name, action_avp_val); - if (rc < 0) - LM_ERR("Couldn't create ["RO_AVP_CCA_FUI_ACTION"] AVP\n"); - else - LM_DBG("Created AVP ["RO_AVP_CCA_FUI_ACTION"] successfully: value=[%d]\n", action); + if (rc < 0) + LM_ERR("Couldn't create ["RO_AVP_CCA_FUI_ACTION"] AVP\n"); + else + LM_DBG("Created AVP ["RO_AVP_CCA_FUI_ACTION"] successfully: value=[%d]\n", action); if (redirecturi && redirecturi->len >0 && redirecturi->s) { redirecturi_avp_val.s.len = redirecturi->len; @@ -1605,7 +1605,7 @@ static int create_cca_fui_avps(int action, str* redirecturi) { LM_DBG("Created AVP ["RO_AVP_CCA_FUI_REDIRECT_URI"] successfully: value=[%.*s]\n", redirecturi->len, redirecturi->s); } - return 1; + return 1; } static int get_mac_avp_value(struct sip_msg *msg, str *value) {

2 years, 10 months

git:5.5:ba6b3e8d: sms: fixed misleading-indentation warning GH #3012

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: ba6b3e8d8a9cc898e54acf750f871b812911d972 URL: https://github.com/kamailio/kamailio/commit/ba6b3e8d8a9cc898e54acf750f871b8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:01+01:00 sms: fixed misleading-indentation warning GH #3012 (cherry picked from commit adb2d539e0db7feb1d6758dcc040c22a5915f104) --- Modified: src/modules/sms/sms_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/ba6b3e8d8a9cc898e54acf750f871b8… Patch: https://github.com/kamailio/kamailio/commit/ba6b3e8d8a9cc898e54acf750f871b8… --- diff --git a/src/modules/sms/sms_funcs.c b/src/modules/sms/sms_funcs.c index 32efec520c..36b85a964e 100644 --- a/src/modules/sms/sms_funcs.c +++ b/src/modules/sms/sms_funcs.c @@ -883,21 +883,22 @@ void modem_process(struct modem *mdm) /* if any, let's get them */ if (used_mem) LM_DBG("%d new SMS on modem\n",used_mem); - for(i=1,k=1;k<=used_mem && i<=max_mem;i++) { - if (getsms(&sms,mdm,i)!=-1) { - k++; - LM_DBG("SMS Get from location %d\n",i); - /*for test ;-) -> to be remove*/ - LM_DBG("SMS RECEIVED:\n\rFrom: %s %s\n\r%.*s %.*s" - "\n\r\"%.*s\"\n\r",sms.sender,sms.name, - DATE_LEN,sms.date,TIME_LEN,sms.time, - sms.userdatalength,sms.ascii); - if (!sms.is_statusreport) - _send_sms_as_sip(&sms, mdm); - else - check_sms_report(&sms); - } + + for(i=1,k=1;k<=used_mem && i<=max_mem;i++) { + if (getsms(&sms,mdm,i)!=-1) { + k++; + LM_DBG("SMS Get from location %d\n",i); + /*for test ;-) -> to be remove*/ + LM_DBG("SMS RECEIVED:\n\rFrom: %s %s\n\r%.*s %.*s" + "\n\r\"%.*s\"\n\r",sms.sender,sms.name, + DATE_LEN,sms.date,TIME_LEN,sms.time, + sms.userdatalength,sms.ascii); + if (!sms.is_statusreport) + _send_sms_as_sip(&sms, mdm); + else + check_sms_report(&sms); } + } /* if reports are used, checks for expired records in report queue */ if (sms_report_type!=NO_REPORT)

2 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2022