sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
242 discussions

git:master:4fb8accc: ims_registrar_pcscf: update registered state to pending registration if contact exists

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4fb8accc6747ad56fec3dc84d70cb2b8bbd7316e URL: https://github.com/kamailio/kamailio/commit/4fb8accc6747ad56fec3dc84d70cb2b… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-28T17:24:15+01:00 ims_registrar_pcscf: update registered state to pending registration if contact exists --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/4fb8accc6747ad56fec3dc84d70cb2b… Patch: https://github.com/kamailio/kamailio/commit/4fb8accc6747ad56fec3dc84d70cb2b… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 7e425230d0d..679abc99ca5 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -477,8 +477,15 @@ int save_pending(struct sip_msg *_m, udomain_t *_d) ul.unlock_udomain(_d, &ci.via_host, ci.via_port, ci.via_prot); return -2; } - } else { - LM_DBG("Contact already exists - not doing anything for now\n"); + } else if(pcontact->reg_state == PCONTACT_DEREG_PENDING_PUBLISH) { + LM_DBG("Contact already exists - Updating contact [%.*s]: setting " + "state to PCONTACT_REG_PENDING\n", + pcontact->aor.len, pcontact->aor.s); + + memset(&ci_, 0, sizeof(struct pcontact_info)); + ci_.reg_state = PCONTACT_REG_PENDING; + ci_.num_service_routes = 0; + ul.update_pcontact(_d, &ci_, pcontact); } }

9 months, 3 weeks

git:master:17bdbd34: ims_usrloc: make matching of username in contact conditional

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 17bdbd34b1038de936f14c1a41ce55f571e6402a URL: https://github.com/kamailio/kamailio/commit/17bdbd34b1038de936f14c1a41ce55f… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-28T17:24:15+01:00 ims_usrloc: make matching of username in contact conditional --- Modified: src/modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/17bdbd34b1038de936f14c1a41ce55f… Patch: https://github.com/kamailio/kamailio/commit/17bdbd34b1038de936f14c1a41ce55f… --- diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c index 0d7c14390ac..3c754a6f17f 100644 --- a/src/modules/ims_usrloc_pcscf/udomain.c +++ b/src/modules/ims_usrloc_pcscf/udomain.c @@ -616,32 +616,40 @@ int get_pcontact_from_cache(udomain_t *_d, pcontact_info_t *contact_info, continue; } } - if((contact_info->aor.len > 0) && (needle_uri.user.len != 0)) { - if((needle_uri.user.len != c->contact_user.len) - || (memcmp(needle_uri.user.s, c->contact_user.s, - needle_uri.user.len) - != 0)) { - LM_ERR("user name does not match - no match here...\n"); - LM_DBG("found pcontact username [%d]: [%.*s]\n", i, - c->contact_user.len, c->contact_user.s); - LM_DBG("incoming contact username: [%.*s]\n", - needle_uri.user.len, needle_uri.user.s); - c = c->next; - continue; - } - if((contact_info->aor.len >= 4) - && (memcmp(contact_info->aor.s, c->aor.s, 4) - != 0)) { // do not mix up sip- and tel-URIs. - LM_ERR("scheme does not match - no match here...\n"); - LM_DBG("found pcontact scheme [%d]: [%.*s]\n", i, 4, - c->aor.s); - LM_DBG("incoming contact scheme: [%.*s]\n", 4, - contact_info->aor.s); - c = c->next; - continue; + + // perform full contact match + if(match_contact_host_port == 0) { + if((contact_info->aor.len > 0) + && (needle_uri.user.len != 0)) { + if((needle_uri.user.len != c->contact_user.len) + || (memcmp(needle_uri.user.s, c->contact_user.s, + needle_uri.user.len) + != 0)) { + LM_ERR("user name does not match - no match " + "here...\n"); + LM_DBG("found pcontact username [%d]: [%.*s]\n", i, + c->contact_user.len, c->contact_user.s); + LM_DBG("incoming contact username: [%.*s]\n", + needle_uri.user.len, needle_uri.user.s); + c = c->next; + continue; + } + if((contact_info->aor.len >= 4) + && (memcmp(contact_info->aor.s, c->aor.s, 4) + != 0)) { // do not mix up sip- and tel-URIs. + LM_ERR("scheme does not match - no match " + "here...\n"); + LM_DBG("found pcontact scheme [%d]: [%.*s]\n", i, 4, + c->aor.s); + LM_DBG("incoming contact scheme: [%.*s]\n", 4, + contact_info->aor.s); + c = c->next; + continue; + } + } else { + LM_DBG("No user name present - abort user name " + "check\n"); } - } else { - LM_DBG("No user name present - abort user name check\n"); }

