- sr-dev - kamailio.org

git:master:2ab74b2c: db_postgres: added support for async queries
by Daniel-Constantin Mierla 07 Feb '22

07 Feb '22

Module: kamailio Branch: master Commit: 2ab74b2cee705a97214a61936a6e940bcbf6eb75 URL: https://github.com/kamailio/kamailio/commit/2ab74b2cee705a97214a61936a6e940… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-07T21:49:06+01:00 db_postgres: added support for async queries --- Modified: src/modules/db_postgres/db_postgres.c Modified: src/modules/db_postgres/km_dbase.c Modified: src/modules/db_postgres/km_dbase.h --- Diff: https://github.com/kamailio/kamailio/commit/2ab74b2cee705a97214a61936a6e940… Patch: https://github.com/kamailio/kamailio/commit/2ab74b2cee705a97214a61936a6e940…

1 0

[kamailio/kamailio] fixed format-truncation warning (PR #3017)
by sergey-safarov 07 Feb '22

07 Feb '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 - [x] Related to issue #3013 #### Description fixed format-truncation warning You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3017 -- Commit Summary -- * presence: fixed format-truncation warning GH #3013 * rls: fixed format-truncation warning GH #3013 -- File Changes -- M src/modules/presence/presence.c (4) M src/modules/rls/rls.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3017.patch https://github.com/kamailio/kamailio/pull/3017.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3017 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3017(a)github.com>

2 2

git:master:e921fc8e: rls: fixed format-truncation warning GH #3013
by Daniel-Constantin Mierla 07 Feb '22

07 Feb '22

Module: kamailio Branch: master Commit: e921fc8ed7a6c9fdeb532179a77503cd67799487 URL: https://github.com/kamailio/kamailio/commit/e921fc8ed7a6c9fdeb532179a77503c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-07T21:46:57+01:00 rls: fixed format-truncation warning GH #3013 --- Modified: src/modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/e921fc8ed7a6c9fdeb532179a77503c… Patch: https://github.com/kamailio/kamailio/commit/e921fc8ed7a6c9fdeb532179a77503c… --- 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,

1 0

git:master:c1b14f49: presence: fixed format-truncation warning GH #3013
by Daniel-Constantin Mierla 07 Feb '22

07 Feb '22

Module: kamailio Branch: master Commit: c1b14f49ead9a29711cde5334155819cd1c6c90d URL: https://github.com/kamailio/kamailio/commit/c1b14f49ead9a29711cde5334155819… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-07T21:46:57+01:00 presence: fixed format-truncation warning GH #3013 --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/c1b14f49ead9a29711cde5334155819… Patch: https://github.com/kamailio/kamailio/commit/c1b14f49ead9a29711cde5334155819… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index da253acbac..d6e287c40e 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -566,8 +566,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,

1 0

[kamailio/kamailio] fixed misleading-indentation warning (PR #3016)
by sergey-safarov 07 Feb '22

07 Feb '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 - [x] Related to issue #3012 #### Description fixed misleading-indentation warning You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3016 -- Commit Summary -- * sms: fixed misleading-indentation warning GH #3012 * ims_charging: fixed misleading-indentation warning GH #3012 * kazoo: fixed misleading-indentation warning GH #3012 -- File Changes -- M src/modules/ims_charging/ims_ro.c (26) M src/modules/kazoo/kz_amqp.c (21) M src/modules/sms/sms_funcs.c (29) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3016.patch https://github.com/kamailio/kamailio/pull/3016.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3016 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3016(a)github.com>

2 2

git:master:2b9706ac: kazoo: fixed misleading-indentation warning GH #3012
by Daniel-Constantin Mierla 07 Feb '22

07 Feb '22

Module: kamailio Branch: master Commit: 2b9706aca33b8ca34d3d9c58b80527956c92dd7a URL: https://github.com/kamailio/kamailio/commit/2b9706aca33b8ca34d3d9c58b805279… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-07T21:45:43+01:00 kazoo: fixed misleading-indentation warning GH #3012 --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/2b9706aca33b8ca34d3d9c58b805279… Patch: https://github.com/kamailio/kamailio/commit/2b9706aca33b8ca34d3d9c58b805279… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 4d9e3dcd8a..15d5b259a1 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -798,9 +798,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)); @@ -1126,11 +1126,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; } @@ -2045,14 +2045,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; - }

1 0

git:master:adb2d539: sms: fixed misleading-indentation warning GH #3012
by Daniel-Constantin Mierla 07 Feb '22

07 Feb '22

Module: kamailio Branch: master Commit: adb2d539e0db7feb1d6758dcc040c22a5915f104 URL: https://github.com/kamailio/kamailio/commit/adb2d539e0db7feb1d6758dcc040c22… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-07T21:45:43+01:00 sms: fixed misleading-indentation warning GH #3012 --- Modified: src/modules/sms/sms_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/adb2d539e0db7feb1d6758dcc040c22… Patch: https://github.com/kamailio/kamailio/commit/adb2d539e0db7feb1d6758dcc040c22… --- 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)

1 0

git:master:d94879b0: ims_charging: fixed misleading-indentation warning GH #3012
by Daniel-Constantin Mierla 07 Feb '22

07 Feb '22

Module: kamailio Branch: master Commit: d94879b06f9bbb9d6ffa2dcaae5b213f169f2d5a URL: https://github.com/kamailio/kamailio/commit/d94879b06f9bbb9d6ffa2dcaae5b213… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-07T21:45:43+01:00 ims_charging: fixed misleading-indentation warning GH #3012 --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/d94879b06f9bbb9d6ffa2dcaae5b213… Patch: https://github.com/kamailio/kamailio/commit/d94879b06f9bbb9d6ffa2dcaae5b213… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index d93d565a65..11b2335f51 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1604,23 +1604,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; @@ -1634,7 +1634,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) {

1 0

git:master:4f3f4e51: core: set mem_summary to 12 by default
by Daniel-Constantin Mierla 07 Feb '22

07 Feb '22

Module: kamailio Branch: master Commit: 4f3f4e5152e2e6cc7bb2bf4f97bbb2d21c6f91be URL: https://github.com/kamailio/kamailio/commit/4f3f4e5152e2e6cc7bb2bf4f97bbb2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-07T09:08:47+01:00 core: set mem_summary to 12 by default - more useful for troubleshoot on a quick look - avoid long restart time for writing a lot of log messages with memory status for each chunk --- Modified: src/core/cfg_core.c --- Diff: https://github.com/kamailio/kamailio/commit/4f3f4e5152e2e6cc7bb2bf4f97bbb2d… Patch: https://github.com/kamailio/kamailio/commit/4f3f4e5152e2e6cc7bb2bf4f97bbb2d… --- diff --git a/src/core/cfg_core.c b/src/core/cfg_core.c index 44d98dfe25..51394a6977 100644 --- a/src/core/cfg_core.c +++ b/src/core/cfg_core.c @@ -110,7 +110,7 @@ struct cfg_group_core default_core_cfg = { -1, /**< udp4_raw_ttl (auto detect by default) */ 0, /*!< force_rport */ L_DBG+1, /*!< memlog */ - 3, /*!< mem_summary -flags: 0 off, 1 pkg_status, 2 shm_status, + 12, /*!< mem_summary -flags: 0 off, 1 pkg_status, 2 shm_status, 4 pkg_sums, 8 shm_sums, 16 short_status */ 1, /*!< mem_safety - 0 disabled; 1 enabled */ 1, /*!< mem_join - 1 enabled */

1 0

Kamailio Glob style include / wildcard.
by Brandon Armstead 04 Feb '22

04 Feb '22

Would it be possible to get glob style includes in place, i.e. include_file "/some/path/*.cfg". Reviewing the source, it looks like sr_push_yy_state in src/core/cfg.lex needs an update. Daniel - can you confirm if this is the correct place to modify such behavior and if there are any gotchas in implementation of this? It would be nice if it had full support for glob inclusion / imports, similar to nginx i.e. include_file "/home/*/foo/bar/*.cfg" would include files in /home/brandon/foo/bar/*.cfg and /home/dev/foo/bar/*.cfg although I realize this adds a bit more complexity, any reason you can see why not to add support for this? Thanks!

2 1

[kamailio/kamailio] SCSCF failing to send INVITE to application server. (Issue #3015)
by SJ286 03 Feb '22

03 Feb '22

We are trying to test private VoLTE setup with real UEs using open5gs EPC , kamailio IMS and application server. We see INVITE request reaching till term-SCSCF with URL (sip:405874000000955@ims.mnc874.mcc405.3gppnetwork.org;user=phone) but it is not forwarding request to application server. SCSCF is trying to fetch IMPU record for application server with tel uri even though it receives SIP uri in INVITE message. Hence fails to reach application server. Could anyone help us on why 'isc_match_filter()' function is returning tel uri even though it is receiving sip uri in message? Attaching log and pcap for reference. #### SCSCF logs [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [ims_isc_mod.c:253]: isc_match_filter(): Starting triggering [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [ims_isc_mod.c:323]: isc_match_filter(): Checking if ISC is for originating user [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [ims_isc_mod.c:362]: isc_match_filter(): Checking if ISC is for terminating user [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [ims_isc_mod.c:372]: isc_match_filter(): ISC is for Term user [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [checker.c:586]: isc_is_registered(): Searching in usrloc [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [checker.c:589]: isc_is_registered(): no record exists for [tel:405874000000955] [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [ims_isc_mod.c:380]: isc_match_filter(): Term User <tel:405874000000955> [0] [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [ims_isc_mod.c:383]: isc_match_filter(): Checking if RURI has changed...comparing: <> and <tel:405874000000955> [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [ims_isc_mod.c:390]: isc_match_filter(): Resuming triggering [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [checker.c:586]: isc_is_registered(): Searching in usrloc [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [checker.c:589]: isc_is_registered(): no record exists for [tel:405874000000955] [33;1mscscf |[0m [0;39;49m[0;39;49m 3(34) DEBUG: ims_isc [checker.c:431]: isc_checker_find(): isc_checker_find: starting search [33;1mscscf |[0m [0;39;49m[0;31;49m 3(34) ERROR: ims_isc [checker.c:448]: isc_checker_find(): Failure getting IMPU record for [tel:405874000000955] - ISC checker find METHOD: [INVITE] [open5gs_test67.zip](https://github.com/kamailio/kamailio/files/7979412/open… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3015 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3015(a)github.com>

3 4

[kamailio/kamailio] Localy generated transaction with dns failover and socket forcing (Issue #2987)
by Dennis 02 Feb '22

02 Feb '22

### Description DNS failover do not wok for localy generated transaction when script forcing socket or sets Via parameters with corex via_add_srvid/via_add_xavp_params, in log appear the errors: ``` Dec 24 13:30:17 sbc kamailio[9772]: 10(9800) DEBUG: <core> [core/parser/parse_uri.c:1306]: parse_uri(): bad uri, state 0 parsed: <<F3>gbf> (4) / <<F3>gbf#017^?> (38) Dec 24 13:30:17 sbc kamailio[9772]: 10(9800) ERROR: tm [ut.h:245]: uri2dst2(): bad_uri: [<F3>gbf#017^?] ``` #### Reproduction Config stripped for localize problem: ``` #!define IPADDR_THISNODE "192.168.122.130" #!subst "/IPADDR_THISNODE/192.168.122.130/" #!define MULTIDOMAIN 0 ####### Global Parameters ######### #!define WITH_DEBUG ### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR #!ifdef WITH_DEBUG debug=4 log_stderror=yes #!else debug=2 log_stderror=no #!endif memdbg=5 memlog=5 log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " /* number of SIP routing processes */ children=8 server_id = 10 xavp_via_params = "via" /* uncomment the next line to disable TCP (default on) */ disable_tcp=yes /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ # auto_aliases=no /* listen on local and anycast addresses */ listen=udp:IPADDR_THISNODE:5060 #### DNS settings use_dns_cache = on # Use KAMAILIO internal DNS cache use_dns_failover = on # Depends on KAMAILIO internal DNS cache #dns_srv_loadbalancing = on # #dns_try_naptr = on # dns_try_naptr = off # dns_retr_time=1 # Time in seconds before retrying a DNS request dns_retr_no=1 # Number of DNS retransmissions before giving up dns_try_ipv6=yes dns_use_search_list=no ####### Modules Section ######## /* set paths to location of modules */ loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "counters.so" loadmodule "dispatcher.so" # ----------------- setting module-specific parameters --------------- # ----- jsonrpcs params ----- modparam("jsonrpcs", "pretty_format", 1) /* set the path to RPC fifo control file */ # modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ # modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) # ----- tm params ----- modparam("tm", "fr_timer", 2000) #modparam("tm", "reparse_on_dns_failover", 0) # ----- dispatcher params ----- modparam("dispatcher", "list_file", "/etc/kamailio/dispatcher.list") modparam("dispatcher", "ds_ping_interval", 10) modparam("dispatcher", "ds_probing_mode", 1) modparam("dispatcher", "ds_probing_threshold", 2) modparam("dispatcher", "ds_ping_method", "OPTIONS") modparam("dispatcher", "outbound_proxy", "sip:proxy") # ----- corex params ----- modparam("corex", "dns_cache", "type=A;name=proxy;addr=192.168.122.129;ttl=3600000;flags=2") modparam("corex", "dns_cache", "type=A;name=proxy;addr=192.168.122.131;ttl=3600000;flags=2") # ----- rr params ----- # set next param to 1 to add value to ;lr param (helps with some UAs) modparam("rr", "enable_full_lr", 0) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) onsend_route { xinfo(">> onsend_route snd_to=$sndto(ip)\n"); } event_route [tm:local-request] { xlog("L_INFO", ">> Routing locally generated $rm to $ru\n"); xinfo(">> mbu: $mbu"); $fs = "udp:IPADDR_THISNODE:5060"; // This have the same effect as forcing socket // via_add_srvid(1); t_set_fr(1000,250); } ``` disparcher list have only one target: `110 sip:192.168.122.131:5060;transport=udp 0 1` The scenario is simple - dispatcher try to ping target via proxy, config have two "A" records in cache, all work as expected until tm:local-request route modify Via header by setting $fs or one of the corex module functions which set flags FL_ADD_SRVID|FL_ADD_XAVP_VIA_PARAMS|FL_USE_XAVP_VIA_FIELDS, tm in this case (after error as above) decline failover. #### Debugging Data transaction fail log: ``` Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: dispatcher [dispatch.c:3546]: ds_ping_result_helper(): probe all, mode DS_PROBE_ALL Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: dispatcher [dispatch.c:3589]: ds_ping_set(): probing set #110, URI sip:192.168.122.131:5060;transport=udp Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: dispatcher [dispatch.c:3620]: ds_ping_set(): Default ping_from: sip:dispatcher@localhost Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: dispatcher [dispatch.c:3630]: ds_ping_set(): Default outbound proxy: sip:proxy Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: tm [uac.c:457]: t_uac_prepare(): next_hop=<sip:proxy> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (_sip._udp.proxy(15), 33), h=170 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/dns_cache.c:3050]: dns_srv_resolve_ip(): ("_sip._udp.proxy", 0, 0), ret=-5, ip= Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (proxy(5), 1), h=878 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/dns_cache.c:2807]: dns_a_resolve(): (proxy, 0) returning 0 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/dns_cache.c:3176]: dns_srv_sip_resolve(): (proxy, 0, 0), ip, ret=0 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: tm [uac.c:158]: dlg2hash(): hashid 55725 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: tm [uac.c:246]: t_run_local_req(): executing event_route[tm:local-request] Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_fline.c:249]: parse_first_line(): first line type 1 (request) flags 1 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:677]: parse_msg(): SIP Request: Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:679]: parse_msg(): method: <OPTIONS> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:681]: parse_msg(): uri: <sip:192.168.122.131:5060;transport=udp> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:683]: parse_msg(): version: <SIP/2.0> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Via] type 1 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKda9d.ac749307000000000000000000000000.0>; state=16 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:555]: parse_headers(): Via found, flags=2 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:557]: parse_headers(): this is the first via Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) INFO: <script>: >> Routing locally generated OPTIONS to sip:192.168.122.131:5060;transport=udp Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/msg_translator.c:1799]: check_boundaries(): no multi-part body Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) INFO: <script>: >> mbu: OPTIONS sip:192.168.122.131:5060;transport=udp SIP/2.0 Dec 24 13:15:37 sbc kamailio[9772]: Via: SIP/2.0/UDP 192.168.122.130;branch=z9hG4bKda9d.ac749307000000000000000000000000.0 Dec 24 13:15:37 sbc kamailio[9772]: To: <sip:192.168.122.131:5060;transport=udp> Dec 24 13:15:37 sbc kamailio[9772]: From: <sip:dispatcher@localhost>;tag=e92e326f0a937cb326014225217c2c12-5929046b Dec 24 13:15:37 sbc kamailio[9772]: CSeq: 10 OPTIONS Dec 24 13:15:37 sbc kamailio[9772]: Call-ID: 62100fd077a3a243-9799(a)192.168.122.130 Dec 24 13:15:37 sbc kamailio[9772]: Max-Forwards: 70 Dec 24 13:15:37 sbc kamailio[9772]: Content-Length: 0 Dec 24 13:15:37 sbc kamailio[9772]: User-Agent: kamailio (5.5.3 (x86_64/linux)) Dec 24 13:15:37 sbc kamailio[9772]: #015 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: pv [pv_core.c:2703]: pv_set_force_sock(): trying to set send-socket to [udp:192.168.122.130:5060] Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/socket_info.c:641]: grep_sock_info(): checking if host==us: 15==15 && [192.168.122.130] == [192.168.122.130] Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/socket_info.c:648]: grep_sock_info(): checking if port 5060 (advertise 0) matches port 5060 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: tm [uac.c:314]: t_run_local_req(): local Via update - new socket: [192.168.122.130] - msg-flags: 0 9(9799) DEBUG: tm [uac.c:340]: t_run_local_req(): apply new updates with Via to sip msg Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/msg_translator.c:1799]: check_boundaries(): no multi-part body Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_fline.c:249]: parse_first_line(): first line type 1 (request) flags 1 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:677]: parse_msg(): SIP Request: Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:679]: parse_msg(): method: <OPTIONS> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:681]: parse_msg(): uri: <sip:192.168.122.131:5060;transport=udp> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:683]: parse_msg(): version: <SIP/2.0> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Via] type 1 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKda9d.ac749307000000000000000000000000.0>; state=16 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:555]: parse_headers(): Via found, flags=2 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:557]: parse_headers(): this is the first via Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [To] type 3 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_addr_spec.c:884]: parse_addr_spec(): end of header reached, state=10 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:173]: get_hdr_field(): <To> [42]; uri=[sip:192.168.122.131:5060;transport=udp] Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:176]: get_hdr_field(): to body (42)[<sip:192.168.122.131:5060;transport=udp> Dec 24 13:15:37 sbc kamailio[9772]: ], to tag (0)[] Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [From] type 4 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [CSeq] type 5 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:154]: get_hdr_field(): cseq <CSeq>: <10> <OPTIONS> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Call-ID] type 6 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Max-Forwards] type 8 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Content-Length] type 12 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:187]: get_hdr_field(): content_length=0 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [User-Agent] type 28 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:91]: get_hdr_field(): found end of header Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_fline.c:249]: parse_first_line(): first line type 1 (request) flags 1 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:677]: parse_msg(): SIP Request: Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:679]: parse_msg(): method: <OPTIONS> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:681]: parse_msg(): uri: <sip:192.168.122.131:5060;transport=udp> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:683]: parse_msg(): version: <SIP/2.0> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Via] type 1 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKda9d.ac749307000000000000000000000000.0>; state=16 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:555]: parse_headers(): Via found, flags=2 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:557]: parse_headers(): this is the first via Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [To] type 3 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_addr_spec.c:884]: parse_addr_spec(): end of header reached, state=10 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:173]: get_hdr_field(): <To> [42]; uri=[sip:192.168.122.131:5060;transport=udp] Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:176]: get_hdr_field(): to body (42)[<sip:192.168.122.131:5060;transport=udp> Dec 24 13:15:37 sbc kamailio[9772]: ], to tag (0)[] Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [From] type 4 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [CSeq] type 5 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/msg_parser.c:154]: get_hdr_field(): cseq <CSeq>: <10> <OPTIONS> Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: <core> [core/parser/parse_hname2.c:293]: parse_sip_header_name(): parsed header name [Call-ID] type 6 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: tm [uac.c:189]: uac_refresh_hdr_shortcuts(): cseq: [CSeq: 10] Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) DEBUG: tm [uac.c:685]: send_prepared_request_impl(): uac: 0x7f0f6262b9c8 branch: 0 to 192.168.122.131:5060 Dec 24 13:15:37 sbc kamailio[9772]: 9(9799) INFO: <script>: >> onsend_route snd_to=192.168.122.131 Dec 24 13:15:37 sbc kamailio[9772]: 10(9800) DEBUG: <core> [core/parser/parse_uri.c:1306]: parse_uri(): bad uri, state 0 parsed: <<F3>gbf> (4) / <<F3>gbf#017^?> (38) Dec 24 13:15:37 sbc kamailio[9772]: 10(9800) ERROR: tm [ut.h:245]: uri2dst2(): bad_uri: [<F3>gbf#017^?] Dec 24 13:15:37 sbc kamailio[9772]: 10(9800) DEBUG: tm [t_reply.c:1363]: t_should_relay_response(): ->>>>>>>>> T_code=0, new_code=408 Dec 24 13:15:37 sbc kamailio[9772]: 10(9800) DEBUG: tm [t_reply.c:1592]: t_should_relay_response(): rps completed - uas status: 0 branch: 0 Dec 24 13:15:37 sbc kamailio[9772]: 10(9800) DEBUG: tm [t_reply.c:2236]: local_reply(): branch=0, save=0, winner=0 Dec 24 13:15:37 sbc kamailio[9772]: 10(9800) DEBUG: tm [t_reply.c:2275]: local_reply(): local transaction completed 408/0 (totag retr: 0/1024) Dec 24 13:15:37 sbc kamailio[9772]: 10(9800) DEBUG: tm [t_hooks.c:256]: run_trans_callbacks_internal(): DBG: trans=0x7f0f6262b738, callback type 1024, id 0 entered Dec 24 13:15:37 sbc kamailio[9772]: 10(9800) DEBUG: dispatcher [dispatch.c:3491]: ds_options_callback(): OPTIONS-Request was finished with code 408 (to sip:192.168.122.131:5060;transport=udp, group 110) Dec 24 13:15:37 sbc kamailio[9772]: 10(9800) DEBUG: dispatcher [dispatch.c:2973]: ds_update_state(): update state for sip:192.168.122.131:5060;transport=udp in group 110 to 10 Dec 24 13:15:37 sbc kamailio[9772]: 10(9800) DEBUG: dispatcher [dispatch.c:3049]: ds_update_state(): old state was 9, set new state to 9 ``` I think that error somewhere in memory management when allocating/free structures for Via header modification which is hard to debug, i have insert several debug output in uac.c in my case the problem fire after a call of function insert_tmcb: ``` /* Register the callbacks after everything is successful and nothing can fail. Otherwise the callback parameter would be freed twise, once from TMCB_DESTROY, and again because of the negative return code. */ {// extra debug struct ua_client *uac=&request->my_T->uac[0]; LM_DBG(">>>>> Before insert_tmcb\n"); LM_DBG(">>>>> request uac: %p urip: %p uri: %.*s\n", uac, &uac->uri, STR_FMT(&uac->uri)); uac=&new_cell->uac[0]; LM_DBG(">>>>> new_cell uac: %p urip: %p uri: %.*s\n", uac, &uac->uri, STR_FMT(&uac->uri)); } if(uac_r->cb && insert_tmcb(&(new_cell->tmcb_hl), uac_r->cb_flags, *(uac_r->cb), uac_r->cbp, NULL)!=1){ ret=E_OUT_OF_MEM; LM_ERR("short of tmcb shmem\n"); goto error1; } {// extra debug struct ua_client *uac=&request->my_T->uac[0]; LM_DBG(">>>>> After insert_tmcb\n"); LM_DBG(">>>>> request uac: %p urip: %p uri: %.*s\n", uac, &uac->uri, STR_FMT(&uac->uri)); uac=&new_cell->uac[0]; LM_DBG(">>>>> new_cell uac: %p urip: %p uri: %.*s\n", uac, &uac->uri, STR_FMT(&uac->uri)); } ``` In log i see: ``` Dec 24 14:36:39 sbc kamailio[12709]: 9(12732) DEBUG: tm [uac.c:189]: uac_refresh_hdr_shortcuts(): cseq: [CSeq: 10] Dec 24 14:36:39 sbc kamailio[12709]: 9(12732) DEBUG: tm [uac.c:591]: t_uac_prepare(): >>>>> Before insert_tmcb Dec 24 14:36:39 sbc kamailio[12709]: 9(12732) DEBUG: tm [uac.c:592]: t_uac_prepare(): >>>>> request uac: 0x7f72407959c8 urip: 0x7f7240795bd8 uri: sip:192.168.122.131:5060;transport=udp Dec 24 14:36:39 sbc kamailio[12709]: 9(12732) DEBUG: tm [uac.c:594]: t_uac_prepare(): >>>>> new_cell uac: 0x7f72407959c8 urip: 0x7f7240795bd8 uri: sip:192.168.122.131:5060;transport=udp Dec 24 14:36:39 sbc kamailio[12709]: 9(12732) DEBUG: tm [uac.c:604]: t_uac_prepare(): >>>>> After insert_tmcb Dec 24 14:36:39 sbc kamailio[12709]: 9(12732) DEBUG: tm [uac.c:605]: t_uac_prepare(): >>>>> request uac: 0x7f72407959c8 urip: 0x7f7240795bd8 uri: <F3>#007yDr^? Dec 24 14:36:39 sbc kamailio[12709]: 9(12732) DEBUG: tm [uac.c:607]: t_uac_prepare(): >>>>> new_cell uac: 0x7f72407959c8 urip: 0x7f7240795bd8 uri: <F3>#007yDr^? Dec 24 14:36:39 sbc kamailio[12709]: 9(12732) DEBUG: tm [uac.c:699]: send_prepared_request_impl(): uac: 0x7f72407959c8 branch: 0 to 192.168.122.131:5060 Dec 24 14:36:39 sbc kamailio[12709]: 9(12732) INFO: <script>: >> onsend_route snd_to=192.168.122.131 Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) DEBUG: <core> [core/parser/parse_uri.c:1306]: parse_uri(): bad uri, state 0 parsed: <<F3>#007yD> (4) / <<F3>#007yDr^?> (38) Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) ERROR: tm [ut.h:245]: uri2dst2(): bad_uri: [<F3>#007yDr^?] Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) DEBUG: tm [t_reply.c:1363]: t_should_relay_response(): ->>>>>>>>> T_code=0, new_code=408 Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) DEBUG: tm [t_reply.c:1592]: t_should_relay_response(): rps completed - uas status: 0 branch: 0 Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) DEBUG: tm [t_reply.c:2236]: local_reply(): branch=0, save=0, winner=0 Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) DEBUG: tm [t_reply.c:2275]: local_reply(): local transaction completed 408/0 (totag retr: 0/1024) Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) DEBUG: tm [t_hooks.c:256]: run_trans_callbacks_internal(): DBG: trans=0x7f7240795738, callback type 1024, id 0 entered Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) DEBUG: dispatcher [dispatch.c:3491]: ds_options_callback(): OPTIONS-Request was finished with code 408 (to sip:192.168.122.131:5060;transport=udp, group 110) Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) DEBUG: dispatcher [dispatch.c:2973]: ds_update_state(): update state for sip:192.168.122.131:5060;transport=udp in group 110 to 10 Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) DEBUG: dispatcher [dispatch.c:3004]: ds_update_state(): destination did not replied 1 times, threshold 2 Dec 24 14:36:40 sbc kamailio[12709]: 10(12733) DEBUG: dispatcher [dispatch.c:3049]: ds_update_state(): old state was 0, set new state to 10 ``` insert_tmcb have shm_malloc fincion call in the beninig, after this call the content of uri structure is broken. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.3 (x86_64/linux) 473cef flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. ``` * **Operating System**: ``` Ubuntu 18.04.6 LTS ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2987 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2987(a)github.com>

3 8

git:master:ee33df08: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 01 Feb '22

01 Feb '22

Module: kamailio Branch: master Commit: ee33df0800493329b6fd1cc1d9979182cad86379 URL: https://github.com/kamailio/kamailio/commit/ee33df0800493329b6fd1cc1d997918… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-01T17:31:17+01:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/ee33df0800493329b6fd1cc1d997918… Patch: https://github.com/kamailio/kamailio/commit/ee33df0800493329b6fd1cc1d997918…

1 0

git:master:6fe9d152: htable: exported config functions to set value and item at once
by Daniel-Constantin Mierla 01 Feb '22

01 Feb '22

Module: kamailio Branch: master Commit: 6fe9d1527d247d8d5ad926d2290dae3860a1d78a URL: https://github.com/kamailio/kamailio/commit/6fe9d1527d247d8d5ad926d2290dae3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-01T11:20:39+01:00 htable: exported config functions to set value and item at once - they were already available in kemi --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/6fe9d1527d247d8d5ad926d2290dae3… Patch: https://github.com/kamailio/kamailio/commit/6fe9d1527d247d8d5ad926d2290dae3… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 5599ffe0e6..6de38d57e9 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -84,6 +84,10 @@ static int w_ht_iterator_rm(struct sip_msg* msg, char* iname, char* foo); static int w_ht_iterator_sets(struct sip_msg* msg, char* iname, char* val); static int w_ht_iterator_seti(struct sip_msg* msg, char* iname, char* val); static int w_ht_iterator_setex(struct sip_msg* msg, char* iname, char* val); +static int w_ht_setxs(sip_msg_t *msg, char *htname, char *itname, + char *itval, char *exval); +static int w_ht_setxi(sip_msg_t *msg, char *htname, char *itname, + char *itval, char *exval); int ht_param(modparam_t type, void* val); @@ -152,6 +156,10 @@ static cmd_export_t cmds[]={ fixup_free_spve_igp, ANY_ROUTE}, {"sht_iterator_setex", (cmd_function)w_ht_iterator_setex, 2, fixup_spve_igp, fixup_free_spve_igp, ANY_ROUTE}, + {"sht_setxs", (cmd_function)w_ht_setxs, 4, fixup_sssi, + fixup_free_sssi, ANY_ROUTE}, + {"sht_setxi", (cmd_function)w_ht_setxi, 4, fixup_ssii, + fixup_free_ssii, ANY_ROUTE}, {"bind_htable", (cmd_function)bind_htable, 0, 0, 0, ANY_ROUTE}, @@ -1302,6 +1310,37 @@ static int ki_ht_setxs(sip_msg_t *msg, str *htname, str *itname, str *itval, return 1; } +/** + * + */ +static int w_ht_setxs(sip_msg_t *msg, char *htname, char *itname, + char *itval, char *exval) +{ + str shtname; + str sitname; + str sitval; + int iexval; + + if(fixup_get_svalue(msg, (gparam_t*)htname, &shtname)<0 || shtname.len<=0) { + LM_ERR("cannot get htable name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)itname, &sitname)<0 || sitname.len<=0) { + LM_ERR("cannot get item name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)itval, &sitval)<0) { + LM_ERR("cannot get item value\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t*)exval, &iexval)<0) { + LM_ERR("cannot get expire value\n"); + return -1; + } + + return ki_ht_setxs(msg, &shtname, &sitname, &sitval, iexval); +} + /** * */ @@ -1345,6 +1384,37 @@ static int ki_ht_setxi(sip_msg_t *msg, str *htname, str *itname, int itval, return 0; } +/** + * + */ +static int w_ht_setxi(sip_msg_t *msg, char *htname, char *itname, + char *itval, char *exval) +{ + str shtname; + str sitname; + int nitval; + int iexval; + + if(fixup_get_svalue(msg, (gparam_t*)htname, &shtname)<0 || shtname.len<=0) { + LM_ERR("cannot get htable name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)itname, &sitname)<0 || sitname.len<=0) { + LM_ERR("cannot get item name\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t*)itval, &nitval)<0) { + LM_ERR("cannot get item value\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t*)exval, &iexval)<0) { + LM_ERR("cannot get expire value\n"); + return -1; + } + + return ki_ht_setxi(msg, &shtname, &sitname, nitval, iexval); +} + #define KSR_HT_KEMI_NOINTVAL -255 static ht_cell_t *_htc_ki_local=NULL;

1 0

git:master:a2c9b9ba: htable: docs for sht_setxs() and sht_setxi()
by Daniel-Constantin Mierla 01 Feb '22

01 Feb '22

Module: kamailio Branch: master Commit: a2c9b9ba8861bfc95ca995c491d2c32ac8e59579 URL: https://github.com/kamailio/kamailio/commit/a2c9b9ba8861bfc95ca995c491d2c32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-01T11:44:50+01:00 htable: docs for sht_setxs() and sht_setxi() --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a2c9b9ba8861bfc95ca995c491d2c32… Patch: https://github.com/kamailio/kamailio/commit/a2c9b9ba8861bfc95ca995c491d2c32… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index e39482acd3..9ea5c183f7 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -926,6 +926,52 @@ sht_rm_name("ha", "re", ".*"); ... sht_rm_value("ha", "re", ".*"); ... +</programlisting> + </example> + </section> + <section id="htable.f.sht_setxs"> + <title> + <function moreinfo="none">sht_setxs(htname, itname, itval, exval)</function> + </title> + <para> + Set the item with the name 'itname' from hash table 'htname' to string + value 'itval' and expire property to 'exval'. + </para> + <para> + The parameters can be with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_setxs</function> usage</title> + <programlisting format="linespecific"> +... +sht_setxs("ha", "test", "abc", "10"); +... +</programlisting> + </example> + </section> + <section id="htable.f.sht_setxi"> + <title> + <function moreinfo="none">sht_setxi(htname, itname, itval, exval)</function> + </title> + <para> + Set the item with the name 'itname' from hash table 'htname' to integer + value 'itval' and expire property to 'exval'. + </para> + <para> + The parameters can be with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_setxi</function> usage</title> + <programlisting format="linespecific"> +... +sht_setxs("ha", "test", "100", "10"); +... </programlisting> </example> </section>

1 0

git:master:8a124182: core: two fixup helpers for functions with four parameters
by Daniel-Constantin Mierla 01 Feb '22

01 Feb '22

Module: kamailio Branch: master Commit: 8a124182ab0667455726fa1d2ed2fc368c2723ff URL: https://github.com/kamailio/kamailio/commit/8a124182ab0667455726fa1d2ed2fc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-01T11:11:15+01:00 core: two fixup helpers for functions with four parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/8a124182ab0667455726fa1d2ed2fc3… Patch: https://github.com/kamailio/kamailio/commit/8a124182ab0667455726fa1d2ed2fc3… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 148ba50227..325e3d117b 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -788,6 +788,7 @@ int fixup_free_vstr_all(void** param, int param_no) pv_elem_free_all((pv_elem_t*)(*param)); return 0; } + /** * */ @@ -799,3 +800,71 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen) } return -1; } + +/** + * + */ +int fixup_sssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + case 3: + return fixup_spve_null(param, 1); + case 4: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_sssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + case 3: + return fixup_free_spve_null(param, 1); + case 4: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_ssii(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_spve_null(param, 1); + case 3: + case 4: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_ssii(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_free_spve_null(param, 1); + case 3: + case 4: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index f91e489f68..ca63a5a804 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -162,4 +162,11 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); int fixup_igp_regexp(void** param, int param_no); int fixup_free_igp_regexp(void** param, int param_no); + +int fixup_sssi(void** param, int param_no); +int fixup_free_sssi(void** param, int param_no); + +int fixup_ssii(void** param, int param_no); +int fixup_free_ssii(void** param, int param_no); + #endif

1 0

Re: [sr-dev] [kamailio/kamailio] core: tcp - added core parameter tcp_wait_data (7a5ae41)
by Victor Seva 01 Feb '22

01 Feb '22

fixed at 2e62177f7f08314efa883f87f3d703a4f71a1d5e -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e552ad8917/65788779(a)github.com>

1 0

Re: [sr-dev] [kamailio/kamailio] core: tcp - added core parameter tcp_wait_data (7a5ae41)
by tsearle 01 Feb '22

01 Feb '22

This is a compile error, an extra ) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e552ad8917/65785606(a)github.com>

1 0

git:master:4031260f: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 31 Jan '22

31 Jan '22

Module: kamailio Branch: master Commit: 4031260fbb21a0330651977fdcaf4708dc270497 URL: https://github.com/kamailio/kamailio/commit/4031260fbb21a0330651977fdcaf470… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-31T19:46:12+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/4031260fbb21a0330651977fdcaf470… Patch: https://github.com/kamailio/kamailio/commit/4031260fbb21a0330651977fdcaf470…

1 0

git:master:e3cfb250: nathelper: added alias_name parameter
by Daniel-Constantin Mierla 31 Jan '22

31 Jan '22

Module: kamailio Branch: master Commit: e3cfb250912911e31bbc69e9927d48ef9384e949 URL: https://github.com/kamailio/kamailio/commit/e3cfb250912911e31bbc69e9927d48e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-31T19:28:09+01:00 nathelper: added alias_name parameter - allows to set the name of the parmeter used for alias --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/e3cfb250912911e31bbc69e9927d48e… Patch: https://github.com/kamailio/kamailio/commit/e3cfb250912911e31bbc69e9927d48e… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 3fdbc0332a..2d9e4ee6b7 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -201,6 +201,7 @@ static int nh_filter_srvid = 0; /*0-> disabled, 1 ->enabled*/ unsigned int *natping_state = NULL; +static str nh_alias_name = str_init(""); /* clang-format off */ static cmd_export_t cmds[] = { @@ -275,6 +276,7 @@ static param_export_t params[] = { {"append_sdp_oldmediaip", INT_PARAM, &sdp_oldmediaip }, {"filter_server_id", INT_PARAM, &nh_filter_srvid }, {"nat_addr_mode", INT_PARAM, &nh_nat_addr_mode }, + {"alias_name", PARAM_STR, &nh_alias_name }, {0, 0, 0} }; @@ -449,6 +451,12 @@ static int mod_init(void) LM_ERR("failed to register RPC commands\n"); return -1; } + if(nh_alias_name.s != NULL && nh_alias_name.len > 0) { + if(ksr_contact_alias_set_name(&nh_alias_name) < 0) { + LM_ERR("failed to set contact alias parameter name\n"); + return -1; + } + } if(rcv_avp_param && *rcv_avp_param) { s.s = rcv_avp_param;

1 0

git:master:36320b7a: nathelper: docs for alias_name parameter
by Daniel-Constantin Mierla 31 Jan '22

31 Jan '22

Module: kamailio Branch: master Commit: 36320b7a22982cc6d2aff610b325bf9620d99239 URL: https://github.com/kamailio/kamailio/commit/36320b7a22982cc6d2aff610b325bf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-31T19:32:35+01:00 nathelper: docs for alias_name parameter --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/36320b7a22982cc6d2aff610b325bf9… Patch: https://github.com/kamailio/kamailio/commit/36320b7a22982cc6d2aff610b325bf9… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 832e324819..d0e8a18ea4 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -508,6 +508,27 @@ modparam("nathelper", "filter_server_id", 1) ... modparam("nathelper", "nat_addr_mode", 0) ... +</programlisting> + </example> + </section> + <section id="nathelper.p.alias_name"> + <title><varname>alias_name</varname> (string)</title> + <para> + The parameter sets the name of the Contact URI parameter set by + set_contact_alias() or add_contact_alias() and processed by + handle_ruri_alias() in R-URI. + </para> + <para> + <emphasis> + Default value is <quote>alias</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>alias_name</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "alias_name", "saddr") +... </programlisting> </example> </section>

1 0

git:master:ff1a1d0a: core: dset - added function to set contact alias parameter name
by Daniel-Constantin Mierla 31 Jan '22

31 Jan '22

Module: kamailio Branch: master Commit: ff1a1d0adef9dbfeb9a523297027a162c2f644ea URL: https://github.com/kamailio/kamailio/commit/ff1a1d0adef9dbfeb9a523297027a16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-31T17:30:07+01:00 core: dset - added function to set contact alias parameter name --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/ff1a1d0adef9dbfeb9a523297027a16… Patch: https://github.com/kamailio/kamailio/commit/ff1a1d0adef9dbfeb9a523297027a16… --- diff --git a/src/core/dset.c b/src/core/dset.c index f682cede71..26530c2769 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -873,6 +873,30 @@ int msg_get_src_addr(sip_msg_t *msg, str *uri, int mode) return 0; } + +/** + * set name of alias parameter used for contact/r-uri src/rcv address encoding + */ +int ksr_contact_alias_set_name(str *aname) +{ + _ksr_contact_salias.s = (char*)pkg_malloc(aname->len + 3); + if(_ksr_contact_salias.s==NULL) { + PKG_MEM_ERROR; + return -1; + } + _ksr_contact_salias.s[0] = ';'; + memcpy(_ksr_contact_salias.s + 1, aname->s, aname->len); + _ksr_contact_salias.s[aname->len+1] = '='; + _ksr_contact_salias.s[aname->len+2] = '\0'; + _ksr_contact_salias.len = aname->len + 2; + _ksr_contact_alias.s = _ksr_contact_salias.s + 1; + _ksr_contact_alias.len = _ksr_contact_salias.len - 1; + LM_DBG("new contact alias parameter expression [%.*s]\n", + _ksr_contact_salias.len, _ksr_contact_salias.s); + + return 0; +} + /** * add alias parameter with encoding of source address * - nuri->s must point to a buffer of nuri->len size diff --git a/src/core/dset.h b/src/core/dset.h index 56ffe953eb..b661fc7c84 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -285,6 +285,7 @@ int getbflagsval(unsigned int branch, flag_t* res); */ int setbflagsval(unsigned int branch, flag_t val); +int ksr_contact_alias_set_name(str *aname); int uri_add_rcv_alias(sip_msg_t *msg, str *uri, str *nuri); int uri_restore_rcv_alias(str *uri, str *nuri, str *suri); int uri_trim_rcv_alias(str *uri, str *nuri);

1 0

[kamailio/kamailio] register using uac module is getting send even if send_socket is not in this listening list of kamailio (#2624)
by Surendra Tiwari 31 Jan '22

31 Jan '22

### Description I am uac module with database. uacreg table have the send_socket column. i do have 2 kamailio server running. i want only kamailio-1 should send register to uacreg entries. for this i have used send_socket column with socket of kamailio-1. After this we can see both kamailio server sending registration and that's the problem.  ### Troubleshooting #### Reproduction loadmodule "uac.so" modparam("uac","auth_username_avp","$avp(auser)") modparam("uac","auth_password_avp","$avp(apass)") modparam("uac","auth_realm_avp","$avp(arealm)") modparam("uac", "reg_contact_addr", "EXTERNAL_IP:5060") modparam("uac", "reg_db_url", DBURL) and use send_socket into uacreg with kamailio-1 socket.  #### 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` ``` version: kamailio 5.3.8 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 ``` * **Operating System**:  ``` root@ip-10-0-12-135:/etc/kamailio# uname -a Linux ip-10-0-12-135 5.3.0-1019-aws #21~18.04.1-Ubuntu SMP Mon May 11 12:33:03 UTC 2020 x86_64 GNU/Linux ``` -- 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/issues/2624

5 10

git:master:4793b392: nathelper: use contact uri alias parameter name via core globals
by Daniel-Constantin Mierla 31 Jan '22

31 Jan '22

Module: kamailio Branch: master Commit: 4793b392489e64a6f106f04f5faaca6d40eeccf8 URL: https://github.com/kamailio/kamailio/commit/4793b392489e64a6f106f04f5faaca6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-31T14:29:48+01:00 nathelper: use contact uri alias parameter name via core globals --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/4793b392489e64a6f106f04f5faaca6… Patch: https://github.com/kamailio/kamailio/commit/4793b392489e64a6f106f04f5faaca6…

1 0

git:master:2ed2161a: core: dset - global variables for contact uri alias parameter name
by Daniel-Constantin Mierla 31 Jan '22

31 Jan '22

Module: kamailio Branch: master Commit: 2ed2161a2d7e7c027c5fe7bad3ebdee606ad8e1f URL: https://github.com/kamailio/kamailio/commit/2ed2161a2d7e7c027c5fe7bad3ebdee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-31T14:01:08+01:00 core: dset - global variables for contact uri alias parameter name --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/2ed2161a2d7e7c027c5fe7bad3ebdee… Patch: https://github.com/kamailio/kamailio/commit/2ed2161a2d7e7c027c5fe7bad3ebdee…

1 0

[kamailio/kamailio] app_lua: build warning (#2728)
by sergey-safarov 29 Jan '22

29 Jan '22

``` which: no lua-config in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) which: no lua-config in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) CC (gcc) [M app_lua.so] app_lua_api.o app_lua_api.c: In function 'lua_sr_kemi_register_libs': app_lua_api.c:1942:2: warning: implicit declaration of function 'luaL_openlib'; did you mean 'luaL_openlibs'? [-Wimplicit-f unction-declaration] 1942 | luaL_openlib(L, "KSR", _sr_crt_KSRMethods, 0); | ^~~~~~~~~~~~ | luaL_openlibs CC (gcc) [M app_lua.so] app_lua_kemi_export.o CC (gcc) [M app_lua.so] app_lua_mod.o LD (gcc) [M app_lua.so] app_lua.so which: no lua-config in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) which: no lua-config in (/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) CC (gcc) [M app_lua_sr.so] app_lua_sr_api.o app_lua_sr_api.c: In function 'lua_sr_core_openlibs': app_lua_sr_api.c:1614:2: warning: implicit declaration of function 'luaL_openlib'; did you mean 'luaL_openlibs'? [-Wimplici t-function-declaration] 1614 | luaL_openlib(L, "sr", _sr_core_Map, 0); | ^~~~~~~~~~~~ | luaL_openlibs CC (gcc) [M app_lua_sr.so] app_lua_sr_exp.o app_lua_sr_exp.c: In function 'lua_sr_exp_openlibs': app_lua_sr_exp.c:3686:3: warning: implicit declaration of function 'luaL_openlib'; did you mean 'luaL_openlibs'? [-Wimplici t-function-declaration] 3686 | luaL_openlib(L, "sr.sl", _sr_sl_Map, 0); | ^~~~~~~~~~~~ | luaL_openlibs CC (gcc) [M app_lua_sr.so] app_lua_sr_mod.o LD (gcc) [M app_lua_sr.so] app_lua_sr.so ``` -- 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/issues/2728

2 10

[kamailio/kamailio] REGISTER with http_async_client (Issue #3009)
by cyril-rm 27 Jan '22

27 Jan '22

Hi there, I have a weird issue with kamailio (latest docker image kamailio-ci:5.5.2-alpine) and http_async_client. Before posting a lot of logs, let me describe what I want to achieve. I have a Kamailio and a SIP Phone. The SIP phone sends a REGISTER to kamailio, then in my routing block, I check if I have an Authorization header. Since I don't have an Authorization (first message), I use "www_challenge()". This replies to the SIP phone, and then the SIP phone sends a new REGISTER with the correct Authorization header. So far so good. Now, when I get the REGISTER with Authorization header, I want to ask an HTTP endpoint if this user is allowed to connect and check the password using http_async_query(). The problem is that when the transaction resumes, the tmx module is unhappy and throws this error : `30(36) CRITICAL: tmx [t_var.c:546]: pv_get_tm_reply_code(): no picked branch (-1) for a final response in MODE_ONFAILURE ` And a 500 error is sent back to the sip phone. The AUTH_REPLY route is still called and I can use the $http* values. it seems that my AUTH_REPLY route is called but considered as a "failure_route" `19(27) exec: *** cfgtrace:dbg_cfg_trace(): failure_route=[AUTH_REPLY] c=[/etc/kamailio/kamailio.cfg] l=665 a=16 n=if ` Do you see something that I am doing wrong or missing in my logic? Is pausing/resuming to use the async http client is allowed if I'm handling a REGISTER transaction? Here's a simplified version of my routing block (not far from reality): ``` request_route{ route(AUTH); route[AUTH]{ if (is_method("REGISTER"){ if(no_auth_header){ www_challenge("$td","1"); exit; } else{ t_newtran(); http_async_query("http://xxx.xxx.xxx.xxx:9000/auth?foo=bar", "AUTH_REPLY"); } } } route[AUTH_REPLY]{ xlog("L_INFO", "route[HTTP_REPLY]: status $http_rs\n"); } } ``` Best regards! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3009 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3009(a)github.com>

2 3

git:master:3b75ccbf: app_lua_sr: support for lua 5.4.x
by Daniel-Constantin Mierla 26 Jan '22

26 Jan '22

Module: kamailio Branch: master Commit: 3b75ccbfda758e0d72e34ad5e9d3deb75d10ecf9 URL: https://github.com/kamailio/kamailio/commit/3b75ccbfda758e0d72e34ad5e9d3deb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T16:25:56+01:00 app_lua_sr: support for lua 5.4.x --- Modified: src/modules/app_lua_sr/app_lua_sr_api.c --- Diff: https://github.com/kamailio/kamailio/commit/3b75ccbfda758e0d72e34ad5e9d3deb… Patch: https://github.com/kamailio/kamailio/commit/3b75ccbfda758e0d72e34ad5e9d3deb… --- diff --git a/src/modules/app_lua_sr/app_lua_sr_api.c b/src/modules/app_lua_sr/app_lua_sr_api.c index 90267467d6..884330c604 100644 --- a/src/modules/app_lua_sr/app_lua_sr_api.c +++ b/src/modules/app_lua_sr/app_lua_sr_api.c @@ -45,8 +45,70 @@ #include "app_lua_sr_api.h" #include "app_lua_sr_exp.h" +#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 +#define luaL_openlib ksr_luaL_openlib +#endif + + extern app_lua_api_t _app_lua_api; + +#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 +/** + * + */ +void ksr_luaL_openlib_mode(lua_State *L, const char *libname, + const luaL_Reg *lfuncs, int nup, int mode) +{ + char modname[256]; + char *submod = NULL; + int tidx = 0; + if(mode) { + /* support for registering 'module.submodule' functions + * - 'module' functions must be registered first */ + if(strlen(libname)>254) { + LM_ERR("module name is too long [%s]\n", libname); + return; + } + strcpy(modname, libname); + submod = strchr(modname, '.'); + if(submod != NULL) { + *submod = '\0'; + submod++; + } + lua_getglobal(L, modname); + if (lua_isnil(L, -1)) { + if(submod != NULL) { + LM_ERR("main module not registered yet [%s]\n", libname); + return; + } + lua_pop(L, 1); + lua_newtable(L); + luaL_setfuncs(L, lfuncs, 0); + lua_setglobal(L, modname); + return; + } + tidx = lua_gettop(L); + lua_newtable(L); + luaL_setfuncs(L, lfuncs, 0); + lua_setfield(L, tidx, submod); + return; + } + lua_newtable(L); + luaL_setfuncs(L, lfuncs, 0); + lua_setglobal(L, libname); +} + +/** + * + */ +void ksr_luaL_openlib(lua_State *L, const char *libname, + const luaL_Reg *lfuncs, int nup) +{ + ksr_luaL_openlib_mode(L, libname, lfuncs, nup, 1); +} +#endif + /** * */

1 0

git:5.5:d0b14f3e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 26 Jan '22

26 Jan '22

Module: kamailio Branch: 5.5 Commit: d0b14f3e64355aca6c1f0218c804b34b0810c703 URL: https://github.com/kamailio/kamailio/commit/d0b14f3e64355aca6c1f0218c804b34… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-26T14:01:43+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siputils/README Modified: src/modules/statsc/README --- Diff: https://github.com/kamailio/kamailio/commit/d0b14f3e64355aca6c1f0218c804b34… Patch: https://github.com/kamailio/kamailio/commit/d0b14f3e64355aca6c1f0218c804b34… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 87d3ecf9e4..fb4508ebaa 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -452,6 +452,11 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") timeout value will be converted to a 180 message. Please note that you need to set a positive timeout value in order to use this function. + Note: the change of sip reply can be done only in cases when it is not + parsed too much before config execution, otherwise it fails. For + example, setting global parameter "log_prefix" can cause this function + to fail changing the replies. + The function returns TRUE on success, and FALSE during processing failures. diff --git a/src/modules/statsc/README b/src/modules/statsc/README index 2ef41cc72d..d06f3925b2 100644 --- a/src/modules/statsc/README +++ b/src/modules/statsc/README @@ -103,6 +103,8 @@ modparam("statsc", "interval", 300) How many items to store for each statistic. + Note: it must be set before any 'track' parameter. + Default value is 100. Example 1.2. Set items parameter

1 0

git: new commits in branch 5.5
by Daniel-Constantin Mierla 26 Jan '22

26 Jan '22

- URL: https://github.com/kamailio/kamailio/commit/5d08f4028ad6f805940d1824e17fb14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:33:14+01:00 core: parser - clang format parser_f.c (cherry picked from commit 03acf834a19689d6c3efcea93e48985d3e7ffc37) - URL: https://github.com/kamailio/kamailio/commit/fb06dbf3e0452f1b4e8772da3fa94d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:33:33+01:00 core: parser sdp - check if delimiter exceeds body limit (cherry picked from commit bd5280726a9842b257afabae548853d000ecd249) - URL: https://github.com/kamailio/kamailio/commit/5715fc40664438e092d444ea31b99c9… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2022-01-26T13:33:51+01:00 dlgs: optimize dlgs_init, if/else path are identical (cherry picked from commit 8e7f2e6a158bb2c59600b03be3c7e6eefc416180) - URL: https://github.com/kamailio/kamailio/commit/97bc9751485dfd9aa314e15aaef73b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:34:18+01:00 misc/examples: kemi - update lua sample config (cherry picked from commit 99a9f27c8d24a06f201b4713f7a2bfeb37092482) - URL: https://github.com/kamailio/kamailio/commit/0ba7876e5cc1120d7e64e779ba9327e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:34:29+01:00 misc/examples: kemi - sanity checks for response in python script (cherry picked from commit bd42130e3cfb87856b4b0431de50eccdd4324f9f) - URL: https://github.com/kamailio/kamailio/commit/42e3c28f2744ee4c799c972bed56e41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:34:46+01:00 auth_identity: close file in case of errors - GH #2983 (cherry picked from commit 84cdc33429c61fe7cac91cbedf96bef560267313) - URL: https://github.com/kamailio/kamailio/commit/65e50fbd24f9239a4dab25c6b832867… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2022-01-26T13:35:23+01:00 ldap: rename private function ldap_connect When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> (cherry picked from commit 362c6de08058948d0a70a1eeb14ec718f922b4e5) - URL: https://github.com/kamailio/kamailio/commit/e0084adcda85b10b3b0c0765a292cfd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:35:58+01:00 siputils: docs - note about restrictions of ring_insert_callid() - GH #2989 (cherry picked from commit 090f1f74603de6113f3dd41095ae41b4f03f8171) - URL: https://github.com/kamailio/kamailio/commit/0aa4340764f78c74a62054050d88056… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:36:17+01:00 core: parser sdp - print hdr name by length on error in get_sdp_hdr_field() (cherry picked from commit c4e462fa6bda38ac6fd814ce8d98ea030d4049b9) - URL: https://github.com/kamailio/kamailio/commit/0ea3ec6b76ecd519d3a9446c79d5361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:38:15+01:00 core: renamed global is_main to _ksr_is_main - safer to avoid conflicts with other libs (cherry picked from commit f3454dd9f2d065e7757e9d9680b815481d08269c) - URL: https://github.com/kamailio/kamailio/commit/a1939714a74bac7b3118373e6fedf2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:38:28+01:00 ctl: rename is_main to _ksr_is_main (cherry picked from commit e7c14adc0b171fae9ad7c0fed4fb3c785dd282ca) - URL: https://github.com/kamailio/kamailio/commit/5e3b2f9dd2465508b10531bf345e892… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:38:36+01:00 db_text: rename is_main to _ksr_is_main (cherry picked from commit 52cad0a39b224add8ff7eb6dd253f00122e93704) - URL: https://github.com/kamailio/kamailio/commit/32973b52303a5576a821af50d0ba2db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:38:46+01:00 http_async_module: check return for event_base_dispatch() - exit if it fails - part of GH #2999 (cherry picked from commit 461ec0a79ae365729c11efcbd96fc158c50a2891) - URL: https://github.com/kamailio/kamailio/commit/5e105ffbc6ad699ab06fbbf7e50c2b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:38:55+01:00 usrloc: removed unrelated comment with is_main - was not even used (cherry picked from commit 3a00526bbe535d46d234108cb71fd80376f0718d) - URL: https://github.com/kamailio/kamailio/commit/7ebe3f4cb5fbe68159ee94bc962585d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:39:03+01:00 ims_usrloc_pcscf: removed unrelated comment with is_main - was not even used (cherry picked from commit 5978ec116c3efacacf260e9f579d93c9e9bfb780) - URL: https://github.com/kamailio/kamailio/commit/d3dffa9b3afb57b041a046d5c6a8d90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:39:12+01:00 p_usrloc: removed unrelated comment with is_main - was not even used (cherry picked from commit 9d280b589a035fa04cd4c7235671d1fdb6ae44e9) - URL: https://github.com/kamailio/kamailio/commit/183afaf6ecdd3ddde4ea5b9ad61202e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:39:31+01:00 ims_usrloc_scscf: removed unrelated comment with is_main - was not even used (cherry picked from commit 819ca1d7afe558d944fa88b2d453bf7ae7fcc819) - URL: https://github.com/kamailio/kamailio/commit/e3ed8c0d80dea4da4c522864f1480d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:39:46+01:00 presence: utils - use memcpy instead of strncpy for coherence (cherry picked from commit 33c40170e73adc71e2ad66d8dbb6c776b771ce5d) - URL: https://github.com/kamailio/kamailio/commit/7381ccd61a325e5b6502d05588ac8ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:39:57+01:00 lcr: init buffers to try to get rid of new warnings (cherry picked from commit 0247c336e208912324c71aea9843e688d7c5a463) - URL: https://github.com/kamailio/kamailio/commit/e855d251d27e5a399cfa3d8a70b4387… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:40:06+01:00 dispatcher: safety checks for str fields (cherry picked from commit 5443db4d632c8502dc622cc28fe2847fb0c147c1) - URL: https://github.com/kamailio/kamailio/commit/93cd99f08c61b7355e948dfbf855eb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:40:22+01:00 rls: free xml doc in case of error (cherry picked from commit 55f23d09faee06a892dde13e371d144b98bae68f) - URL: https://github.com/kamailio/kamailio/commit/4f002432bf2699d99f7b83a3652fc9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:40:39+01:00 avpops: init variable to fix warning (cherry picked from commit b7815d04ced35d5b5ccbcdaa39d41ef4a2cb2ad0) - URL: https://github.com/kamailio/kamailio/commit/c8582892d0cacbd2ed857f87d2fa59a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:40:47+01:00 db_text: init variable to fix warning (cherry picked from commit 102b7c62ae9877151ce542b8b5747051fb954acb) - URL: https://github.com/kamailio/kamailio/commit/49d5f6eb5f9f0a800dbaaf02c3ef8ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:40:55+01:00 dialog: init variable to fix warning (cherry picked from commit 682f9984fc4942d5f786f0ca9d798630d618f8da) - URL: https://github.com/kamailio/kamailio/commit/8c0fcc2a437b194c9a4f5426d1e611c… Author: Morten Tryfoss <morten(a)tryfoss.no> Date: 2022-01-26T13:41:16+01:00 dispatcher: Fix handling of inactive destination for alg 13 Alg 13 did try to distribute calls to inactive destinations. If the highest priority destination is inactive, hash is not updated and the xavp is not set. This is resulting in failover mechanism not working at all for the given call. When the hash variable is not updated, it makes alg 13 behave like round robin if the scenario above occurs. If you got two destinations and the highest priority is out of service, 50% of the calls will fail. Now I tried a more simple approach updating hash with the first entry of the sorted list. (cherry picked from commit adba3caa2d12d1f8b89d720fbb9a6a9cdc8b2573) - URL: https://github.com/kamailio/kamailio/commit/ef9b353910d10d91fde88193b7a3dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:41:30+01:00 core: parser - print ascii code and position of invalid char for identity info (cherry picked from commit 40e59d9c3b8ec531cb9e26093c43647a43108dfd) - URL: https://github.com/kamailio/kamailio/commit/c8d579452906aee0c2716ef9ac25fe0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:42:03+01:00 dispatcher: removed module name from log message - updates to debug messages (cherry picked from commit 29ebde9cfe746c1dd9083a5fc4b26a32c39ca0a4) - URL: https://github.com/kamailio/kamailio/commit/633148323c83b9f35d221ff59fbf7b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:42:17+01:00 tm: update uri when refreshing local uac shortcuts (cherry picked from commit 0ed1282238da6cdd8a4dbef1b61493b70a850a6b) - URL: https://github.com/kamailio/kamailio/commit/3d4ceff9aa77b841fa2df938cfbab9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:42:40+01:00 db_unixodbc: catch queries without result to skip printing error logs - GH #2810 (cherry picked from commit 795a09077ccc5dd06f9074978dc77dd81389512b) - URL: https://github.com/kamailio/kamailio/commit/331e60374e6a0c283b835ab62da8482… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:42:55+01:00 stats: detect of mod param items is set after track - it can lead to crash if items is set to greater value than the default one (GH #2101) - round up for better memory alignment in the allocated structures (cherry picked from commit b29c79c8d83fd23064e50dcee02e5f85ec51328d) - URL: https://github.com/kamailio/kamailio/commit/38bdf24485f3e4d2d9489ba695f7b23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:43:05+01:00 statsc: note that items param must be set before track (cherry picked from commit f517f8c655e676f5872eda5f81f5244eac4eed25) - URL: https://github.com/kamailio/kamailio/commit/b149906e3c0558fd9cb866d39b36f18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:43:51+01:00 core: set exit flag for return 0 (cherry picked from commit 23c39ecbdd29f2fff0af4a693b08032e8afff48b) - URL: https://github.com/kamailio/kamailio/commit/3ee8896e87a8a2b0f6e704d806983b5… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-01-26T13:44:49+01:00 phonenum: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules; - removed predefined CXX and LD variables. (cherry picked from commit c4b280bd5b5b0cfb8d34ecef296972f2a043791e) - URL: https://github.com/kamailio/kamailio/commit/0ee717c91ca0dc590d6764803c15198… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-01-26T13:44:59+01:00 websocket: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. (cherry picked from commit 0a3476384b325514b1da784b74cc821360193409) - URL: https://github.com/kamailio/kamailio/commit/d40337449e274f6c6d9ea1754977287… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-01-26T13:45:06+01:00 rtp_media_server: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. (cherry picked from commit cda05478b25ad93b1fb7475cf6b2767d7164bbbb) - URL: https://github.com/kamailio/kamailio/commit/254d19b4dd703c24a7a15e5539e585e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:45:17+01:00 websocket: makefile - set library path for localbase (cherry picked from commit 2e4258f440a07a2cfd20082af22bba4f9a2448ab) - URL: https://github.com/kamailio/kamailio/commit/a18374d1f0c5ec58e92981e4ac14320… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:45:28+01:00 Makefile.defs: set localbase for macports on macos (cherry picked from commit 584eabf7de6af9f835678f9c6d6851cce49a3878) - URL: https://github.com/kamailio/kamailio/commit/4e6cd4cd5f2eab7d4f6300a9ac1c488… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-26T13:45:55+01:00 dispatcher: check reload delta in functions building new routing structure (cherry picked from commit 76c273ecaa76f031ce9892acd895b4eacf4de17e)

1 0

[kamailio/kamailio] Append HF don't work in event_route (Issue #3006)
by Eulnono76 24 Jan '22

24 Jan '22

### Description Hello, I'm trying to connect kamailio to Microsoft Teams. Dispatch is correctly configured and send SIP OPTION correctly. Following this tutorial : https://skalatan.de/en/blog/kamailio-sbc-teams, I added an Event_Route to add contact header to SIP OPTION from dispath to MS : event_route[tm:local-request] { xlog("*** tm:local-request *** "); if(is_method("OPTIONS") && $ru =~ "pstnhub.microsoft.com") { xlog("L_INFO", "Append new contact !\n"); append_hf("Contact: <sip:MY_SBC_NAME.COM:5061;transport=tls>\r\n"); } xlog("L_INFO", "Sent out tm request: $mb\n"); } When I check the log to see my sended frame, I don't see a contact header field : _INFO: <script>: Append new contact ! INFO: <script>: Sent out tm request : OPTIONS sip:sip.pstnhub.microsoft.com;transport=tls SIP/2.0 Via: SIP/2.0/TLS MY_SBC_NAME.COM:5061;branch=z9hG4bK4497.f3e5e754000000000000000000000000.0 To: <sip:sip.pstnhub.microsoft.com;transport=tls> From: <sip:MY_SBC_NAME.COM.fr>;tag=a76e006ace3802951ed860e08df964af-7971 CSeq: 10 OPTIONS Call-ID: 2e1278ea77796160-9837@MY_SBC_IP Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.2.1 (x86_64/linux))_ According the documentation about textop, append_hf(txt[, hdr]) : _This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE._ So my question is append HF can be used in Event_route ? Is there any other way to add contact header ? Regards, Arnaud ### Troubleshooting #### Reproduction Can be easily reproducted with the following code (don t forget to set SBC NAME) event_route[tm:local-request] { xlog("*** tm:local-request *** "); if(is_method("OPTIONS") && $ru =~ "pstnhub.microsoft.com") { xlog("L_INFO", "Append new contact !\n"); append_hf("Contact: <sip:MY_SBC_NAME.COM:5061;transport=tls>\r\n"); } xlog("L_INFO", "Sent out tm request: $mb\n"); } #### Log Messages INFO: <script>: Append new contact ! INFO: <script>: Sent out tm request : OPTIONS sip:sip.pstnhub.microsoft.com;transport=tls SIP/2.0 Via: SIP/2.0/TLS MY_SBC_NAME.COM:5061;branch=z9hG4bK4497.f3e5e754000000000000000000000000.0 To: <sip:sip.pstnhub.microsoft.com;transport=tls> From: <sip:MY_SBC_NAME.COM.fr>;tag=a76e006ace3802951ed860e08df964af-7971 CSeq: 10 OPTIONS Call-ID: 2e1278ea77796160-9837@MY_SBC_IP Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.2.1 (x86_64/linux)) ``` #### SIP Traffic Traffic is in TLS, can't be easily readed. ### Additional Information version: kamailio 5.3.9 (x86_64/linux) a5fd0a flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a5fd0a compiled on 15:59:30 Jan 10 2022 with gcc 8.3.0 * **Operating System**: No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster Linux debian 4.19.0-17-amd64 #1 SMP Debian 4.19.194-3 (2021-07-18) x86_64 GNU/Linux -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3006 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3006(a)github.com>

2 6

app_lua warning
by Juha Heinanen 24 Jan '22

24 Jan '22

I noticed that master build on Debian 11 with ii liblua5.1-0-dev:amd64 5.1.5-8.1+b3 amd64 Development files for the Lua language version 5.1 gave compiler warning: CC (gcc) [M app_lua.so] app_lua_api.o app_lua_api.c: In function 'ksr_luaL_openlib_mode': app_lua_api.c:221:4: warning: implicit declaration of function 'luaL_setfuncs'; did you mean 'lua_setfenv'? [-Wimplicit-function-declaration] 221 | luaL_setfuncs(L, lfuncs, 0); | ^~~~~~~~~~~~~ | lua_setfenv I have not defined LUAJIT="yes" in the build. -- Juha

2 5

git:master:5d5934ab: app_lua_sr: Makefile - reworked detection of lua version with support for 5.3 and 5.4
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

Module: kamailio Branch: master Commit: 5d5934ab14605f22231f1340f51b2b5c6ade46f5 URL: https://github.com/kamailio/kamailio/commit/5d5934ab14605f22231f1340f51b2b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T13:49:37+01:00 app_lua_sr: Makefile - reworked detection of lua version with support for 5.3 and 5.4 --- Modified: src/modules/app_lua_sr/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/5d5934ab14605f22231f1340f51b2b5… Patch: https://github.com/kamailio/kamailio/commit/5d5934ab14605f22231f1340f51b2b5…

1 0

git:master:74bcf6e3: app_lua_sr: fixed confition on number of parameters for xavp get
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

Module: kamailio Branch: master Commit: 74bcf6e3f891def532fbcba7d709b3ee7ce9614d URL: https://github.com/kamailio/kamailio/commit/74bcf6e3f891def532fbcba7d709b3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T13:55:55+01:00 app_lua_sr: fixed confition on number of parameters for xavp get --- Modified: src/modules/app_lua_sr/app_lua_sr_api.c --- Diff: https://github.com/kamailio/kamailio/commit/74bcf6e3f891def532fbcba7d709b3e… Patch: https://github.com/kamailio/kamailio/commit/74bcf6e3f891def532fbcba7d709b3e… --- diff --git a/src/modules/app_lua_sr/app_lua_sr_api.c b/src/modules/app_lua_sr/app_lua_sr_api.c index 58b9d8c60a..90267467d6 100644 --- a/src/modules/app_lua_sr/app_lua_sr_api.c +++ b/src/modules/app_lua_sr/app_lua_sr_api.c @@ -1466,7 +1466,7 @@ static int lua_sr_xavp_get(lua_State *L) env_L = _app_lua_api.env_get_f(); num_param = lua_gettop(L); - if(num_param<2 && num_param>3) + if(num_param<2 || num_param>3) { LM_ERR("wrong number of parameters [%d]\n", num_param); return 0; @@ -1615,4 +1615,4 @@ void lua_sr_core_openlibs(lua_State *L) luaL_openlib(L, "sr.hdr", _sr_hdr_Map, 0); luaL_openlib(L, "sr.pv", _sr_pv_Map, 0); luaL_openlib(L, "sr.xavp", _sr_xavp_Map, 0); -} \ No newline at end of file +}

1 0

git:master:8caf07a4: app_lua: Makefile - check cross compile for luajit
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

Module: kamailio Branch: master Commit: 8caf07a43f86e6fc38bda96efb04c69679e26561 URL: https://github.com/kamailio/kamailio/commit/8caf07a43f86e6fc38bda96efb04c69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T13:45:32+01:00 app_lua: Makefile - check cross compile for luajit - a few updates for compile flags ordering --- Modified: src/modules/app_lua/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/8caf07a43f86e6fc38bda96efb04c69… Patch: https://github.com/kamailio/kamailio/commit/8caf07a43f86e6fc38bda96efb04c69… --- diff --git a/src/modules/app_lua/Makefile b/src/modules/app_lua/Makefile index ca3012ee73..5c0ccd1477 100644 --- a/src/modules/app_lua/Makefile +++ b/src/modules/app_lua/Makefile @@ -17,6 +17,7 @@ ifeq ($(LUAJIT),) BUILDER = $(shell which pkg-config) endif ifeq ($(BUILDER),) + # no pkg-config - try finding by path ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.1),) LUALIB=lua5.1 else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.2),) @@ -26,7 +27,7 @@ ifeq ($(LUAJIT),) else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.4),) LUALIB=lua5.4 endif - DEFS+= -I$(LOCALBASE)/include -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include/$(LUALIB) + DEFS+= -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include -I$(LOCALBASE)/include/$(LUALIB) LIBS+= -L$(LOCALBASE)/lib -l$(LUALIB) -lm else ifneq ($(shell pkg-config --silence-errors --libs lua-5.1),) @@ -52,6 +53,7 @@ ifeq ($(LUAJIT),) DEFS+= $(shell pkg-config --cflags $(LUALIB)) LIBS = $(shell pkg-config --libs $(LUALIB)) else + # pkg-config with no lua library detected - try finding by path LUALIB=lua ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.1),) LUALIB=lua5.1 @@ -62,7 +64,7 @@ ifeq ($(LUAJIT),) else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.4),) LUALIB=lua5.4 endif - DEFS+= -I$(LOCALBASE)/include -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include/$(LUALIB) + DEFS+= -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include -I$(LOCALBASE)/include/$(LUALIB) LIBS+= -L$(LOCALBASE)/lib -l$(LUALIB) -lm endif endif @@ -71,8 +73,10 @@ ifeq ($(LUAJIT),) LIBS = $(shell lua-config --libs) endif else - # Build using LuaJIT - BUILDER = $(shell which pkg-config) + # build using LuaJIT + ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) + endif ifeq ($(BUILDER),) DEFS+= -I/usr/include/luajit-2.1 LIBS = -lluajit-5.1

1 0

git:master:76c273ec: dispatcher: check reload delta in functions building new routing structure
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

Module: kamailio Branch: master Commit: 76c273ecaa76f031ce9892acd895b4eacf4de17e URL: https://github.com/kamailio/kamailio/commit/76c273ecaa76f031ce9892acd895b4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T13:37:36+01:00 dispatcher: check reload delta in functions building new routing structure --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/76c273ecaa76f031ce9892acd895b4e… Patch: https://github.com/kamailio/kamailio/commit/76c273ecaa76f031ce9892acd895b4e… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 37000221e3..059df89123 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -952,6 +952,16 @@ static int ds_warn_fixup(void **param, int param_no) static int ds_reload(sip_msg_t *msg) { + if(ds_rpc_reload_time==NULL) { + LM_ERR("not ready for reload\n"); + return -1; + } + if(*ds_rpc_reload_time!=0 && *ds_rpc_reload_time > time(NULL) - ds_reload_delta) { + LM_ERR("ongoing reload\n"); + return -1; + } + *ds_rpc_reload_time = time(NULL); + if(!ds_db_url.s) { if(ds_load_list(dslistfile) != 0) LM_ERR("Error reloading from list\n"); @@ -1859,6 +1869,18 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) str dest; str attrs = STR_NULL; + if(ds_rpc_reload_time==NULL) { + LM_ERR("Not ready for rebuilding destinations list\n"); + rpc->fault(ctx, 500, "Not ready for reload"); + return; + } + if(*ds_rpc_reload_time!=0 && *ds_rpc_reload_time > time(NULL) - ds_reload_delta) { + LM_ERR("ongoing reload\n"); + rpc->fault(ctx, 500, "Ongoing reload"); + return; + } + *ds_rpc_reload_time = time(NULL); + flags = 0; nparams = rpc->scan(ctx, "dS*dS", &group, &dest, &flags, &attrs); @@ -1890,6 +1912,18 @@ static void dispatcher_rpc_remove(rpc_t *rpc, void *ctx) int group; str dest; + if(ds_rpc_reload_time==NULL) { + LM_ERR("Not ready for rebuilding destinations list\n"); + rpc->fault(ctx, 500, "Not ready for reload"); + return; + } + if(*ds_rpc_reload_time!=0 && *ds_rpc_reload_time > time(NULL) - ds_reload_delta) { + LM_ERR("ongoing reload\n"); + rpc->fault(ctx, 500, "Ongoing reload"); + return; + } + *ds_rpc_reload_time = time(NULL); + if(rpc->scan(ctx, "dS", &group, &dest) < 2) { rpc->fault(ctx, 500, "Invalid Parameters"); return;

1 0

git:master:673dab16: app_lua: Makefile - reworked detection of lua version with support for 5.3 and 5.4
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

Module: kamailio Branch: master Commit: 673dab16593d9a70bf606adaf31b52d14ad75e99 URL: https://github.com/kamailio/kamailio/commit/673dab16593d9a70bf606adaf31b52d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T13:37:36+01:00 app_lua: Makefile - reworked detection of lua version with support for 5.3 and 5.4 --- Modified: src/modules/app_lua/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/673dab16593d9a70bf606adaf31b52d… Patch: https://github.com/kamailio/kamailio/commit/673dab16593d9a70bf606adaf31b52d…

1 0

git:master:f2cf4581: github: use bullseye docker image
by Victor Seva 24 Jan '22

24 Jan '22

Module: kamailio Branch: master Commit: f2cf4581389ddea28ab870842c3cbd864926ba43 URL: https://github.com/kamailio/kamailio/commit/f2cf4581389ddea28ab870842c3cbd8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-01-24T10:07:15+01:00 github: use bullseye docker image --- Modified: .github/workflows/main.yml Modified: test/travis/build_travis.sh --- Diff: https://github.com/kamailio/kamailio/commit/f2cf4581389ddea28ab870842c3cbd8… Patch: https://github.com/kamailio/kamailio/commit/f2cf4581389ddea28ab870842c3cbd8… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a745d88b0..4c94110f68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,9 +22,9 @@ jobs: strategy: matrix: include: - - distribution: buster + - distribution: bullseye compilier: gcc - - distribution: buster + - distribution: bullseye compilier: clang - distribution: sid compilier: gcc diff --git a/test/travis/build_travis.sh b/test/travis/build_travis.sh index 368f013ebc..696e193dec 100755 --- a/test/travis/build_travis.sh +++ b/test/travis/build_travis.sh @@ -7,7 +7,7 @@ set -e -DIST=${DIST:-buster} +DIST=${DIST:-bullseye} CC=${CC:-gcc} if ! [ -d /code/pkg/kamailio/deb/"${DIST}" ] ; then

1 0

git:master:e139f0c6: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 24 Jan '22

24 Jan '22

Module: kamailio Branch: master Commit: e139f0c6816728a7104be96b501559ae5a68a353 URL: https://github.com/kamailio/kamailio/commit/e139f0c6816728a7104be96b501559a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-24T10:01:28+01:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/e139f0c6816728a7104be96b501559a… Patch: https://github.com/kamailio/kamailio/commit/e139f0c6816728a7104be96b501559a…

1 0

git:master:9b9a4b28: core: added rpc command core.runinfo
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

Module: kamailio Branch: master Commit: 9b9a4b283539f4575240737f2557ad84a4df9615 URL: https://github.com/kamailio/kamailio/commit/9b9a4b283539f4575240737f2557ad8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T09:49:02+01:00 core: added rpc command core.runinfo - return runtime info: running version, uptime, ... --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/9b9a4b283539f4575240737f2557ad8… Patch: https://github.com/kamailio/kamailio/commit/9b9a4b283539f4575240737f2557ad8… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 8231e3b1b9..e4695bb251 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -370,6 +370,45 @@ static void core_info(rpc_t* rpc, void* c) +static const char* core_runinfo_doc[] = { + "Runtime info - binary name, version, uptime, ...", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +static void core_runinfo(rpc_t* rpc, void* c) +{ + void* s; + time_t now; + char buf[MAX_CTIME_LEN]; + str snow; + snow.s = buf; + int uptime; + + time(&now); + + if (rpc->add(c, "{", &s) < 0) { + rpc->fault(c, 500, "Server failure"); + return; + } + rpc->struct_add(s, "s", "name", ver_name); + rpc->struct_add(s, "s", "version", ver_version); + rpc->struct_add(s, "s", "sourceid", ver_id); + rpc->struct_add(s, "s", "compiler", ver_compiler); + rpc->struct_add(s, "s", "compiled", ver_compiled_time); + if(ctime_r(&now, snow.s)) { + snow.len = strlen(snow.s); + if(snow.len>2 && snow.s[snow.len-1]=='\n') snow.len--; + rpc->struct_add(s, "S", "time_now", &snow); + } + rpc->struct_add(s, "s", "time_started", up_since_ctime); + uptime = (int)(now-up_since); + rpc->struct_add(s, "d", "uptime_secs", uptime); + rpc->struct_printf(s, "utime_days", "%dd %dh %dm %ds", + uptime/86400, (uptime%86400)/3600, ((uptime%86400)%3600)/60, + ((uptime%86400)%3600)%60); + +} + static const char* core_uptime_doc[] = { "Returns uptime of SIP server.", /* Documentation string */ 0 /* Method signature(s) */ @@ -1079,6 +1118,8 @@ static rpc_export_t core_rpc_methods[] = { 0 }, {"core.info", core_info, core_info_doc, 0 }, + {"core.runinfo", core_runinfo, core_runinfo_doc, + 0 }, {"core.uptime", core_uptime, core_uptime_doc, 0 }, {"core.ps", core_ps, core_ps_doc, RET_ARRAY}, {"core.psx", core_psx, core_psx_doc, RET_ARRAY},

1 0

git:master:999857f0: kex: docs for rpc core.runinfo
by Daniel-Constantin Mierla 24 Jan '22

24 Jan '22

Module: kamailio Branch: master Commit: 999857f092d59084430c3a4ce0ea71b7cd497de2 URL: https://github.com/kamailio/kamailio/commit/999857f092d59084430c3a4ce0ea71b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-24T09:51:08+01:00 kex: docs for rpc core.runinfo --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/999857f092d59084430c3a4ce0ea71b… Patch: https://github.com/kamailio/kamailio/commit/999857f092d59084430c3a4ce0ea71b… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 47eebc847f..34484bc4ec 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -489,6 +489,15 @@ resetdebug(); Verbose info, including version number, compile flags, compiler, repository, hash </para> </section> + <section id="kex.r.core.runinfo"> + <title> + <function moreinfo="none">core.runinfo</function> + </title> + <para> + Runtime details like running version, uptime, ... + </para> + </section> + <section id="kex.r.core.kill"> <title> <function moreinfo="none">core.kill</function>

1 0

git:master:399c9517: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 23 Jan '22

23 Jan '22

Module: kamailio Branch: master Commit: 399c95171db003dc56b0f870c8dacd3922ac45c3 URL: https://github.com/kamailio/kamailio/commit/399c95171db003dc56b0f870c8dacd3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-23T20:01:22+01:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/399c95171db003dc56b0f870c8dacd3… Patch: https://github.com/kamailio/kamailio/commit/399c95171db003dc56b0f870c8dacd3…

1 0

git:master:90b7f615: htable: docs - removed extra ending section tag
by Daniel-Constantin Mierla 23 Jan '22

23 Jan '22

Module: kamailio Branch: master Commit: 90b7f6157abbbdf0de61ac3f7764ad41f29f37d9 URL: https://github.com/kamailio/kamailio/commit/90b7f6157abbbdf0de61ac3f7764ad4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-23T19:50:44+01:00 htable: docs - removed extra ending section tag - fault of previous commit --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/90b7f6157abbbdf0de61ac3f7764ad4… Patch: https://github.com/kamailio/kamailio/commit/90b7f6157abbbdf0de61ac3f7764ad4… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 196f9707fa..e39482acd3 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1477,7 +1477,6 @@ kamcmd htable.seti test x[0] 123 ... </programlisting> </section> - </section> <section id="htable.rpc.setex"> <title> <function moreinfo="none">htable.setex htable key expire</function>

1 0

git:master:8ea9d5a8: app_lua: enclose ksr_luaL_openlib() between defines
by Daniel-Constantin Mierla 23 Jan '22

23 Jan '22

Module: kamailio Branch: master Commit: 8ea9d5a8b989332e16ecc56373d7d417123dc20c URL: https://github.com/kamailio/kamailio/commit/8ea9d5a8b989332e16ecc56373d7d41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-23T19:48:59+01:00 app_lua: enclose ksr_luaL_openlib() between defines - uses functions not available in lua 5.1 --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/8ea9d5a8b989332e16ecc56373d7d41… Patch: https://github.com/kamailio/kamailio/commit/8ea9d5a8b989332e16ecc56373d7d41… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 2bf255414a..0a1d13532c 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -188,6 +188,7 @@ int sr_lua_reload_module(unsigned int reload) return 0; } +#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 /** * */ @@ -241,6 +242,7 @@ void ksr_luaL_openlib(lua_State *L, const char *libname, { ksr_luaL_openlib_mode(L, libname, lfuncs, nup, 1); } +#endif /** *

1 0

[kamailio/kamailio] Kamailio 5.3 bc5970811d coredump (Issue #2998)
by Stefan Mititelu 21 Jan '22

21 Jan '22

### Description Hello, I'm being stuck at debugging a coredump for kamailio 5.3. built at bc5970811d commit, that happened when receiving/forwarding 100 Trying. It is not easily reproducible. I'm stuck at question 1 and 2, below. Please let me know if you have any other ideas of what is happening. Thank you.  #### Debugging Data ``` (gdb) bt #0 0x00005593f836b822 in match_by_name (avp=0xc, id=105, name=0x7ffc060813a8) at core/usr_avp.c:378 #1 0x00005593f836c670 in search_next_avp (s=0x7ffc060813a0, val=0x7ffc06081380) at core/usr_avp.c:499 #2 0x00005593f836c02c in search_avp (ident=..., val=0x7ffc06081380, state=0x7ffc060813a0) at core/usr_avp.c:465 #3 0x00005593f836b9a6 in search_first_avp (flags=1, name=..., val=0x7ffc06081380, s=0x7ffc060813a0) at core/usr_avp.c:414 #4 0x00007f82877df246 in pv_get_avp (msg=0x7f82890e0708, param=0x7f8288ce18d0, res=0x7ffc060814e0) at pv_core.c:1793 #5 0x00005593f839b872 in pv_get_spec_value (msg=0x7f82890e0708, sp=0x7f8288ce18b8, value=0x7ffc060814e0) at core/pvapi.c:1404 #6 0x00005593f81b88f2 in rv_defined (h=0x7ffc06082f80, msg=0x7f82890e0708, res=0x7ffc060816d0, rv=0x7f8288ce18b0, cache=0x0) at core/rvalue.c:1854 #7 0x00005593f81b89ad in int_rve_defined (h=0x7ffc06082f80, msg=0x7f82890e0708, res=0x7ffc060816d0, rve=0x7f8288ce18a8) at core/rvalue.c:1890 #8 0x00005593f81b9fc4 in rval_expr_eval_int (h=0x7ffc06082f80, msg=0x7f82890e0708, res=0x7ffc060816d0, rve=0x7f8288ce2708) at core/rvalue.c:2113 #9 0x00005593f81ec024 in do_action (h=0x7ffc06082f80, a=0x7f8288ce5390, msg=0x7f82890e0708) at core/action.c:1047 #10 0x00005593f81fa61a in run_actions (h=0x7ffc06082f80, a=0x7f8288ce5390, msg=0x7f82890e0708) at core/action.c:1576 #11 0x00005593f81ec523 in do_action (h=0x7ffc06082f80, a=0x7f8288ce54e0, msg=0x7f82890e0708) at core/action.c:1062 #12 0x00005593f81fa61a in run_actions (h=0x7ffc06082f80, a=0x7f8288ce54e0, msg=0x7f82890e0708) at core/action.c:1576 #13 0x00005593f81e8aac in do_action (h=0x7ffc06082f80, a=0x7f8288ffa900, msg=0x7f82890e0708) at core/action.c:695 #14 0x00005593f81fa61a in run_actions (h=0x7ffc06082f80, a=0x7f8288ffa6c8, msg=0x7f82890e0708) at core/action.c:1576 #15 0x00005593f81fae2c in run_top_route (a=0x7f8288ffa6c8, msg=0x7f82890e0708, c=0x7ffc06082f80) at core/action.c:1661 #16 0x00007f828793a44d in reply_received (p_msg=0x7f82890e0708) at t_reply.c:2429 #17 0x00005593f82eb5f5 in do_forward_reply (msg=0x7f82890e0708, mode=0) at core/forward.c:763 #18 0x00005593f82ed46a in forward_reply (msg=0x7f82890e0708) at core/forward.c:864 #19 0x00005593f835b481 in receive_msg ( buf=0x5593f8637640 <buf> "SIP/2.0 100 trying -- your call is important to us\r\nVia: SIP/2.0/UDP "..., len=529, rcv_info=0x7ffc06083520) at core/receive.c:509 #20 0x00005593f8232670 in udp_rcv_loop () at core/udp_server.c:554 #21 0x00005593f819a052 in main_loop () at main.c:1673 #22 0x00005593f81a343b in main (argc=9, argv=0x7ffc06083e68) at main.c:2802 ``` ``` (gdb) frame 0 #0 0x00005593f836b822 in match_by_name (avp=0xc, id=105, name=0x7ffc060813a8) at core/usr_avp.c:378 378 in core/usr_avp.c (gdb) print avp $3 = (avp_t *) 0xc (gdb) print *avp Cannot access memory at address 0xc ``` ``` (gdb) frame 2 #2 0x00005593f836c02c in search_avp (ident=..., val=0x7ffc06081380, state=0x7ffc060813a0) at core/usr_avp.c:465 465 in core/usr_avp.c (gdb) print list $4 = (avp_list_t *) 0x7f8207bb25e0 (gdb) print *list $5 = (avp_list_t) 0x7f821fff4c88 (gdb) print state->avp $6 = (avp_t *) 0xc (gdb) print state->name $7 = {n = -2003544275, s = {s = 0x7f828894572d "lastdst)", len = 7}, re = 0x7f828894572d} (gdb) print state->flags $8 = 497 (gdb) info locals ret = 0x18861c010 st = {flags = 273, id = 10, name = {n = -2000249939, s = {s = 0x7f8288c69bad "mapped_identity_user)", len = 20}, re = 0x7f8288c69bad}, avp = 0x7f823768ba60} list = 0x7f8207bb25e0 __func__ = "search_avp" ``` ``` (gdb) frame 4 #4 0x00007f82877df246 in pv_get_avp (msg=0x7f82890e0708, param=0x7f8288ce18d0, res=0x7ffc060814e0) at pv_core.c:1793 1793 pv_core.c: No such file or directory. (gdb) info locals name_type = 1 avp_name = {n = -2003544275, s = {s = 0x7f828894572d "lastdst)", len = 7}, re = 0x7f828894572d} avp_value = {n = -128721111, s = {s = 0x5593f853df29 "", len = 0}, re = 0x5593f853df29} avp = 0x7f8288dcec50 avp_value0 = {n = 0, s = {s = 0x0, len = -130631258}, re = 0x0} avp0 = 0x7ffc06082f80 idx = 0 idxf = 0 p = 0x200000000 <error: Cannot access memory at address 0x200000000> p_ini = 0x7f82890e0708 "/\031\232" p_size = 21907 n = 0 state = {flags = 497, id = 105, name = {n = -2003544275, s = {s = 0x7f828894572d "lastdst)", len = 7}, re = 0x7f828894572d}, avp = 0xc} __func__ = "pv_get_avp" ``` Question1: In frame 4, shouldn't "state" local variable be all 0's? Question2: In frame 2, shouldn't "state->avp" have the value of "*list"? ### Possible Solutions I've seen there is a static declaration of "state" or "st" inside functions: ``` ./src/modules/avp/avp.c:915: static struct search_state state; ./src/core/usr_avp.c:421: static struct search_state st; ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.8 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: compiled with gcc 8.3.0 ``` * **Operating System**: ``` Debian 10 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2998 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2998(a)github.com>

2 3

git:master:b0e705fb: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 21 Jan '22

21 Jan '22

Module: kamailio Branch: master Commit: b0e705fbd796ba279400dae39607e86a185be43c URL: https://github.com/kamailio/kamailio/commit/b0e705fbd796ba279400dae39607e86… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-21T09:01:24+01:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/b0e705fbd796ba279400dae39607e86… Patch: https://github.com/kamailio/kamailio/commit/b0e705fbd796ba279400dae39607e86…

1 0

git:master:083de68b: htable: added rpc command to set expire for an intem
by Daniel-Constantin Mierla 21 Jan '22

21 Jan '22

Module: kamailio Branch: master Commit: 083de68b8e930b3be151a56f7452e14ea5bcc752 URL: https://github.com/kamailio/kamailio/commit/083de68b8e930b3be151a56f7452e14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-21T08:46:03+01:00 htable: added rpc command to set expire for an intem --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/083de68b8e930b3be151a56f7452e14… Patch: https://github.com/kamailio/kamailio/commit/083de68b8e930b3be151a56f7452e14… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index ed28190880..5599ffe0e6 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1413,6 +1413,10 @@ static const char* htable_seti_doc[2] = { "Set one key in a hash table to an integer value.", 0 }; +static const char* htable_setex_doc[2] = { + "Set expire in a hash table for the item referenced by key.", + 0 +}; static const char* htable_list_doc[2] = { "List all htables.", 0 @@ -1611,6 +1615,35 @@ static void htable_rpc_seti(rpc_t* rpc, void* c) { return; } +/*! \brief RPC htable.setex command to set expire for one item */ +static void htable_rpc_setex(rpc_t* rpc, void* c) { + str htname, itname; + int exval; + ht_t *ht; + + if (rpc->scan(c, "SS.d", &htname, &itname, &exval) < 3) { + rpc->fault(c, 500, + "Not enough parameters (htable name, item name and expire)"); + return; + } + + /* check if htable exists */ + ht = ht_get_table(&htname); + if (!ht) { + rpc->fault(c, 500, "No such htable"); + return; + } + + + if(ki_ht_setex(NULL, &htname, &itname, exval)<0) { + rpc->fault(c, 500, "Failed to set the item"); + return; + } + + rpc->rpl_printf(c, "Ok"); + return; +} + /*! \brief RPC htable.dump command to print content of a hash table */ static void htable_rpc_dump(rpc_t* rpc, void* c) { @@ -1973,6 +2006,7 @@ rpc_export_t htable_rpc[] = { {"htable.get", htable_rpc_get, htable_get_doc, 0}, {"htable.sets", htable_rpc_sets, htable_sets_doc, 0}, {"htable.seti", htable_rpc_seti, htable_seti_doc, 0}, + {"htable.setex", htable_rpc_setex, htable_setex_doc, 0}, {"htable.listTables", htable_rpc_list, htable_list_doc, RET_ARRAY}, {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, {"htable.store", htable_rpc_store, htable_store_doc, 0},

1 0

git:master:2b9c0a5f: htable: docs for rpc command htable.setex
by Daniel-Constantin Mierla 21 Jan '22

21 Jan '22

Module: kamailio Branch: master Commit: 2b9c0a5fbc2c9ce7354655fa22038e22302553af URL: https://github.com/kamailio/kamailio/commit/2b9c0a5fbc2c9ce7354655fa22038e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-21T08:49:51+01:00 htable: docs for rpc command htable.setex --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2b9c0a5fbc2c9ce7354655fa22038e2… Patch: https://github.com/kamailio/kamailio/commit/2b9c0a5fbc2c9ce7354655fa22038e2… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 360abbd896..196f9707fa 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1475,6 +1475,36 @@ kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer kamcmd htable.seti test x[0] 123 ... +</programlisting> + </section> + </section> + <section id="htable.rpc.setex"> + <title> + <function moreinfo="none">htable.setex htable key expire</function> + </title> + <para> + Set the expire for an item in hash table. + </para> + <para> + Name: <emphasis>htable.setex</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable : name of the hash table</para> + </listitem> + <listitem><para>key : key name in the hash table</para> + </listitem> + <listitem><para>expire : integer value for the expire (seconds)</para> + </listitem> + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +# set expire for $sht(test=>x) to 120 secs +kamctl rpc htable.seti test x 120 +... </programlisting> </section> <section id="htable.rpc.dump">

1 0

git:master:c23104bd: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: c23104bd16c8b1df983e434dc6017a69bf586604 URL: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-20T16:31:20+01:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6… Patch: https://github.com/kamailio/kamailio/commit/c23104bd16c8b1df983e434dc6017a6… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index ba2f50461e..5fe4071d56 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -1295,7 +1295,7 @@ event_route[uac:reply] { * contact_addr - contact address to be used for this record instead of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It - can be set to '.' (dot) to skip setting it and then + can be set to '' (empty string) to skip setting it and then reg_contact_addr modparam is used. * socket - Used socket for sending out registration requests, e.g.:,

1 0

git:master:8014638f: uac: fix wrong documentation regarding contact_addr database, empty string means skip, not dot
by Henning Westerholt 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 8014638fb8a3653868684d00df7dfb8e3f13eb33 URL: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-01-20T15:16:39Z uac: fix wrong documentation regarding contact_addr database, empty string means skip, not dot --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8… Patch: https://github.com/kamailio/kamailio/commit/8014638fb8a3653868684d00df7dfb8… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index b6184a6daa..188d1b913e 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1619,7 +1619,7 @@ event_route[uac:reply] { <listitem><para> <emphasis>contact_addr</emphasis> - contact address to be used for this record instead of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It can - be set to '.' (dot) to skip setting it and then reg_contact_addr modparam is used. + be set to '' (empty string) to skip setting it and then reg_contact_addr modparam is used. </para></listitem> </itemizedlist> <itemizedlist>

1 0

git:master:2e4258f4: websocket: makefile - set library path for localbase
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 2e4258f440a07a2cfd20082af22bba4f9a2448ab URL: https://github.com/kamailio/kamailio/commit/2e4258f440a07a2cfd20082af22bba4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T13:02:44+01:00 websocket: makefile - set library path for localbase --- Modified: src/modules/websocket/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2e4258f440a07a2cfd20082af22bba4… Patch: https://github.com/kamailio/kamailio/commit/2e4258f440a07a2cfd20082af22bba4… --- diff --git a/src/modules/websocket/Makefile b/src/modules/websocket/Makefile index 764453b080..99b1fe1f8c 100644 --- a/src/modules/websocket/Makefile +++ b/src/modules/websocket/Makefile @@ -40,7 +40,7 @@ LIBS+= $(TLS_EXTRA_LIBS) ifeq ($(EMBEDDED_UTF8_DECODE),0) DEFS += -I$(LOCALBASE)/include - LIBS += -lunistring + LIBS += -L$(LOCALBASE)/lib -lunistring else DEFS += -DEMBEDDED_UTF8_DECODE endif

1 0

git:master:584eabf7: Makefile.defs: set localbase for macports on macos
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 584eabf7de6af9f835678f9c6d6851cce49a3878 URL: https://github.com/kamailio/kamailio/commit/584eabf7de6af9f835678f9c6d6851c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T13:02:44+01:00 Makefile.defs: set localbase for macports on macos --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/584eabf7de6af9f835678f9c6d6851c… Patch: https://github.com/kamailio/kamailio/commit/584eabf7de6af9f835678f9c6d6851c… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 84f9438bc4..d2d7c60814 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -524,7 +524,12 @@ ifeq ($(OS), darwin) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ + MACPORTS = $(shell which port 2>/dev/null) +ifeq ($(MACPORTS),) LOCALBASE ?= /usr/local +else + LOCALBASE ?= /opt/local +endif endif LOCALBASE ?= /usr/local

1 0

git:master:ca3b5f3c: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: ca3b5f3ca581c4327d6b02342773fed47ea82ee2 URL: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-20T12:31:24+01:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed… Patch: https://github.com/kamailio/kamailio/commit/ca3b5f3ca581c4327d6b02342773fed… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index ef76592a83..ab56c61379 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -178,6 +178,11 @@ allid,time_hires&cid:callid running Kamailio with this module loaded: * hiredis - available at https://github.com/redis/hiredis + The following library is an optional dependency to support redis + cluster protocol: + * hiredis-cluster - available at + https://github.com/Nordix/hiredis-cluster + 4. Parameters 4.1. schema_path (string) @@ -227,6 +232,10 @@ modparam("db_redis", "verbosity", 0) 'redis://[username]@host:port/database'. Username is optional. The database portion must be a valid Redis database number. + For cluster support you need to set the "db_url" modparam with a comma + separated list of cluster hosts: 'redis://host1:port1,host2:port2/'. + The database portion is not supported in cluster mode. + Example 1.4. Usage ... loadmodule "db_redis.so"

1 0

[kamailio/kamailio] Db redis cluster support (PR #2995)
by Riccardo-78 20 Jan '22

20 Jan '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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Related to issue #2977 #### Description Add support for redis cluster protocol via hiredis-cluster library to db_redis module You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2995 -- Commit Summary -- * db_redis: added hiredis-cluster detection * db_redis: use cluster api * db_redis: update documentation -- File Changes -- M src/modules/db_redis/Makefile (14) M src/modules/db_redis/doc/db_redis_admin.xml (15) M src/modules/db_redis/redis_connection.c (115) M src/modules/db_redis/redis_connection.h (34) M src/modules/db_redis/redis_dbase.c (135) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2995.patch https://github.com/kamailio/kamailio/pull/2995.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2995 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2995(a)github.com>

3 5

git:master:8eec0115: db_redis: use cluster api
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 8eec0115a2689ce1d4bff2b5bab909f2401965f4 URL: https://github.com/kamailio/kamailio/commit/8eec0115a2689ce1d4bff2b5bab909f… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:30:22+01:00 db_redis: use cluster api --- Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_connection.h Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/8eec0115a2689ce1d4bff2b5bab909f… Patch: https://github.com/kamailio/kamailio/commit/8eec0115a2689ce1d4bff2b5bab909f…

1 0

git:master:610603da: db_redis: update documentation
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 610603da5fb45eeffba2f7d623f50b358e65d6ed URL: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:30:22+01:00 db_redis: update documentation --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3… Patch: https://github.com/kamailio/kamailio/commit/610603da5fb45eeffba2f7d623f50b3… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 6439c79b6f..b3b54c08a2 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -146,6 +146,17 @@ location=entry:ruid&usrdom:username,domain&timer:partition,keepalive;acc </listitem> </itemizedlist> </para> + <para> + The following library is an optional dependency to support redis cluster protocol: + <itemizedlist> + <listitem> + <para> + <emphasis>hiredis-cluster</emphasis> - available at + <ulink url="https://github.com/Nordix/hiredis-cluster">https://github.com/Nordix/hiredis-cluster</ulink> + </para> + </listitem> + </itemizedlist> + </para> </section> </section> @@ -216,6 +227,10 @@ modparam("db_redis", "verbosity", 0) 'redis://[username]@host:port/database'. Username is optional. The database portion must be a valid Redis database number. </para> + <para> + For cluster support you need to set the "db_url" modparam with a comma separated list of cluster hosts: + 'redis://host1:port1,host2:port2/'. The database portion is not supported in cluster mode. + </para> <example> <title>Usage</title> <programlisting format="linespecific">

1 0

git:master:f15c768c: db_redis: added hiredis-cluster detection
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: f15c768ce89ef78eb87e476d4c6dff0b29585df2 URL: https://github.com/kamailio/kamailio/commit/f15c768ce89ef78eb87e476d4c6dff0… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:30:22+01:00 db_redis: added hiredis-cluster detection --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f15c768ce89ef78eb87e476d4c6dff0… Patch: https://github.com/kamailio/kamailio/commit/f15c768ce89ef78eb87e476d4c6dff0… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index ca8020d543..179bc6f406 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -10,6 +10,12 @@ HIREDIS_BUILDER = $(shell \ if pkg-config --exists hiredis; then \ echo 'pkg-config hiredis'; \ fi) + +HIREDIS_CLUSTER_BUILDER = $(shell \ + if pkg-config --exists hiredis_cluster; then \ + echo 'pkg-config hiredis_cluster'; \ + fi) + endif ifeq ($(HIREDIS_BUILDER),) @@ -33,6 +39,14 @@ endif DEFS+=$(HIREDISDEFS) LIBS=$(HIREDISLIBS) +ifneq ($(HIREDIS_CLUSTER_BUILDER),) + HIREDISCLUSTERDEFS = $(shell $(HIREDIS_CLUSTER_BUILDER) --cflags) + HIREDISCLUSTERLIBS = $(shell $(HIREDIS_CLUSTER_BUILDER) --libs) + DEFS+=-DWITH_HIREDIS_CLUSTER + DEFS+=$(HIREDISCLUSTERDEFS) + LIBS+=$(HIREDISCLUSTERLIBS) +endif + SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1

1 0

[kamailio/kamailio] Fix websocket and phonenum for build on FreeBSD (PR #3000)
by Boris Korzun 20 Jan '22

20 Jan '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) - [ ] 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 `websocket` and `phonenum` are not build on FreeBSD environment. The proposed patch fixes it and makes modules are consistent with the rest of modules. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3000 -- Commit Summary -- * phonenum: Makefile - support for FreeBSD build * websocket: Makefile - support for FreeBSD build -- File Changes -- M src/modules/phonenum/Makefile (9) M src/modules/websocket/Makefile (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3000.patch https://github.com/kamailio/kamailio/pull/3000.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3000 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3000(a)github.com>

2 7

git:master:cda05478: rtp_media_server: Makefile - support for FreeBSD build
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: cda05478b25ad93b1fb7475cf6b2767d7164bbbb URL: https://github.com/kamailio/kamailio/commit/cda05478b25ad93b1fb7475cf6b2767… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:27:09+01:00 rtp_media_server: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. --- Modified: src/modules/rtp_media_server/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/cda05478b25ad93b1fb7475cf6b2767… Patch: https://github.com/kamailio/kamailio/commit/cda05478b25ad93b1fb7475cf6b2767… --- diff --git a/src/modules/rtp_media_server/Makefile b/src/modules/rtp_media_server/Makefile index 5386a3065a..18645c209a 100644 --- a/src/modules/rtp_media_server/Makefile +++ b/src/modules/rtp_media_server/Makefile @@ -2,11 +2,11 @@ include ../../Makefile.defs auto_gen= NAME=rtp_media_server.so -DEFS+=-I$(LOCALBASE)/lib +DEFS+=-I$(LOCALBASE)/include ORTPLIBS=-lortp BCUNITLIBS=-lbcunit MS2LIBS=-lmediastreamer -LIBS=$(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS) +LIBS+=-L$(LOCALBASE)/lib $(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS) include ../../Makefile.modules

1 0

git:master:c4b280bd: phonenum: Makefile - support for FreeBSD build
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: c4b280bd5b5b0cfb8d34ecef296972f2a043791e URL: https://github.com/kamailio/kamailio/commit/c4b280bd5b5b0cfb8d34ecef296972f… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:27:09+01:00 phonenum: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules; - removed predefined CXX and LD variables. --- Modified: src/modules/phonenum/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/c4b280bd5b5b0cfb8d34ecef296972f… Patch: https://github.com/kamailio/kamailio/commit/c4b280bd5b5b0cfb8d34ecef296972f… --- diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index 4f187fccf6..f465226a97 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -5,13 +5,11 @@ include ../../Makefile.defs auto_gen= NAME=phonenum.so -CXX=g++ -LD=g++ -LIB_DIR = /opt/local/lib +CXX?=g++ +LD?=g++ -LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber -lgeocoding - -DEFS+= -I/opt/local/include +LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding +DEFS+=-I$(LOCALBASE)/include CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing

1 0

git:master:0a347638: websocket: Makefile - support for FreeBSD build
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 0a3476384b325514b1da784b74cc821360193409 URL: https://github.com/kamailio/kamailio/commit/0a3476384b325514b1da784b74cc821… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T12:27:09+01:00 websocket: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. --- Modified: src/modules/websocket/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/0a3476384b325514b1da784b74cc821… Patch: https://github.com/kamailio/kamailio/commit/0a3476384b325514b1da784b74cc821… --- diff --git a/src/modules/websocket/Makefile b/src/modules/websocket/Makefile index f74003225b..764453b080 100644 --- a/src/modules/websocket/Makefile +++ b/src/modules/websocket/Makefile @@ -39,7 +39,8 @@ endif LIBS+= $(TLS_EXTRA_LIBS) ifeq ($(EMBEDDED_UTF8_DECODE),0) - LIBS+= -lunistring + DEFS += -I$(LOCALBASE)/include + LIBS += -lunistring else DEFS += -DEMBEDDED_UTF8_DECODE endif

1 0

git:master:23c39ecb: core: set exit flag for return 0
by Daniel-Constantin Mierla 20 Jan '22

20 Jan '22

Module: kamailio Branch: master Commit: 23c39ecbdd29f2fff0af4a693b08032e8afff48b URL: https://github.com/kamailio/kamailio/commit/23c39ecbdd29f2fff0af4a693b08032… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-20T09:57:45+01:00 core: set exit flag for return 0 --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/23c39ecbdd29f2fff0af4a693b08032… Patch: https://github.com/kamailio/kamailio/commit/23c39ecbdd29f2fff0af4a693b08032… --- diff --git a/src/core/action.c b/src/core/action.c index b8525f6c6a..48b150dd70 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -366,6 +366,9 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) goto error; } h->run_flags|=(unsigned int)a->val[1].u.number; + if(unlikely((ret==0) && (h->run_flags&RETURN_R_F))) { + h->run_flags |= EXIT_R_F; + } break; case FORWARD_T: #ifdef USE_TCP

1 0

git:master:af080336: modules: readme files regenerated - presence_conference ... [skip ci]
by Kamailio Dev 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: af080336e1d63cf51d0f29ed946ebfb73c2c77f0 URL: https://github.com/kamailio/kamailio/commit/af080336e1d63cf51d0f29ed946ebfb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-18T20:31:18+01:00 modules: readme files regenerated - presence_conference ... [skip ci] --- Modified: src/modules/presence_conference/README Modified: src/modules/presence_dialoginfo/README Modified: src/modules/presence_mwi/README Modified: src/modules/presence_profile/README Modified: src/modules/presence_reginfo/README Modified: src/modules/presence_xml/README --- Diff: https://github.com/kamailio/kamailio/commit/af080336e1d63cf51d0f29ed946ebfb… Patch: https://github.com/kamailio/kamailio/commit/af080336e1d63cf51d0f29ed946ebfb…

1 0

[kamailio/kamailio] presence : add default_expires and use in the presence* modules (PR #3003)
by adita76 18 Jan '22

18 Jan '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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Related to issue #2996 #### Description closes #2996 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3003 -- Commit Summary -- * presence: added default_expires parameter * presence_conference: use parameter presence/default_expires instead of 3600 constant * presence_dialoginfo: use parameter presence/default_expires instead of 3600 constant * presence_mwi: use parameter presence/default_expires instead of 3600 constant * presence_profile: use parameter presence/default_expires instead of 3600 constant * presence_reginfo: use parameter presence/default_expires instead of 3600 constant * presence_xml: use parameter presence/default_expires instead of 3600 constant -- File Changes -- M src/modules/presence/doc/presence_admin.xml (22) M src/modules/presence/presence.c (6) M src/modules/presence/presence.h (1) M src/modules/presence_conference/add_events.c (14) M src/modules/presence_dialoginfo/add_events.c (12) M src/modules/presence_mwi/add_events.c (12) M src/modules/presence_profile/add_events.c (13) M src/modules/presence_reginfo/add_events.c (12) M src/modules/presence_xml/add_events.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3003.patch https://github.com/kamailio/kamailio/pull/3003.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3003 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3003(a)github.com>

3 18

git:master:e8ece95f: presence_reginfo: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: e8ece95f0c56d81d644fe469e3cbbf56c11c0891 URL: https://github.com/kamailio/kamailio/commit/e8ece95f0c56d81d644fe469e3cbbf5… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_reginfo: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_reginfo/add_events.c Modified: src/modules/presence_reginfo/doc/presence_reginfo_admin.xml Modified: src/modules/presence_reginfo/presence_reginfo.c Modified: src/modules/presence_reginfo/presence_reginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/e8ece95f0c56d81d644fe469e3cbbf5… Patch: https://github.com/kamailio/kamailio/commit/e8ece95f0c56d81d644fe469e3cbbf5… --- diff --git a/src/modules/presence_reginfo/add_events.c b/src/modules/presence_reginfo/add_events.c index 3cb9f7a145..468a14dd3a 100644 --- a/src/modules/presence_reginfo/add_events.c +++ b/src/modules/presence_reginfo/add_events.c @@ -39,7 +39,7 @@ int reginfo_add_events(void) event.content_type.s = "application/reginfo+xml"; event.content_type.len = 23; - event.default_expires= 3600; + event.default_expires= pres_reginfo_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml b/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml index b99c35e088..9c7450a2e2 100644 --- a/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml +++ b/src/modules/presence_reginfo/doc/presence_reginfo_admin.xml @@ -64,6 +64,31 @@ </section> </section> + <section> + <title>Parameters</title> + <section id="presence_reginfo.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence_reginfo", "default_expires", 3600) + ... + </programlisting> + </example> + </section> + + </section> + + <section> <title>Functions</title> <para> diff --git a/src/modules/presence_reginfo/presence_reginfo.c b/src/modules/presence_reginfo/presence_reginfo.c index eadbfdad24..abb8755ca0 100644 --- a/src/modules/presence_reginfo/presence_reginfo.c +++ b/src/modules/presence_reginfo/presence_reginfo.c @@ -46,14 +46,23 @@ static int mod_init(void); /* module variables */ add_event_t pres_add_event; +/* module parameters */ +unsigned int pres_reginfo_default_expires = 3600; + +/* module exported paramaters */ +static param_export_t params[] = { + { "default_expires", INT_PARAM, &pres_reginfo_default_expires }, + {0, 0, 0} +}; + /* module exports */ /* clang-format off */ struct module_exports exports= { "presence_reginfo", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ 0, /* exported functions */ - 0, /* exported parameters */ - 0, /* RPC method exports */ + params, /* exported parameters */ + 0, /* RPC method exports */ 0, /* exported pseudo-variables */ 0, /* response handling function */ mod_init, /* module initialization function */ diff --git a/src/modules/presence_reginfo/presence_reginfo.h b/src/modules/presence_reginfo/presence_reginfo.h index 6d5371535b..6fa47c008f 100644 --- a/src/modules/presence_reginfo/presence_reginfo.h +++ b/src/modules/presence_reginfo/presence_reginfo.h @@ -25,5 +25,5 @@ #define _PRES_REGINFO_H_ extern add_event_t pres_add_event; - +extern unsigned int pres_reginfo_default_expires; #endif

1 0

git:master:ad8e1c4d: presence_xml: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: ad8e1c4d0cfb0a8c6af17b08900ef45064e54303 URL: https://github.com/kamailio/kamailio/commit/ad8e1c4d0cfb0a8c6af17b08900ef45… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_xml: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_xml/add_events.c Modified: src/modules/presence_xml/doc/presence_xml_admin.xml Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h --- Diff: https://github.com/kamailio/kamailio/commit/ad8e1c4d0cfb0a8c6af17b08900ef45… Patch: https://github.com/kamailio/kamailio/commit/ad8e1c4d0cfb0a8c6af17b08900ef45… --- diff --git a/src/modules/presence_xml/add_events.c b/src/modules/presence_xml/add_events.c index a7e82aa71f..54a3c52bf4 100644 --- a/src/modules/presence_xml/add_events.c +++ b/src/modules/presence_xml/add_events.c @@ -33,6 +33,7 @@ #include "../../core/parser/parse_content.h" #include "../../core/data_lump_rpl.h" #include "../../core/ut.h" +#include "../presence/presence.h" #include "xcap_auth.h" #include "notify_body.h" #include "add_events.h" @@ -65,7 +66,7 @@ int xml_add_events(void) event.agg_nbody = pres_agg_nbody; event.evs_publ_handl = xml_publ_handl; event.free_body = free_xml_body; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; event.get_rules_doc = pres_get_rules_doc; event.get_pidf_doc = pres_get_pidf_doc; if(psapi.add_event(&event) < 0) { @@ -85,7 +86,7 @@ int xml_add_events(void) event.content_type.len = 27; event.type = WINFO_TYPE; event.free_body = free_xml_body; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; if(psapi.add_event(&event) < 0) { LM_ERR("while adding event presence.winfo\n"); @@ -106,7 +107,7 @@ int xml_add_events(void) event.content_type.len = 27; event.type = PUBL_TYPE; event.free_body = free_xml_body; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; if(psapi.add_event(&event) < 0) { LM_ERR("while adding event dialog;sla\n"); return -1; @@ -124,7 +125,7 @@ int xml_add_events(void) event.content_type.len = 25; event.type = PUBL_TYPE; - event.default_expires = 3600; + event.default_expires = pxml_default_expires; if(psapi.add_event(&event) < 0) { LM_ERR("while adding event xcap-diff\n"); return -1; diff --git a/src/modules/presence_xml/doc/presence_xml_admin.xml b/src/modules/presence_xml/doc/presence_xml_admin.xml index 4eaf7d82ac..387fd2f759 100644 --- a/src/modules/presence_xml/doc/presence_xml_admin.xml +++ b/src/modules/presence_xml/doc/presence_xml_admin.xml @@ -413,6 +413,27 @@ modparam("presence_xml", "presence_single_body_lookup_element", "status") </programlisting> </example> </section> + +<section id="presence_xml.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_xml", "default_expires", 3600) +... +</programlisting> + </example> +</section> + </section> diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index cc9b814eed..85ebca3d49 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -98,6 +98,8 @@ int pxml_force_single_body = 0; str pxml_single_body_priorities = str_init("Available|Ringing|On the Phone"); str pxml_single_body_lookup_element = str_init("note"); +unsigned int pxml_default_expires = 3600; + /** SL API structure */ sl_api_t slb; @@ -138,6 +140,7 @@ static param_export_t params[]={ { "force_presence_single_body", INT_PARAM, &pxml_force_single_body }, { "presence_single_body_priorities", PARAM_STR, &pxml_single_body_priorities }, { "presence_single_body_lookup_element", PARAM_STR, &pxml_single_body_lookup_element }, + { "default_expires", INT_PARAM, &pxml_default_expires }, { 0, 0, 0} }; /* clang-format on */ diff --git a/src/modules/presence_xml/presence_xml.h b/src/modules/presence_xml/presence_xml.h index e77891e642..7c20b9c7eb 100644 --- a/src/modules/presence_xml/presence_xml.h +++ b/src/modules/presence_xml/presence_xml.h @@ -53,4 +53,6 @@ extern int pxml_integrated_xcap_server; extern xcap_serv_t *xs_list; extern xcapGetNewDoc_t xcap_GetNewDoc; +extern unsigned int pxml_default_expires; + #endif

1 0

git:master:1e3606eb: presence_mwi: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 1e3606ebca0d927595f6a0aa98cc0972174b9a62 URL: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_mwi: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_mwi/add_events.c Modified: src/modules/presence_mwi/doc/presence_mwi_admin.xml Modified: src/modules/presence_mwi/presence_mwi.c Modified: src/modules/presence_mwi/presence_mwi.h --- Diff: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… Patch: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… --- diff --git a/src/modules/presence_mwi/add_events.c b/src/modules/presence_mwi/add_events.c index 001034ade4..089940e081 100644 --- a/src/modules/presence_mwi/add_events.c +++ b/src/modules/presence_mwi/add_events.c @@ -124,7 +124,7 @@ int mwi_add_events(void) event.content_type.s = "application/simple-message-summary"; event.content_type.len = 34; - event.default_expires= 3600; + event.default_expires= pres_mwi_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = mwi_publ_handl; diff --git a/src/modules/presence_mwi/doc/presence_mwi_admin.xml b/src/modules/presence_mwi/doc/presence_mwi_admin.xml index e73c3f72a8..654dd080cd 100644 --- a/src/modules/presence_mwi/doc/presence_mwi_admin.xml +++ b/src/modules/presence_mwi/doc/presence_mwi_admin.xml @@ -68,9 +68,26 @@ <section> <title>Parameters</title> - <para> - None. - </para> + <section id="presence_mwi.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence_mwi", "default_expires", 3600) + ... + </programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/presence_mwi/presence_mwi.c b/src/modules/presence_mwi/presence_mwi.c index afd605f7c7..9fdeeeb84c 100644 --- a/src/modules/presence_mwi/presence_mwi.c +++ b/src/modules/presence_mwi/presence_mwi.c @@ -59,6 +59,9 @@ static int mod_init(void); /* module variables */ add_event_t pres_add_event; +/* module parameters */ +unsigned int pres_mwi_default_expires = 3600; + /* module exported commands */ static cmd_export_t cmds[] = { @@ -67,6 +70,7 @@ static cmd_export_t cmds[] = /* module exported paramaters */ static param_export_t params[] = { + { "default_expires", INT_PARAM, &pres_mwi_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_mwi/presence_mwi.h b/src/modules/presence_mwi/presence_mwi.h index 9e7d5c4d52..5eed0d742c 100644 --- a/src/modules/presence_mwi/presence_mwi.h +++ b/src/modules/presence_mwi/presence_mwi.h @@ -34,5 +34,6 @@ #define _PRES_MWI_H_ extern add_event_t pres_add_event; +extern unsigned int pres_mwi_default_expires; #endif

1 0

git:master:86cb58b0: presence_profile: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 86cb58b045854c6fe95afbd81c2c13c81e1052d5 URL: https://github.com/kamailio/kamailio/commit/86cb58b045854c6fe95afbd81c2c13c… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_profile: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_profile/add_events.c Modified: src/modules/presence_profile/doc/presence_profile_admin.xml Modified: src/modules/presence_profile/presence_profile.c Modified: src/modules/presence_profile/presence_profile.h --- Diff: https://github.com/kamailio/kamailio/commit/86cb58b045854c6fe95afbd81c2c13c… Patch: https://github.com/kamailio/kamailio/commit/86cb58b045854c6fe95afbd81c2c13c… --- diff --git a/src/modules/presence_profile/add_events.c b/src/modules/presence_profile/add_events.c index 72a5f58567..ec03193d41 100644 --- a/src/modules/presence_profile/add_events.c +++ b/src/modules/presence_profile/add_events.c @@ -45,11 +45,10 @@ int profile_add_events(void) event.name.s = "ua-profile"; event.name.len = 10; - event.content_type.s = "text/xml"; event.content_type.len = 8; - event.default_expires= 3600; + event.default_expires= pres_profile_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_profile/doc/presence_profile_admin.xml b/src/modules/presence_profile/doc/presence_profile_admin.xml index c54be3446b..ddc811f88e 100644 --- a/src/modules/presence_profile/doc/presence_profile_admin.xml +++ b/src/modules/presence_profile/doc/presence_profile_admin.xml @@ -64,9 +64,25 @@ <section> <title>Exported Parameters</title> - <para> - None. - </para> + <section id="presence_profile.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence_profile", "default_expires", 3600) + ... + </programlisting> + </example> + </section> </section> <section> diff --git a/src/modules/presence_profile/presence_profile.c b/src/modules/presence_profile/presence_profile.c index 0a4ab47434..ba3a2746f1 100644 --- a/src/modules/presence_profile/presence_profile.c +++ b/src/modules/presence_profile/presence_profile.c @@ -56,13 +56,22 @@ static int mod_init(void); /* module variables */ add_event_t pres_add_event; +/* module parameters */ +unsigned int pres_profile_default_expires = 3600; + +/* module exported paramaters */ +static param_export_t params[] = { + { "default_expires", INT_PARAM, &pres_profile_default_expires }, + {0, 0, 0} +}; + /* module exports */ /* clang-format off */ struct module_exports exports= { "presence_profile", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ 0, /* exported functions */ - 0, /* exported parameters */ + params, /* exported parameters */ 0, /* RPC method exports */ 0, /* exported pseudo-variables */ 0, /* response handling function */ diff --git a/src/modules/presence_profile/presence_profile.h b/src/modules/presence_profile/presence_profile.h index 7906f323b4..ff70a74941 100644 --- a/src/modules/presence_profile/presence_profile.h +++ b/src/modules/presence_profile/presence_profile.h @@ -31,5 +31,6 @@ #define _PRES_PROFILE_H_ extern add_event_t pres_add_event; +extern unsigned int pres_profile_default_expires; #endif

1 0

git:master:21588198: presence_conference: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 2158819818afabd501af1a41803989d4bd00656e URL: https://github.com/kamailio/kamailio/commit/2158819818afabd501af1a41803989d… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_conference: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_conference/add_events.c Modified: src/modules/presence_conference/doc/presence_conference_admin.xml Modified: src/modules/presence_conference/presence_conference.c Modified: src/modules/presence_conference/presence_conference.h --- Diff: https://github.com/kamailio/kamailio/commit/2158819818afabd501af1a41803989d… Patch: https://github.com/kamailio/kamailio/commit/2158819818afabd501af1a41803989d… --- diff --git a/src/modules/presence_conference/add_events.c b/src/modules/presence_conference/add_events.c index 576746efed..7683f5a8bc 100644 --- a/src/modules/presence_conference/add_events.c +++ b/src/modules/presence_conference/add_events.c @@ -43,7 +43,7 @@ int conference_add_events(void) event.content_type.s = "application/conference-info+xml"; event.content_type.len = 31; - event.default_expires= 3600; + event.default_expires = pres_conf_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_conference/doc/presence_conference_admin.xml b/src/modules/presence_conference/doc/presence_conference_admin.xml index 6b1f46012e..158d241c24 100644 --- a/src/modules/presence_conference/doc/presence_conference_admin.xml +++ b/src/modules/presence_conference/doc/presence_conference_admin.xml @@ -76,6 +76,26 @@ modparam("presence_conference", "use_partial_states", 0) </example> </section> +<section id="presence_conference.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_conference", "default_expires", 3600) +... +</programlisting> + </example> +</section> + </section> <section> diff --git a/src/modules/presence_conference/presence_conference.c b/src/modules/presence_conference/presence_conference.c index cb117c3c6a..890533e11f 100644 --- a/src/modules/presence_conference/presence_conference.c +++ b/src/modules/presence_conference/presence_conference.c @@ -49,6 +49,7 @@ add_event_t pres_add_event; /* module parameters */ int use_partial_states = 0; +unsigned int pres_conf_default_expires = 3600; /* module exported commands */ static cmd_export_t cmds[] = @@ -59,6 +60,7 @@ static cmd_export_t cmds[] = /* module exported paramaters */ static param_export_t params[] = { { "use_partial_states", INT_PARAM, &use_partial_states }, + { "default_expires", INT_PARAM, &pres_conf_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_conference/presence_conference.h b/src/modules/presence_conference/presence_conference.h index f8e0efe9de..8bf05885af 100644 --- a/src/modules/presence_conference/presence_conference.h +++ b/src/modules/presence_conference/presence_conference.h @@ -26,5 +26,6 @@ #define _PRES_CONFERENCE_H_ extern add_event_t pres_add_event; +extern unsigned int pres_conf_default_expires; #endif

1 0

git:master:31598421: presence_dialoginfo: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 31598421de858786f9ed416db8f33c12c0efd383 URL: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_dialoginfo: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_dialoginfo/add_events.c Modified: src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml Modified: src/modules/presence_dialoginfo/presence_dialoginfo.c Modified: src/modules/presence_dialoginfo/presence_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… Patch: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… --- diff --git a/src/modules/presence_dialoginfo/add_events.c b/src/modules/presence_dialoginfo/add_events.c index 03cd981837..bed11b2d48 100644 --- a/src/modules/presence_dialoginfo/add_events.c +++ b/src/modules/presence_dialoginfo/add_events.c @@ -43,7 +43,7 @@ int dlginfo_add_events(void) event.content_type.s = "application/dialog-info+xml"; event.content_type.len = 27; - event.default_expires= 3600; + event.default_expires= pres_dlginfo_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml b/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml index cdb1729584..caca121f18 100644 --- a/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml +++ b/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml @@ -248,6 +248,26 @@ modparam("presence_dialoginfo", "force_dummy_dialog", 1) </example> </section> +<section id="presence_dialoginfo.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_dialoginfo", "default_expires", 3600) +... +</programlisting> + </example> +</section> + </section> <section> diff --git a/src/modules/presence_dialoginfo/presence_dialoginfo.c b/src/modules/presence_dialoginfo/presence_dialoginfo.c index 9bf8199dda..edc96fb11e 100644 --- a/src/modules/presence_dialoginfo/presence_dialoginfo.c +++ b/src/modules/presence_dialoginfo/presence_dialoginfo.c @@ -49,6 +49,7 @@ add_event_t pres_add_event; /* module parameters */ int force_single_dialog = 0; int force_dummy_dialog = 0; +unsigned int pres_dlginfo_default_expires = 3600; /* module exported commands */ static cmd_export_t cmds[] = @@ -60,6 +61,7 @@ static cmd_export_t cmds[] = static param_export_t params[] = { { "force_single_dialog", INT_PARAM, &force_single_dialog }, { "force_dummy_dialog", INT_PARAM, &force_dummy_dialog }, + { "default_expires", INT_PARAM, &pres_dlginfo_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_dialoginfo/presence_dialoginfo.h b/src/modules/presence_dialoginfo/presence_dialoginfo.h index 750a8c3347..2e9c40553d 100644 --- a/src/modules/presence_dialoginfo/presence_dialoginfo.h +++ b/src/modules/presence_dialoginfo/presence_dialoginfo.h @@ -26,5 +26,6 @@ #define _PRES_DLGINFO_H_ extern add_event_t pres_add_event; +extern unsigned int pres_dlginfo_default_expires; #endif

1 0

[kamailio/kamailio] replacing wrong function return with correct one (PR #3004)
by Saurabh 18 Jan '22

18 Jan '22

Replacing wrong return function with correct one in `w_ht_iterator_setex` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3004 -- Commit Summary -- * replacing wrong function return with correct one -- File Changes -- M src/modules/htable/htable.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3004.patch https://github.com/kamailio/kamailio/pull/3004.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3004 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3004(a)github.com>

2 2

git:master:1f3de642: htable: proper function executed by w_ht_iterator_setex()
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 1f3de642bc3822290608dfed6a47a9052fa65ae1 URL: https://github.com/kamailio/kamailio/commit/1f3de642bc3822290608dfed6a47a90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:11:58+01:00 htable: proper function executed by w_ht_iterator_setex() - reported by GH #3004 --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/1f3de642bc3822290608dfed6a47a90… Patch: https://github.com/kamailio/kamailio/commit/1f3de642bc3822290608dfed6a47a90… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 7e72ad0840..ed28190880 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -923,7 +923,7 @@ static int w_ht_iterator_setex(struct sip_msg* msg, char* iname, char* val) return -1; } - return ki_ht_iterator_seti(msg, &siname, ival); + return ki_ht_iterator_setex(msg, &siname, ival); } static int ki_ht_slot_xlock(sip_msg_t *msg, str *htname, str *skey, int lmode)

1 0

git:master:2e85bb54: app_lua: support for lua 5.4.x
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 2e85bb541ff19e4b0074b04c4d05399a216deca2 URL: https://github.com/kamailio/kamailio/commit/2e85bb541ff19e4b0074b04c4d05399… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T15:19:52+01:00 app_lua: support for lua 5.4.x - GH #2728 --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/2e85bb541ff19e4b0074b04c4d05399… Patch: https://github.com/kamailio/kamailio/commit/2e85bb541ff19e4b0074b04c4d05399… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 6dffde1119..2bf255414a 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -42,6 +42,10 @@ #define KSR_APP_LUA_LOG_EXPORTS (1<<0) +#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 +#define luaL_openlib ksr_luaL_openlib +#endif + extern int _ksr_app_lua_log_mode; void lua_sr_kemi_register_libs(lua_State *L); @@ -190,15 +194,41 @@ int sr_lua_reload_module(unsigned int reload) void ksr_luaL_openlib_mode(lua_State *L, const char *libname, const luaL_Reg *lfuncs, int nup, int mode) { + char modname[256]; + char *submod = NULL; + int tidx = 0; if(mode) { - lua_getglobal(L, libname); + /* support for registering 'module.submodule' functions + * - 'module' functions must be registered first */ + if(strlen(libname)>254) { + LM_ERR("module name is too long [%s]\n", libname); + return; + } + strcpy(modname, libname); + submod = strchr(modname, '.'); + if(submod != NULL) { + *submod = '\0'; + submod++; + } + lua_getglobal(L, modname); if (lua_isnil(L, -1)) { + if(submod != NULL) { + LM_ERR("main module not registered yet [%s]\n", libname); + return; + } lua_pop(L, 1); lua_newtable(L); + luaL_setfuncs(L, lfuncs, 0); + lua_setglobal(L, modname); + return; } - } else { + tidx = lua_gettop(L); lua_newtable(L); + luaL_setfuncs(L, lfuncs, 0); + lua_setfield(L, tidx, submod); + return; } + lua_newtable(L); luaL_setfuncs(L, lfuncs, 0); lua_setglobal(L, libname); } @@ -209,7 +239,7 @@ void ksr_luaL_openlib_mode(lua_State *L, const char *libname, void ksr_luaL_openlib(lua_State *L, const char *libname, const luaL_Reg *lfuncs, int nup) { - ksr_luaL_openlib_mode(L, libname, lfuncs, nup, 0); + ksr_luaL_openlib_mode(L, libname, lfuncs, nup, 1); } /**

1 0

[kamailio/kamailio] DB_UNIXODBC always reports errors for sql queries with no result set (#2810)
by kdanderso 17 Jan '22

17 Jan '22

### Description SQL queries that do not return a result set (such as INSERT, DELETE, UPDATE) always report errors when using db_unixodbc. The query succeeds, but the log indicates a failure. #### Reproduction Use db_unixodbc.so for sql queries. Issue a valid query such as INSERT that is not expected to return a result set. #### Log Messages ERROR: db_unixodbc [res.c:52]: db_unixodbc_get_columns(): no columns returned from the query ERROR: db_unixodbc [res.c:253]: db_unixodbc_convert_result(): getting column names failed ERROR: db_unixodbc [dbase.c:271]: db_unixodbc_store_result(): failed to convert result ERROR: <core> [db_query.c:197]: db_do_raw_query(): error while storing result ERROR: sqlops [sql_api.c:297]: sql_do_query(): cannot do the query [DELETE FROM mytable WHERE id = 1] ### Additional Information Kamailio Version 5.5.0 This issue was also reported to SR-users, but that user did not open an issue. (See https://lists.kamailio.org/pipermail/sr-users/2018-March/100581.html) -- 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/issues/2810

2 5

git:master:a30a6ceb: app_lua: added internal alternative to luaL_openlib()
by Daniel-Constantin Mierla 17 Jan '22

17 Jan '22

Module: kamailio Branch: master Commit: a30a6ceb5d7616bc135377b1dc507bd2eeeab876 URL: https://github.com/kamailio/kamailio/commit/a30a6ceb5d7616bc135377b1dc507bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-17T08:29:13+01:00 app_lua: added internal alternative to luaL_openlib() - it was deprecated in Lua API, no longer available in newer versions [wip] --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/a30a6ceb5d7616bc135377b1dc507bd… Patch: https://github.com/kamailio/kamailio/commit/a30a6ceb5d7616bc135377b1dc507bd… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 8b572d2382..6dffde1119 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -184,6 +184,34 @@ int sr_lua_reload_module(unsigned int reload) return 0; } +/** + * + */ +void ksr_luaL_openlib_mode(lua_State *L, const char *libname, + const luaL_Reg *lfuncs, int nup, int mode) +{ + if(mode) { + lua_getglobal(L, libname); + if (lua_isnil(L, -1)) { + lua_pop(L, 1); + lua_newtable(L); + } + } else { + lua_newtable(L); + } + luaL_setfuncs(L, lfuncs, 0); + lua_setglobal(L, libname); +} + +/** + * + */ +void ksr_luaL_openlib(lua_State *L, const char *libname, + const luaL_Reg *lfuncs, int nup) +{ + ksr_luaL_openlib_mode(L, libname, lfuncs, nup, 0); +} + /** * */

1 0

[kamailio/kamailio] mhomed does not work with virtual IPs created by keepalived (Issue #3002)
by ccolumbu999 15 Jan '22

15 Jan '22

### Description I enabled mhomed=1 as well as ip_free_bind=1, but kamailio does not recognize that there is internal and external traffic. For example I also enabled modparam("rr", "enable_double_rr", 1), but the 2 Record-Routes both have the external IP. In addition fix_nated_contact() and fix_nated_sdp don't work because they think all traffic is coming from the external IP.  ### Troubleshooting I tried a lot of things. #### Reproduction Set up a server with keepalived and a virtual IP and use any standard NAT config and it won't work.  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions I thought that ip_free_bind=1 would fix this issue, but it does not seem to have any effect.  ### 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/3002 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3002(a)github.com>

2 3

git:master:3da3a780: kex: use unsigned long for rpc stats.fetchn values
by Daniel-Constantin Mierla 14 Jan '22

14 Jan '22

Module: kamailio Branch: master Commit: 3da3a780c9a9a4fc7a0852193080da2cbaa2adcf URL: https://github.com/kamailio/kamailio/commit/3da3a780c9a9a4fc7a0852193080da2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-14T16:50:07+01:00 kex: use unsigned long for rpc stats.fetchn values --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/3da3a780c9a9a4fc7a0852193080da2… Patch: https://github.com/kamailio/kamailio/commit/3da3a780c9a9a4fc7a0852193080da2… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index a1f14a7dc6..ec543d1b60 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -496,7 +496,7 @@ static void rpc_fetch_add_stat(rpc_t* rpc, void* ctx, void* hst, char* g, char* snprintf(nbuf, 127, "%s.%s", g, n); if (numeric) { - res = rpc->struct_add(hst, "d", nbuf, val); + res = rpc->struct_add(hst, "j", nbuf, val); } else { res = rpc->struct_printf(hst, nbuf, "%lu", val); }

1 0

git:master:6794a120: statsc: use long long for rpc output value
by Daniel-Constantin Mierla 14 Jan '22

14 Jan '22

Module: kamailio Branch: master Commit: 6794a120f3c2466985fe1d837f00c5366df8e1c1 URL: https://github.com/kamailio/kamailio/commit/6794a120f3c2466985fe1d837f00c53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-14T16:19:28+01:00 statsc: use long long for rpc output value --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6794a120f3c2466985fe1d837f00c53… Patch: https://github.com/kamailio/kamailio/commit/6794a120f3c2466985fe1d837f00c53… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 1ee13c3cec..6baf2bea4a 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -354,7 +354,8 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) int cmode; str sname; int range; - int k, m, n, v; + int k, m, n; + int64_t v; time_t tn; void* th; void* ts; @@ -433,7 +434,7 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Error creating rpc (5)"); return; } - v = (int)sm->vals[k]; + v = sm->vals[k]; switch(cmode) { case 1: break; @@ -442,13 +443,13 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) continue; } if(k==0) { - v -= (int)sm->vals[statsc_items-1]; + v -= sm->vals[statsc_items-1]; } else { - v -= (int)sm->vals[k-1]; + v -= sm->vals[k-1]; } break; } - if(rpc->struct_add(ti, "udd", + if(rpc->struct_add(ti, "uLd", "timestamp", (unsigned int)_statsc_info->slist->vals[k], "value", v, "index", m++)<0) { @@ -464,7 +465,7 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Error creating rpc (7)"); return; } - v = (int)sm->vals[k]; + v = sm->vals[k]; switch(cmode) { case 1: break; @@ -472,10 +473,10 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) if(n==k-1) { continue; } - v -= (int)sm->vals[k-1]; + v -= sm->vals[k-1]; break; } - if(rpc->struct_add(ti, "udd", + if(rpc->struct_add(ti, "uLd", "timestamp", (unsigned int)_statsc_info->slist->vals[k], "value", v, "index", m++)<0) {

1 0

[kamailio/kamailio] add parameter presence : default_expires (Issue #2996)
by adita76 14 Jan '22

14 Jan '22

### Description Similar to pua:default_expires, a default expire value could be added for subscriptions. The default expiration values are now hard coded for presence modules, in presence_*/add_events.c files. ### Expected behavior Default expiration value that is configurable. #### Actual observed behavior Default expiration value is 3600. ### Possible Solutions Adding a parameter presence : default_expires and use it in all presence_*/add_events.c files. I can implement this myself. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2996 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2996(a)github.com>

2 2

[kamailio/kamailio] server crashes every 10 hours (#2101)
by ekke56 14 Jan '22

14 Jan '22

### Description  ### Troubleshooting coredump data below. #### Reproduction  #### Debugging Data  ``` (gdb) bt full #0 0x000000000046ccdd in get_hash1_raw (s=0x5da51296 <Address 0x5da51296 out of bounds>, len=9) at core/hashes.h:109 p = 0x5da51296 <Address 0x5da51296 out of bounds> v = 4100353960 h = 0 #1 0x000000000046cfb6 in str_hash_get (ht=0xa6d6c0 <cnts_hash_table>, key=0x5da51296 <Address 0x5da51296 out of bounds>, len=9) at core/str_hash.h:94 h = 0 e = 0x19 #2 0x000000000046debe in cnt_hash_lookup (group=0x7ffc2db9d7c0, name=0x7eff79693b80) at core/counters.c:420 e = 0x7eff80c48c88 first = 0xbd8191bc2e950d55 cnt_rec = 0x7eff80c48cb0 #3 0x000000000046e752 in counter_lookup_str (handle=0x7ffc2db9d7d0, group=0x7ffc2db9d7c0, name=0x7eff79693b80) at core/counters.c:541 cnt_rec = 0x19 #4 0x00007eff7d65b447 in get_stat (name=0x7eff79693b80) at ../../core/counters.h:197 h = {id = 13} grp = {s = 0x0, len = 0} #5 0x00007eff7d65c113 in statsc_svalue (name=0x7eff79693b80, res=0x7eff79693f4b) at statsc_mod.c:149 stat = 0xd __FUNCTION__ = "statsc_svalue" #6 0x00007eff7d65db79 in statsc_timer (ticks=113205942, param=0x0) at statsc_mod.c:274 sm = 0x7eff79693b70 tn = 1571099286 n = 115 __FUNCTION__ = "statsc_timer" #7 0x00000000005db7f9 in sr_wtimer_exec (ticks=113205942, param=0x0) at core/timer_proc.c:390 wt = 0x7eff80c56f48 wn = 0x0 wp = 0x0 cs = 0 __FUNCTION__ = "sr_wtimer_exec" #8 0x00000000005daa29 in fork_sync_timer (child_id=-1, desc=0x7c8a71 "secondary timer", make_sock=1, f=0x5db4f2 <sr_wtimer_exec>, param=0x0, interval=1000) at core/timer_proc.c:224 pid = 0 ts1 = 1811295077 ts2 = 1000 #9 0x00000000005dbb26 in sr_wtimer_start () at core/timer_proc.c:416 __FUNCTION__ = "sr_wtimer_start" #10 0x0000000000425a33 in main_loop () at main.c:1729 i = 8 pid = 3615 si = 0x0 si_desc = "udp receiver child=7 sock=91.216.86.57:5060\000\377~\000\000@۹-\374\177\000\000\020\207A\000\000\000\000\000\020\336\271-\374\177\000\000\323c{\000\000\000\000\000\031\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\200\000\000\000\000\000__:\201\377~\000\000\250\346\260v\377~\000\000\270\314À\377~\000" nrprocs = 8 woneinit = 1 __FUNCTION__ = "main_loop" #11 0x000000000042c72a in main (argc=7, argv=0x7ffc2db9def8) at main.c:2696 cfg_stream = 0x1ee3010 c = -1 r = 0 tmp = 0x7ffc2db9ef2c "" tmp_len = 0 port = 0 proto = 0 options = 0x76a9a0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 ---Type <return> to continue, or q <return> to quit--- info locals seed = 2620966285 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x2 p = 0x0 st = {st_dev = 20, st_ino = 22346, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1568107728, tv_nsec = 458000000}, st_mtim = { tv_sec = 1571064422, tv_nsec = 57000000}, st_ctim = {tv_sec = 1571064422, tv_nsec = 57000000}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) list 104 register unsigned v; 105 register unsigned h; 106 107 h=0; 108 109 hash_update_str(s, s+len, p, v, h); 110 return hash_finish(h); 111 } 112 113 ``` #### Log Messages  ``` no relevant messages ``` #### SIP Traffic  ``` seems to be triggered by internal timer ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.4 (x86_64/linux) 759867 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 759867 compiled on 12:20:22 Sep 11 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` CentOS Linux release 7.4.1708 (Core) Linux xxx 3.10.0-957.12.2.el7.x86_64 #1 SMP Tue May 14 21:24:32 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/issues/2101

3 20

git:master:22558e34: modules: readme files regenerated - statsc ... [skip ci]
by Kamailio Dev 14 Jan '22

14 Jan '22

Module: kamailio Branch: master Commit: 22558e3407a49dbf7ef84669190df0c98c8a8d58 URL: https://github.com/kamailio/kamailio/commit/22558e3407a49dbf7ef84669190df0c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-14T09:16:13+01:00 modules: readme files regenerated - statsc ... [skip ci] --- Modified: src/modules/statsc/README --- Diff: https://github.com/kamailio/kamailio/commit/22558e3407a49dbf7ef84669190df0c… Patch: https://github.com/kamailio/kamailio/commit/22558e3407a49dbf7ef84669190df0c… --- diff --git a/src/modules/statsc/README b/src/modules/statsc/README index 2ef41cc72d..d06f3925b2 100644 --- a/src/modules/statsc/README +++ b/src/modules/statsc/README @@ -103,6 +103,8 @@ modparam("statsc", "interval", 300) How many items to store for each statistic. + Note: it must be set before any 'track' parameter. + Default value is 100. Example 1.2. Set items parameter

1 0

git:master:f517f8c6: statsc: note that items param must be set before track
by Daniel-Constantin Mierla 14 Jan '22

14 Jan '22

Module: kamailio Branch: master Commit: f517f8c655e676f5872eda5f81f5244eac4eed25 URL: https://github.com/kamailio/kamailio/commit/f517f8c655e676f5872eda5f81f5244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-14T09:02:39+01:00 statsc: note that items param must be set before track --- Modified: src/modules/statsc/doc/statsc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f517f8c655e676f5872eda5f81f5244… Patch: https://github.com/kamailio/kamailio/commit/f517f8c655e676f5872eda5f81f5244… --- diff --git a/src/modules/statsc/doc/statsc_admin.xml b/src/modules/statsc/doc/statsc_admin.xml index 9794349690..3dd6d80051 100644 --- a/src/modules/statsc/doc/statsc_admin.xml +++ b/src/modules/statsc/doc/statsc_admin.xml @@ -81,6 +81,9 @@ modparam("statsc", "interval", 300) <para> How many items to store for each statistic. </para> + <para> + Note: it must be set before any 'track' parameter. + </para> <para> <emphasis> Default value is 100.

1 0

git:master:b29c79c8: stats: detect of mod param items is set after track
by Daniel-Constantin Mierla 14 Jan '22

14 Jan '22

Module: kamailio Branch: master Commit: b29c79c8d83fd23064e50dcee02e5f85ec51328d URL: https://github.com/kamailio/kamailio/commit/b29c79c8d83fd23064e50dcee02e5f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-14T08:55:06+01:00 stats: detect of mod param items is set after track - it can lead to crash if items is set to greater value than the default one (GH #2101) - round up for better memory alignment in the allocated structures --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b29c79c8d83fd23064e50dcee02e5f8… Patch: https://github.com/kamailio/kamailio/commit/b29c79c8d83fd23064e50dcee02e5f8…

1 0

[kamailio/kamailio] Infinity read from closed socket (#2658)
by sergey-safarov 13 Jan '22

13 Jan '22

### Description I observing a case when Kamailio stop processing calls. What is found: *Lot of connections with CLOSE_WAIT state* ``` [root@sbc-13 ~]# netstat -anp | grep 5060 tcp 129 0 100.85.118.66:5060 0.0.0.0:* LISTEN 56907/kamailio tcp 153 0 100.85.118.66:5060 3.101.84.132:21929 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:32738 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:39084 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:28843 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:57939 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:27823 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:15820 CLOSE_WAIT - tcp 0 0 100.85.118.66:5060 207.244.110.239:11587 ESTABLISHED 56907/kamailio tcp 153 0 100.85.118.66:5060 3.101.84.132:11972 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:57245 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:54344 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:41416 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:3644 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:61657 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:49325 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:65334 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:48657 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:1612 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:7879 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:56626 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:57247 CLOSE_WAIT - tcp 153 0 100.85.118.66:5060 3.101.84.132:30494 CLOSE_WAIT - ``` At this time on two core server, one core loaded 100% and another core is free. And top show ``` %Cpu(s): 29.4 us, 26.5 sy ``` As about 26% CPU cycles proceed kernel call, using `strace` utility I found Kamailio process (with top CSP usage) continusly make thus kernel calls. ``` recvfrom(58, 0x7ffdb46a5ab0, 232, MSG_PEEK, NULL, NULL) = -1 EAGAIN (Resource temporarily unavailable) recvfrom(58, 0x7ffdb46a5ab0, 232, MSG_PEEK, NULL, NULL) = -1 EAGAIN (Resource temporarily unavailable) recvfrom(58, 0x7ffdb46a5ab0, 232, MSG_PEEK, NULL, NULL) = -1 EAGAIN (Resource temporarily unavailable) recvfrom(58, 0x7ffdb46a5ab0, 232, MSG_PEEK, NULL, NULL) = -1 EAGAIN (Resource temporarily unavailable) recvfrom(58, 0x7ffdb46a5ab0, 232, MSG_PEEK, NULL, NULL) = -1 EAGAIN (Resource temporarily unavailable) recvfrom(58, 0x7ffdb46a5ab0, 232, MSG_PEEK, NULL, NULL) = -1 EAGAIN (Resource temporarily unavailable) recvfrom(58, 0x7ffdb46a5ab0, 232, MSG_PEEK, NULL, NULL) = -1 EAGAIN (Resource temporarily unavailable) recvfrom(58, 0x7ffdb46a5ab0, 232, MSG_PEEK, NULL, NULL) = -1 EAGAIN (Resource temporarily unavailable) recvfrom(58, 0x7ffdb46a5ab0, 232, MSG_PEEK, NULL, NULL) = -1 EAGAIN (Resource temporarily unavailable) ``` *Then I check 58 process file descriptor* ``` [root@sbc-13 ~]# ls -la /proc/56907/fd/58 lrwx------. 1 kamailio kamailio 64 Mar 3 10:49 /proc/56907/fd/58 -> 'socket:[3931924]' ``` *Info about open socket* ``` [root@sbc-13 ~]# lsof -a -p 56907| grep 3931924 kamailio 56907 kamailio 58u IPv4 3931924 0t0 TCP ip-100-85-118-66.us-west-1.compute.internal:sip->207.244.110.239:11495 (ESTABLISHED) ``` *Info about Kamailio 56907 process* ``` [root@sbc-13 ~]# kamcmd core.ps | tail 56903 tcp receiver (generic) child=4 56904 tcp receiver (generic) child=5 56905 tcp receiver (generic) child=6 56906 tcp receiver (generic) child=7 56907 tcp main process ``` Then using gdb I have created core file and back trace here ``` (gdb) bt full #0 0x00007f07d3639b1e in recv () from /lib64/libpthread.so.0 No symbol table info available. #1 0x0000000000528817 in tcpconn_read_haproxy (c=0x7f07ce98d930) at core/tcp_main.c:953 bytes = -1 retval = 0 size = 3454406656 port = 32519 p = 0x7ef068 "" end = 0x7f07d335c4c0 <syslog> "\363\017\036\372H\201\354", <incomplete sequence \330> src_ip = 0x6e9646 <qm_shm_malloc+103> dst_ip = 0x7ffdb46a5c20 v2sig = "\r\n\r\n\000\r\nQUIT\n" hdr = {v1 = {line = "\300\304\065\323\004", '\000' <repeats 11 times>, "\370ؘ\316\004\000\000\000t\251\205\000\000\000\000\000\320[j\264\375\177\000\000\004\331m\000\000\000\000\000\320[j\264\375\177\000\000\306\331m\000\000\000\000\000\b\342u\316\a\177\000\000\000\020\346\315\a\177\000\000\367b\201\000\000\000\000\000y\251\205\000n\004\000\000\260\235\201\000\000\000\000\000\247\227\201"}, v2 = {sig = "\300\304\065\323\004\000\000\000\000\000\000", ver_cmd = 0 '\000', fam = 0 '\000', len = 0, addr = {ip4 = {src_addr = 3466123512, dst_addr = 4, src_port = 43380, dst_port = 133}, ip6 = {src_addr = "\370ؘ\316\004\000\000\000t\251\205\000\000\000\000", dst_addr = "\320[j\264\375\177\000\000\004\331m\000\000\000\000", src_port = 23504, dst_port = 46186}, unx = {src_addr = "\370ؘ\316\004\000\000\000t\251\205\000\000\000\000\000\320[j\264\375\177\000\000\004\331m\000\000\000\000\000\320[j\264\375\177\000\000\306\331m\000\000\000\000\000\b\342u\316\a\177\000\000\000\020\346\315\a\177\000\000\367b\201\000\000\000\000\000y\251\205\000n\004\000\000\260\235\201\000\000\000\000\000\247\227\201\000\000\000\000\000\240C\000\000\000\000\000\000\000\020\346", <incomplete sequence \315>, dst_addr = "\a\177\000\000PB\226\316\a\177\000\000\000\020\346\315\a\177\000\000\274\332\366\312\a\177\000\000Ȧ\351͗\002\000\000\240\370\366\312\a\177\000\000S\342\366\312\a\177\000\000@\342u\316\a\177\000\000\000\000\000\000\000\000P\225\001\000\000\000\000\000\000\000\003\000\000\000\001\b\000\000\300[j\264\375\177\000\000R\031Q\000\000\000\000\000hV\313\322\a\177\000"}}}} __func__ = "tcpconn_read_haproxy" #2 0x0000000000529cc8 in tcpconn_new (sock=58, su=0x7ffdb46a5e00, local_addr=0x7f07d2cb5668, ba=0x7f07d2cb5610, type=2, state=3) at core/tcp_main.c:1164 c = 0x7f07ce98d930 rd_b_size = 16384 ret = 32519 __func__ = "tcpconn_new" #3 0x000000000055194e in handle_new_connect (si=0x7f07d2cb5610) at core/tcp_main.c:4259 su = {s = {sa_family = 2, sa_data = ",\347\317\364n\357\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 59180, sin_addr = {s_addr = 4017026255}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 59180, sin6_flowinfo = 4017026255, sin6_addr = {__in6_u = {__u6_addr8 = "\000\000\000\000\000\000\000\000h\360~\000\000\000\000", __u6_addr16 = {0, 0, 0, 0, 61544, 126, 0, 0}, __u6_addr32 = {0, 0, 8319080, 0}}}, sin6_scope_id = 67108864}, sas = {ss_family = 2, __ss_padding = ",\347\317\364n\357\000\000\000\000\000\000\000\000h\360~\000\000\000\000\000\000\000\000\004\000\000\000\000\360^j\264\375\177\000\000\023FU\000\000\000\000\000\230_\226\316\a\177\000\000\300\225\264\000\000\000\000\000\377\377\377\377\001\000\000\000\060٘\316\a\177\000\000\060٘\316\a\177\000\000\377\377\377\377\377\377\377\377\220^j\264\375\177\000\000\000\000\000\000\000\000\000\000\300\304\065\323\a\177\000", __ss_align = 8235966803625406752}} sock_name = {s = {sa_family = 23984, sa_data = "j\264\375\177\000\000\376\023Q\000\000\000\000"}, sin = {sin_family = 23984, sin_port = 46186, sin_addr = {s_addr = 32765}, sin_zero = "\376\023Q\000\000\000\000"}, sin6 = {sin6_family = 23984, sin6_port = 46186, sin6_flowinfo = 32765, sin6_addr = {__in6_u = {__u6_addr8 = "\376\023Q\000\000\000\000\000\310ژ\316\a\177\000", __u6_addr16 = {5118, 81, 0, 0, 56008, 52888, 32519, 0}, __u6_addr32 = {5313534, 0, 3466123976, 32519}}}, sin6_scope_id = 3454980136}, sas = {ss_family = 23984, __ss_padding = "j\264\375\177\000\000\376\023Q\000\000\000\000\000\310ژ\316\a\177\000\000(\320\356\315\a\177\000\000\030\"\202\000_\376\377\377\000\000\000\000\000\000\000\000\300\304\065\323\a\177\000\000\363:\204\000\000\000\000\000h\360~\000\000\000\000\000\000\000\000\004\000\000\000\000\360^j\264\375\177\000\000\245\222T\000\000\000\000\000\250\376\314\322\002\000\000\000\000\000\000\000\002\000\000\000Dc\201\000\241\001\000", __ss_align = 0}} sock_name_len = 32519 dst_su = 0x7f07d2cb5668 tcpconn = 0xffffffffce98d930 su_len = 16 new_sock = 58 __func__ = "handle_new_connect" #4 0x0000000000554aac in handle_io (fm=0x7f07d2ccfa40, ev=1, idx=-1) at core/tcp_main.c:4517 ret = 16 __func__ = "handle_io" #5 0x000000000051c992 in io_wait_loop_epoll (h=0xaf4760 <io_h>, t=5, repeat=0) at core/io_wait.h:1070 n = 1 r = 0 fm = 0x7f07d2ccfa40 revents = 1 __func__ = "io_wait_loop_epoll" #6 0x000000000055800f in tcp_main_loop () at core/tcp_main.c:4808 si = 0x0 r = 8 __func__ = "tcp_main_loop" #7 0x000000000042ca0b in main_loop () at main.c:1788 i = 8 pid = 0 si = 0x0 si_desc = "udp receiver child=7 sock=[2600:1f1c:6d5:aa03::7]:5060\000\061\063\062:5060)\000\000\000\000\060\000\000\000\370bj\264\375\177\000\000\020bj\264\375\177\000\000\000\334ѯ\344lFߨE\201\000\000\000\000\000\250\203\306\322k\000\000\000\363:\204\000\000\000\000\000\270o\305\322\a\177\000" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #8 0x0000000000435d95 in main (argc=11, argv=0x7ffdb46a6828) at main.c:2895 cfg_stream = 0x156b2a0 c = -1 r = 0 tmp = 0x7ffdb46a6ee3 "" tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x7f1e48 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 2702569434 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x7ffdb46d4268 p = 0x7f07d3309db5 <handle_intel.constprop+197> "H\205\300uf\213t$\004M\215\216\244" st = {st_dev = 24, st_ino = 19244, st_nlink = 2, st_mode = 16832, st_uid = 985, st_gid = 979, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1613817804, tv_nsec = 114998890}, st_mtim = {tv_sec = 1614768566, tv_nsec = 7667804}, st_ctim = {tv_sec = 1614768566, tv_nsec = 7667804}, __glibc_reserved = {0, 0, 0}} tbuf = '\000' <repeats 16 times>, "\214\344'\323\a\177\000\000\330Am\264\375\177\000\000\000\000\000\000 ", '\000' <repeats 19 times>, "X_\376\323\a\177\000\000\000ej\264\375\177\000\000\a\000\000\000\000\000\000\000\020U\376\323\a\177\000\000\a\000\000\000\t\000\000\000\210\351 \324\a\177\000\000\034\021\377\323\a\177\000\000\000\000\000\000\000\000\000\000H\037\377\323\a\177\000\000Pdj\264\375\177\000\000\260\344'\323\a\177\000\000\300\363\037\324\a\177\000\000\000\000\000\000\000\000\000\000\320dj\264\375\177", '\000' <repeats 26 times>, "\200W\376\323\a\177\000\000"... option_index = 12 long_options = {{name = 0x7f4056 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7ef4e1 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7f405b "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x7f4061 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7f4067 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7f4070 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7f407a "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7f4084 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7f408f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7f4098 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7f40a3 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7f40a9 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x7f40b3 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` We use enabled haproxy protocol. Loos as Kamailio does not properly close the socket when the socket closed on the client-side. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@sbc-13 ~]# kamailio -v version: kamailio 5.5.0-dev4 (x86_64/linux) 06656a flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 06656a compiled on 04:01:58 Mar 1 2021 with gcc 8.3.1 ``` * **Operating System**: ``` [root@sbc-13 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- 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/issues/2658

3 9

git:master:795a0907: db_unixodbc: catch queries without result to skip printing error logs
by Daniel-Constantin Mierla 13 Jan '22

13 Jan '22

Module: kamailio Branch: master Commit: 795a09077ccc5dd06f9074978dc77dd81389512b URL: https://github.com/kamailio/kamailio/commit/795a09077ccc5dd06f9074978dc77dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-13T16:49:33+01:00 db_unixodbc: catch queries without result to skip printing error logs - GH #2810 --- Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/795a09077ccc5dd06f9074978dc77dd… Patch: https://github.com/kamailio/kamailio/commit/795a09077ccc5dd06f9074978dc77dd… --- diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index f2e1a3b12e..bbbb6e2d38 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -252,6 +252,8 @@ void db_unixodbc_close(db1_con_t* _h) */ static int db_unixodbc_store_result(const db1_con_t* _h, db1_res_t** _r) { + SQLSMALLINT cols = 0; + if ((!_h) || (!_r)) { LM_ERR("invalid parameter value\n"); @@ -266,6 +268,14 @@ static int db_unixodbc_store_result(const db1_con_t* _h, db1_res_t** _r) return -2; } + SQLNumResultCols(CON_RESULT(_h), &cols); + if(cols==0) { + /* no result */ + (*_r)->col.n = 0; + (*_r)->n = 0; + return 0; + } + if (db_unixodbc_convert_result(_h, *_r) < 0) { LM_ERR("failed to convert result\n");

1 0

git:master:0ed12822: tm: update uri when refreshing local uac shortcuts
by Daniel-Constantin Mierla 13 Jan '22

13 Jan '22

Module: kamailio Branch: master Commit: 0ed1282238da6cdd8a4dbef1b61493b70a850a6b URL: https://github.com/kamailio/kamailio/commit/0ed1282238da6cdd8a4dbef1b61493b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-13T13:49:46+01:00 tm: update uri when refreshing local uac shortcuts --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/0ed1282238da6cdd8a4dbef1b61493b… Patch: https://github.com/kamailio/kamailio/commit/0ed1282238da6cdd8a4dbef1b61493b… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 9cbc9d5f88..7dfcefb6ea 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -160,9 +160,9 @@ static inline unsigned int dlg2hash( dlg_t* dlg ) } /** - * refresh hdr shortcuts inside new buffer + * refresh r-uri and hdr shortcuts inside new buffer */ -int uac_refresh_hdr_shortcuts(tm_cell_t *tcell, char *buf, int buf_len) +int uac_refresh_shortcuts(tm_cell_t *tcell, int branch, char *buf, int buf_len) { sip_msg_t lreq; struct cseq_body *cs; @@ -175,6 +175,7 @@ int uac_refresh_hdr_shortcuts(tm_cell_t *tcell, char *buf, int buf_len) LM_ERR("failed to parse headers in new message\n"); goto error; } + tcell->uac[branch].uri = *GET_RURI(&lreq); tcell->from.s = lreq.from->name.s; tcell->from.len = lreq.from->len; tcell->to.s = lreq.to->name.s; @@ -541,7 +542,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, if (unlikely(refresh_shortcuts==E_DROP)) { ret=E_DROP; goto error1; - } + } } #endif @@ -576,7 +577,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, request->buffer = buf; request->buffer_len = buf_len; if(unlikely(refresh_shortcuts==1)) { - if(uac_refresh_hdr_shortcuts(new_cell, buf, buf_len)<0) { + if(uac_refresh_shortcuts(new_cell, 0, buf, buf_len)<0) { LM_ERR("failed to refresh header shortcuts\n"); goto error1; }

1 0

git:master:55d185de: dispatcher: reworked management of ping reply codes and classes
by Daniel-Constantin Mierla 13 Jan '22

13 Jan '22

Module: kamailio Branch: master Commit: 55d185de535503ab860c0475e07d2d4af64f3ab0 URL: https://github.com/kamailio/kamailio/commit/55d185de535503ab860c0475e07d2d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-13T12:16:14+01:00 dispatcher: reworked management of ping reply codes and classes - do not generate all the 100 replies code for a class, but compare to be in in the range --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/55d185de535503ab860c0475e07d2d4… Patch: https://github.com/kamailio/kamailio/commit/55d185de535503ab860c0475e07d2d4…

1 0

git:master:29ebde9c: dispatcher: removed module name from log message
by Daniel-Constantin Mierla 13 Jan '22

13 Jan '22

Module: kamailio Branch: master Commit: 29ebde9cfe746c1dd9083a5fc4b26a32c39ca0a4 URL: https://github.com/kamailio/kamailio/commit/29ebde9cfe746c1dd9083a5fc4b26a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-13T10:37:46+01:00 dispatcher: removed module name from log message - updates to debug messages --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/29ebde9cfe746c1dd9083a5fc4b26a3… Patch: https://github.com/kamailio/kamailio/commit/29ebde9cfe746c1dd9083a5fc4b26a3… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index fbf65d33fe..216a04f297 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1151,7 +1151,7 @@ static int ds_parse_reply_codes() list_size += 100; } } - LM_DBG("Should be %d Destinations.\n", list_size); + LM_DBG("expecting %d reply codes\n", list_size); if(list_size > 0) { /* Allocate Memory for the new list: */ @@ -1206,7 +1206,7 @@ static int ds_parse_reply_codes() } /* Print the list as INFO: */ for(i = 0; i < *ds_ping_reply_codes_cnt; i++) { - LM_DBG("Dispatcher: Now accepting Reply-Code %d (%d/%d) as valid\n", + LM_DBG("now accepting reply code %d (%d/%d) as valid\n", (*ds_ping_reply_codes)[i], (i + 1), *ds_ping_reply_codes_cnt); } return 0;

1 0

[kamailio/kamailio] Adding listen flag to ignore matches in grep_sock_info when an IP is not active locally (Issue #2984)
by rhys-hanrahan 12 Jan '22

12 Jan '22

### Description As per my thread on sr-users: **Active/active keepalived - Kamailio includes non-local virtual IP in "myself" which breaks DMQ call routing**, I am seeing issues due to the behavior of `check_self` and more specifically `grep_sock_info`. I have attached a patch with a proposed new feature that would allow changing this behaviour slightly, although I've avoided changing any default behaviour. I have a setup with keepalived in active/active mode, with two virtual IPs. The goal is that each VIP is active only one one node at a time, but in the event of a failure, both VIPs would become active on one node. The issue I am facing is that in order for this to work, I need to have both nodes listen on both virtual IPs at all times, but this means that both nodes always consider traffic to those IPs local to themselves, even when that is not the case. This breaks many things, basically anything with `uri == myself`. But even internally in Kamailio itself, this is causing problems. For example: PATH support is broken and this is not easily fixed in the config because `lookup()` is actually using `check_self()` internally. I am sure there are many other features which will not work right in the above scenario, and this is why I'm proposing a change in the code itself, instead of just trying to solve it in the config. I've attached a patch file with my proposed change and would appreciate any feedback as to my overall approach. If this seems OK then I will put together a pull request for your review. Thanks! ### Expected behavior Kamailio should detect what IP addresses are currently active locally on it's system before considering the socket a match. If the IP is not currently there, it should ignore the match as if it is not currently listening on this IP (because it really is not!) #### Actual observed behavior Right now, Kamailio looks blindly at all "listen" sockets and looks for a match, regardless of if that IP is currently active locally or not, and this causes the false results of `check_self` ### Possible Solutions As mentioned, I'm attaching a patch showing my overall approach. Basically: * I am using pre-existing functions as much as possible for best compatibility e.g. IPv6 and IPv4. * I use `dns_resolvehost()` which seems to have a caching function built-in and so I am hoping the performance impact of my change would be negligible. * My code only makes a change _if_ the virtual flag is set, and if not, existing behaviour is kept so as to avoid any breaking changes. [RT59671-kamailio-add-listen-virtual-check2.patch.txt](https://github.com/ka… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2984 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2984(a)github.com>

3 3

[kamailio/kamailio] integer overflow in 'core.shmmem' output (#2824)
by Julius Flohr 12 Jan '22

12 Jan '22

Hi, we are using kamailio with more than 4GB of shared memory. When using 'core.shmem' we are expierencing an integer overflow in the output. The issue can be found here: https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… I currently don't have the time to setup a build environment so I can't fix it myself. cheers. -- 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/issues/2824

3 3

git:master:f619cae5: corex: rpc shm stats values printed as unsigned long
by Daniel-Constantin Mierla 12 Jan '22

12 Jan '22

Module: kamailio Branch: master Commit: f619cae55ffeb4596da852d9ed75773c3217de50 URL: https://github.com/kamailio/kamailio/commit/f619cae55ffeb4596da852d9ed75773… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-12T17:03:58+01:00 corex: rpc shm stats values printed as unsigned long - GH #2824 --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/f619cae55ffeb4596da852d9ed75773… Patch: https://github.com/kamailio/kamailio/commit/f619cae55ffeb4596da852d9ed75773… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 7bf10553dd..615fb892bc 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -46,9 +46,9 @@ static void corex_rpc_shm_info(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error creating rpc"); return; } - if(rpc->struct_add(th, "su", + if(rpc->struct_add(th, "sj", "name", (_shm_root.mname)?_shm_root.mname:"unknown", - "size", (unsigned int)shm_mem_size) <0) { + "size", shm_mem_size) <0) { rpc->fault(ctx, 500, "Internal error adding fields"); return; } @@ -69,13 +69,13 @@ static void corex_rpc_shm_stats(rpc_t* rpc, void* c) shm_info(&mi); rpc->add(c, "{", &th); - rpc->struct_add(th, "uuuuuu", - "total", (unsigned int)(mi.total_size), - "free", (unsigned int)(mi.free), - "used", (unsigned int)(mi.used), - "real_used",(unsigned int)(mi.real_used), - "max_used", (unsigned int)(mi.max_used), - "fragments", (unsigned int)mi.total_frags + rpc->struct_add(th, "jjjjjj", + "total", mi.total_size, + "free", mi.free, + "used", mi.used, + "real_used", mi.real_used, + "max_used", mi.max_used, + "fragments", mi.total_frags ); }

1 0

git:master:3a11426b: kamcmd: double/float values printed without decimals when they are 0
by Daniel-Constantin Mierla 12 Jan '22

12 Jan '22

Module: kamailio Branch: master Commit: 3a11426bdf0a4a458f2531689110fee84451da88 URL: https://github.com/kamailio/kamailio/commit/3a11426bdf0a4a458f2531689110fee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-12T17:05:21+01:00 kamcmd: double/float values printed without decimals when they are 0 - cope better with long (long) values stored in double fields --- Modified: utils/kamcmd/kamcmd.c --- Diff: https://github.com/kamailio/kamailio/commit/3a11426bdf0a4a458f2531689110fee… Patch: https://github.com/kamailio/kamailio/commit/3a11426bdf0a4a458f2531689110fee… --- diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c index f1cbc24d68..141f309aaf 100644 --- a/utils/kamcmd/kamcmd.c +++ b/utils/kamcmd/kamcmd.c @@ -427,7 +427,11 @@ void print_binrpc_val(struct binrpc_val* v, int ident) printf("%c", (v->u.end)?'}':'{'); break; case BINRPC_T_DOUBLE: - printf("%f", v->u.fval); + if(v->u.fval == (double)((long long int)v->u.fval)) { + printf("%lld", (long long int)v->u.fval); + } else { + printf("%f", v->u.fval); + } break; default: printf("ERROR: unknown type %d\n", v->type);

1 0

git:master:7162dc0a: ctl: float/double values are stored over a long long int instead of int
by Daniel-Constantin Mierla 12 Jan '22

12 Jan '22

Module: kamailio Branch: master Commit: 7162dc0a7368f61e3b32231a2ad00e72ee29d82e URL: https://github.com/kamailio/kamailio/commit/7162dc0a7368f61e3b32231a2ad00e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-12T17:02:11+01:00 ctl: float/double values are stored over a long long int instead of int - cope with larger values than MAX_INT/1000, supporint now up to MAX_LLONG/1000 --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/7162dc0a7368f61e3b32231a2ad00e7… Patch: https://github.com/kamailio/kamailio/commit/7162dc0a7368f61e3b32231a2ad00e7… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index cb7204fffd..bb34cd3be5 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -205,6 +205,31 @@ inline static int binrpc_add_tag(struct binrpc_pkt* pkt, int type, int end) +/* writes a minimal long long, returns the new offset and sets + * len to the number of bytes written (<=8) + * to check for oveflow use: returned_value-p != *len + * (Note: if *len==0 using the test above succeeds even if p>=end) + */ +inline static unsigned char* binrpc_write_llong( unsigned char* p, + unsigned char* end, + long long i, int *len) +{ + int size; + unsigned long long u; + + u = (unsigned long long)i; + + for (size=8; size && ((u & (0xffull<<56))==0); u<<=8, size--); + *len=size; + for(; (p<end) && (size); p++, size--){ + *p=(unsigned char)(u>>56); + u<<=8; + } + return p; +} + + + /* writes a minimal int, returns the new offset and sets * len to the number of bytes written (<=4) * to check for oveflow use: returned_value-p != *len @@ -330,6 +355,23 @@ inline static int binrpc_hdr_change_len(unsigned char* hdr, int hdr_len, } +/* int format: size TYPE <val> */ +inline static int binrpc_add_llong_type(struct binrpc_pkt* pkt, long long i, int type) +{ + + unsigned char* p; + int size; + + p=binrpc_write_llong(pkt->crt+1, pkt->end, i, &size); + if ((pkt->crt>=pkt->end) || ((int)(p-pkt->crt-1)!=size)) + goto error_len; + *(pkt->crt)=(size<<4) | type; + pkt->crt=p; + return 0; +error_len: + return E_BINRPC_OVERFLOW; +} + /* int format: size BINRPC_T_INT <val> */ inline static int binrpc_add_int_type(struct binrpc_pkt* pkt, int i, int type) @@ -351,9 +393,9 @@ inline static int binrpc_add_int_type(struct binrpc_pkt* pkt, int i, int type) /* double format: FIXME: for now a hack: fixed point represented in - * an int (=> max 3 decimals, < MAX_INT/1000) */ + * a long long (=> max 3 decimals, < MAX_LLONG/1000) */ #define binrpc_add_double_type(pkt, f, type)\ - binrpc_add_int_type((pkt), (int)((f)*1000), (type)) + binrpc_add_llong_type((pkt), (long long)((f)*1000), (type)) @@ -516,6 +558,35 @@ static inline int binrpc_addfault( struct binrpc_pkt* pkt, /* parsing incoming messages */ +static inline unsigned char* binrpc_read_llong( long long* i, + int len, + unsigned char* s, + unsigned char* end, + int *err + ) +{ + unsigned char* start; + unsigned long long u; + + start=s; + *i=0; + u = 0; + *err=0; + for(;len>0; len--, s++){ + if (s>=end){ + *err=E_BINRPC_MORE_DATA; + *i = (long long)u; + return start; + } + u<<=8; + u|=*s; + }; + *i = (long long)u; + return s; +} + + + static inline unsigned char* binrpc_read_int( int* i, int len, unsigned char* s, @@ -638,8 +709,8 @@ inline static unsigned char* binrpc_read_record(struct binrpc_parse_ctx* ctx, int end_tag; int tmp; unsigned char* p; - int i; - + long long ll; + p=buf; end_tag=0; *err=0; @@ -758,10 +829,10 @@ inline static unsigned char* binrpc_read_record(struct binrpc_parse_ctx* ctx, } break; case BINRPC_T_DOUBLE: /* FIXME: hack: represented as fixed point - inside an int */ + inside an long long */ if (ctx->in_struct && smode==0) goto error_record; - p=binrpc_read_int(&i, len, p, end, err); - v->u.fval=((double)i)/1000; + p=binrpc_read_llong(&ll, len, p, end, err); + v->u.fval=((double)ll)/1000; break; default: if (ctx->in_struct){

1 0

[kamailio/kamailio] SEGV on unknown address (Issue #2993)
by taotao gu 12 Jan '22

12 Jan '22

Linux x1-1 5.11.0-43-generic #47~20.04.2-Ubuntu SMP Mon Dec 13 11:06:56 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux poc [https://github.com/gtt1995/poc/blob/main/kamailio/148907.testcase](https://… AddressSanitizer:DEADLYSIGNAL ================================================================= ==2350==ERROR: AddressSanitizer: SEGV on unknown address 0x608000010000 (pc 0x7f8ec09469c3 bp 0x7ffd84505c90 sp 0x7ffd84505718 T0) ==2350==The signal is caused by a READ memory access. SCARINESS: 20 (wild-addr-read) #0 0x7f8ec09469c3 in libc.so.6 #1 0x7f8ec0835209 in libc.so.6 #2 0x7f8ec08d5f32 in libc.so.6 #3 0x7f8ec08d63e9 in syslog #4 0x64a045 in parse_identityinfo /src/kamailio/src/core/parser/parse_identityinfo.c:315:3 #5 0x64b29b in parse_identityinfo_header /src/kamailio/src/core/parser/parse_identityinfo.c:346:2 #6 0x576467 in LLVMFuzzerTestOneInput /src/kamailio/misc/fuzz/fuzz_parse_msg.c:53:5 #7 0x456e73 in fuzzer::Fuzzer::ExecuteCallback(unsigned char const*, unsigned long) cxa_noexception.cpp:0 #8 0x45665a in fuzzer::Fuzzer::RunOne(unsigned char const*, unsigned long, bool, fuzzer::InputInfo*, bool, bool*) cxa_noexception.cpp:0 #9 0x457efb in fuzzer::Fuzzer::MutateAndTestOne() cxa_noexception.cpp:0 #10 0x4589e5 in fuzzer::Fuzzer::Loop(std::__Fuzzer::vector<fuzzer::SizedFile, std::__Fuzzer::allocator<fuzzer::SizedFile> >&) cxa_noexception.cpp:0 #11 0x44812d in fuzzer::FuzzerDriver(int*, char***, int (*)(unsigned char const*, unsigned long)) cxa_noexception.cpp:0 #12 0x471172 in main /src/llvm-project/compiler-rt/lib/fuzzer/FuzzerMain.cpp:20:10 #13 0x7f8ec07e20b2 in __libc_start_main #14 0x41fa0d in _start AddressSanitizer can not provide additional info. SUMMARY: AddressSanitizer: SEGV (/lib/x86_64-linux-gnu/libc.so.6+0x18b9c3) ==2350==ABORTING MS: 3 ChangeBinInt-ShuffleBytes-EraseBytes-; base unit: ae3912c98bceb907c57e00fbcb572ff78ca2f12c 0x2d,0x2d,0x32,0x32,0x52,0x52,0x41,0x52,0xec,0x53,0x52,0x52,0x20,0x73,0x2d,0x34,0x38,0x39,0x31,0x36,0x9,0x48,0x48,0x48,0x1a,0xa,0x50,0x72,0x69,0x76,0x61,0x63,0x79,0x3a,0xa,0x20,0x73,0x32,0xa,0x49,0x64,0x65,0x6e,0x74,0x69,0x74,0x79,0x2d,0x49,0x6e,0x66,0x6f,0x3a,0x3c,0x3a,0x3a,0x3a,0x3a,0xff,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xea,0xa,0xa,0xff,0xff,0xff,0xff,0xff, --22RRAR\354SRR s-48916\011HHH\032\012Privacy:\012 s2\012Identity-Info:<::::\377\352\352\352\352\352\352\352\352\352\352\352\352\352\352\352\352\352\352\352\352\012\012\377\377\377\377\377 artifact_prefix='/clusterfuzz/run_bot/clusterfuzz/bot/inputs/fuzzer-testcases/'; Test unit written to /clusterfuzz/run_bot/clusterfuzz/bot/inputs/fuzzer-testcases/crash-9886d78e9acf21b875f4e58d2d14222a4ed1e86f Base64: LS0yMlJSQVLsU1JSIHMtNDg5MTYJSEhIGgpQcml2YWN5OgogczIKSWRlbnRpdHktSW5mbzo8Ojo6Ov/q6urq6urq6urq6urq6urq6urq6goK//////8= stat::number_of_executed_units: 14639 stat::average_exec_per_sec: 1219 stat::new_units_added: 1293 stat::slowest_unit_time_sec: 0 stat::peak_rss_mb: 142 INFO: exiting: 77 time: 85s +----------------------------------------Release Build Unsymbolized Stacktrace (diff)----------------------------------------+ ==2350==The signal is caused by a READ memory access. SCARINESS: 20 (wild-addr-read) #0 0x7f8ec09469c3 (/lib/x86_64-linux-gnu/libc.so.6+0x18b9c3) #1 0x7f8ec0835209 (/lib/x86_64-linux-gnu/libc.so.6+0x7a209) #2 0x7f8ec08d5f32 (/lib/x86_64-linux-gnu/libc.so.6+0x11af32) #3 0x7f8ec08d63e9 (/lib/x86_64-linux-gnu/libc.so.6+0x11b3e9) #4 0x64a045 (/clusterfuzz/run_bot/clusterfuzz/bot/builds/kamailio_libfuzzer_asan/custom/fuzz_parse_msg+0x64a045) #5 0x64b29b (/clusterfuzz/run_bot/clusterfuzz/bot/builds/kamailio_libfuzzer_asan/custom/fuzz_parse_msg+0x64b29b) #6 0x576467 (/clusterfuzz/run_bot/clusterfuzz/bot/builds/kamailio_libfuzzer_asan/custom/fuzz_parse_msg+0x576467) #7 0x456e73 (/clusterfuzz/run_bot/clusterfuzz/bot/builds/kamailio_libfuzzer_asan/custom/fuzz_parse_msg+0x456e73) #8 0x45665a (/clusterfuzz/run_bot/clusterfuzz/bot/builds/kamailio_libfuzzer_asan/custom/fuzz_parse_msg+0x45665a) #9 0x457efb (/clusterfuzz/run_bot/clusterfuzz/bot/builds/kamailio_libfuzzer_asan/custom/fuzz_parse_msg+0x457efb) #10 0x4589e5 (/clusterfuzz/run_bot/clusterfuzz/bot/builds/kamailio_libfuzzer_asan/custom/fuzz_parse_msg+0x4589e5) #11 0x44812d (/clusterfuzz/run_bot/clusterfuzz/bot/builds/kamailio_libfuzzer_asan/custom/fuzz_parse_msg+0x44812d) #12 0x471172 (/clusterfuzz/run_bot/clusterfuzz/bot/builds/kamailio_libfuzzer_asan/custom/fuzz_parse_msg+0x471172) #13 0x7f8ec07e20b2 (/lib/x86_64-linux-gnu/libc.so.6+0x270b2) #14 0x41fa0d (/clusterfuzz/run_bot/clusterfuzz/bot/builds/kamailio_libfuzzer_asan/custom/fuzz_parse_msg+0x41fa0d) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2993 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2993(a)github.com>

3 3

git:master:40e59d9c: core: parser - print ascii code and position of invalid char for identity info
by Daniel-Constantin Mierla 12 Jan '22

12 Jan '22

Module: kamailio Branch: master Commit: 40e59d9c3b8ec531cb9e26093c43647a43108dfd URL: https://github.com/kamailio/kamailio/commit/40e59d9c3b8ec531cb9e26093c43647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-12T14:12:42+01:00 core: parser - print ascii code and position of invalid char for identity info --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/40e59d9c3b8ec531cb9e26093c43647… Patch: https://github.com/kamailio/kamailio/commit/40e59d9c3b8ec531cb9e26093c43647… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index 7afd473f23..dc0aba5d9b 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -311,8 +311,8 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) parseerror: if(p < end) { - LM_ERR("unexpected char [%c] in status %d: [%.*s]\n", *p, status, - (int)(p - buffer), buffer); + LM_ERR("unexpected char [%c/%d] in status %d - pos %d: [%.*s]\n", *p, *p, + status, (int)(p - buffer), (int)(p - buffer), buffer); } else { LM_ERR("unexpected end of buffer - status %d\n", status); }

1 0

[kamailio/kamailio] module_db_mysql: Allow '@' in username/password for db_url URIs (#1346)
by Florian Floimair 12 Jan '22

12 Jan '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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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  - It is allowed to use '@' within a username and/or a password for MySQL. Database as a Service providers like e.g. Microsoft Azure use these in usernames by default. The existing URI parser always treated the '@' as a separator between username:password and host:port/db parts of the URI. The parser now checks how many '@' characters are present in the URI and only treats the last occurence as separator for the host:port/db part. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1346 -- Commit Summary -- * module_db_mysql: Allow '@' in username/password for db_url URIs -- File Changes -- M src/modules/db_mysql/my_uri.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1346.patch https://github.com/kamailio/kamailio/pull/1346.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/1346

2 4

Wiki edit access
by Rhys Hanrahan 12 Jan '22

12 Jan '22

Hi All, I’m trying to update the cookbook to document PR #2985, but it looks like I need edit access on the wiki? My username is “rhys”. Can someone give me access? Thanks! Rhys Hanrahan | Chief Information Officer e: rhys(a)nexusone.com.au<mailto:rhys@nexusone.com.au> [www.nexusone.com.au]<http://www.nexusone.com.au/> [signature_214001646] <http://www.fusiontech.com.au/> NEXUS ONE | FUSION TECHNOLOGY SOLUTIONS p: 1800 NEXUS1 (1800 639 871) or 1800 565 845 | a: Suite 12.03 Level 12, 227 Elizabeth Street, Sydney NSW 2000 www.nexusone.com.au<http://www.nexusone.com.au/> | www.fusiontech.com.au<http://www.fusiontech.com.au/> The information in this email and any accompanying attachments may contain; a. Confidential information of Fusion Technology Solutions Pty Ltd, Nexus One Pty Ltd or third parties; b. Legally privileged information of Fusion Technology Solutions Pty Ltd, Nexus One Pty Ltd or third parties; and or c. Copyright material Fusion Technology Solutions Pty Ltd, Nexus One Pty Ltd or third parties. If you have received this email in error, please notify the sender immediately and delete this message. Fusion Technology Solutions Pty Ltd, Nexus One Pty Ltd does not accept any responsibility for loss or damage arising from the use or distribution of this email. Please consider the environment before printing this email.

2 1

git:master:c818e163: presence: small spelling fix in XML entity ID
by Henning Westerholt 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: c818e16367ff997ecb059141f4752d6e8ba6136f URL: https://github.com/kamailio/kamailio/commit/c818e16367ff997ecb059141f4752d6… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-01-11T15:10:50Z presence: small spelling fix in XML entity ID --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c818e16367ff997ecb059141f4752d6… Patch: https://github.com/kamailio/kamailio/commit/c818e16367ff997ecb059141f4752d6… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 25e43ef0b6..7e425105aa 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1229,7 +1229,7 @@ pres_refresh_watchers("sip:test@kamailio.org", "presence", 1); </example> </section> - <section id="presence.f.pres_update_whatchers"> + <section id="presence.f.pres_update_watchers"> <title> <function moreinfo="none">pres_update_watchers(uri, event)</function> </title>

1 0

git:master:6ba9249e: evapi: small spelling fix in comment
by Henning Westerholt 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 6ba9249e49e5eafe164beae46996161a3950def4 URL: https://github.com/kamailio/kamailio/commit/6ba9249e49e5eafe164beae46996161… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-01-11T15:10:30Z evapi: small spelling fix in comment --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/6ba9249e49e5eafe164beae46996161… Patch: https://github.com/kamailio/kamailio/commit/6ba9249e49e5eafe164beae46996161… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 1b8bff4402..6249fc869a 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -578,7 +578,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent return; } - /* start watcher to read messages from whatchers */ + /* start watcher to read messages from watchers */ ev_io_init(evapi_client, evapi_recv_client, csock, EV_READ); ev_io_start(loop, evapi_client); }

1 0

[kamailio/kamailio] hostname in kubernetes (#2119)
by lazedo 11 Jan '22

11 Jan '22

### Description gethostname not accurate in kubernetes  ### Troubleshooting #### Reproduction  on a recent test with kamailio in kubernetes, found that gethostname can return only the hostname and not the fqdn. this depends on the kind of object is used (deployment/statefulset) ### Possible Solutions  the below patch fixed the issues i was having ``` diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 5f77aa9..f65b4dd 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -455,6 +455,11 @@ if (gethostname(hbuf, 512)<0) { LM_WARN("gethostname failed - host pvs will be null\n"); return -1; + } else { + struct hostent* h; + if((h = gethostbyname(hbuf)) != NULL) { + memcpy(hbuf, h->h_name, 512); + } } hlen = strlen(hbuf); ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` latest master ``` * **Operating System**:  ``` buster & centos7 ``` -- 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/issues/2119

4 10

[kamailio/kamailio] erlang: getting null value in erl_xbuff in response of erl_rpc request (#2069)
by vipulpatel310 11 Jan '22

11 Jan '22

### Description **I did:** I have installed kamailio 5.2.4 in ubuntu system and configured kamailio script to connect with erlang node also it sends rpc request to erlang node and get response which I have printed in a logs. ... $erl_list(L) = "two"; $erl_list(L) = "one"; xlog("L_ALERT","Before RPC: $erl_list(args=>format)\n"); erl_rpc("erlang", "list_to_tuple", "$erl_list(args)", "$erl_xbuff(repl)"); xlogl("L_ALERT","type(reply): $erl_xbuff(repl=>type), format(repl): $erl_xbuff(repl=>format)\n"); ... **Expected to happen:** Response should be get from erlang node against RPC request and it should be store in erl_xbuff. And it should be print logs like: ALERT: <script>: 501:type(reply): tuple, format(repl): {"one", "two"} **Actually happened:** Response is getting properly. but the problem is to store data into xbuff so it print logs like: ALERT: <script>: 501:type(reply): <null>, format(repl): <null> ### Troubleshooting I have check with older version 4.3.0 and it works fine. getting this problem after 5.2.0 version So, I have compare 5.2.0 and 4.3.0 version code. I found one change in pv_xbuff.c file which is creating a problem when I revert the change then it works fine. #### Reproduction It will be reproducible everytime. Just sends rpc request and get the value in xbuff. check xbuff value #### Log Messages Problem logs: ``` ALERT: <script>: Before RPC: [["one", "two"]] WARNING: <core> [core/mem/q_malloc.c:480]: qm_free(): WARNING: free(0) called from erlang: pv_xbuff.c: xavp_decode(1209) ALERT: <script>: 501:type(reply): <null>, format(repl): <null> ``` logs after change: ``` ALERT: <script>: Before RPC: [["one", "two"]] WARNING: <core> [core/mem/q_malloc.c:480]: qm_free(): WARNING: free(0) called from erlang: pv_xbuff.c: xavp_decode(1209) ALERT: <script>: 501:type(reply): tuple, format(repl): {"one", "two"} ``` ### Possible Solutions revert the 6542a367638ec5f8a2b62994f8c309e7a2533962 commit. It will work fine ### Additional Information ``` version: kamailio 5.2.4 (x86_64/linux) 759867 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 759867 compiled on 11:52:55 Sep 4 2019 with gcc 7.4.0 ``` * **Operating System**: ``` Distributor ID: Ubuntu Description: Ubuntu 18.04 LTS Release: 18.04 Codename: bionic Linux hostname.domain.com 4.15.0-20-generic #21-Ubuntu SMP Tue Apr 24 06:16:15 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/issues/2069

2 3

[kamailio/kamailio] kamailio can't support send Rx_AAR for origin call (#1793)
by lsm808 11 Jan '22

11 Jan '22

Hi All, When kamailio(kamailio-5.0) receive 200 OK message, we need to send Rx_AAR for origin and term call. Rx_AAR("MT_aar_reply", "origin","",2); for origin call Rx_AAR("MT_aar_reply", "term","",2); for term call. But from source code ims_qos_mod.c, we see lots of part like below to not support for a request. Even we comments them, there are still lots of issues, could we support the scenarios like below: when kamailio receive 200 OK, we can send Rx_AAR for term and origin call. //We don't ever do AAR on request for calling scenario... if (msg->first_line.type != SIP_REPLY) { // Added by vlv // LM_DBG("Can't do AAR for call session in request\n"); // return result; } -- 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/issues/1793

2 4

[kamailio/kamailio] while passing different callid then actual for rtpengine_offer, rtpengine_answer and rtpengine_delete, rtpstats will not populate the stastics of rtpengine (#1788)
by Surendra Tiwari 11 Jan '22

11 Jan '22

### 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) ``` -- 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/issues/1788

2 4

[kamailio/kamailio] siptrace: option ping from nathelper do not get duplicated (#1722)
by Roman Dissauer 11 Jan '22

11 Jan '22

### Description when using kamailio with mod siptrace in trace mode, option pings from nathelper module and tls encrypted packets do not get duplicated ### Troubleshooting #### Reproduction  version: kamailio 5.1.6 (x86_64/linux) modparam("nathelper", "ping_nated_only", 0) modparam("siptrace", "trace_mode", 1) modparam("siptrace", "duplicate_uri", "sip:10.1.1.1:5888") when listening on sip:10.1.1.1:5888 all the duplicated sip packets arrive except option pings from nathelper and tls encrypted traffic (which should then be already decrypted by kamailio) ### Possible Solutions  seems that core triggers are not evaluated when using tls or nathelper option pings ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 ``` * **Operating System**:  ``` Linux AT1LKAM04 4.9.0-8-amd64 #1 SMP Debian 4.9.110-3+deb9u6 (2018-10-08) x86_64 GNU/Linux ``` -- 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/issues/1722

3 8

[kamailio/kamailio] evapi: if there is no evapi clients are connected to kamailio, evapi trying to send data. (#1700)
by Surendra Tiwari 11 Jan '22

11 Jan '22

### Description right now, evapi module trying to send data even if no clients are connected .in the case new transaction is created and even suspended also. kamailio should not create the transaction if no evapi client is connected to kamailio.  ### 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) ``` -- 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/issues/1700

2 3

[kamailio/kamailio] Feature request: Increase number of "custom fields" in sipcapture-module (#1278)
by mihovilkolaric 11 Jan '22

11 Jan '22

The module sipcapture provides the modparams "custom_field1_header" to "custom_field3_header", to store the content of up to three arbitrary header fields as separate columns in the database. They can be used as all other "standard" columns in homer. However I found out that searching/filtering for even more (standardized, as well as private) header fields would be very helpful (I identified about ten interesting additional headers, but the number is constantly increasing ;-) ). Could you thus please increase the number of custom fields? (I suppose the most flexible solution could be something as the db_extra in the acc-module, which is not fixed to certain columns (regarding number of columns, as well as their names) (see https://www.kamailio.org/docs/modules/5.0.x/modules/acc.html#acc.p.db_extra ).) -- 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/issues/1278

2 2

[kamailio/kamailio] Diameter AVP handling from kamailio.cfg (#922)
by miricz 11 Jan '22

11 Jan '22

Below feature were discussed with Carsten Bock Currently Diameter AVP values and especially Experimental Result Code is not available from the kamailio.cfg Therefore I would like to request such kind of feature. I would like to use it mainly on Cx interface for Server-Assignment-Answer (SAA), Location-Info-Answer (LIA), Multimedia-Auth-Answer (MAA), Push-Profile-Answer (PPA) It should be implemented such a way like in the ims_charging module. Thank you very much in advance! _Cheers, Zoltan_ -- 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/issues/922

2 2

[kamailio] add socket activation support (#293)
by zabbal 11 Jan '22

11 Jan '22

Having (optional) support for socket activation in Kamailio would bring several benefits: * Security: systemd can listen on privileged ports or socket paths and start Kamailio with privileges already dropped. * Major upgrades or reconfigurations of Kamailio requiring a full restart are possible without having the listening socket(s) ever go away. * Any service dependent on Kamailio doesn't have to wait for it to finish starting (or start at all). --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/293

3 4

[kamailio/kamailio] pv needed to get access to X509v3 Subject Alternative Names of peer's SSL certificate (#707)
by juha-h 11 Jan '22

11 Jan '22

A sip proxy may serve many domains listed in its SSL certificate X509v3 Subject Alternative Name field. In order to find out if a peer sip proxy is serving a particular domain, access would be needed in config file to this list of domains. --- 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/issues/707

4 4

[kamailio/kamailio] dispatcher: Fix handling of inactive destination for alg 13 (PR #2964)
by mtryfoss 11 Jan '22

11 Jan '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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Alg 13 did try to distribute calls to inactive destinations. If the highest priority destination is inactive, hash is not updated and the xavp is not set. This is resulting in failover mechanism not working at all for the given call. When the hash variable is not updated, it makes alg 13 behave like round robin if the scenario above occurs. If you got two destinations and the highest priority is out of service, 50% of the calls will fail. Now I tried a more simple approach updating hash with the first entry of the sorted list. Also fixed a typo in a variable name. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2964 -- Commit Summary -- * dispatcher: Fix handling of inactive destination for alg 13 -- File Changes -- M src/modules/dispatcher/dispatch.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2964.patch https://github.com/kamailio/kamailio/pull/2964.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/2964

2 6

git:master:adba3caa: dispatcher: Fix handling of inactive destination for alg 13
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: adba3caa2d12d1f8b89d720fbb9a6a9cdc8b2573 URL: https://github.com/kamailio/kamailio/commit/adba3caa2d12d1f8b89d720fbb9a6a9… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T12:46:33+01:00 dispatcher: Fix handling of inactive destination for alg 13 Alg 13 did try to distribute calls to inactive destinations. If the highest priority destination is inactive, hash is not updated and the xavp is not set. This is resulting in failover mechanism not working at all for the given call. When the hash variable is not updated, it makes alg 13 behave like round robin if the scenario above occurs. If you got two destinations and the highest priority is out of service, 50% of the calls will fail. Now I tried a more simple approach updating hash with the first entry of the sorted list. --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/adba3caa2d12d1f8b89d720fbb9a6a9… Patch: https://github.com/kamailio/kamailio/commit/adba3caa2d12d1f8b89d720fbb9a6a9… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 26836433f1..fad6334fa4 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2201,7 +2201,7 @@ int ds_manage_route_algo13(ds_set_t *idx, ds_select_state_t *rstate) { } for(y=0; y<idx->nr ;y++) { - int latency_proirity_handicap = 0; + int latency_priority_handicap = 0; ds_dest_t * ds_dest = &idx->dlist[z]; int gw_priority = ds_dest->priority; int gw_latency = ds_dest->latency_stats.estimate; @@ -2211,19 +2211,15 @@ int ds_manage_route_algo13(ds_set_t *idx, ds_select_state_t *rstate) { gw_latency = ds_dest->latency_stats.estimate - ds_dest->latency_stats.average; if(!gw_inactive) { if(gw_latency > gw_priority && gw_priority > 0) - latency_proirity_handicap = gw_latency / gw_priority; - ds_dest->attrs.rpriority = gw_priority - latency_proirity_handicap; + latency_priority_handicap = gw_latency / gw_priority; + ds_dest->attrs.rpriority = gw_priority - latency_priority_handicap; if(ds_dest->attrs.rpriority < 1 && gw_priority > 0) ds_dest->attrs.rpriority = 1; - if(ds_dest->attrs.rpriority > active_priority) { - hash = z; - active_priority = ds_dest->attrs.rpriority; - } ds_sorted[y].idx = z; ds_sorted[y].priority = ds_dest->attrs.rpriority; LM_DBG("[active]idx[%d]uri[%.*s]priority[%d-%d=%d]latency[%dms]flag[%d]\n", z, ds_dest->uri.len, ds_dest->uri.s, - gw_priority, latency_proirity_handicap, + gw_priority, latency_priority_handicap, ds_dest->attrs.rpriority, gw_latency, ds_dest->flags); } else { ds_sorted[y].idx = -1; @@ -2237,10 +2233,15 @@ int ds_manage_route_algo13(ds_set_t *idx, ds_select_state_t *rstate) { else z = (z + 1) % idx->nr; } - idx->last = (hash + 1) % idx->nr; - LM_DBG("priority[%d]gateway_selected[%d]next_index[%d]\n", active_priority, hash, idx->last); ds_sorted_by_priority(ds_sorted, idx->nr); + // the list order might have changed after sorting - update hash + if(idx->nr > 0) { + hash = ds_sorted[0].idx; + active_priority = ds_sorted[0].priority; + } ds_manage_routes_fill_reodered_xavp(ds_sorted, idx, rstate); + idx->last = (hash + 1) % idx->nr; + LM_DBG("priority[%d]gateway_selected[%d]next_index[%d]\n", active_priority, hash, idx->last); pkg_free(ds_sorted); return hash; }

1 0

git:master:1c43e8b4: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 1c43e8b4ed63d29ef912211e368faaea6a62dcd8 URL: https://github.com/kamailio/kamailio/commit/1c43e8b4ed63d29ef912211e368faae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-11T12:46:26+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/1c43e8b4ed63d29ef912211e368faae… Patch: https://github.com/kamailio/kamailio/commit/1c43e8b4ed63d29ef912211e368faae… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 8b85f1f05e..533a41caab 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1985,10 +1985,13 @@ kamcmd dlg.list_ctx * mkey - matching key. It can be: 'ruri' - match against R-URI of the dialog; 'furi' - match against From header URI of the dialog; 'turi' - match against the To header URI of the dialog; 'callid' - - match against Call-Id value. + match against Call-Id value; 'start_ts' - match against start + timestamp. * mop - matching operator. It can be: 'eq' - match using string comparison; 're' - match using regular expression; 'sw' - match - using starts-with (prefix) comparison. + using starts-with (prefix) comparison; 'gt' - match using integer + greater comparison; 'lt' - match using integer lesser comparison. + Integer comparison can be used only with 'start_ts' key. * mval - matching value. RPC Command Format: @@ -1997,6 +2000,8 @@ kamcmd dlg.list_match furi eq sip:alice@test.com 2 ... kamcmd dlg.list_match furi sw sip:alice@ ... +kamcmd dlg.list_match start_ts gt s:1641550904 +... 9.4. dlg.list_match_ctx

1 0

[kamailio/kamailio] add filtering based on start timestamp to dlg.list_match (PR #2997)
by Riccardo-78 11 Jan '22

11 Jan '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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2997 -- Commit Summary -- * dialog: add filter based on start timestamp to dlg.list_match * dialog: update documentation -- File Changes -- M src/modules/dialog/dialog.c (49) M src/modules/dialog/doc/dialog_admin.xml (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2997.patch https://github.com/kamailio/kamailio/pull/2997.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2997 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2997(a)github.com>

2 5

git:master:97293a53: dialog: update documentation
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 97293a53060b2b2329018ca7bbeb02a26b0a4afe URL: https://github.com/kamailio/kamailio/commit/97293a53060b2b2329018ca7bbeb02a… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T12:45:40+01:00 dialog: update documentation --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97293a53060b2b2329018ca7bbeb02a… Patch: https://github.com/kamailio/kamailio/commit/97293a53060b2b2329018ca7bbeb02a… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index d456d545ef..290e68d4d6 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2500,12 +2500,16 @@ dlg_reset_property("timeout-noreset"); <emphasis>mkey</emphasis> - matching key. It can be: 'ruri' - match against R-URI of the dialog; 'furi' - match against From header URI of the dialog; 'turi' - match against the To header - URI of the dialog; 'callid' - match against Call-Id value. + URI of the dialog; 'callid' - match against Call-Id value; + 'start_ts' - match against start timestamp. </para></listitem> <listitem><para> <emphasis>mop</emphasis> - matching operator. It can be: 'eq' - match using string comparison; 're' - match using regular - expression; 'sw' - match using starts-with (prefix) comparison. + expression; 'sw' - match using starts-with (prefix) comparison; + 'gt' - match using integer greater comparison; 'lt' - match + using integer lesser comparison. Integer comparison can be used + only with 'start_ts' key. </para></listitem> <listitem><para> <emphasis>mval</emphasis> - matching value. @@ -2517,6 +2521,8 @@ dlg_reset_property("timeout-noreset"); &kamcmd; dlg.list_match furi eq sip:alice@test.com 2 ... &kamcmd; dlg.list_match furi sw sip:alice@ +... +&kamcmd; dlg.list_match start_ts gt s:1641550904 ... </programlisting> </section>

1 0

git:master:b177f05e: dialog: add filter based on start timestamp to dlg.list_match
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: b177f05ee8b3a6bf553160ececdb3508a99a65b0 URL: https://github.com/kamailio/kamailio/commit/b177f05ee8b3a6bf553160ececdb350… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T12:45:40+01:00 dialog: add filter based on start timestamp to dlg.list_match --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/b177f05ee8b3a6bf553160ececdb350… Patch: https://github.com/kamailio/kamailio/commit/b177f05ee8b3a6bf553160ececdb350… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index da3ce7cbfd..a25224318c 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2932,6 +2932,8 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) str mop = {NULL, 0}; str mval = {NULL, 0}; str sval = {NULL, 0}; + unsigned int ival = 0; + unsigned int mival = 0; int n = 0; int m = 0; int vkey = 0; @@ -2960,6 +2962,8 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) vkey = 2; } else if(mkey.len==6 && strncmp(mkey.s, "callid", mkey.len)==0) { vkey = 3; + } else if(mkey.len==8 && strncmp(mkey.s, "start_ts", mkey.len)==0) { + vkey = 4; } else { LM_ERR("invalid key %.*s\n", mkey.len, mkey.s); rpc->fault(c, 500, "Invalid matching key parameter"); @@ -2983,6 +2987,10 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) } } else if(strncmp(mop.s, "sw", 2)==0) { vop = 2; + } else if(strncmp(mop.s, "gt", 2)==0) { + vop = 3; + } else if(strncmp(mop.s, "lt", 2)==0) { + vop = 4; } else { LM_ERR("invalid matching operator %.*s\n", mop.len, mop.s); rpc->fault(c, 500, "Invalid matching operator parameter"); @@ -2992,6 +3000,18 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) n = 0; } + if (vkey == 4 && vop <= 2) { + LM_ERR("Matching operator %.*s not supported with start_ts key\n", mop.len, mop.s); + rpc->fault(c, 500, "Matching operator not supported with start_ts key"); + return; + } + + if (vkey != 4 && vop >= 3) { + LM_ERR("Matching operator %.*s not supported with key %.*s\n", mop.len, mop.s, mkey.len, mkey.s); + rpc->fault(c, 500, "Matching operator not supported"); + return; + } + for(i=0; i<d_table->size; i++) { dlg_lock(d_table, &(d_table->entries[i])); for(dlg=d_table->entries[i].first; dlg!=NULL; dlg=dlg->next) { @@ -3009,6 +3029,9 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) case 3: sval = dlg->callid; break; + case 4: + ival = dlg->start_ts; + break; } switch(vop) { case 0: @@ -3031,6 +3054,17 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) matched = 1; } break; + case 3: + /* greater than */ + if (str2int(&mval, &mival) == 0 && ival > mival) { + matched = 1; + } + break; + case 4: + if (str2int(&mval, &mival) == 0 && ival < mival) { + matched = 1; + } + break; } if (matched==1) { m++;

1 0

[kamailio/kamailio] cannot use ring_insert_callid when defined log_prefix (Issue #2989)
by sergey-safarov 11 Jan '22

11 Jan '22

### Description I want to convert 183 messages to 180 using the `ring_insert_callid` function. This does not work when used `log_prefix`. Generated error like > siputils [ring.c:300]: conv183(): 183 message got parsed too far! #### Reproduction you can start kamailio using config file like ``` log_prefix="{$mt $hdr(CSeq) $ci} " listen=udp:eth0:5060 loadmodule "xlog.so" loadmodule "pv.so" loadmodule "sl.so" loadmodule "siputils.so" modparam("siputils", "ring_timeout", 30) request_route { xlog("L_ERR", "Test1: $rc\n"); if (is_request()) { ring_insert_callid(); } $du = "sip:192.168.0.1;tranport=udp"; forward(); } ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2989 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2989(a)github.com>

4 13

git:5.5:2ab37358: pkg/kamailio/deb: add --atexit=no
by Victor Seva 11 Jan '22

11 Jan '22

Module: kamailio Branch: 5.5 Commit: 2ab373588c1052da3b92739f7ac92e23ed4f0561 URL: https://github.com/kamailio/kamailio/commit/2ab373588c1052da3b92739f7ac92e2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-01-11T09:38:11+01:00 pkg/kamailio/deb: add --atexit=no This helps with openssl1.1 see #2912 (cherry picked from commit b5258d9b0e88de4b9a7c58997b651e790e2cc87e) --- Modified: pkg/kamailio/deb/bionic/kamailio.init Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/bullseye/kamailio.init Modified: pkg/kamailio/deb/bullseye/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.init Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.init Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/focal/kamailio.init Modified: pkg/kamailio/deb/focal/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.init Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.init Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/kamailio.init Modified: pkg/kamailio/deb/wheezy/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/2ab373588c1052da3b92739f7ac92e2… Patch: https://github.com/kamailio/kamailio/commit/2ab373588c1052da3b92739f7ac92e2…

1 0

git:master:b5258d9b: pkg/kamailio/deb: add --atexit=no
by Victor Seva 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: b5258d9b0e88de4b9a7c58997b651e790e2cc87e URL: https://github.com/kamailio/kamailio/commit/b5258d9b0e88de4b9a7c58997b651e7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-01-11T09:35:08+01:00 pkg/kamailio/deb: add --atexit=no This helps with openssl1.1 see #2912 --- Modified: pkg/kamailio/deb/bionic/kamailio.init Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/bookworm/kamailio.init Modified: pkg/kamailio/deb/bookworm/kamailio.service Modified: pkg/kamailio/deb/bullseye/kamailio.init Modified: pkg/kamailio/deb/bullseye/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.init Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.init Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/focal/kamailio.init Modified: pkg/kamailio/deb/focal/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.init Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.init Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/kamailio.init Modified: pkg/kamailio/deb/wheezy/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/b5258d9b0e88de4b9a7c58997b651e7… Patch: https://github.com/kamailio/kamailio/commit/b5258d9b0e88de4b9a7c58997b651e7…

1 0

git:master:9f679c6e: pkg/kamailio/deb: version set 5.6.0~dev3
by Victor Seva 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 9f679c6e1c036a8bda42807fea6a42b8d1d2230c URL: https://github.com/kamailio/kamailio/commit/9f679c6e1c036a8bda42807fea6a42b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-01-11T09:29:51+01:00 pkg/kamailio/deb: version set 5.6.0~dev3 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/9f679c6e1c036a8bda42807fea6a42b… Patch: https://github.com/kamailio/kamailio/commit/9f679c6e1c036a8bda42807fea6a42b…

1 0

git:master:b7815d04: avpops: init variable to fix warning
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: b7815d04ced35d5b5ccbcdaa39d41ef4a2cb2ad0 URL: https://github.com/kamailio/kamailio/commit/b7815d04ced35d5b5ccbcdaa39d41ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T08:41:35+01:00 avpops: init variable to fix warning --- Modified: src/modules/avpops/avpops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/b7815d04ced35d5b5ccbcdaa39d41ef… Patch: https://github.com/kamailio/kamailio/commit/b7815d04ced35d5b5ccbcdaa39d41ef… --- diff --git a/src/modules/avpops/avpops_impl.c b/src/modules/avpops/avpops_impl.c index 8a6e4c2b2d..28f270fe17 100644 --- a/src/modules/avpops/avpops_impl.c +++ b/src/modules/avpops/avpops_impl.c @@ -505,7 +505,7 @@ int ops_dbstore_avps (struct sip_msg* msg, struct fis_param *sp, avp_list_t avp_list; struct usr_avp *avp; unsigned short name_type; - int_str avp_name; + int_str avp_name = {0}; int_str i_s; str uuid; int keys_nr;

1 0

git:master:102b7c62: db_text: init variable to fix warning
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 102b7c62ae9877151ce542b8b5747051fb954acb URL: https://github.com/kamailio/kamailio/commit/102b7c62ae9877151ce542b8b574705… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T09:02:11+01:00 db_text: init variable to fix warning --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/102b7c62ae9877151ce542b8b574705… Patch: https://github.com/kamailio/kamailio/commit/102b7c62ae9877151ce542b8b574705… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index 8b88ed8074..6480210ebc 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -87,7 +87,7 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) char path[512]; char *buf; int c, crow, ccol, bp, sign, max_auto; - dbt_val_t dtval; + dbt_val_t dtval = {0}; dbt_table_p dtp = NULL; dbt_column_p colp, colp0 = NULL; dbt_row_p rowp, rowp0 = NULL;

1 0

git:master:682f9984: dialog: init variable to fix warning
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 682f9984fc4942d5f786f0ca9d798630d618f8da URL: https://github.com/kamailio/kamailio/commit/682f9984fc4942d5f786f0ca9d79863… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T09:02:35+01:00 dialog: init variable to fix warning --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/682f9984fc4942d5f786f0ca9d79863… Patch: https://github.com/kamailio/kamailio/commit/682f9984fc4942d5f786f0ca9d79863… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 38dc105fb8..36d43f90f3 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -106,7 +106,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no srjson_t *it = NULL; dlg_dmq_action_t action = DLG_DMQ_NONE; - dlg_iuid_t iuid; + dlg_iuid_t iuid = {0}; str profiles = {0, 0}, callid = {0, 0}, tag1 = {0,0}, tag2 = {0,0}, contact1 = {0,0}, contact2 = {0,0}, k={0,0}, v={0,0}; str cseq1 = {0,0}, cseq2 = {0,0}, route_set1 = {0,0}, route_set2 = {0,0},

1 0

git:master:5443db4d: dispatcher: safety checks for str fields
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 5443db4d632c8502dc622cc28fe2847fb0c147c1 URL: https://github.com/kamailio/kamailio/commit/5443db4d632c8502dc622cc28fe2847… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T08:20:30+01:00 dispatcher: safety checks for str fields --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/5443db4d632c8502dc622cc28fe2847… Patch: https://github.com/kamailio/kamailio/commit/5443db4d632c8502dc622cc28fe2847… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 661b4a9533..26836433f1 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1192,7 +1192,7 @@ unsigned int ds_get_hash(str *x, str *y) if(!x && !y) return 0; h = 0; - if(x) { + if(x && x->s) { p = x->s; if(x->len >= 4) { for(; p <= (x->s + x->len - 4); p += 4) { @@ -1207,7 +1207,7 @@ unsigned int ds_get_hash(str *x, str *y) } h += v ^ (v >> 3); } - if(y) { + if(y && y->s) { p = y->s; if(y->len >= 4) { for(; p <= (y->s + y->len - 4); p += 4) {

1 0

git:master:55f23d09: rls: free xml doc in case of error
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 55f23d09faee06a892dde13e371d144b98bae68f URL: https://github.com/kamailio/kamailio/commit/55f23d09faee06a892dde13e371d144… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T08:30:46+01:00 rls: free xml doc in case of error --- Modified: src/modules/rls/resource_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/55f23d09faee06a892dde13e371d144… Patch: https://github.com/kamailio/kamailio/commit/55f23d09faee06a892dde13e371d144… --- diff --git a/src/modules/rls/resource_notify.c b/src/modules/rls/resource_notify.c index d42c29666b..0f31e7c877 100644 --- a/src/modules/rls/resource_notify.c +++ b/src/modules/rls/resource_notify.c @@ -183,6 +183,7 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, subs_t* dialog= NULL; int len_est = 0; int resource_added = 0; /* Flag to indicate that we have added at least one resource */ + int ok = 0; /* generate the boundary string */ boundary_string= generate_string(BOUNDARY_STRING_LEN); @@ -430,6 +431,7 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, } done: + ok = 1; if (dbmode == RLS_DB_ONLY && rls_dbf.end_transaction) { if (rls_dbf.end_transaction(rls_db) < 0) @@ -454,6 +456,11 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, LM_ERR("in abort_transaction\n"); } + if(ok==0) { + if(rlmi_doc!=NULL) { + xmlFreeDoc(rlmi_doc); + } + } return; }

1 0

git:master:33c40170: presence: utils - use memcpy instead of strncpy for coherence
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 33c40170e73adc71e2ad66d8dbb6c776b771ce5d URL: https://github.com/kamailio/kamailio/commit/33c40170e73adc71e2ad66d8dbb6c77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T08:19:06+01:00 presence: utils - use memcpy instead of strncpy for coherence --- Modified: src/modules/presence/utils_func.h --- Diff: https://github.com/kamailio/kamailio/commit/33c40170e73adc71e2ad66d8dbb6c77… Patch: https://github.com/kamailio/kamailio/commit/33c40170e73adc71e2ad66d8dbb6c77… --- diff --git a/src/modules/presence/utils_func.h b/src/modules/presence/utils_func.h index 27fcc07d0a..5c5d58b22a 100644 --- a/src/modules/presence/utils_func.h +++ b/src/modules/presence/utils_func.h @@ -137,7 +137,7 @@ static inline int ps_fill_local_contact(struct sip_msg *msg, str *contact) contact->len += 1; p += 1; } - strncpy(p, ip.s, ip.len); + memcpy(p, ip.s, ip.len); contact->len += ip.len; p += ip.len; if(msg->rcv.bind_address->address.af == AF_INET6) { @@ -145,7 +145,7 @@ static inline int ps_fill_local_contact(struct sip_msg *msg, str *contact) contact->len += 1; p += 1; } - if(contact->len > LCONTACT_BUF_SIZE - 21) { + if(contact->len > LCONTACT_BUF_SIZE - 22) { LM_ERR("buffer overflow\n"); goto error; } @@ -156,8 +156,9 @@ static inline int ps_fill_local_contact(struct sip_msg *msg, str *contact) } contact->len += len; p += len; - strncpy(p, proto, plen); + memcpy(p, proto, plen); contact->len += plen; + contact->s[contact->len] = '\0'; return 0; error:

1 0

git:master:0247c336: lcr: init buffers to try to get rid of new warnings
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 0247c336e208912324c71aea9843e688d7c5a463 URL: https://github.com/kamailio/kamailio/commit/0247c336e208912324c71aea9843e68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T08:19:42+01:00 lcr: init buffers to try to get rid of new warnings --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0247c336e208912324c71aea9843e68… Patch: https://github.com/kamailio/kamailio/commit/0247c336e208912324c71aea9843e68… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 630593bd36..9647dde044 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2900,6 +2900,8 @@ static int ki_next_gw(sip_msg_t *_m) struct ip_addr addr; tag_str.s = &(tag[0]); + r_uri[0] = '\0'; + dst_uri[0] = '\0'; ru_avp = search_first_avp( ruri_user_avp_type, ruri_user_avp, &ruri_user_val, 0);

1 0

git:master:819ca1d7: ims_usrloc_scscf: removed unrelated comment with is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 819ca1d7afe558d944fa88b2d453bf7ae7fcc819 URL: https://github.com/kamailio/kamailio/commit/819ca1d7afe558d944fa88b2d453bf7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 ims_usrloc_scscf: removed unrelated comment with is_main - was not even used --- Modified: src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/819ca1d7afe558d944fa88b2d453bf7… Patch: https://github.com/kamailio/kamailio/commit/819ca1d7afe558d944fa88b2d453bf7… --- diff --git a/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c index 0b01fdc437..bb5c394704 100644 --- a/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c +++ b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c @@ -47,7 +47,7 @@ #include "../../core/dprint.h" #include "../../core/rpc_lookup.h" #include "../../core/timer.h" /* register_timer */ -#include "../../core/globals.h" /* is_main */ +#include "../../core/globals.h" #include "../../core/ut.h" /* str_init */ #include "dlist.h" /* register_udomain */ #include "udomain.h" /* {insert,delete,get,release}_urecord */

1 0

git:master:5978ec11: ims_usrloc_pcscf: removed unrelated comment with is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 5978ec116c3efacacf260e9f579d93c9e9bfb780 URL: https://github.com/kamailio/kamailio/commit/5978ec116c3efacacf260e9f579d93c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 ims_usrloc_pcscf: removed unrelated comment with is_main - was not even used --- Modified: src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5978ec116c3efacacf260e9f579d93c… Patch: https://github.com/kamailio/kamailio/commit/5978ec116c3efacacf260e9f579d93c… --- diff --git a/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c index 9765526015..fe9a1f5f02 100644 --- a/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c +++ b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c @@ -47,7 +47,7 @@ #include "../../core/dprint.h" #include "../../core/rpc_lookup.h" #include "../../core/timer.h" /* register_timer */ -#include "../../core/globals.h" /* is_main */ +#include "../../core/globals.h" #include "../../core/ut.h" /* str_init */ #include "dlist.h" /* register_udomain */ #include "udomain.h" /* {insert,delete,get,release}_urecord */

1 0

git:master:9d280b58: p_usrloc: removed unrelated comment with is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 9d280b589a035fa04cd4c7235671d1fdb6ae44e9 URL: https://github.com/kamailio/kamailio/commit/9d280b589a035fa04cd4c7235671d1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 p_usrloc: removed unrelated comment with is_main - was not even used --- Modified: src/modules/p_usrloc/p_usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9d280b589a035fa04cd4c7235671d1f… Patch: https://github.com/kamailio/kamailio/commit/9d280b589a035fa04cd4c7235671d1f… --- diff --git a/src/modules/p_usrloc/p_usrloc_mod.c b/src/modules/p_usrloc/p_usrloc_mod.c index 8804e5cd86..e6fd33d9b9 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.c +++ b/src/modules/p_usrloc/p_usrloc_mod.c @@ -45,7 +45,7 @@ #include "../../core/dprint.h" #include "../../core/rpc_lookup.h" #include "../../core/timer_proc.h" -#include "../../core/globals.h" /* is_main */ +#include "../../core/globals.h" #include "../../core/ut.h" /* str_init */ #include "udomain.h" /* {insert,delete,get,release}_urecord */ #include "urecord.h" /* {insert,delete,get}_ucontact */

1 0

git:master:3a00526b: usrloc: removed unrelated comment with is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 3a00526bbe535d46d234108cb71fd80376f0718d URL: https://github.com/kamailio/kamailio/commit/3a00526bbe535d46d234108cb71fd80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 usrloc: removed unrelated comment with is_main - was not even used --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3a00526bbe535d46d234108cb71fd80… Patch: https://github.com/kamailio/kamailio/commit/3a00526bbe535d46d234108cb71fd80… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 5668586733..d60162ed3e 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -46,7 +46,7 @@ #include "../../core/rpc_lookup.h" #include "../../core/timer.h" /* register_timer */ #include "../../core/timer_proc.h" /* register_sync_timer */ -#include "../../core/globals.h" /* is_main */ +#include "../../core/globals.h" #include "../../core/ut.h" /* str_init */ #include "../../core/utils/sruid.h" #include "dlist.h" /* register_udomain */

1 0

git:master:52cad0a3: db_text: rename is_main to _ksr_is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 52cad0a39b224add8ff7eb6dd253f00122e93704 URL: https://github.com/kamailio/kamailio/commit/52cad0a39b224add8ff7eb6dd253f00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 db_text: rename is_main to _ksr_is_main --- Modified: src/modules/db_text/dbt_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/52cad0a39b224add8ff7eb6dd253f00… Patch: https://github.com/kamailio/kamailio/commit/52cad0a39b224add8ff7eb6dd253f00… --- diff --git a/src/modules/db_text/dbt_lib.c b/src/modules/db_text/dbt_lib.c index 0735c04c2e..7c6bb9f2c0 100644 --- a/src/modules/db_text/dbt_lib.c +++ b/src/modules/db_text/dbt_lib.c @@ -40,7 +40,7 @@ static gen_lock_t *_dbt_cachesem = NULL; static dbt_tbl_cachel_p _dbt_cachetbl = NULL; -extern int is_main; +extern int _ksr_is_main; #define DBT_CACHETBL_SIZE 16 @@ -267,7 +267,7 @@ dbt_table_p dbt_db_get_table(dbt_cache_p _dc, const str *_s) hash = core_hash(&_dc->name, _s, DBT_CACHETBL_SIZE); hashidx = hash % DBT_CACHETBL_SIZE; - if(!is_main) + if(!_ksr_is_main) lock_get(&_dbt_cachetbl[hashidx].sem); _tbc = _dbt_cachetbl[hashidx].dtp; @@ -429,8 +429,8 @@ int dbt_cache_print2(int _f, int _lock) int dbt_cache_print(int _f) { - return dbt_cache_print2(_f, !is_main); -} + return dbt_cache_print2(_f, !_ksr_is_main); +} int dbt_is_neq_type(db_type_t _t0, db_type_t _t1) {

1 0

git:master:461ec0a7: http_async_module: check return for event_base_dispatch()
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 461ec0a79ae365729c11efcbd96fc158c50a2891 URL: https://github.com/kamailio/kamailio/commit/461ec0a79ae365729c11efcbd96fc15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 http_async_module: check return for event_base_dispatch() - exit if it fails - part of GH #2999 --- Modified: src/modules/http_async_client/async_http.c Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/461ec0a79ae365729c11efcbd96fc15… Patch: https://github.com/kamailio/kamailio/commit/461ec0a79ae365729c11efcbd96fc15… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index a1b7215fc9..bb5ff69db9 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -48,6 +48,7 @@ #include "../../core/receive.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#include "../../core/daemonize.h" #include "../../modules/tm/tm_load.h" #include "async_http.h" @@ -89,8 +90,12 @@ int async_http_init_worker(int prank, async_http_worker_t* worker) void async_http_run_worker(async_http_worker_t* worker) { + int ret; init_http_multi(worker->evbase, worker->g); - event_base_dispatch(worker->evbase); + ret = event_base_dispatch(worker->evbase); + LM_ERR("event base dispatch failed - ret: %d (errno: %d - %s)\n", ret, errno, + strerror(errno)); + ksr_exit(-1); } int async_http_init_sockets(async_http_worker_t *worker) diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 8be4747c1d..5829f22b70 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -325,7 +325,7 @@ static int child_init(int rank) int pid; int i; - LM_DBG("child initializing async http\n"); + LM_DBG("child initializing async http (rank: %d)\n", rank); if(num_workers<=0) return 0; @@ -336,7 +336,7 @@ static int child_init(int rank) if (rank==PROC_INIT) { for(i=0; i<num_workers; i++) { - LM_DBG("initializing worker notification socket: %d\n", i); + LM_DBG("initializing worker notification socket: %d (rank: %d)\n", i, rank); if(async_http_init_sockets(&workers[i])<0) { LM_ERR("failed to initialize tasks sockets\n"); return -1;

1 0

git:master:e7c14adc: ctl: rename is_main to _ksr_is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: e7c14adc0b171fae9ad7c0fed4fb3c785dd282ca URL: https://github.com/kamailio/kamailio/commit/e7c14adc0b171fae9ad7c0fed4fb3c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 ctl: rename is_main to _ksr_is_main --- Modified: src/modules/ctl/ctl.c --- Diff: https://github.com/kamailio/kamailio/commit/e7c14adc0b171fae9ad7c0fed4fb3c7… Patch: https://github.com/kamailio/kamailio/commit/e7c14adc0b171fae9ad7c0fed4fb3c7… --- diff --git a/src/modules/ctl/ctl.c b/src/modules/ctl/ctl.c index a51a7b41ff..65cb10589e 100644 --- a/src/modules/ctl/ctl.c +++ b/src/modules/ctl/ctl.c @@ -332,7 +332,7 @@ static int mod_child(int rank) goto error; } if (pid == 0){ /* child */ - is_main=0; + _ksr_is_main=0; DBG("ctl: %d io_listen_loop(%d, %p)\n", rank, fd_no, ctrl_sock_lst); io_listen_loop(fd_no, ctrl_sock_lst);

1 0

git:master:f3454dd9: core: renamed global is_main to _ksr_is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: f3454dd9f2d065e7757e9d9680b815481d08269c URL: https://github.com/kamailio/kamailio/commit/f3454dd9f2d065e7757e9d9680b8154… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:37:59+01:00 core: renamed global is_main to _ksr_is_main - safer to avoid conflicts with other libs --- Modified: src/core/globals.h Modified: src/core/pt.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/f3454dd9f2d065e7757e9d9680b8154… Patch: https://github.com/kamailio/kamailio/commit/f3454dd9f2d065e7757e9d9680b8154… --- diff --git a/src/core/globals.h b/src/core/globals.h index f3777d37a8..3a10439142 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -159,7 +159,7 @@ extern char *avp_db_url; /* db url used by user preferences (AVPs) */ extern int reply_to_via; -extern int is_main; +extern int _ksr_is_main; extern int fixup_complete; /* debugging level for dumping memory status */ diff --git a/src/core/pt.c b/src/core/pt.c index a3094a29fb..e3dc94d5a3 100644 --- a/src/core/pt.c +++ b/src/core/pt.c @@ -262,7 +262,7 @@ int fork_process(int child_id, char *desc, int make_sock) #ifdef USE_TCP sockfd[0]=sockfd[1]=-1; if(make_sock && !tcp_disable){ - if (!is_main){ + if (!_ksr_is_main){ LM_CRIT("called from a non " "\"main\" process! If forking from a module's " "child_init() fork only if rank==PROC_MAIN or" @@ -297,7 +297,7 @@ int fork_process(int child_id, char *desc, int make_sock) goto error; }else if (pid==0){ /* child */ - is_main=0; /* a forked process cannot be the "main" one */ + _ksr_is_main=0; /* a forked process cannot be the "main" one */ process_no=child_process_no; daemon_status_on_fork_cleanup(); /* close tcp unix sockets if this is not tcp main */ @@ -401,8 +401,8 @@ int fork_tcp_process(int child_id, char *desc, int r, int *reader_fd_1) reader_fd[0]=reader_fd[1]=-1; ret=-1; - if (!is_main){ - LM_CRIT("called from a non \"main\" process\n"); + if (!_ksr_is_main){ + LM_CRIT("called from a non \"main\" process (%d)\n", _ksr_is_main); goto error; } if (tcp_main_pid){ @@ -441,7 +441,7 @@ int fork_tcp_process(int child_id, char *desc, int r, int *reader_fd_1) goto end; } if (pid==0){ - is_main=0; /* a forked process cannot be the "main" one */ + _ksr_is_main=0; /* a forked process cannot be the "main" one */ process_no=child_process_no; /* close unneeded unix sockets */ close_extra_socks(child_id, process_no); diff --git a/src/main.c b/src/main.c index 60435e865e..016a90cabe 100644 --- a/src/main.c +++ b/src/main.c @@ -508,7 +508,7 @@ extern FILE* yyin; extern int yyparse(void); -int is_main=1; /* flag = is this the "main" process? */ +int _ksr_is_main=1; /* flag = is this the "main" process? */ int fixup_complete=0; /* flag = is the fixup complete ? */ char* pid_file = 0; /* filename as asked by use */ @@ -649,7 +649,7 @@ static void kill_all_children(int signum) * (only main can add processes, so from main is safe not to lock * and moreover it avoids the lock-holding suicidal children problem) */ - if (!is_main) lock_get(process_lock); + if (!_ksr_is_main) lock_get(process_lock); for (r=1; r<*process_count; r++){ if (r==process_no) continue; /* try not to be suicidal */ if (pt[r].pid) { @@ -658,7 +658,7 @@ static void kill_all_children(int signum) else LM_CRIT("killing: %s > %d no pid!!!\n", pt[r].desc, pt[r].pid); } - if (!is_main) lock_release(process_lock); + if (!_ksr_is_main) lock_release(process_lock); } } @@ -832,7 +832,7 @@ void sig_usr(int signo) #endif #endif - if (is_main){ + if (_ksr_is_main){ if (sig_flag==0) sig_flag=signo; else /* previous sig. not processed yet, ignoring? */ return; ; @@ -3070,7 +3070,7 @@ int main(int argc, char** argv) if (ret < 0) goto error; /*kill everything*/ - if (is_main) shutdown_children(SIGTERM, 0); + if (_ksr_is_main) shutdown_children(SIGTERM, 0); if (!dont_daemonize) { if (daemon_status_send(0) < 0) fprintf(stderr, "error sending exit status: %s [%d]\n", @@ -3081,7 +3081,7 @@ int main(int argc, char** argv) error: /*kill everything*/ - if (is_main) shutdown_children(SIGTERM, 0); + if (_ksr_is_main) shutdown_children(SIGTERM, 0); if (!dont_daemonize) { if (daemon_status_send((char)-1) < 0) fprintf(stderr, "error sending exit status: %s [%d]\n",

1 0

git:master:c73a8deb: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: c73a8deb2f3ff18bdcb98c7ed4cf9f562058265e URL: https://github.com/kamailio/kamailio/commit/c73a8deb2f3ff18bdcb98c7ed4cf9f5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-10T15:01:23+01:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/c73a8deb2f3ff18bdcb98c7ed4cf9f5… Patch: https://github.com/kamailio/kamailio/commit/c73a8deb2f3ff18bdcb98c7ed4cf9f5…

1 0

git:master:195f7ea8: siputils: remove ring 180/183 conversion functions (GH #2989)
by Henning Westerholt 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 195f7ea8a16aa4df36c722267b6456a4b82fb2bd URL: https://github.com/kamailio/kamailio/commit/195f7ea8a16aa4df36c722267b6456a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2022-01-10T13:44:51Z siputils: remove ring 180/183 conversion functions (GH #2989) - remove ring 180/183 conversion functions (GH #2989) - they are not working correctly anymore, and can easily be replaced by textops/htable or reply routes --- Modified: src/modules/siputils/doc/siputils_admin.xml Modified: src/modules/siputils/siputils.c Removed: src/modules/siputils/ring.c Removed: src/modules/siputils/ring.h --- Diff: https://github.com/kamailio/kamailio/commit/195f7ea8a16aa4df36c722267b6456a… Patch: https://github.com/kamailio/kamailio/commit/195f7ea8a16aa4df36c722267b6456a…

1 0

git:master:cd3942b1: modules: readme files regenerated - nats ... [skip ci]
by Kamailio Dev 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: cd3942b13cd09e0a1a27264a714424db3ad05895 URL: https://github.com/kamailio/kamailio/commit/cd3942b13cd09e0a1a27264a714424d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-07T14:31:10+01:00 modules: readme files regenerated - nats ... [skip ci] --- Modified: src/modules/nats/README --- Diff: https://github.com/kamailio/kamailio/commit/cd3942b13cd09e0a1a27264a714424d… Patch: https://github.com/kamailio/kamailio/commit/cd3942b13cd09e0a1a27264a714424d…

1 0

[kamailio/kamailio] NATS: add new function `nats_publish()` (PR #2978)
by Emmanuel Schmidbauer 07 Jan '22

07 Jan '22

#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 Adds Publish function to NATS module. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2978 -- Commit Summary -- * NATS: add new function `nats_publish()` -- File Changes -- M src/modules/nats/Makefile (2) A src/modules/nats/defs.h (40) M src/modules/nats/doc/nats_admin.xml (23) M src/modules/nats/nats_mod.c (44) M src/modules/nats/nats_mod.h (17) A src/modules/nats/nats_pub.c (157) A src/modules/nats/nats_pub.h (46) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2978.patch https://github.com/kamailio/kamailio/pull/2978.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2978 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2978(a)github.com>

3 9

git:master:ce21bd8a: NATS: add new function `nats_publish()`
by Emmanuel Schmidbauer 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: ce21bd8a0cd4c74227bc43bef2bdd8f4a8006171 URL: https://github.com/kamailio/kamailio/commit/ce21bd8a0cd4c74227bc43bef2bdd8f… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2021-12-30T10:37:27-05:00 NATS: add new function `nats_publish()` --- Added: src/modules/nats/defs.h Added: src/modules/nats/nats_pub.c Added: src/modules/nats/nats_pub.h Modified: src/modules/nats/doc/nats_admin.xml Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/ce21bd8a0cd4c74227bc43bef2bdd8f… Patch: https://github.com/kamailio/kamailio/commit/ce21bd8a0cd4c74227bc43bef2bdd8f…

1 0

git:master:fbdb57aa: Merge pull request #2978 from kamailio/NATS-add-nats_publish
by GitHub 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: fbdb57aab18b570880bf63590b41e8f32f13fca1 URL: https://github.com/kamailio/kamailio/commit/fbdb57aab18b570880bf63590b41e8f… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-01-07T08:16:17-05:00 Merge pull request #2978 from kamailio/NATS-add-nats_publish NATS: add new function `nats_publish()` --- Added: src/modules/nats/defs.h Added: src/modules/nats/nats_pub.c Added: src/modules/nats/nats_pub.h Modified: src/modules/nats/doc/nats_admin.xml Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/fbdb57aab18b570880bf63590b41e8f… Patch: https://github.com/kamailio/kamailio/commit/fbdb57aab18b570880bf63590b41e8f…

1 0

[kamailio/kamailio] core: Add virtual flag to listen config to ignore inactive ip addresses (PR #2985)
by rhys-hanrahan 07 Jan '22

07 Jan '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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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 - [X] Related to issue #2984 #### Description A new option to "listen" has been added called "virtual". This sets a flag on the listening socket to modify the behaviour of grep_sock_info. When this flag is set, grep_sock_info will only consider the listening IP a match if the IP is found in the system's current list of local IP addresses. If the IP is not currently local, then the matching IP is ignored. If the virtual flag is not set on the socket then existing behaviour used instead. This feature is intended for scenarios where you have two Kamailio nodes in active/active setup, with virtual IPs, where you need to be able to listen on a virtual IP but it may not always be active locally. With this flag applied to a `listen=` socket, Kamailio will only consider traffic destined to this IP local, when the IP is actually active on the system, and other times the match is ignored. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2985 -- Commit Summary -- * core: listen can now have a "virtual" flag to check for nonlocal floating IPs. * etc: kamailio.cfg - added example use of listen's new virtual flag. * core: Added virtual flag to output of core.sockets_list * corex: Added virtual flag to output of "corex.list_sockets" * ims_ipsec_pcscf: Added virtual flag to output of sockets list. -- File Changes -- M etc/kamailio.cfg (2) M src/core/cfg.lex (2) M src/core/cfg.y (83) M src/core/core_cmd.c (10) M src/core/ip_addr.h (1) M src/core/socket_info.c (85) M src/modules/corex/corex_rpc.c (5) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2985.patch https://github.com/kamailio/kamailio/pull/2985.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2985 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2985(a)github.com>

3 17

git:master:3e7d5ed3: core: Updated check_local_addresses to use getifaddrs
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 3e7d5ed34033067377ed9034e4ec49be444ca6fe URL: https://github.com/kamailio/kamailio/commit/3e7d5ed34033067377ed9034e4ec49b… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 core: Updated check_local_addresses to use getifaddrs Changed virtual socket code to use getifaddrs instead of gethostbyname as this avoids lookups against the hosts file, which causes incorrect results. --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/3e7d5ed34033067377ed9034e4ec49b… Patch: https://github.com/kamailio/kamailio/commit/3e7d5ed34033067377ed9034e4ec49b… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 8ee6cd0b32..afb1dd5603 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -575,8 +575,8 @@ struct socket_info** get_sock_info_list(unsigned short proto) */ static int check_local_addresses(struct socket_info* si) { - struct hostent* he; - struct utsname myname; + int match = 0; + struct ifaddrs *ifap, *ifa; if (si == NULL) { LM_ERR("Socket info is NULL. Returning no match.\n"); @@ -589,40 +589,41 @@ static int check_local_addresses(struct socket_info* si) return 1; } - if (uname(&myname) <0){ - LM_ERR("Cannot determine hostname. Guessing a not local virtual IP.\n"); + if (getifaddrs(&ifap) != 0) { + LM_ERR("getifaddrs failed. Assuming no match.\n"); return 0; } - - //Should return a list of local IPs - he = _resolvehost(myname.nodename); - if (he == NULL) { - LM_ERR("Cannot get list of local IPs. Guessing not a local virtual IP.\n"); - return 0; - } - char** paddrlist = he->h_addr_list; - int i = 0; - while (*paddrlist != NULL) + + for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + /* skip if no IP addr associated with the interface */ + if (ifa->ifa_addr==0) + continue; +#ifdef AF_PACKET + /* skip AF_PACKET addr family since it is of no use later on */ + if (ifa->ifa_addr->sa_family == AF_PACKET) + continue; +#endif struct ip_addr local_addr; - hostent2ip_addr(&local_addr, he, i); + sockaddr2ip_addr(&local_addr, (struct sockaddr*)ifa->ifa_addr); LM_DBG("Checking local address: %s\n", ip_addr2a(&local_addr)); if (ip_addr_cmp(&si->address, &local_addr)) { - LM_DBG("Found matching local IP for virtual socket: %s\n", ip_addr2a(&local_addr)); - return 1; + match = 1; + LM_DBG("Found matching local IP %s for virtual socket %s\n", ip_addr2a(&local_addr), si->name.s); + break; } - - i++; - paddrlist++; } - + freeifaddrs(ifap); //Default to not local if no match is found - LM_DBG("No matching local IP found.\n"); - return 0; + if (!match) { + LM_DBG("No matching local IP found for socket %s.\n", si->name.s); + return 0; + } else { + return 1; + } } - /* helper function for grep_sock_info * params: * host - hostname to compare with

1 0

git:master:04aa88c5: corex: Added virtual flag to output of "corex.list_sockets"
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 04aa88c524ba6a61e59d9be6a344dce79c3aa178 URL: https://github.com/kamailio/kamailio/commit/04aa88c524ba6a61e59d9be6a344dce… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 corex: Added virtual flag to output of "corex.list_sockets" --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/04aa88c524ba6a61e59d9be6a344dce… Patch: https://github.com/kamailio/kamailio/commit/04aa88c524ba6a61e59d9be6a344dce… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index 8677c35d22..12fd8044af 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -95,10 +95,11 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx) } } - if(rpc->struct_add(th, "sssss", + if(rpc->struct_add(th, "ssssss", "PORT", si->port_no_str.s, "MCAST", si->flags & SI_IS_MCAST ? "yes" : "no", - "MHOMED", si->flags & SI_IS_MHOMED? "yes" : "no", + "MHOMED", si->flags & SI_IS_MHOMED ? "yes" : "no", + "VIRTUAL", si->flags & SI_IS_VIRTUAL ? "yes" : "no", "SOCKNAME", si->sockname.s? si->sockname.s : "-", "ADVERTISE", si->useinfo.name.s?si->useinfo.name.s:"-")<0) {

1 0

git:master:3cf03329: ims_ipsec_pcscf: Added virtual flag to output of sockets list.
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 3cf033295f2ec78aeddf53b130ae9eab8f6d60f8 URL: https://github.com/kamailio/kamailio/commit/3cf033295f2ec78aeddf53b130ae9ea… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 ims_ipsec_pcscf: Added virtual flag to output of sockets list. --- Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3cf033295f2ec78aeddf53b130ae9ea… Patch: https://github.com/kamailio/kamailio/commit/3cf033295f2ec78aeddf53b130ae9ea… --- diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index dbcf64b924..b2a19f332e 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -140,9 +140,9 @@ static void ipsec_print_all_socket_lists() } if(si->port_no_str.s){ - sprintf(buf + cnt, "):%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, "):%s%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); }else{ - sprintf(buf + cnt, "):%u%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, "):%u%s%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); } cnt = strlen(buf); }else{ @@ -157,9 +157,9 @@ static void ipsec_print_all_socket_lists() } if(si->port_no_str.s){ - sprintf(buf + cnt, ":%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, ":%s%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); }else{ - sprintf(buf + cnt, ":%u%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, ":%u%s%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); } cnt = strlen(buf);

1 0

git:master:e93640e6: core: listen can now have a "virtual" flag to check for nonlocal floating IPs.
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: e93640e6119e61a24d8c1f6d36b60c83b3573f90 URL: https://github.com/kamailio/kamailio/commit/e93640e6119e61a24d8c1f6d36b60c8… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 core: listen can now have a "virtual" flag to check for nonlocal floating IPs. A new option to "listen" has been added called "virtual". This sets a flag on the listening socket to modify the behaviour of grep_sock_info. When this flag is set, grep_sock_info will only consider the listening IP a match if the IP is found in the system's current list of local IP addresses. If the IP is not currently local, then the matching IP is ignored. If the virtual flag is not set on the socket then existing behaviour used instead. This is useful in scenarios with an active/active cluster where Kamailio must know if a floating IP is currently local or not. --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/e93640e6119e61a24d8c1f6d36b60c8… Patch: https://github.com/kamailio/kamailio/commit/e93640e6119e61a24d8c1f6d36b60c8…

1 0

git:master:92c44f1b: core: Added virtual flag to output of core.sockets_list
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 92c44f1b3196f125b3e298499ed65df12cdd1a5a URL: https://github.com/kamailio/kamailio/commit/92c44f1b3196f125b3e298499ed65df… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 core: Added virtual flag to output of core.sockets_list --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/92c44f1b3196f125b3e298499ed65df… Patch: https://github.com/kamailio/kamailio/commit/92c44f1b3196f125b3e298499ed65df… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index ba17c06e47..8231e3b1b9 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -955,10 +955,11 @@ static void core_sockets_list(rpc_t* rpc, void* c) for (ai=si->addr_info_lst; ai; ai=ai->next) rpc->struct_add(ha, "ss", "address", ai->address_str.s); - rpc->struct_add(ha, "sss", + rpc->struct_add(ha, "ssss", "port", si->port_no_str.s, "mcast", si->flags & SI_IS_MCAST ? "yes" : "no", - "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no"); + "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no", + "virtual", si->flags & SI_IS_VIRTUAL ? "yes" : "no"); } else { printf(" %s: %s", get_proto_name(proto), @@ -969,10 +970,11 @@ static void core_sockets_list(rpc_t* rpc, void* c) if (!(si->flags & SI_IS_IP)) rpc->struct_add(ha, "s", "ipaddress", si->address_str.s); - rpc->struct_add(ha, "sss", + rpc->struct_add(ha, "ssss", "port", si->port_no_str.s, "mcast", si->flags & SI_IS_MCAST ? "yes" : "no", - "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no"); + "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no", + "virtual", si->flags & SI_IS_VIRTUAL ? "yes" : "no"); } } } while((proto=next_proto(proto)));

1 0

[kamailio/kamailio] tcpclose event_routes issue (PR #2980)
by vlitvinov 07 Jan '22

07 Jan '22

#### 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) - [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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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  We faced an issue that tcp:close (timeout and reset) event routes don't execute in rare cases. Debugging and testing show that in the case when a connection is marked as BAD or write timeout etc our event routes don't execute. I found that executing event routes is in the read function only. So in case when a connection is destroyed triggered by other reasons we don't have a notification about this. I propose to do this in main file every time when we destroy connections. But in this case, we don't have I reason to destroy (timeout reset or EOF). In our lab with these changes issue is gone. But sure this is just a concept. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2980 -- Commit Summary -- * tcpclose event_routes issue -- File Changes -- M src/core/tcp_main.c (26) M src/core/tcp_read.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2980.patch https://github.com/kamailio/kamailio/pull/2980.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2980 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2980(a)github.com>

2 6

git:master:60c5a873: tcpclose event_routes issue
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 60c5a87379b30aa3f0eef569166abac703fab50a URL: https://github.com/kamailio/kamailio/commit/60c5a87379b30aa3f0eef569166abac… Author: Viktor <victor.litvinov(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:23:41+01:00 tcpclose event_routes issue --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/60c5a87379b30aa3f0eef569166abac… Patch: https://github.com/kamailio/kamailio/commit/60c5a87379b30aa3f0eef569166abac…

1 0

git:master:635f3fb5: tcpclose event_routes issue
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 635f3fb5387713181a3492278bcf72d34738afd2 URL: https://github.com/kamailio/kamailio/commit/635f3fb5387713181a3492278bcf72d… Author: Viktor <victor.litvinov(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:23:41+01:00 tcpclose event_routes issue --- Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/635f3fb5387713181a3492278bcf72d… Patch: https://github.com/kamailio/kamailio/commit/635f3fb5387713181a3492278bcf72d…

1 0

git:master:da0d4658: tcpclose event_routes issue
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: da0d4658985fe4b98a8247dc7a89dd48a6635e94 URL: https://github.com/kamailio/kamailio/commit/da0d4658985fe4b98a8247dc7a89dd4… Author: Viktor <victor.litvinov(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:23:41+01:00 tcpclose event_routes issue --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/da0d4658985fe4b98a8247dc7a89dd4… Patch: https://github.com/kamailio/kamailio/commit/da0d4658985fe4b98a8247dc7a89dd4… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 458093b22d..f738325285 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3649,7 +3649,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) /* if refcnt was 1 => it was used only in the tcp reader => it's not hashed or watched for IO anymore => no need to io_watch_del() */ - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_destroy(tcpconn); break; } @@ -3661,7 +3661,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) tcpconn->flags &= ~F_CONN_WRITE_W; } #endif /* TCP_ASYNC */ - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); } #ifdef TCP_ASYNC @@ -3713,7 +3713,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) io_watch_del(&io_h, tcpconn->s, -1, IO_FD_CLOSING); tcpconn->flags&=~F_CONN_WRITE_W; } - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); } else if (unlikely(tcpconn->flags & F_CONN_WRITE_W)){ BUG("unhashed connection watched for write\n"); @@ -3750,7 +3750,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) tcpconn->flags&=~F_CONN_WRITE_W; } #endif /* TCP_ASYNC */ - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); } #ifdef TCP_ASYNC @@ -3782,7 +3782,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) #endif /* TCP_ASYNC */ if (tcpconn_try_unhash(tcpconn)) tcpconn_put(tcpconn); - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); /* deref & delete if refcnt==0 */ break; default:

1 0

git:master:7583b930: Makefile.defs: version set to 5.6.0-dev3
by Daniel-Constantin Mierla 06 Jan '22

06 Jan '22

Module: kamailio Branch: master Commit: 7583b9300864caeb6538a3bfbaf30aa7b0a22ba3 URL: https://github.com/kamailio/kamailio/commit/7583b9300864caeb6538a3bfbaf30aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-06T11:10:12+01:00 Makefile.defs: version set to 5.6.0-dev3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/7583b9300864caeb6538a3bfbaf30aa… Patch: https://github.com/kamailio/kamailio/commit/7583b9300864caeb6538a3bfbaf30aa… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 57bccfe725..84f9438bc4 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:f7358b01: db_cluster: enclose block in curly braces
by Daniel-Constantin Mierla 06 Jan '22

06 Jan '22

Module: kamailio Branch: master Commit: f7358b01efd0d8d71edf730d1a8cf4c9555d1dd8 URL: https://github.com/kamailio/kamailio/commit/f7358b01efd0d8d71edf730d1a8cf4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-06T11:08:09+01:00 db_cluster: enclose block in curly braces - fix returning always introduced in previous commit --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f7358b01efd0d8d71edf730d1a8cf4c… Patch: https://github.com/kamailio/kamailio/commit/f7358b01efd0d8d71edf730d1a8cf4c… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index c42d5b2aa9..07192d6362 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -263,9 +263,10 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) return; } - if(con->sinfo==NULL) + if(con->sinfo==NULL) { rpc->fault(c, 500, "Cluster state info missing."); return; + } /* Overwrite the number of seconds if the connection is already disabled. */ if (con->sinfo->state & DBCL_CON_INACTIVE)

1 0

[kamailio/kamailio] pua : default_expires parameter is not used in code (Issue #2994)
by adita76 05 Jan '22

05 Jan '22

### Description pua : default_expires parameter is not functionally used in code It is not used neither in pua module, nor in others pua_* modules. ### Troubleshooting Its presence is confusing if it does nothing, but it is described in documentation. ### Possible Solutions Can it be used as default expires for subscriptions related to pua events ? Otherwise it should be removed. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2994 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2994(a)github.com>

2 2

git:master:50a976f0: pua: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 05 Jan '22

05 Jan '22

Module: kamailio Branch: master Commit: 50a976f00e4ee19c24260a10f0a70349fe2d9d6d URL: https://github.com/kamailio/kamailio/commit/50a976f00e4ee19c24260a10f0a7034… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-05T18:44:41+01:00 pua: use parameter default_expires instead of 3600 constant - GH #2994 --- Modified: src/modules/pua/pua.c Modified: src/modules/pua/pua.h Modified: src/modules/pua/send_publish.c Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/50a976f00e4ee19c24260a10f0a7034… Patch: https://github.com/kamailio/kamailio/commit/50a976f00e4ee19c24260a10f0a7034… --- diff --git a/src/modules/pua/pua.c b/src/modules/pua/pua.c index d0c89ba10d..be68e29549 100644 --- a/src/modules/pua/pua.c +++ b/src/modules/pua/pua.c @@ -58,7 +58,7 @@ htable_t* HashT= NULL; int HASH_SIZE= -1; extern int bind_pua(pua_api_t* api); int min_expires= 0; -int default_expires=3600; +int pua_default_expires=3600; static str db_url = str_init(DEFAULT_DB_URL); str db_table= str_init("pua"); int update_period= 100; @@ -126,7 +126,7 @@ static param_export_t params[]={ {"db_url", PARAM_STR, &db_url}, {"db_table", PARAM_STR, &db_table}, {"min_expires", INT_PARAM, &min_expires}, - {"default_expires", INT_PARAM, &default_expires}, + {"default_expires", INT_PARAM, &pua_default_expires}, {"update_period", INT_PARAM, &update_period}, {"outbound_proxy", PARAM_STR, &outbound_proxy}, {"dlginfo_increase_version", INT_PARAM, &dlginfo_increase_version}, @@ -162,8 +162,8 @@ static int mod_init(void) if(min_expires< 0) min_expires= 0; - if(default_expires< 600) - default_expires= 3600; + if(pua_default_expires< 600) + pua_default_expires= 3600; if(pua_rpc_init()<0) { LM_ERR("failed to register RPC commands\n"); @@ -702,7 +702,7 @@ int update_pua(ua_pres_t* p) dlg_t* td = NULL; if(p->desired_expires== 0) - expires= 3600; + expires= pua_default_expires; else expires= p->desired_expires- (int)time(NULL); @@ -1255,4 +1255,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_pua_exports); return 0; -} \ No newline at end of file +} diff --git a/src/modules/pua/pua.h b/src/modules/pua/pua.h index 908f5b0cb3..7d99c0f796 100644 --- a/src/modules/pua/pua.h +++ b/src/modules/pua/pua.h @@ -43,7 +43,7 @@ extern htable_t* HashT; extern int HASH_SIZE; extern int min_expires; extern int pua_ul_publish; -extern int default_expires; +extern int pua_default_expires; extern str outbound_proxy; extern int check_remote_contact; extern int dbmode; diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 338ee892b4..e2e4c0ca7f 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -668,7 +668,7 @@ int send_publish( publ_info_t* publ ) if(publ->flag & UPDATE_TYPE) LM_DBG("etag:%.*s\n", etag.len, etag.s); - str_hdr = publ_build_hdr((publ->expires< 0)?3600:publ->expires, ev, &publ->content_type, + str_hdr = publ_build_hdr((publ->expires< 0)?pua_default_expires:publ->expires, ev, &publ->content_type, (publ->flag & UPDATE_TYPE)?&etag:NULL, publ->extra_headers, (body)?1:0); if(str_hdr == NULL) diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index fefc4ef283..723507bb86 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -971,7 +971,7 @@ int send_subscribe(subs_info_t* subs) subs->source_flag= XMPP_SUBSCRIBE; if(subs->expires< 0) - expires= 3600; + expires= pua_default_expires; else expires= subs->expires;

1 0

Re: [sr-dev] [kamailio/kamailio] mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload (559b52b)
by Olle E. Johansson 04 Jan '22

04 Jan '22

Fixed in cf1907cac4c21fe12a27057cc3eeb2dd98e65635 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b2ab8e0343/62881526(a)github.com>

1 0

git:master:6ce9c3c8: Secfilter: Modify error messages to RPC error messages instead of printf
by Olle E. Johansson 04 Jan '22

04 Jan '22

Module: kamailio Branch: master Commit: 6ce9c3c897055ff9942634c493caf79780ccf71b URL: https://github.com/kamailio/kamailio/commit/6ce9c3c897055ff9942634c493caf79… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-04T10:49:10+01:00 Secfilter: Modify error messages to RPC error messages instead of printf --- Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/6ce9c3c897055ff9942634c493caf79… Patch: https://github.com/kamailio/kamailio/commit/6ce9c3c897055ff9942634c493caf79… --- diff --git a/src/modules/secfilter/secfilter_rpc.c b/src/modules/secfilter/secfilter_rpc.c index 2f763e4732..72db9a599d 100644 --- a/src/modules/secfilter/secfilter_rpc.c +++ b/src/modules/secfilter/secfilter_rpc.c @@ -112,7 +112,7 @@ void secf_rpc_add_bl(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Values (%.*s, %.*s) inserted into blacklist", ctype.len, ctype.s, data.len, data.s); } else { - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); + rpc->fault(ctx, 500, "Error inserting values in the blacklist"); } lock_release(&secf_data->lock); } @@ -141,7 +141,7 @@ void secf_rpc_add_wl(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Values (%.*s, %.*s) inserted into whitelist", ctype.len, ctype.s, data.len, data.s); } else { - rpc->rpl_printf(ctx, "Error insert values in the whitelist"); + rpc->fault(ctx, 500, "Error insert values in the whitelist"); } lock_release(&secf_data->lock); } @@ -154,7 +154,7 @@ void secf_rpc_reload(rpc_t *rpc, void *ctx) if(secf_load_db() == -1) { LM_ERR("Error loading data from database\n"); - rpc->rpl_printf(ctx, "Error loading data from database"); + rpc->fault(ctx, 500, "Error loading data from database"); } else { rpc->rpl_printf(ctx, "Data reloaded"); }

1 0

git:master:89958e93: TLS: Add RPC success confirmation message
by Olle E. Johansson 04 Jan '22

04 Jan '22

Module: kamailio Branch: master Commit: 89958e9350597100d09689357b631ad30928ed99 URL: https://github.com/kamailio/kamailio/commit/89958e9350597100d09689357b631ad… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T17:00:28+01:00 TLS: Add RPC success confirmation message --- Modified: src/modules/tls/tls_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/89958e9350597100d09689357b631ad… Patch: https://github.com/kamailio/kamailio/commit/89958e9350597100d09689357b631ad… --- diff --git a/src/modules/tls/tls_rpc.c b/src/modules/tls/tls_rpc.c index 9927710647..9c7f980e71 100644 --- a/src/modules/tls/tls_rpc.c +++ b/src/modules/tls/tls_rpc.c @@ -87,7 +87,7 @@ static void tls_reload(rpc_t* rpc, void* ctx) *tls_domains_cfg = cfg; lock_release(tls_domains_cfg_lock); - + rpc->rpl_printf(ctx, "Ok. TLS configuration reloaded."); return; error:

1 0

git:master:cf1907ca: mtree: Re-instate error log messages in RPC reload removed in an earlier commit
by Olle E. Johansson 04 Jan '22

04 Jan '22

Module: kamailio Branch: master Commit: cf1907cac4c21fe12a27057cc3eeb2dd98e65635 URL: https://github.com/kamailio/kamailio/commit/cf1907cac4c21fe12a27057cc3eeb2d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-04T10:47:28+01:00 mtree: Re-instate error log messages in RPC reload removed in an earlier commit --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf1907cac4c21fe12a27057cc3eeb2d… Patch: https://github.com/kamailio/kamailio/commit/cf1907cac4c21fe12a27057cc3eeb2d… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 1a2cd9f737..8c703f3531 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -937,6 +937,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) if(mt_load_db_trees()!=0) { rpc->fault(c, 500, "Can not reload Mtrees from database."); + LM_ERR("RPC failed: cannot reload mtrees from database\n"); return; } rpc->rpl_printf(c, "Ok. Mtrees reloaded."); @@ -945,6 +946,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) if(!mt_defined_trees()) { rpc->fault(c, 500, "No Mtrees defined."); + LM_ERR("RPC failed: No Mtrees defined\n"); return; } @@ -971,6 +973,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) if(mt_load_db(pt)!=0) { rpc->fault(c, 500, "Mtree Reload Failed"); + LM_ERR("RPC failed: cannot reload mtrees from database\n"); return; } treeloaded = 1; @@ -978,7 +981,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) pt = pt->next; } if(treeloaded == 0) { - rpc->fault(c, 500, "Can not find specified Mtree"); + rpc->fault(c, 500, "Can not find specified Mtree"); } rpc->rpl_printf(c, "Ok. Mtree reloaded."); return;

1 0

Re: [sr-dev] [kamailio/kamailio] mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload (559b52b)
by Olle E. Johansson 03 Jan '22

03 Jan '22

OK, I did not see the point of them, but you made it understandable :-) Thanks. Will fix. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b2ab8e0343/62841767(a)github.com>

1 0

Re: [sr-dev] [kamailio/kamailio] mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload (559b52b)
by Daniel-Constantin Mierla 03 Jan '22

03 Jan '22

The commit seems to remove the existing error log messages and they are useful with the systems that monitor syslog and trigger alerts. While the commit adds text to rpc response, that is visible on client app and it might not be easily caught by server devops team. The error logs should be reintroduced. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b2ab8e0343/62841330(a)github.com>

1 0

git:master:7feb3865: secfilter: Convert error messages to error responses in secf_rpc_add_dst()
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 7feb38651970fc1f3cfd90769685c46804ab25ae URL: https://github.com/kamailio/kamailio/commit/7feb38651970fc1f3cfd90769685c46… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T16:36:46+01:00 secfilter: Convert error messages to error responses in secf_rpc_add_dst() --- Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/7feb38651970fc1f3cfd90769685c46… Patch: https://github.com/kamailio/kamailio/commit/7feb38651970fc1f3cfd90769685c46… --- diff --git a/src/modules/secfilter/secfilter_rpc.c b/src/modules/secfilter/secfilter_rpc.c index cea9d400e8..2f763e4732 100644 --- a/src/modules/secfilter/secfilter_rpc.c +++ b/src/modules/secfilter/secfilter_rpc.c @@ -63,7 +63,7 @@ void secf_rpc_add_dst(rpc_t *rpc, void *ctx) char *text = NULL; if(rpc->scan(ctx, "d", &number) < 1) { - rpc->fault(ctx, 0, + rpc->fault(ctx, 500, "Invalid Parameters. Usage: secfilter.add_dst " "number\n Example: secfilter.add_dst " "555123123"); @@ -73,7 +73,7 @@ void secf_rpc_add_dst(rpc_t *rpc, void *ctx) data.s = pkg_malloc(data.len * sizeof(char)); if(!data.s) { PKG_MEM_ERROR; - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); + rpc->fault(ctx, 500, "Error insert values in the blacklist"); return; } memcpy(data.s, text, data.len); @@ -82,7 +82,7 @@ void secf_rpc_add_dst(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Values (%s) inserted into blacklist destinations", data); } else { - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); + rpc->fault(ctx, 500, "Error insert values in the blacklist"); } lock_release(&secf_data->lock); if(data.s)

1 0

git:master:9ebf483a: rtpengine: Fix typo in RPC response handling
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 9ebf483a51b8584c05a2bcd3d4b26ac22a878ce8 URL: https://github.com/kamailio/kamailio/commit/9ebf483a51b8584c05a2bcd3d4b26ac… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T16:36:46+01:00 rtpengine: Fix typo in RPC response handling --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/9ebf483a51b8584c05a2bcd3d4b26ac… Patch: https://github.com/kamailio/kamailio/commit/9ebf483a51b8584c05a2bcd3d4b26ac… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 3440daec93..ab6920c01d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1341,7 +1341,7 @@ static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) LM_DBG("current rtpengines list version: %d (%u)\n", _rtpe_list_version->vernum, (unsigned int)_rtpe_list_version->vertime); - rpc->rpl_printf(c, "Ok. Reload successful."); + rpc->rpl_printf(ctx, "Ok. Reload successful."); } static int rtpengine_rpc_iterate(rpc_t* rpc, void* ctx, const str *rtpp_url,

1 0

git:master:b108bd6a: modules: readme files regenerated - rtp_media_server ... [skip ci]
by Kamailio Dev 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: b108bd6aaa7f25f91bd058c92103e9f0910bba0e URL: https://github.com/kamailio/kamailio/commit/b108bd6aaa7f25f91bd058c92103e9f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-03T16:31:27+01:00 modules: readme files regenerated - rtp_media_server ... [skip ci] --- Modified: src/modules/rtp_media_server/README --- Diff: https://github.com/kamailio/kamailio/commit/b108bd6aaa7f25f91bd058c92103e9f… Patch: https://github.com/kamailio/kamailio/commit/b108bd6aaa7f25f91bd058c92103e9f… --- diff --git a/src/modules/rtp_media_server/README b/src/modules/rtp_media_server/README index 511263f880..769af84350 100644 --- a/src/modules/rtp_media_server/README +++ b/src/modules/rtp_media_server/README @@ -85,11 +85,9 @@ Chapter 1. Admin Guide 1. Overview - rtp_media_server module is adding RTP and media processing - functionalities to Kamailio - - Kamailio is providing SIP signaling including and enpoint with Dialog - state, SDP parsing and scripting language + rtp_media_server module adds RTP and media processing functionalities + to Kamailio. Kamailio is providing SIP signaling including an endpoint + with Dialog state, SDP parsing and scripting language. oRTP: is providing Real-time Transport Protocol (RFC 3550) @@ -106,10 +104,11 @@ Chapter 1. Admin Guide 2.1. Building on Debian, Dockerfile and docker image - The module includes Dockerfile that can also be use as a reference on - how to build everything from source on Debian, the of libmediastreamer - on Linux is usually outdated. A docker image is also available from - dockerhub https://hub.docker.com/r/jchavanton/rtp_media_server + The module includes Dockerfile that can also be used as a reference on + how to build everything from source on Debian, the package of + libmediastreamer on Linux is usually outdated. A Docker image is also + available from dockerhub + https://hub.docker.com/r/jchavanton/rtp_media_server 3. Dependencies @@ -118,9 +117,9 @@ Chapter 1. Admin Guide 3.1. Kamailio Modules - The module depends on the following modules (in the other words the - listed modules must be loaded before this module): - * tm - accounting module + The module depends on the following modules (in other words the listed + modules must be loaded before this module): + * tm - transaction module 3.2. External Libraries or Applications @@ -129,7 +128,7 @@ Chapter 1. Admin Guide If you want to build oRTP and mediastreamer from source, you can use the provided script for Debian "install_bc.sh". - * oRTP git://git.linphone.org/ortp.git + * oRTP git clone git://git.linphone.org/ortp.git oRTP is a library implemeting Real-time Transport Protocol (RFC 3550), distributed under GNU GPLv2 or proprietary license. * mediastreamer2 git clone git://git.linphone.org/mediastreamer2.git @@ -167,7 +166,7 @@ modparam("rtp_media_server", "log_file_name", "/var/log/rms/rms_ortp.log") 5.1. rms_answer (event_route) - Create a call leg : with a SIP dialog and an RTP session call the + Create a call leg with a SIP dialog and an RTP session call the event_route This function can be used from REQUEST_ROUTE, REPLY_ROUTE and @@ -201,7 +200,7 @@ route { 5.2. rms_hangup () - Send a BYE, delete the RTP session and the media ressources. + Send a BYE, delete the RTP session and the media resources. This function can be used from EVENT_ROUTE. @@ -245,7 +244,7 @@ e in-dialog request needs to be handled by it. 5.4. rms_dialog_check () Returns true if the current SIP message it handled/known by the RMS - module, else it may be handle in any other way by Kamailio. + module, else it may be handled in any other way by Kamailio. This function can be used from REQUEST_ROUTE, REPLY_ROUTE and FAILURE_ROUTE.

1 0

git:master:261b7e13: matrix: Add RPC response on matrix reload success
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 261b7e13d711e5361ed491a8fd04efee2d73709e URL: https://github.com/kamailio/kamailio/commit/261b7e13d711e5361ed491a8fd04efe… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T16:00:05+01:00 matrix: Add RPC response on matrix reload success --- Modified: src/modules/matrix/matrix.c --- Diff: https://github.com/kamailio/kamailio/commit/261b7e13d711e5361ed491a8fd04efe… Patch: https://github.com/kamailio/kamailio/commit/261b7e13d711e5361ed491a8fd04efe… --- diff --git a/src/modules/matrix/matrix.c b/src/modules/matrix/matrix.c index d2177ccb24..54f26aa0f7 100644 --- a/src/modules/matrix/matrix.c +++ b/src/modules/matrix/matrix.c @@ -526,11 +526,12 @@ static void matrix_rpc_reload(rpc_t* rpc, void* c) if(db_reload_matrix() < 0) { rpc->fault(c, 500, "Reload failed"); } + rpc->rpl_printf(c, "Ok. Reload successful."); matrix_db_close(); } static const char *matrix_rpc_reload_doc[2] = { - "reload matrix records from database", + "Reload matrix records from database", 0 };

1 0

git:master:2468473c: rtpengine: Add RPC success message on reload
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 2468473c18200161bba42e01468d3007541329ef URL: https://github.com/kamailio/kamailio/commit/2468473c18200161bba42e01468d300… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T16:14:19+01:00 rtpengine: Add RPC success message on reload --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/2468473c18200161bba42e01468d300… Patch: https://github.com/kamailio/kamailio/commit/2468473c18200161bba42e01468d300… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 738e55d312..3440daec93 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -283,7 +283,7 @@ static str body_intermediate; static str rtp_inst_pv_param = {NULL, 0}; static pv_spec_t *rtp_inst_pvar = NULL; -/* array with the sockets used by rtpporxy (per process)*/ +/* array with the sockets used by rtpproxy (per process)*/ static unsigned int *rtpp_no = 0; static gen_lock_t *rtpp_no_lock = 0; static int *rtpp_socks = 0; @@ -1341,6 +1341,7 @@ static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) LM_DBG("current rtpengines list version: %d (%u)\n", _rtpe_list_version->vernum, (unsigned int)_rtpe_list_version->vertime); + rpc->rpl_printf(c, "Ok. Reload successful."); } static int rtpengine_rpc_iterate(rpc_t* rpc, void* ctx, const str *rtpp_url,

1 0

git:master:82721b91: rtp_media_server: Documentation update, typo fixing
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 82721b916d9743cca58b69a5772b3e5a7ce8461e URL: https://github.com/kamailio/kamailio/commit/82721b916d9743cca58b69a5772b3e5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T16:28:27+01:00 rtp_media_server: Documentation update, typo fixing --- Modified: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/82721b916d9743cca58b69a5772b3e5… Patch: https://github.com/kamailio/kamailio/commit/82721b916d9743cca58b69a5772b3e5…

1 0

git:master:41e20d7f: keepalive: Add RPC success responses
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 41e20d7f5106748a415951f6766cf64b9d14180d URL: https://github.com/kamailio/kamailio/commit/41e20d7f5106748a415951f6766cf64… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:58:41+01:00 keepalive: Add RPC success responses --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/41e20d7f5106748a415951f6766cf64… Patch: https://github.com/kamailio/kamailio/commit/41e20d7f5106748a415951f6766cf64… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index e6a64dbcd1..ef9fe24a56 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -123,7 +123,7 @@ static void keepalive_rpc_add(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "couldn't add data to list"); return; } - + rpc->rpl_printf(ctx, "Ok. Destination added."); return; } static const char *keepalive_rpc_add_doc[2] = { @@ -156,7 +156,7 @@ static void keepalive_rpc_del(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "couldn't delete data from list"); return; } - + rpc->rpl_printf(ctx, "Ok. Destination removed."); return; } static const char *keepalive_rpc_del_doc[2] = { @@ -217,7 +217,7 @@ static const char *keepalive_rpc_get_doc[2] = { static void keepalive_rpc_flush(rpc_t *rpc, void *ctx) { ka_dest_t *dest; - LM_DBG("keepalive flushe\n"); + LM_DBG("keepalive flush\n"); ka_lock_destination_list(); for(dest = ka_destinations_list->first; dest != NULL; dest = dest->next) { @@ -225,7 +225,7 @@ static void keepalive_rpc_flush(rpc_t *rpc, void *ctx) } ka_destinations_list->first = 0; ka_unlock_destination_list(); - + rpc->rpl_printf(ctx, "Ok. Destination list flushed."); return; } static const char *keepalive_rpc_flush_doc[2] = {

1 0

git:master:e5dac2fb: dmq: Add RPC success response on removing a node
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: e5dac2fb61f375ccd131d4ad0c85ddabda32754c URL: https://github.com/kamailio/kamailio/commit/e5dac2fb61f375ccd131d4ad0c85dda… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dmq: Add RPC success response on removing a node --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/e5dac2fb61f375ccd131d4ad0c85dda… Patch: https://github.com/kamailio/kamailio/commit/e5dac2fb61f375ccd131d4ad0c85dda… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 817fc3f3bb..843b7e3e4d 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -442,6 +442,7 @@ void rpc_dmq_remove(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Failure"); return; } + rpc->rpl_printf(ctx, "Ok. DMQ node removed."); } static const char* rpc_dmq_remove_doc[3] = {

1 0

git:master:af8b605b: disaptcher: Add RPC success message on set_state
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: af8b605b71a4b15f8c2f69878e589c8554bebfec URL: https://github.com/kamailio/kamailio/commit/af8b605b71a4b15f8c2f69878e589c8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 disaptcher: Add RPC success message on set_state --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/af8b605b71a4b15f8c2f69878e589c8… Patch: https://github.com/kamailio/kamailio/commit/af8b605b71a4b15f8c2f69878e589c8… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 4493fed425..655c0ace83 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1775,7 +1775,7 @@ static void dispatcher_rpc_set_state_helper(rpc_t *rpc, void *ctx, int mattr) } } } - + rpc->rpl_printf(ctx, "Ok. Dispatcher state updated."); return; }

1 0

git:master:70a7f92b: dispatcher: Add RPC success message on adding destination to set
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 70a7f92b6df5fa154709ccb711a81641ea84ab51 URL: https://github.com/kamailio/kamailio/commit/70a7f92b6df5fa154709ccb711a8164… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dispatcher: Add RPC success message on adding destination to set --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/70a7f92b6df5fa154709ccb711a8164… Patch: https://github.com/kamailio/kamailio/commit/70a7f92b6df5fa154709ccb711a8164… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 655c0ace83..551e1e0ffd 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1872,7 +1872,7 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Adding dispatcher dst failed"); return; } - + rpc->rpl_printf(ctx, "Ok. Dispatcher destination added."); return; }

1 0

git:master:101ddb5e: dispatcher: Add RPC success message when removing destination from set
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 101ddb5efe16fd415410be1ac86ff759e83bdc54 URL: https://github.com/kamailio/kamailio/commit/101ddb5efe16fd415410be1ac86ff75… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dispatcher: Add RPC success message when removing destination from set --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/101ddb5efe16fd415410be1ac86ff75… Patch: https://github.com/kamailio/kamailio/commit/101ddb5efe16fd415410be1ac86ff75… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 551e1e0ffd..fbf65d33fe 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1897,7 +1897,7 @@ static void dispatcher_rpc_remove(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Removing dispatcher dst failed"); return; } - + rpc->rpl_printf(ctx, "Ok. Dispatcher destination removed."); return; }

1 0

git:master:82845eac: db_cluster: Add RPC success and error messages to dbcl_rpc_enable_connection
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 82845eac8a8bae73d1033736ff9cf15337661981 URL: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 db_cluster: Add RPC success and error messages to dbcl_rpc_enable_connection --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… Patch: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index d4aae0e123..2ddbffc2ad 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -309,6 +309,7 @@ static void dbcl_rpc_enable_connection(rpc_t *rpc, void *c) if(cls==NULL) { LM_INFO("cluster not found [%.*s]\n", cluster.len, cluster.s); + rpc->fault(c, 500, "Cluster not found"); return; } @@ -317,11 +318,14 @@ static void dbcl_rpc_enable_connection(rpc_t *rpc, void *c) if(con==NULL) { LM_INFO("connection not found [%.*s]\n", connection.len, connection.s); + rpc->fault(c, 500, "Cluster connection not found"); return; } - - dbcl_enable_con(con); - + if(dbcl_enable_con(con) < 0) { + rpc->fault(c, 500, "Failed to enable cluster connection."); + return; + } + rpc->rpl_printf(c, "Ok. Cluster connection enabled."); return; }

1 0

git:master:fc0ee0bc: db_cluster: Add RPC error message when clusters not found
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: fc0ee0bca6d5b42d11e0d7ed5933e23ae1636941 URL: https://github.com/kamailio/kamailio/commit/fc0ee0bca6d5b42d11e0d7ed5933e23… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 db_cluster: Add RPC error message when clusters not found --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fc0ee0bca6d5b42d11e0d7ed5933e23… Patch: https://github.com/kamailio/kamailio/commit/fc0ee0bca6d5b42d11e0d7ed5933e23… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index 2ddbffc2ad..c42d5b2aa9 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -339,6 +339,7 @@ static void dbcl_rpc_list_clusters(rpc_t *rpc, void *c) if(cls==NULL) { LM_ERR("root not set\n"); + rpc->fault(c, 500, "Clusters not found"); return; }

1 0

git:master:9f8de525: dispatcher: Add RPC success response on reload
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 9f8de5255bb90551d6cad5828ccafb6f41083c47 URL: https://github.com/kamailio/kamailio/commit/9f8de5255bb90551d6cad5828ccafb6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dispatcher: Add RPC success response on reload --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/9f8de5255bb90551d6cad5828ccafb6… Patch: https://github.com/kamailio/kamailio/commit/9f8de5255bb90551d6cad5828ccafb6… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 4ed98919b7..4493fed425 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1557,6 +1557,7 @@ static void dispatcher_rpc_reload(rpc_t *rpc, void *ctx) return; } } + rpc->rpl_printf(ctx, "Ok. Dispatcher successfully reloaded."); return; }

1 0

git:master:4d41b85a: dbcluster: Add RPC error message wheb listing connections and no cluster is found
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 4d41b85a6b9d7f82306282a19c01d63b90f2a7d9 URL: https://github.com/kamailio/kamailio/commit/4d41b85a6b9d7f82306282a19c01d63… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dbcluster: Add RPC error message wheb listing connections and no cluster is found --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4d41b85a6b9d7f82306282a19c01d63… Patch: https://github.com/kamailio/kamailio/commit/4d41b85a6b9d7f82306282a19c01d63… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index bdbbb70ce6..a2c28f88e5 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -189,6 +189,7 @@ static void dbcl_rpc_list_connections(rpc_t *rpc, void *c) if(cls==NULL) { LM_ERR("cluster not found [%.*s]\n", cluster.len, cluster.s); + rpc->fault(c, 500, "Cluster not found"); return; }

1 0

git:master:86b4189c: db_cluster: Add RPC error messages and responses to dbcl_rpc_ddisable_connection
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 86b4189c1335a2d1aa4414ab9d1a5b8a27a29e00 URL: https://github.com/kamailio/kamailio/commit/86b4189c1335a2d1aa4414ab9d1a5b8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 db_cluster: Add RPC error messages and responses to dbcl_rpc_ddisable_connection --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/86b4189c1335a2d1aa4414ab9d1a5b8… Patch: https://github.com/kamailio/kamailio/commit/86b4189c1335a2d1aa4414ab9d1a5b8… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index a2c28f88e5..d4aae0e123 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -250,6 +250,7 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) if(cls==NULL) { LM_INFO("cluster not found [%.*s]\n", cluster.len, cluster.s); + rpc->fault(c, 500, "Cluster not found"); return; } @@ -258,16 +259,22 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) if(con==NULL) { LM_INFO("connection not found [%.*s]\n", connection.len, connection.s); + rpc->fault(c, 500, "Cluster connection not found"); return; } if(con->sinfo==NULL) + rpc->fault(c, 500, "Cluster state info missing."); return; /* Overwrite the number of seconds if the connection is already disabled. */ if (con->sinfo->state & DBCL_CON_INACTIVE) { - dbcl_disable_con(con, seconds); + if(dbcl_disable_con(con, seconds) < 0) { + rpc->fault(c, 500, "Failed disabling cluster connection."); + return; + } + rpc->rpl_printf(c, "Ok. Cluster connection re-disabled."); return; } @@ -277,8 +284,11 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) return; } - dbcl_disable_con(con, seconds); - + if(dbcl_disable_con(con, seconds) < 0) { + rpc->fault(c, 500, "Failed disabling cluster connection."); + return; + }; + rpc->rpl_printf(c, "Ok. Cluster connection disabled."); return; }

1 0

git:master:fecda3d1: htable: Add RPC response for successful reload of htable
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: fecda3d12f0f72ba0f35f239108f5dcd3bec0959 URL: https://github.com/kamailio/kamailio/commit/fecda3d12f0f72ba0f35f239108f5dc… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:09+01:00 htable: Add RPC response for successful reload of htable --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/fecda3d12f0f72ba0f35f239108f5dc… Patch: https://github.com/kamailio/kamailio/commit/fecda3d12f0f72ba0f35f239108f5dc… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index bd6d474e9d..3e9f52bf13 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1912,6 +1912,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) } free(nht.entries); ht_db_close_con(); + rpc->rpl_printf(c, "Ok. Htable reloaded."); return; }

1 0

git:master:326abd17: htable: Add RPC response for storing htable to DB
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 326abd1737336ad733cb53f9b4ac506f178da0e2 URL: https://github.com/kamailio/kamailio/commit/326abd1737336ad733cb53f9b4ac506… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 htable: Add RPC response for storing htable to DB --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/326abd1737336ad733cb53f9b4ac506… Patch: https://github.com/kamailio/kamailio/commit/326abd1737336ad733cb53f9b4ac506… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 3e9f52bf13..7e72ad0840 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1963,6 +1963,7 @@ static void htable_rpc_store(rpc_t* rpc, void* c) return; } ht_db_close_con(); + rpc->rpl_printf(c, "Ok. Htable successfully stored to DB."); return; }

1 0

git:master:559b52b1: mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 559b52b194f813c0c8584b3becbac9b2ab8e0343 URL: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… Patch: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 63180bbfb7..1a2cd9f737 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -929,61 +929,59 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) { str tname = {0, 0}; m_tree_t *pt = NULL; - int treloaded = 0; + int treeloaded = 0; if(db_table.len>0) { /* re-loading all information from database */ if(mt_load_db_trees()!=0) { - LM_ERR("cannot re-load mtrees from database\n"); - goto error; - } - } else { - if(!mt_defined_trees()) - { - LM_ERR("empty mtree list\n"); - goto error; + rpc->fault(c, 500, "Can not reload Mtrees from database."); + return; } + rpc->rpl_printf(c, "Ok. Mtrees reloaded."); + return; + } + if(!mt_defined_trees()) + { + rpc->fault(c, 500, "No Mtrees defined."); + return; + } - /* read tree name */ - if (rpc->scan(c, "S", &tname) != 1) { + /* read tree name */ + if (rpc->scan(c, "S", &tname) != 1) { + tname.s = 0; + tname.len = 0; + } else { + if(*tname.s=='.') { tname.s = 0; tname.len = 0; - } else { - if(*tname.s=='.') { - tname.s = 0; - tname.len = 0; - } } + } - pt = mt_get_first_tree(); + pt = mt_get_first_tree(); - while(pt!=NULL) + while(pt!=NULL) + { + if(tname.s==NULL + || (tname.s!=NULL && pt->tname.len>=tname.len + && strncmp(pt->tname.s, tname.s, tname.len)==0)) { - if(tname.s==NULL - || (tname.s!=NULL && pt->tname.len>=tname.len - && strncmp(pt->tname.s, tname.s, tname.len)==0)) + /* re-loading table from database */ + if(mt_load_db(pt)!=0) { - /* re-loading table from database */ - if(mt_load_db(pt)!=0) - { - LM_ERR("cannot re-load mtree from database\n"); - goto error; - } - treloaded = 1; + rpc->fault(c, 500, "Mtree Reload Failed"); + return; } - pt = pt->next; - } - if(treloaded == 0) { - rpc->fault(c, 500, "No Mtree Name Matching"); + treeloaded = 1; } + pt = pt->next; } - + if(treeloaded == 0) { + rpc->fault(c, 500, "Can not find specified Mtree"); + } + rpc->rpl_printf(c, "Ok. Mtree reloaded."); return; - -error: - rpc->fault(c, 500, "Mtree Reload Failed"); } static const char* rpc_mtree_reload_doc[2] = {

1 0

git:master:0b5407ec: htable: Add response for rpc flush failed and success states
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 0b5407ec0f13d7631a5273171338628b44814498 URL: https://github.com/kamailio/kamailio/commit/0b5407ec0f13d7631a5273171338628… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:09+01:00 htable: Add response for rpc flush failed and success states --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/0b5407ec0f13d7631a5273171338628… Patch: https://github.com/kamailio/kamailio/commit/0b5407ec0f13d7631a5273171338628… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 78f151daf3..bd6d474e9d 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1809,7 +1809,11 @@ static void htable_rpc_flush(rpc_t* rpc, void* c) rpc->fault(c, 500, "No such htable"); return; } - ht_reset_content(ht); + if(ht_reset_content(ht) < 0) { + rpc->fault(c, 500, "Htable flush failed."); + return; + } + rpc->rpl_printf(c, "Ok. Htable flushed."); } /*! \brief RPC htable.reload command to reload content of a hash table */

1 0

git:master:c4e462fa: core: parser sdp - print hdr name by length on error in get_sdp_hdr_field()
by Daniel-Constantin Mierla 28 Dec '21

28 Dec '21

Module: kamailio Branch: master Commit: c4e462fa6bda38ac6fd814ce8d98ea030d4049b9 URL: https://github.com/kamailio/kamailio/commit/c4e462fa6bda38ac6fd814ce8d98ea0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-28T20:27:43+01:00 core: parser sdp - print hdr name by length on error in get_sdp_hdr_field() --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c4e462fa6bda38ac6fd814ce8d98ea0… Patch: https://github.com/kamailio/kamailio/commit/c4e462fa6bda38ac6fd814ce8d98ea0… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index c62a347ddc..9b7a442e79 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -757,7 +757,8 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) if (match){ match++; }else { - LM_ERR("bad body for <%s>(%d)\n", hdr->name.s, hdr->type); + LM_ERR("bad body for <%.*s>(%d)\n", hdr->name.len, hdr->name.s, + hdr->type); tmp=end; goto error; }

1 0

git:master:089a55b8: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 28 Dec '21

28 Dec '21

Module: kamailio Branch: master Commit: 089a55b8417b48ed783fafe0ed4bc10374e09425 URL: https://github.com/kamailio/kamailio/commit/089a55b8417b48ed783fafe0ed4bc10… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-28T20:16:21+01:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/089a55b8417b48ed783fafe0ed4bc10… Patch: https://github.com/kamailio/kamailio/commit/089a55b8417b48ed783fafe0ed4bc10… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index d5ea0ae845..bd32c3e674 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -461,6 +461,11 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") Please note that you need to set a positive ring_timeout value in order to use this function. + Note: the change of sip reply can be done only in cases when it is not + parsed too much before config execution, otherwise it fails. For + example, setting global parameter "log_prefix" can cause this function + to fail changing the replies. + The function returns TRUE on success, and FALSE during processing failures.

1 0

git:master:090f1f74: siputils: docs - note about restrictions of ring_insert_callid()
by Daniel-Constantin Mierla 28 Dec '21

28 Dec '21

Module: kamailio Branch: master Commit: 090f1f74603de6113f3dd41095ae41b4f03f8171 URL: https://github.com/kamailio/kamailio/commit/090f1f74603de6113f3dd41095ae41b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-28T20:00:17+01:00 siputils: docs - note about restrictions of ring_insert_callid() - GH #2989 --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/090f1f74603de6113f3dd41095ae41b… Patch: https://github.com/kamailio/kamailio/commit/090f1f74603de6113f3dd41095ae41b… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 2b7ac27951..db66d40ac6 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -286,6 +286,12 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") to use this function. </para> <para> + Note: the change of sip reply can be done only in cases when it is not + parsed too much before config execution, otherwise it fails. For + example, setting global parameter "log_prefix" can cause this function + to fail changing the replies. + </para> + <para> The function returns TRUE on success, and FALSE during processing failures. </para> <para>

1 0

[kamailio/kamailio] Run kamailio in kubernates (Issue #2988)
by maryamb99 27 Dec '21

27 Dec '21

Hello everyone, I have a problem over running local docker images of Kamailio in Kubernate cluster.. Consider I build a local docker image from Kamailio and create a pod in one of my nodes . My process created successfully and Kamailio listen over port 5060 now I need to rebuild another docker image with new Kamailio configuration and run it as another pod with new name and listening over port 5061 but I have error "ImagePullBackOff" . I test this scenario many times but problem exists.. It is devastating for me and I need emergency help. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2988 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2988(a)github.com>

3 3

[kamailio/kamailio] Remove RHEL/CentOS 6 packaging as EOL & other enhancements (PR #2986)
by istiak101 25 Dec '21

25 Dec '21

#### Pre-Submission Checklist    - [ ] 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 - [ ] 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 Removed RHEL/CentOS 6 packaging from spec file as those versions reached End of Life almost more than a year ago. Fixed a typo and did %autosetup instead of %setup -n which figures out name and version automatically from macros and also does a quiet decompression of source archive. Note: %autosetup has similar -n flag if archive name isn't standard like %{name}-%{version} You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2986 -- Commit Summary -- * Removed packaging for RHEL/CentOS 6 as End Of Life * Typo fix & %autosetup in prep section -- File Changes -- M pkg/kamailio/obs/kamailio.spec (104) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2986.patch https://github.com/kamailio/kamailio/pull/2986.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2986 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2986(a)github.com>

3 4

Merry Christmas and Happy Holidays 2021-2022!
by Daniel-Constantin Mierla 25 Dec '21

25 Dec '21

Another challenging year is getting close to its end, pressuring even more everyone! Let's hope things will go back to a more usual life (as it used to be) in the near future! Kamailio project continued to develop, bringing out a new major release, preparing for the next one in a few months, relying on an amazing community of developers and users. We also trust it continued to help people and companies world wide to connect with the dear ones and build a better way of living. The season holidays are ahead, time to relax, spend time with family and friends! I take again this chance to express my thanks and greetings to all the friends, developers, supporting companies and community members that made 2021 another great year for Kamailio project. Enjoy the holidays! Merry Christmas! Daniel * Santa is flying Kamailio! * -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

[kamailio/kamailio] Add new parameter to $uac_req (Issue #2982)
by Neimar Avila 23 Dec '21

23 Dec '21

### Description If possible, add a new parameter, where you can choose between sending the password in ha1 or plain text. ### Expected behavior route[REGFWD] { if(!is_method("REGISTER")) { return; } $uac_req(method)="REGISTER"; $uac_req(auser)=$fU; $uac_req(apasswd)="4850730cadc0250e9fa951eae583ace9"; $uac_req(passtype)="ha1"; ... uac_req_send(); ... } #### Actual observed behavior It is currently not possible to send the password in ha1 format #### Debugging Data #### Log Messages #### SIP Traffic ### Possible Solutions Create an additional field. ### Additional Information version: kamailio 5.5.2 (x86_64/linux) 55e232 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 55e232 compiled on 14:20:31 Aug 25 2021 with gcc 4.8.5 * **Operating System**: CentOS Linux release 7.9.2009 (Core) Linux vsphone-proxy-srv1.virtualsistemas.local 3.10.0-1160.45.1.el7.x86_64 #1 SMP Wed Oct 13 17:20:51 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2982 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2982(a)github.com>

3 4

git:master:e809b241: uac: fix unknown type name
by Victor Seva 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: e809b2415b6074826bf641a0a85667a400f778ef URL: https://github.com/kamailio/kamailio/commit/e809b2415b6074826bf641a0a85667a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-22T18:08:30+01:00 uac: fix unknown type name introduced at b6e264c9780fc0432e6e746f473024e41bc1126b > uac_send.c: In function 'uac_send_tm_callback': > uac_send.c:741:16: error: unknown type name 'authenticate_body_t' > 741 | static authenticate_body_t auth; > | ^~~~~~~~~~~~~~~~~~~ > uac_send.c:781:49: warning: passing argument 2 of 'parse_authenticate_body' from incompatible pointer type [-Wincompatible-pointer-types] > 781 | if (parse_authenticate_body(&hdr->body, &auth)<0) > | ^~~~~ > | | > | int * > In file included from uac_send.c:42: > auth_hdr.h:30:67: note: expected 'struct authenticate_body *' but argument is of type 'int *' > 30 | int parse_authenticate_body( str *body, struct authenticate_body *auth); > | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ > uac_send.c:788:27: error: request for member 'realm' in something not a structure or union > 788 | cred.realm = auth.realm; > | ^ > uac_send.c:795:56: warning: passing argument 4 of 'do_uac_auth' from incompatible pointer type [-Wincompatible-pointer-types] > 795 | do_uac_auth(&tp->s_method, &tp->s_ruri, &cred, &auth, response); > | ^~~~~ > | | > | int * > In file included from uac_send.c:41: > auth.h:77:43: note: expected 'struct authenticate_body *' but argument is of type 'int *' > 77 | struct authenticate_body *auth, > | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ > uac_send.c:797:49: warning: passing argument 4 of 'build_authorization_hdr' from incompatible pointer type [-Wincompatible-pointer-types] > 797 | &auth, response); > | ^~~~~ > | | > | int * > In file included from uac_send.c:42: > auth_hdr.h:33:71: note: expected 'struct authenticate_body *' but argument is of type 'int *' > 33 | struct uac_credential *crd, struct authenticate_body *auth, > | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ > make[2]: *** [../../Makefile.rules:100: uac_send.o] Error 1 --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/e809b2415b6074826bf641a0a85667a… Patch: https://github.com/kamailio/kamailio/commit/e809b2415b6074826bf641a0a85667a… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index e5ea420d72..43767c7804 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -738,7 +738,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) struct hdr_field *hdr; HASHHEX response; str *new_auth_hdr = NULL; - static authenticate_body_t auth; + static uac_authenticate_body_t auth; uac_credential_t cred; char b_hdrs[MAX_UACH_SIZE]; str s_hdrs;

1 0

git:5.5:b42dfd30: pv_headers: restore pvh_real_hdr_del_by_name()
by Victor Seva 22 Dec '21

22 Dec '21

Module: kamailio Branch: 5.5 Commit: b42dfd30ba74562e3c7673b3de449760bb315d62 URL: https://github.com/kamailio/kamailio/commit/b42dfd30ba74562e3c7673b3de44976… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-22T11:21:15+01:00 pv_headers: restore pvh_real_hdr_del_by_name() it was wrongly removed at 09981c41cb6685fa18f61b9e7d66339917c4f097 (cherry picked from commit d8f0e71a0497e0bb98be60452914df51c84b56d8) --- Modified: src/modules/pv_headers/pvh_hdr.c --- Diff: https://github.com/kamailio/kamailio/commit/b42dfd30ba74562e3c7673b3de44976… Patch: https://github.com/kamailio/kamailio/commit/b42dfd30ba74562e3c7673b3de44976… --- diff --git a/src/modules/pv_headers/pvh_hdr.c b/src/modules/pv_headers/pvh_hdr.c index 31c09b4b5d..fbb471ccd5 100644 --- a/src/modules/pv_headers/pvh_hdr.c +++ b/src/modules/pv_headers/pvh_hdr.c @@ -131,6 +131,21 @@ int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue) return 1; } +int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname) +{ + hdr_field_t *hf = NULL; + + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->name.len == hname->len + && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { + LM_DBG("remove header[%.*s]: %.*s\n", hf->name.len, hf->name.s, + hf->body.len, hf->body.s); + del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + } + } + return 1; +} + int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname) { hdr_field_t *hf = NULL;

1 0

git:master:d8f0e71a: pv_headers: restore pvh_real_hdr_del_by_name()
by Victor Seva 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: d8f0e71a0497e0bb98be60452914df51c84b56d8 URL: https://github.com/kamailio/kamailio/commit/d8f0e71a0497e0bb98be60452914df5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-22T11:19:19+01:00 pv_headers: restore pvh_real_hdr_del_by_name() it was wrongly removed at 09981c41cb6685fa18f61b9e7d66339917c4f097 --- Modified: src/modules/pv_headers/pvh_hdr.c --- Diff: https://github.com/kamailio/kamailio/commit/d8f0e71a0497e0bb98be60452914df5… Patch: https://github.com/kamailio/kamailio/commit/d8f0e71a0497e0bb98be60452914df5… --- diff --git a/src/modules/pv_headers/pvh_hdr.c b/src/modules/pv_headers/pvh_hdr.c index 31c09b4b5d..fbb471ccd5 100644 --- a/src/modules/pv_headers/pvh_hdr.c +++ b/src/modules/pv_headers/pvh_hdr.c @@ -131,6 +131,21 @@ int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue) return 1; } +int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname) +{ + hdr_field_t *hf = NULL; + + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->name.len == hname->len + && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { + LM_DBG("remove header[%.*s]: %.*s\n", hf->name.len, hf->name.s, + hf->body.len, hf->body.s); + del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + } + } + return 1; +} + int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname) { hdr_field_t *hf = NULL;

1 0

[kamailio/kamailio] nats: Add publish function (PR #2915)
by Stefan Mititelu 22 Dec '21

22 Dec '21

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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  Added a publish function to nats module. When the function is called, the routing process tries to connect to the url (param) and tries to send the payload (param) to the subject queue (param). No libuv is used for this. Probably a better approach is to make publisher workers (like subscriber workers) and pass payload from routing processes to publisher worker processes via shared memory. Right now I see this as an improvement and find the new function good enough, for now. @eschmidbauer what do you think of this? Thank you, Stefan P.S. Will update doc after review. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2915 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2915/commits/121ae374e0c309027eeb…">nats: Add publish function</a> -- File Changes -- M src/modules/nats/nats_mod.c (71) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2915.patch https://github.com/kamailio/kamailio/pull/2915.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/2915

2 12

[kamailio/kamailio] ldap: rename private function ldap_connect (PR #2975)
by micmac1 22 Dec '21

22 Dec '21

``` When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 ``` [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### 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  Hi all, Small compile fix. I saw kamailio is failing to build on OpenWrt build bots since a recent openldap bump from 2.4.58 to 2.6.0. I linked a curl commit in the commit message, they also renamed some of their functions, although they did rename all their ldap_* functions to oldap_. I didn't dare do that in kamailio :) Renaming a single function was enough to make it compile again. Maybe you want to do something different to address this issue, I don't know. I didn't runtest this. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2975 -- Commit Summary -- * ldap: rename private function ldap_connect -- File Changes -- M src/modules/ldap/ldap_connect.c (2) M src/modules/ldap/ldap_connect.h (2) M src/modules/ldap/ldap_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2975.patch https://github.com/kamailio/kamailio/pull/2975.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/2975

2 2

git:master:362c6de0: ldap: rename private function ldap_connect
by Daniel-Constantin Mierla 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: 362c6de08058948d0a70a1eeb14ec718f922b4e5 URL: https://github.com/kamailio/kamailio/commit/362c6de08058948d0a70a1eeb14ec71… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-22T08:43:33+01:00 ldap: rename private function ldap_connect When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ldap/ldap_connect.c Modified: src/modules/ldap/ldap_connect.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/362c6de08058948d0a70a1eeb14ec71… Patch: https://github.com/kamailio/kamailio/commit/362c6de08058948d0a70a1eeb14ec71… --- diff --git a/src/modules/ldap/ldap_connect.c b/src/modules/ldap/ldap_connect.c index 06850705e3..352db480ff 100644 --- a/src/modules/ldap/ldap_connect.c +++ b/src/modules/ldap/ldap_connect.c @@ -185,7 +185,7 @@ int ldap_connect_ex(char *_ld_name, int llevel) return 0; } -int ldap_connect(char *_ld_name) +int oldap_connect(char *_ld_name) { return ldap_connect_ex(_ld_name, L_DBG); } diff --git a/src/modules/ldap/ldap_connect.h b/src/modules/ldap/ldap_connect.h index 32a39e8c57..725e55cd90 100644 --- a/src/modules/ldap/ldap_connect.h +++ b/src/modules/ldap/ldap_connect.h @@ -31,7 +31,7 @@ #include "../../core/str.h" #include "../../core/dprint.h" -extern int ldap_connect(char *_ld_name); +extern int oldap_connect(char *_ld_name); extern int ldap_disconnect(char *_ld_name); extern int ldap_reconnect(char *_ld_name); extern int ldap_get_vendor_version(char **_version); diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index 4eb4118c5b..1fea95e458 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -167,7 +167,7 @@ static int child_init(int rank) return -1; } - if(ldap_connect(ld_name) != 0) { + if(oldap_connect(ld_name) != 0) { LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name); ldap_disconnect(ld_name); return -1;

1 0

git:master:b6e264c9: uac: exposed internal flags for $uac_req(key) variable
by Daniel-Constantin Mierla 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: b6e264c9780fc0432e6e746f473024e41bc1126b URL: https://github.com/kamailio/kamailio/commit/b6e264c9780fc0432e6e746f473024e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-22T08:37:40+01:00 uac: exposed internal flags for $uac_req(key) variable - if set to 1, the password is considered to be HA1 value - GH #2982 --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/b6e264c9780fc0432e6e746f473024e… Patch: https://github.com/kamailio/kamailio/commit/b6e264c9780fc0432e6e746f473024e… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index d906a1c27f..e5ea420d72 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -43,6 +43,8 @@ #include "uac_send.h" #include "uac_reg.h" +#define UAC_SEND_FL_HA1 (1<<0) + #define MAX_UACH_SIZE 2048 #define MAX_UACB_SIZE 32768 #define MAX_UACD_SIZE 128 @@ -492,6 +494,19 @@ int pv_set_uac_req(struct sip_msg* msg, pv_param_t *param, } _uac_req.evtype = tval->ri; break; + case 17: + if(tval==NULL) + { + _uac_req.flags = 0; + return 0; + } + if(!(tval->flags&PV_VAL_INT)) + { + LM_ERR("Invalid value type\n"); + return -1; + } + _uac_req.flags = tval->ri; + break; } return 0; } @@ -528,6 +543,8 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) case 5: if(strncmp(in->s, "auser", 5)==0) sp->pvp.pvn.u.isname.name.n = 9; + else if(strncmp(in->s, "flags", 5)==0) + sp->pvp.pvn.u.isname.name.n = 17; else goto error; break; case 6: @@ -721,8 +738,8 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) struct hdr_field *hdr; HASHHEX response; str *new_auth_hdr = NULL; - static struct authenticate_body auth; - struct uac_credential cred; + static authenticate_body_t auth; + uac_credential_t cred; char b_hdrs[MAX_UACH_SIZE]; str s_hdrs; uac_req_t uac_r; @@ -771,6 +788,9 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) cred.realm = auth.realm; cred.user = tp->s_auser; cred.passwd = tp->s_apasswd; + if(tp->flags & UAC_SEND_FL_HA1) { + cred.aflags = UAC_FLCRED_HA1; + } do_uac_auth(&tp->s_method, &tp->s_ruri, &cred, &auth, response); new_auth_hdr=build_authorization_hdr(ps->code, &tp->s_ruri, &cred,

1 0

[kamailio/kamailio] Potential resource leaks (Issue #2983)
by ryancaicse 22 Dec '21

22 Dec '21

`fclose(pf);` should be put before `Line 295`? https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2983 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2983(a)github.com>

3 6

git:master:84cdc334: auth_identity: close file in case of errors
by Daniel-Constantin Mierla 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: 84cdc33429c61fe7cac91cbedf96bef560267313 URL: https://github.com/kamailio/kamailio/commit/84cdc33429c61fe7cac91cbedf96bef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-22T08:12:20+01:00 auth_identity: close file in case of errors - GH #2983 --- Modified: src/modules/auth_identity/auth_identity.c --- Diff: https://github.com/kamailio/kamailio/commit/84cdc33429c61fe7cac91cbedf96bef… Patch: https://github.com/kamailio/kamailio/commit/84cdc33429c61fe7cac91cbedf96bef… --- diff --git a/src/modules/auth_identity/auth_identity.c b/src/modules/auth_identity/auth_identity.c index 4b4bb4bb08..d43df5a6c5 100644 --- a/src/modules/auth_identity/auth_identity.c +++ b/src/modules/auth_identity/auth_identity.c @@ -359,18 +359,22 @@ static int mod_init(void) } if (x509_get_notafter(&glb_imycertnotafter, pmycert)) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: Error getting certificate expiration date\n"); + fclose(hpemfile); return -13; } if (x509_get_notbefore(&ttmp, pmycert)) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: Error getting certificate validity date\n"); + fclose(hpemfile); return -13; } if ((tnow=time(0)) < 0) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: time error %s\n", strerror(errno)); + fclose(hpemfile); return -13; } if (tnow < ttmp || tnow > glb_imycertnotafter) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: Date of certificate is invalid (%s)\n", glb_sservercertpath); + fclose(hpemfile); return -14; }

1 0

git:master:81b8eb2c: ctl: implement long and long long types of values
by Daniel-Constantin Mierla 21 Dec '21

21 Dec '21

Module: kamailio Branch: master Commit: 81b8eb2c2f8e3fb370185bad05bd77656351dd06 URL: https://github.com/kamailio/kamailio/commit/81b8eb2c2f8e3fb370185bad05bd776… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-21T10:31:01+01:00 ctl: implement long and long long types of values - convert/store from/to double, based on supported types by binrpc, similar to xmlrpc --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/81b8eb2c2f8e3fb370185bad05bd776… Patch: https://github.com/kamailio/kamailio/commit/81b8eb2c2f8e3fb370185bad05bd776…

1 0

git:master:ff2d9e84: xmlrpc: implemented specifier for long and long long types of values
by Daniel-Constantin Mierla 21 Dec '21

21 Dec '21

Module: kamailio Branch: master Commit: ff2d9e84e43e87483cacc6bdbcf875f650b4d292 URL: https://github.com/kamailio/kamailio/commit/ff2d9e84e43e87483cacc6bdbcf875f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-21T09:07:17+01:00 xmlrpc: implemented specifier for long and long long types of values - they are mapped over double, xmlrpc defines only int and double types http://xmlrpc.com/spec.md --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ff2d9e84e43e87483cacc6bdbcf875f… Patch: https://github.com/kamailio/kamailio/commit/ff2d9e84e43e87483cacc6bdbcf875f…

1 0

git:master:04763fe7: core: utils/srjon - macros to get long long values
by Daniel-Constantin Mierla 20 Dec '21

20 Dec '21

Module: kamailio Branch: master Commit: 04763fe7de760005535e145f7fd783bbb60b2586 URL: https://github.com/kamailio/kamailio/commit/04763fe7de760005535e145f7fd783b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-20T10:14:27+01:00 core: utils/srjon - macros to get long long values --- Modified: src/core/utils/srjson.h --- Diff: https://github.com/kamailio/kamailio/commit/04763fe7de760005535e145f7fd783b… Patch: https://github.com/kamailio/kamailio/commit/04763fe7de760005535e145f7fd783b… --- diff --git a/src/core/utils/srjson.h b/src/core/utils/srjson.h index dd56449340..dce2ae9252 100644 --- a/src/core/utils/srjson.h +++ b/src/core/utils/srjson.h @@ -53,6 +53,8 @@ extern "C" #define SRJSON_GET_UINT(sj) ((unsigned int)((sj)->valuedouble)) #define SRJSON_GET_LONG(sj) ((long)((sj)->valuedouble)) #define SRJSON_GET_ULONG(sj) ((unsigned long)((sj)->valuedouble)) +#define SRJSON_GET_LLONG(sj) ((long long)((sj)->valuedouble)) +#define SRJSON_GET_ULLONG(sj) ((unsigned long long)((sj)->valuedouble)) /* The srjson node structure: */ typedef struct srjson {

1 0

git:master:92683311: jsonrpcs: support for long/long values in rpc messages
by Daniel-Constantin Mierla 20 Dec '21

20 Dec '21

Module: kamailio Branch: master Commit: 92683311d16dafe56951d9603a3a1e9a1b219d9a URL: https://github.com/kamailio/kamailio/commit/92683311d16dafe56951d9603a3a1e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-20T10:15:36+01:00 jsonrpcs: support for long/long values in rpc messages - l and j for long and unsigned long - L and J for long long and unsigned long long --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/92683311d16dafe56951d9603a3a1e9… Patch: https://github.com/kamailio/kamailio/commit/92683311d16dafe56951d9603a3a1e9… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index a5a92e1537..a966f6438e 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -484,6 +484,18 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) case 'f': nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, double)); break; + case 'l': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, long)); + break; + case 'j': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, unsigned long)); + break; + case 'L': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, long long)); + break; + case 'J': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, unsigned long long)); + break; case 'b': nj = srjson_CreateBool(ctx->jrpl, ((va_arg(*ap, int)==0)?0:1)); break; @@ -586,6 +598,10 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) { int *int_ptr; unsigned int *uint_ptr; + long *long_ptr; + unsigned long *ulong_ptr; + long long *llong_ptr; + unsigned long long *ullong_ptr; char **char_ptr; double *double_ptr; str *str_ptr; @@ -635,6 +651,22 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) double_ptr = va_arg(ap, double*); *double_ptr = ctx->req_node->valuedouble; break; + case 'l': /* Long */ + long_ptr = va_arg(ap, long*); + *long_ptr = SRJSON_GET_LONG(ctx->req_node); + break; + case 'j': /* Unsigned Long */ + ulong_ptr = va_arg(ap, unsigned long*); + *ulong_ptr = SRJSON_GET_ULONG(ctx->req_node); + break; + case 'L': /* Long Long */ + llong_ptr = va_arg(ap, long long*); + *llong_ptr = SRJSON_GET_LLONG(ctx->req_node); + break; + case 'J': /* Unsigned Long Long */ + ullong_ptr = va_arg(ap, unsigned long long*); + *ullong_ptr = SRJSON_GET_ULLONG(ctx->req_node); + break; case 's': /* zero terminated string */ char_ptr = va_arg(ap, char**); if(ctx->req_node->type==srjson_String) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev