sr-dev February 2022

sr-dev@lists.kamailio.org

17 participants
243 discussions

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: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: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: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: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: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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2022