9 months, 3 weeks

git:5.8:59ab5855: file_out: Fix leaks

by Xenofon Karamanos

Module: kamailio Branch: 5.8 Commit: 59ab58551e5895b710893985d0072c8c510c672c URL: https://github.com/kamailio/kamailio/commit/59ab58551e5895b710893985d0072c8… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-02-27T14:25:32Z file_out: Fix leaks (cherry picked from commit 8af509ae280b2ef155f1946acac5a7d977bb5c14) --- Modified: src/modules/file_out/file_out.c Modified: src/modules/file_out/types.c --- Diff: https://github.com/kamailio/kamailio/commit/59ab58551e5895b710893985d0072c8… Patch: https://github.com/kamailio/kamailio/commit/59ab58551e5895b710893985d0072c8… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 832420f0276..ad055f1852c 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -250,6 +250,14 @@ static void fo_log_writer_process(int rank) LM_ERR("Failed to flush file with err {%s}\n", strerror(errno)); } + if(log_message.prefix != NULL) { + if(log_message.prefix->s != NULL) { + shm_free(log_message.prefix->s); + } + shm_free(log_message.prefix); + log_message.prefix = NULL; + } + if(log_message.message != NULL) { if(log_message.message->s != NULL) { shm_free(log_message.message->s); diff --git a/src/modules/file_out/types.c b/src/modules/file_out/types.c index e2c93b4f502..6dedfd201e1 100644 --- a/src/modules/file_out/types.c +++ b/src/modules/file_out/types.c @@ -132,7 +132,19 @@ void fo_free_queue(fo_queue_t *q) { fo_log_message_t data; while(fo_dequeue(q, &data) > 0) { - shm_free(data.message); + if(data.prefix != NULL) { + if(data.prefix->s != NULL) { + shm_free(data.prefix->s); + } + shm_free(data.prefix); + } + + if(data.message != NULL) { + if(data.message->s != NULL) { + shm_free(data.message->s); + } + shm_free(data.message); + } } shm_free(q); }

9 months, 3 weeks

git:5.8:6721fb7a: file_out: Add header guards

by Xenofon Karamanos

Module: kamailio Branch: 5.8 Commit: 6721fb7aae373d42c4059a630fc79815d2f709b7 URL: https://github.com/kamailio/kamailio/commit/6721fb7aae373d42c4059a630fc7981… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-02-27T14:25:16Z file_out: Add header guards (cherry picked from commit 967fb30b14fb63bcb396956f9e9ed0ca92028682) --- Modified: src/modules/file_out/types.h --- Diff: https://github.com/kamailio/kamailio/commit/6721fb7aae373d42c4059a630fc7981… Patch: https://github.com/kamailio/kamailio/commit/6721fb7aae373d42c4059a630fc7981… --- diff --git a/src/modules/file_out/types.h b/src/modules/file_out/types.h index 782a6bcb31d..641da360dad 100644 --- a/src/modules/file_out/types.h +++ b/src/modules/file_out/types.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef _FO_TYPES_H +#define _FO_TYPES_H + #include "../../core/locking.h" #include "../../core/pvar.h" @@ -61,3 +64,5 @@ typedef struct fo_file_properties } fo_file_properties_t; int fo_file_properties_destroy(fo_file_properties_t *fp); + +#endif

9 months, 3 weeks

