sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:3da9060a: janssonrpcc: do not set TCP_KEEPIDLE if not available in the OS
by Daniel-Constantin Mierla 22 Apr '22

22 Apr '22

Module: kamailio Branch: master Commit: 3da9060a4479b5d1275088213b560f9e3b250394 URL: https://github.com/kamailio/kamailio/commit/3da9060a4479b5d1275088213b560f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-22T13:17:01+02:00 janssonrpcc: do not set TCP_KEEPIDLE if not available in the OS --- Modified: src/modules/janssonrpcc/janssonrpc_connect.c --- Diff: https://github.com/kamailio/kamailio/commit/3da9060a4479b5d1275088213b560f9… Patch: https://github.com/kamailio/kamailio/commit/3da9060a4479b5d1275088213b560f9… --- diff --git a/src/modules/janssonrpcc/janssonrpc_connect.c b/src/modules/janssonrpcc/janssonrpc_connect.c index b6f4d69912..6f5048efd4 100644 --- a/src/modules/janssonrpcc/janssonrpc_connect.c +++ b/src/modules/janssonrpcc/janssonrpc_connect.c @@ -316,8 +316,12 @@ int set_keepalive(int fd, int keepalive, int cnt, int idle, int intvl) { res = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &idle, sizeof(idle)); assert(res == 0); +#ifdef HAVE_TCP_KEEPIDLE res = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle)); assert(res == 0); +#else + LM_INFO("TCP_KEEPIDLE option not available - ignoring\n"); +#endif res = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &intvl, sizeof(intvl)); assert(res == 0);

1 0

git:master:dbf9b284: ims_diameter_server: 0-terminate value converted to json
by Daniel-Constantin Mierla 22 Apr '22

22 Apr '22

Module: kamailio Branch: master Commit: dbf9b28402d9506c5761476febc31fbf45eb08fa URL: https://github.com/kamailio/kamailio/commit/dbf9b28402d9506c5761476febc31fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-22T12:29:35+02:00 ims_diameter_server: 0-terminate value converted to json --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/dbf9b28402d9506c5761476febc31fb… Patch: https://github.com/kamailio/kamailio/commit/dbf9b28402d9506c5761476febc31fb… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 04e2d6d967..73c0e047ea 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -164,9 +164,10 @@ int AAAmsg2json(AAAMessage * request, str * dest) { } dest->len = strlen(out); - dest->s = pkg_malloc(dest->len); + dest->s = pkg_malloc(dest->len + 1); if (dest->s) { memcpy(dest->s, out, dest->len); + dest->s[dest->len] = '\0'; free(out); } else { LM_WARN("Failed to allocate %d bytes for the JSON\n", dest->len);

1 0

git:master:b8b6c915: janssonrpcc: close fd in case of error
by Daniel-Constantin Mierla 22 Apr '22

22 Apr '22

Module: kamailio Branch: master Commit: b8b6c915a0f8d3f820e6c51a272ccd8d8c8f9ac7 URL: https://github.com/kamailio/kamailio/commit/b8b6c915a0f8d3f820e6c51a272ccd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-22T13:05:54+02:00 janssonrpcc: close fd in case of error --- Modified: src/modules/janssonrpcc/janssonrpc_connect.c --- Diff: https://github.com/kamailio/kamailio/commit/b8b6c915a0f8d3f820e6c51a272ccd8… Patch: https://github.com/kamailio/kamailio/commit/b8b6c915a0f8d3f820e6c51a272ccd8… --- diff --git a/src/modules/janssonrpcc/janssonrpc_connect.c b/src/modules/janssonrpcc/janssonrpc_connect.c index 0ba40f1643..b6f4d69912 100644 --- a/src/modules/janssonrpcc/janssonrpc_connect.c +++ b/src/modules/janssonrpcc/janssonrpc_connect.c @@ -338,7 +338,7 @@ void bev_connect(jsonrpc_server_t* server) } else { INFO("setting up socket"); fd = socket(AF_INET, SOCK_STREAM, 0); - if (fd <= 0) { + if (fd < 0) { server->keep_alive_socket_fd = -1; ERR("could not setup socket"); } else { @@ -346,6 +346,9 @@ void bev_connect(jsonrpc_server_t* server) } } if (!fd_is_valid(fd)) { // make sure socket is valid + if (fd >= 0) { + close(fd); + } fd = -1; server->keep_alive_socket_fd = -1; }

