sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
380 discussions

git:master:a7b8cb33: ims_registrar_scscf: formatting change for a few really long lines

by Henning Westerholt

Module: kamailio Branch: master Commit: a7b8cb33d815fcea5dec7c82a33e8fcbad54ba03 URL: https://github.com/kamailio/kamailio/commit/a7b8cb33d815fcea5dec7c82a33e8fc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-07T18:25:36+01:00 ims_registrar_scscf: formatting change for a few really long lines --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/a7b8cb33d815fcea5dec7c82a33e8fc… Patch: https://github.com/kamailio/kamailio/commit/a7b8cb33d815fcea5dec7c82a33e8fc… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index 89202047a9..5f15cf60d7 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -340,7 +340,8 @@ int can_subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { } else { presentity_uri = ul.get_presentity_from_subscriber_dialog(&callid, &ttag, &ftag); if (presentity_uri.len == 0) { - LM_ERR("Unable to get presentity uri from subscriber dialog with callid <%.*s>, ttag <%.*s> and ftag <%.*s>\n", callid.len, callid.s, ttag.len, ttag.s, ftag.len, ftag.s); + LM_ERR("Unable to get presentity uri from subscriber dialog with callid <%.*s>, ttag <%.*s> and ftag <%.*s>\n", + callid.len, callid.s, ttag.len, ttag.s, ftag.len, ftag.s); goto done; } } @@ -1078,7 +1079,8 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { //cscf_get_to_uri(msg, &presentity_uri); presentity_uri = ul.get_presentity_from_subscriber_dialog(&callid, &ttag, &ftag); if (presentity_uri.len == 0) { - LM_ERR("Unable to get presentity uri from subscriber dialog with callid <%.*s>, ttag <%.*s> and ftag <%.*s>\n", callid.len, callid.s, ttag.len, ttag.s, ftag.len, ftag.s); + LM_ERR("Unable to get presentity uri from subscriber dialog with callid <%.*s>, ttag <%.*s> and ftag <%.*s>\n", + callid.len, callid.s, ttag.len, ttag.s, ftag.len, ftag.s); ret = CSCF_RETURN_FALSE; goto doneorerror; } @@ -1360,7 +1362,8 @@ int contact_port_ip_match(str *c1, str *c2) { str ip_port1, ip_port2; aor_to_contact(c1, &ip_port1); //strip userpart from test contact aor_to_contact(c2, &ip_port2); //strip userpart from test contact - LM_DBG("Matching contact using only port and ip - comparing [%.*s] and [%.*s]\n", ip_port1.len, ip_port1.s, ip_port2.len, ip_port2.s); + LM_DBG("Matching contact using only port and ip - comparing [%.*s] and [%.*s]\n", + ip_port1.len, ip_port1.s, ip_port2.len, ip_port2.s); if ((ip_port1.len == ip_port2.len) && !memcmp(ip_port1.s, ip_port2.s, ip_port1.len)) { return 1; } @@ -1437,7 +1440,8 @@ void create_notifications(udomain_t* _t, impurecord_t* r_passed, str *presentity if (event_type == IMS_REGISTRAR_SUBSCRIBE) { if (contact_port_ip_match(watcher_contact, &s->watcher_contact) && (presentity_uri->len == s->presentity_uri.len) && (memcmp(s->presentity_uri.s, presentity_uri->s, presentity_uri->len) == 0)) { - LM_DBG("This is a fix to ensure that we only send full reg info XML to the UE that just subscribed. About to make new notification! We always increment the local cseq and version before we send a new notification\n"); + LM_DBG("This is a fix to ensure that we only send full reg info XML to the UE that just subscribed.\n"); + LM_DBG("About to make new notification! We always increment the local cseq and version before we send a new notification\n"); local_cseq = s->local_cseq + 1; version = s->version + 1;

4 years, 5 months

[kamailio/kamailio] ims_registrar_scscf: added '\n' for debug messages (#2123)

by alexyosifov

- added a new line to the end of some debug logs for better formatting.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2123 -- Commit Summary -- * ims_registrar_scscf: added '\n' for debug messages -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (139) M src/modules/ims_registrar_scscf/usrloc_cb.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2123.patch https://github.com/kamailio/kamailio/pull/2123.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/2123

4 years, 5 months

git:master:2e472701: ims_registrar_scscf: added '\n' for debug messages

by Henning Westerholt

Module: kamailio Branch: master Commit: 2e4727014fff86545bb9ce8bb97f72173d8c8c87 URL: https://github.com/kamailio/kamailio/commit/2e4727014fff86545bb9ce8bb97f721… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-07T18:14:21+01:00 ims_registrar_scscf: added '\n' for debug messages - added a new line to the end of some debug logs for better formatting. --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/2e4727014fff86545bb9ce8bb97f721… Patch: https://github.com/kamailio/kamailio/commit/2e4727014fff86545bb9ce8bb97f721…

4 years, 5 months

git:5.3:6d1abb35: ims_ipsec_pcscf: closing mnl_socket in some exceptional situations

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: 6d1abb352c772caf164486854a2609ca67a0142b URL: https://github.com/kamailio/kamailio/commit/6d1abb352c772caf164486854a2609c… Author: Stanislav S. Litvinenko <litvinenko(a)protei.ru> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-07T18:08:09+01:00 ims_ipsec_pcscf: closing mnl_socket in some exceptional situations - fix leak socket when error handling errors in creation or destruction ipsec tunnel (cherry picked from commit 575102bef5418ddfef2f619f22dd827183eef8af) --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/6d1abb352c772caf164486854a2609c… Patch: https://github.com/kamailio/kamailio/commit/6d1abb352c772caf164486854a2609c… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index c27335126b..11673582ad 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -338,15 +338,18 @@ static int create_ipsec_tunnel(const struct ip_addr *remote_addr, ipsec_t* s) if(remote_addr->af == AF_INET){ if(str2ipbuf(&ipsec_listen_addr, &ipsec_addr) < 0){ LM_ERR("Unable to convert ipsec addr4 [%.*s]\n", ipsec_listen_addr.len, ipsec_listen_addr.s); + close_mnl_socket(sock); return 0; } } else if(remote_addr->af == AF_INET6){ if(str2ip6buf(&ipsec_listen_addr6, &ipsec_addr) < 0){ LM_ERR("Unable to convert ipsec addr6 [%.*s]\n", ipsec_listen_addr6.len, ipsec_listen_addr6.s); + close_mnl_socket(sock); return 0; } } else { LM_ERR("Unsupported AF %d\n", remote_addr->af); + close_mnl_socket(sock); return 0; } @@ -355,6 +358,7 @@ static int create_ipsec_tunnel(const struct ip_addr *remote_addr, ipsec_t* s) memset(remote_addr_str, 0, sizeof(remote_addr_str)); if(inet_ntop(remote_addr->af, remote_addr->u.addr, remote_addr_str, sizeof(remote_addr_str)) == NULL) { LM_CRIT("Error converting remote IP address: %s\n", strerror(errno)); + close_mnl_socket(sock); return -1; } @@ -401,6 +405,7 @@ static int destroy_ipsec_tunnel(str remote_addr, ipsec_t* s, unsigned short rece // convert 'remote_addr' ip string to ip_addr_t if(str2ipxbuf(&remote_addr, &ip_addr) < 0){ LM_ERR("Unable to convert remote address [%.*s]\n", remote_addr.len, remote_addr.s); + close_mnl_socket(sock); return -1; }

4 years, 5 months

[kamailio/kamailio] ims_ipsec_pcscf: closing mnl_socket in some exceptional situations (#2114)

by Stanislav Litvinenko

- fix leak socket when error handling errors in creation or destruction ipsec tunnel   #### 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  Fixed socket leak on error during ipsec tunnel creation or destruction. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2114 -- Commit Summary -- * ims_ipsec_pcscf: closing mnl_socket in some exceptional situations -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2114.patch https://github.com/kamailio/kamailio/pull/2114.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/2114

4 years, 5 months

git:master:575102be: ims_ipsec_pcscf: closing mnl_socket in some exceptional situations

by Henning Westerholt

Module: kamailio Branch: master Commit: 575102bef5418ddfef2f619f22dd827183eef8af URL: https://github.com/kamailio/kamailio/commit/575102bef5418ddfef2f619f22dd827… Author: Stanislav S. Litvinenko <litvinenko(a)protei.ru> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-07T18:06:50+01:00 ims_ipsec_pcscf: closing mnl_socket in some exceptional situations - fix leak socket when error handling errors in creation or destruction ipsec tunnel --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/575102bef5418ddfef2f619f22dd827… Patch: https://github.com/kamailio/kamailio/commit/575102bef5418ddfef2f619f22dd827… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index c27335126b..11673582ad 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -338,15 +338,18 @@ static int create_ipsec_tunnel(const struct ip_addr *remote_addr, ipsec_t* s) if(remote_addr->af == AF_INET){ if(str2ipbuf(&ipsec_listen_addr, &ipsec_addr) < 0){ LM_ERR("Unable to convert ipsec addr4 [%.*s]\n", ipsec_listen_addr.len, ipsec_listen_addr.s); + close_mnl_socket(sock); return 0; } } else if(remote_addr->af == AF_INET6){ if(str2ip6buf(&ipsec_listen_addr6, &ipsec_addr) < 0){ LM_ERR("Unable to convert ipsec addr6 [%.*s]\n", ipsec_listen_addr6.len, ipsec_listen_addr6.s); + close_mnl_socket(sock); return 0; } } else { LM_ERR("Unsupported AF %d\n", remote_addr->af); + close_mnl_socket(sock); return 0; } @@ -355,6 +358,7 @@ static int create_ipsec_tunnel(const struct ip_addr *remote_addr, ipsec_t* s) memset(remote_addr_str, 0, sizeof(remote_addr_str)); if(inet_ntop(remote_addr->af, remote_addr->u.addr, remote_addr_str, sizeof(remote_addr_str)) == NULL) { LM_CRIT("Error converting remote IP address: %s\n", strerror(errno)); + close_mnl_socket(sock); return -1; } @@ -401,6 +405,7 @@ static int destroy_ipsec_tunnel(str remote_addr, ipsec_t* s, unsigned short rece // convert 'remote_addr' ip string to ip_addr_t if(str2ipxbuf(&remote_addr, &ip_addr) < 0){ LM_ERR("Unable to convert remote address [%.*s]\n", remote_addr.len, remote_addr.s); + close_mnl_socket(sock); return -1; }

4 years, 5 months

git:master:7e767768: kafka: README file

by Vicente Hernando

Module: kamailio Branch: master Commit: 7e7677683dd26f7f7ea2f0143c503cefa29dc535 URL: https://github.com/kamailio/kamailio/commit/7e7677683dd26f7f7ea2f0143c503ce… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-11-06T21:23:52+01:00 kafka: README file --- Added: src/modules/kafka/README --- Diff: https://github.com/kamailio/kamailio/commit/7e7677683dd26f7f7ea2f0143c503ce… Patch: https://github.com/kamailio/kamailio/commit/7e7677683dd26f7f7ea2f0143c503ce…

4 years, 5 months

git:master:3585f802: dialog: added dlg.briefing rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3585f802b3beada38b24e1daa72dc527c1d86535 URL: https://github.com/kamailio/kamailio/commit/3585f802b3beada38b24e1daa72dc52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-01T10:23:35+01:00 dialog: added dlg.briefing rpc command - list fewer details for the dialog records in memory --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/3585f802b3beada38b24e1daa72dc52… Patch: https://github.com/kamailio/kamailio/commit/3585f802b3beada38b24e1daa72dc52… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index a5f0e56b39..dd41ddf756 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2837,7 +2837,46 @@ static void rpc_dlg_list_match_ctx(rpc_t *rpc, void *c) rpc_dlg_list_match_ex(rpc, c, 1); } +static const char *rpc_dlg_briefing_doc[2] = { + "List the summary of dialog records in memory", 0 +}; + +/*! + * \brief List summary of active calls + */ +static void rpc_dlg_briefing(rpc_t *rpc, void *c) +{ + dlg_cell_t *dlg; + unsigned int i; + void *h; + + for( i=0 ; i<d_table->size ; i++ ) { + dlg_lock( d_table, &(d_table->entries[i]) ); + for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { + if (rpc->add(c, "{", &h) < 0) { + rpc->fault(c, 500, "Failed to create the structure"); + return; + } + if(rpc->struct_add(h, "ddSSSSSd", + "h_entry", dlg->h_entry, + "h_id", dlg->h_id, + "from_uri", &dlg->from_uri, + "to_uri", &dlg->to_uri, + "call-id", &dlg->callid, + "from_tag", &dlg->tag[DLG_CALLER_LEG], + "to_tag", &dlg->tag[DLG_CALLER_LEG], + "state", dlg->state) < 0) { + rpc->fault(c, 500, "Failed to add fields"); + return; + + } + } + dlg_unlock( d_table, &(d_table->entries[i]) ); + } +} + static rpc_export_t rpc_methods[] = { + {"dlg.briefing", rpc_dlg_briefing, rpc_dlg_briefing_doc, RET_ARRAY}, {"dlg.list", rpc_print_dlgs, rpc_print_dlgs_doc, RET_ARRAY}, {"dlg.list_ctx", rpc_print_dlgs_ctx, rpc_print_dlgs_ctx_doc, RET_ARRAY}, {"dlg.list_match", rpc_dlg_list_match, rpc_dlg_list_match_doc, RET_ARRAY},

4 years, 5 months

[kamailio/kamailio] Modules: db_redisusrloc for usrloc module (#1446)

by Surendra Tiwari

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1446 -- Commit Summary -- * kamailio db_redisusrloc -- File Changes -- A src/modules/db_redisusrloc/Makefile (36) A src/modules/db_redisusrloc/README (88) A src/modules/db_redisusrloc/db_redisusrloc.c (100) A src/modules/db_redisusrloc/doc/Makefile (4) A src/modules/db_redisusrloc/doc/db_redisusrloc.xml (45) A src/modules/db_redisusrloc/doc/db_redisusrloc_admin.xml (86) A src/modules/db_redisusrloc/redisdb_base.c (1189) A src/modules/db_redisusrloc/redisdb_connection.c (100) A src/modules/db_redisusrloc/redisdb_connection.h (43) A src/modules/db_redisusrloc/redisdb_dbase.h (96) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1446.patch https://github.com/kamailio/kamailio/pull/1446.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/1446

4 years, 5 months

git:master:574b080d: core: slow timer - warning message if callback function is null

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 574b080d69b2b968cfe871bc7cfe8fdf930fbc2e URL: https://github.com/kamailio/kamailio/commit/574b080d69b2b968cfe871bc7cfe8fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-05T13:47:53+01:00 core: slow timer - warning message if callback function is null --- Modified: src/core/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/574b080d69b2b968cfe871bc7cfe8fd… Patch: https://github.com/kamailio/kamailio/commit/574b080d69b2b968cfe871bc7cfe8fd… --- diff --git a/src/core/timer.c b/src/core/timer.c index 1bcd036fda..f6b60ec3df 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -1101,7 +1101,19 @@ void slow_timer_main() #endif SET_RUNNING_SLOW(tl); UNLOCK_SLOW_TIMER_LIST(); - ret=tl->f(*ticks, tl, tl->data); + if(likely(tl->f)) { + ret=tl->f(*ticks, tl, tl->data); + } else { + ret =0; +#ifdef TIMER_DEBUG + LM_WARN("null timer callback for %p (%s:%u - %s(...))\n", + tl, (tl->add_file)?tl->add_file:"unknown", + tl->add_line, + (tl->add_func)?tl->add_func:"unknown"); +#else + LM_WARN("null callback function for %p\n", tl); +#endif + } /* reset the configuration group handles */ cfg_reset_all(); if (ret==0){

4 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019