[kamailio/kamailio] Library libjson-c-dev 0.15.2 not compatible with pua_json module (Issue #3376)

by Henning Westerholt

There seems to be an incompatibility in the pua_json module related to the libjson-c-dev" version. The module crashes on startup on version 0.15.2 (e.g. from Debian bullseye). It works with version 0.12 (e.g. Debian buster). Backtrace below: ``` #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 #1 0x00007f6d265e5537 in __GI_abort () at abort.c:79 #2 0x00007f6d265e540f in __assert_fail_base (fmt=0x7f6d2675d6a8 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=0x7f6d2322c091 "jso->_ref_count > 0", file=0x7f6d2322c064 "./json_object.c", line=308, function=<optimized out>) at assert.c:92 #3 0x00007f6d265f4662 in __GI___assert_fail (assertion=0x7f6d2322c091 "jso->_ref_count > 0", file=0x7f6d2322c064 "./json_object.c", line=308, function=0x7f6d2322c480 "json_object_put") at assert.c:101 #4 0x00007f6d23224732 in json_object_put () from /lib/x86_64-linux-gnu/libjson-c.so.5 #5 0x00007f6d25842362 in pua_json_publish (msg=0x7fffb3fffb20, json=0x7f6d25ff5778 "{\"Call-ID\":\"111\",\"Event-Category\":\"presence\",\"Event-Name\":\"update\",\"Event-Package\":\"message-summary\",\"Expires\":\"3600\",\"To\":\"sip:103@XXX.YYY.55.208\",\"To-User\":\"103\",\"To-Realm\":\"XXX.YYY.55.208\",\"From\":\""...) at pua_json_publish.c:383 #6 0x00007f6d2583e74a in w_pua_json_publish (msg=0x7fffb3fffb20, p1pjson=0x7f6d25ff5988 "xW\377%m\177", p2=0x0) at pua_json_mod.c:100 #7 0x0000563199d1c47e in do_action () #8 0x0000563199d29ae6 in run_actions () #9 0x00007f6d2324444e in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/xhttp.so #10 0x00007f6d23246005 in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/xhttp.so #11 0x0000563199e6cb10 in nonsip_msg_run_hooks () #12 0x0000563199ede538 in receive_msg () #13 0x0000563199cac4f2 in receive_tcp_msg () #14 0x0000563199caeb51 in tcp_read_req () #15 0x0000563199cb2028 in ?? () #16 0x0000563199c9da4f in ?? () #17 0x0000563199cb4f8c in tcp_receive_loop () #18 0x0000563199e2330b in tcp_init_children () #19 0x0000563199c8967f in main_loop () #20 0x0000563199c9446e in main () ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3376 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3376(a)github.com>

9 months, 3 weeks

git:master:8af509ae: file_out: Fix leaks

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 8af509ae280b2ef155f1946acac5a7d977bb5c14 URL: https://github.com/kamailio/kamailio/commit/8af509ae280b2ef155f1946acac5a7d… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-02-27T15:18:57+02:00 file_out: Fix leaks --- Modified: src/modules/file_out/file_out.c Modified: src/modules/file_out/types.c --- Diff: https://github.com/kamailio/kamailio/commit/8af509ae280b2ef155f1946acac5a7d… Patch: https://github.com/kamailio/kamailio/commit/8af509ae280b2ef155f1946acac5a7d… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 832420f0276..ad055f1852c 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -250,6 +250,14 @@ static void fo_log_writer_process(int rank) LM_ERR("Failed to flush file with err {%s}\n", strerror(errno)); } + if(log_message.prefix != NULL) { + if(log_message.prefix->s != NULL) { + shm_free(log_message.prefix->s); + } + shm_free(log_message.prefix); + log_message.prefix = NULL; + } + if(log_message.message != NULL) { if(log_message.message->s != NULL) { shm_free(log_message.message->s); diff --git a/src/modules/file_out/types.c b/src/modules/file_out/types.c index e2c93b4f502..6dedfd201e1 100644 --- a/src/modules/file_out/types.c +++ b/src/modules/file_out/types.c @@ -132,7 +132,19 @@ void fo_free_queue(fo_queue_t *q) { fo_log_message_t data; while(fo_dequeue(q, &data) > 0) { - shm_free(data.message); + if(data.prefix != NULL) { + if(data.prefix->s != NULL) { + shm_free(data.prefix->s); + } + shm_free(data.prefix); + } + + if(data.message != NULL) { + if(data.message->s != NULL) { + shm_free(data.message->s); + } + shm_free(data.message); + } } shm_free(q); }

9 months, 4 weeks

git:master:967fb30b: file_out: Add header guards

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 967fb30b14fb63bcb396956f9e9ed0ca92028682 URL: https://github.com/kamailio/kamailio/commit/967fb30b14fb63bcb396956f9e9ed0c… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-02-27T15:18:57+02:00 file_out: Add header guards --- Modified: src/modules/file_out/types.h --- Diff: https://github.com/kamailio/kamailio/commit/967fb30b14fb63bcb396956f9e9ed0c… Patch: https://github.com/kamailio/kamailio/commit/967fb30b14fb63bcb396956f9e9ed0c… --- diff --git a/src/modules/file_out/types.h b/src/modules/file_out/types.h index 782a6bcb31d..641da360dad 100644 --- a/src/modules/file_out/types.h +++ b/src/modules/file_out/types.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef _FO_TYPES_H +#define _FO_TYPES_H + #include "../../core/locking.h" #include "../../core/pvar.h" @@ -61,3 +64,5 @@ typedef struct fo_file_properties } fo_file_properties_t; int fo_file_properties_destroy(fo_file_properties_t *fp); + +#endif

9 months, 4 weeks

[kamailio/kamailio] file_out: Free allocated memory (PR #3770)

by Xenofon Karamanos

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR free allocated memory and add heder guards. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3770 -- Commit Summary -- * file_out: Add header guards * file_out: Fix leaks -- File Changes -- M src/modules/file_out/file_out.c (8) M src/modules/file_out/types.c (14) M src/modules/file_out/types.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3770.patch https://github.com/kamailio/kamailio/pull/3770.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3770 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3770(a)github.com>

9 months, 4 weeks

[kamailio/kamailio] Hello I am Facing issue while Installing Kamilio from Herulspreet brach. It is showing multiple definitions under CDP module. (Issue #3769)

by Shailesh192

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3769 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3769(a)github.com>

9 months, 4 weeks

git:master:c3d75388: tcpops: if connection not found, return attributes from sip msg rcv

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c3d753885b3cd1bc0cb9f46986e5798dfb5f6552 URL: https://github.com/kamailio/kamailio/commit/c3d753885b3cd1bc0cb9f46986e5798… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-27T09:50:05+01:00 tcpops: if connection not found, return attributes from sip msg rcv --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c3d753885b3cd1bc0cb9f46986e5798… Patch: https://github.com/kamailio/kamailio/commit/c3d753885b3cd1bc0cb9f46986e5798… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 15e39993d64..aad29665d72 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -762,41 +762,50 @@ static int pv_get_tcp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return -1; } + con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0); switch(param->pvn.u.isname.name.n) { - case 1: - sval.s = ip_addr2a(&msg->rcv.src_ip); + case 1: /* c_si */ + if(con == NULL) { + sval.s = ip_addr2a(&msg->rcv.src_ip); + sval.len = strlen(sval.s); + return pv_get_strval(msg, param, res, &sval); + } + sval.s = ip_addr2a(&con->cinfo.src_ip); + tcpconn_put(con); sval.len = strlen(sval.s); return pv_get_strval(msg, param, res, &sval); - case 2: - ival = msg->rcv.src_port; + case 2: /* c_sp */ + if(con == NULL) { + ival = msg->rcv.src_port; + return pv_get_sintval(msg, param, res, ival); + } + ival = con->cinfo.src_port; + tcpconn_put(con); return pv_get_sintval(msg, param, res, ival); - case 3: - if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) - == NULL) { + case 3: /* ac_si */ + if(con == NULL) { return pv_get_null(msg, param, res); } sval.s = ip_addr2a(&con->cinfo.src_ip); tcpconn_put(con); sval.len = strlen(sval.s); return pv_get_strval(msg, param, res, &sval); - case 4: - if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) - == NULL) { + case 4: /* ac_sp */ + if(con == NULL) { return pv_get_null(msg, param, res); } ival = con->cinfo.src_port; tcpconn_put(con); return pv_get_sintval(msg, param, res, ival); - case 5: - if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) - == NULL) { + case 5: /* aconid */ + if(con == NULL) { return pv_get_null(msg, param, res); } ival = con->id; tcpconn_put(con); return pv_get_sintval(msg, param, res, ival); - default: + default: /* conid */ return pv_get_sintval(msg, param, res, msg->rcv.proto_reserved1); } }

9 months, 4 weeks

← Newer
1
2
3
4
5
6
7
8
...
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 2024