1 0

git:master:55255570: tcpops: remove explicit compile warning about unavailable TCP_KEEPIDLE
by Daniel-Constantin Mierla 22 Apr '22

22 Apr '22

Module: kamailio Branch: master Commit: 55255570cf74f8c86d7757a3fb08ac3aad7cfa55 URL: https://github.com/kamailio/kamailio/commit/55255570cf74f8c86d7757a3fb08ac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-22T13:15:57+02:00 tcpops: remove explicit compile warning about unavailable TCP_KEEPIDLE --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/55255570cf74f8c86d7757a3fb08ac3… Patch: https://github.com/kamailio/kamailio/commit/55255570cf74f8c86d7757a3fb08ac3… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index cb1728390c..fa886c5460 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -168,7 +168,6 @@ int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int close LM_ERR("failed to set keepalive idle interval: %s\n", strerror(errno)); } #else - #warning "TCP_KEEPIDLE option not supported by this platform" LM_DBG("TCP_KEEPIDLE option not available - ignoring\n"); #endif

1 0

git:master:1e97d6e6: evrexec: free resources in case of failure
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: 1e97d6e63c89c7a27be7152ac38192d056fef7c8 URL: https://github.com/kamailio/kamailio/commit/1e97d6e63c89c7a27be7152ac38192d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T20:00:11+02:00 evrexec: free resources in case of failure --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1e97d6e63c89c7a27be7152ac38192d… Patch: https://github.com/kamailio/kamailio/commit/1e97d6e63c89c7a27be7152ac38192d… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index 253197d100..3087e65369 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -259,11 +259,14 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) if(it->sockfd==-1) { LM_ERR("failed to create socket - address: %.*s (%d/%s)\n", it->sockaddr.len, it->sockaddr.s, errno, strerror(errno)); + freeaddrinfo(res); return; } if(bind(it->sockfd, res->ai_addr, res->ai_addrlen)==-1) { LM_ERR("failed to bind socket - address: %.*s (%d/%s)\n", it->sockaddr.len, it->sockaddr.s, errno, strerror(errno)); + close(it->sockfd); + freeaddrinfo(res); return; } freeaddrinfo(res);

1 0

git:master:e2df1d91: pua_reginfo: clang format code files
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: e2df1d91de0e0351a7976720d1e9a101af746cf7 URL: https://github.com/kamailio/kamailio/commit/e2df1d91de0e0351a7976720d1e9a10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T16:07:17+02:00 pua_reginfo: clang format code files --- Modified: src/modules/pua_reginfo/notify.c Modified: src/modules/pua_reginfo/notify.h Modified: src/modules/pua_reginfo/pua_reginfo.c Modified: src/modules/pua_reginfo/pua_reginfo.h Modified: src/modules/pua_reginfo/subscribe.c Modified: src/modules/pua_reginfo/subscribe.h Modified: src/modules/pua_reginfo/usrloc_cb.c Modified: src/modules/pua_reginfo/usrloc_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/e2df1d91de0e0351a7976720d1e9a10… Patch: https://github.com/kamailio/kamailio/commit/e2df1d91de0e0351a7976720d1e9a10…

1 0

[kamailio/kamailio] ims_registrar_scscf: replace unregistered state with deregistered (PR #3076)
by Kristiyan Peychev 21 Apr '22

21 Apr '22

#### 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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This is the actual application of PR #3051; registration termination requests work properly now. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3076 -- Commit Summary -- * ims_registrar_scscf: replace unregistered state with deregistered where relevant for CxDx Registration Termination Requests -- File Changes -- M src/modules/ims_registrar_scscf/cxdx_callbacks.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3076.patch https://github.com/kamailio/kamailio/pull/3076.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3076 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3076(a)github.com>

3 2

git:master:27a98c58: ims_registrar_scscf: replace unregistered state with deregistered where relevant for CxDx Registration Termination Requests
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: 27a98c580f41a279417a8493461ff0567b3ce12a URL: https://github.com/kamailio/kamailio/commit/27a98c580f41a279417a8493461ff05… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T15:30:05+02:00 ims_registrar_scscf: replace unregistered state with deregistered where relevant for CxDx Registration Termination Requests --- Modified: src/modules/ims_registrar_scscf/cxdx_callbacks.c --- Diff: https://github.com/kamailio/kamailio/commit/27a98c580f41a279417a8493461ff05… Patch: https://github.com/kamailio/kamailio/commit/27a98c580f41a279417a8493461ff05… --- diff --git a/src/modules/ims_registrar_scscf/cxdx_callbacks.c b/src/modules/ims_registrar_scscf/cxdx_callbacks.c index ca601bd991..00fc280b4d 100644 --- a/src/modules/ims_registrar_scscf/cxdx_callbacks.c +++ b/src/modules/ims_registrar_scscf/cxdx_callbacks.c @@ -90,10 +90,9 @@ AAAMessage* cxdx_process_rtr(AAAMessage *rtr) { while (impucontact) { LM_DBG("Deleting contact with AOR [%.*s]\n", impucontact->contact->aor.len, impucontact->contact->aor.s); ul.lock_contact_slot_i(impucontact->contact->sl); - impucontact->contact->state = CONTACT_DELETE_PENDING; if (r->shead) { //send NOTIFY to all subscribers of this IMPU. - notify_subscribers(r, impucontact->contact, 0, 0, IMS_REGISTRAR_CONTACT_UNREGISTERED); + notify_subscribers(r, impucontact->contact, 0, 0, IMS_REGISTRAR_CONTACT_DEREGISTERED); } impucontact->contact->state = CONTACT_DELETED; ul.unlock_contact_slot_i(impucontact->contact->sl); @@ -119,10 +118,9 @@ AAAMessage* cxdx_process_rtr(AAAMessage *rtr) { while (impucontact) { LM_DBG("Deleting contact with AOR [%.*s]\n", impucontact->contact->aor.len, impucontact->contact->aor.s); ul.lock_contact_slot_i(impucontact->contact->sl); - impucontact->contact->state = CONTACT_DELETE_PENDING; if (r->shead) { //send NOTIFY to all subscribers of this IMPU. - notify_subscribers(r, impucontact->contact, 0, 0, IMS_REGISTRAR_CONTACT_UNREGISTERED); + notify_subscribers(r, impucontact->contact, 0, 0, IMS_REGISTRAR_CONTACT_DEREGISTERED); } impucontact->contact->state = CONTACT_DELETED; ul.unlock_contact_slot_i(impucontact->contact->sl);

1 0

[kamailio/kamailio] add function t_continue_skip_timer to enable skipping of timer checks (PR #3080)
by Kristiyan Peychev 21 Apr '22

21 Apr '22

#### 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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This is done because IMS third party registration requests would be skipped because t_continue would get called on the transaction _way_ before the timer timeout. All this resulted in the correct route not being called. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3080 -- Commit Summary -- * tm: add function t_continue_skip_timer to enable skipping of timer checks * ims_registrar_scscf: use t_continue_skip_timer instead of t_continue when processing CxDx SAR -- File Changes -- M src/modules/ims_registrar_scscf/cxdx_sar.c (2) M src/modules/tm/t_lookup.c (2) M src/modules/tm/t_suspend.c (15) M src/modules/tm/t_suspend.h (2) M src/modules/tm/tm_load.c (1) M src/modules/tm/tm_load.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3080.patch https://github.com/kamailio/kamailio/pull/3080.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3080 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3080(a)github.com>

2 2

git:master:2067f110: tm: add function t_continue_skip_timer to enable skipping of timer checks
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: 2067f110336244826b183a649cb987fac94ffe1c URL: https://github.com/kamailio/kamailio/commit/2067f110336244826b183a649cb987f… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T15:29:37+02:00 tm: add function t_continue_skip_timer to enable skipping of timer checks This is done because third party registration requests would be skipped because t_continue would get called on the transaction _way_ before the timer timeout. All this resulted in the correct route not being called. --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/t_suspend.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/2067f110336244826b183a649cb987f… Patch: https://github.com/kamailio/kamailio/commit/2067f110336244826b183a649cb987f… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index b90672b3e4..f041116bb8 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1587,7 +1587,7 @@ int t_get_canceled_ident(struct sip_msg* msg, unsigned int* hash_index, * 0). * @param hash_index - searched transaction hash_index (part of the ident). * @param label - searched transaction label (part of the ident). - * @param filter - if 1, skip transaction put on-wait (terminated state). + * @param filter - if 1, filter out transactions put on-wait (terminated state). * @return -1 on error/not found, 1 on success (found) * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). */ diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index bae9747282..f0255d6647 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -163,8 +163,8 @@ int t_suspend(struct sip_msg *msg, * 0 - success * <0 - failure */ -int t_continue_helper(unsigned int hash_index, unsigned int label, - struct action *rtact, str *cbname, str *cbparam) +static int t_continue_helper(unsigned int hash_index, unsigned int label, + struct action *rtact, str *cbname, str *cbparam, int skip_timer) { tm_cell_t *t; tm_cell_t *backup_T = T_UNDEFINED; @@ -192,7 +192,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, backup_T = get_t(); backup_T_branch = get_t_branch(); - if (t_lookup_ident_filter(&t, hash_index, label, 1) < 0) { + if (t_lookup_ident_filter(&t, hash_index, label, skip_timer) < 0) { set_t(backup_T, backup_T_branch); LM_WARN("active transaction not found\n"); return -1; @@ -592,13 +592,18 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, int t_continue(unsigned int hash_index, unsigned int label, struct action *route) { - return t_continue_helper(hash_index, label, route, NULL, NULL); + return t_continue_helper(hash_index, label, route, NULL, NULL, 1); +} +int t_continue_skip_timer(unsigned int hash_index, unsigned int label, + struct action *route) +{ + return t_continue_helper(hash_index, label, route, NULL, NULL, 0); } int t_continue_cb(unsigned int hash_index, unsigned int label, str *cbname, str *cbparam) { - return t_continue_helper(hash_index, label, NULL, cbname, cbparam); + return t_continue_helper(hash_index, label, NULL, cbname, cbparam, 0); } /* Revoke the suspension of the SIP request, i.e. diff --git a/src/modules/tm/t_suspend.h b/src/modules/tm/t_suspend.h index fcbe182ad1..07c4e7bc37 100644 --- a/src/modules/tm/t_suspend.h +++ b/src/modules/tm/t_suspend.h @@ -29,6 +29,8 @@ typedef int (*t_suspend_f)(struct sip_msg *msg, int t_continue(unsigned int hash_index, unsigned int label, struct action *route); +int t_continue_skip_timer(unsigned int hash_index, unsigned int label, + struct action *route); typedef int (*t_continue_f)(unsigned int hash_index, unsigned int label, struct action *route); diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index 911be5d917..65515a3a28 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -115,6 +115,7 @@ int load_tm( struct tm_binds *tmb) tmb->t_get_canceled_ident = t_get_canceled_ident; tmb->t_suspend = t_suspend; tmb->t_continue = t_continue; + tmb->t_continue_skip_timer = t_continue_skip_timer; tmb->t_continue_cb = t_continue_cb; tmb->t_cancel_suspend = t_cancel_suspend; tmb->t_get_reply_totag = t_get_reply_totag; diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index a0f3afde00..8190ee977c 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -95,6 +95,7 @@ struct tm_binds { t_get_canceled_ident_f t_get_canceled_ident; t_suspend_f t_suspend; t_continue_f t_continue; + t_continue_f t_continue_skip_timer; t_continue_cb_f t_continue_cb; t_cancel_suspend_f t_cancel_suspend; tget_reply_totag_f t_get_reply_totag;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev