sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
319 discussions

[kamailio/kamailio] Adding SSL support to db_redis and ndb_redis (PR #3345)

by joelbax

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description A couple of commit (1 per each module) adding SSL support to db_redis and ndb_redis. This mainly includes checking if proper parameter is provided (for ndb_redis it is `ssl` option in the DB URL and, for db_redis, a new `opt_ssl` parameter) and create a temporary SSL context that is used to initialise the redis context. db_redis is also updated with another parameter to provide a DB access password. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3345 -- Commit Summary -- * db_redis: Adding SSL support * ndb_redis: Adding SSL support -- File Changes -- M src/modules/db_redis/Makefile (8) M src/modules/db_redis/db_redis_mod.c (5) M src/modules/db_redis/redis_connection.c (43) M src/modules/db_redis/redis_connection.h (2) M src/modules/ndb_redis/Makefile (6) M src/modules/ndb_redis/redis_client.c (47) M src/modules/ndb_redis/redis_client.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3345.patch https://github.com/kamailio/kamailio/pull/3345.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3345 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3345(a)github.com>

1 year

[kamailio/kamailio] rtpengine: support receiving dtmf events from rtpengine and raise an event (PR #3471)

by Joey Golan

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3471 -- Commit Summary -- * imc: add support to modify member role * imc: call handle_modify * imc: db_mode support * Merge branch 'kamailio:master' into master * imc: destroy db only if db_mode is not 0 * Merge remote-tracking branch 'joeygo/master' * imc: propagate content-type header * Merge branch 'kamailio:master' into master * Merge remote-tracking branch 'joeygo/master' * Merge branch 'kamailio:master' into master * rtpengine: support receiving dtmf events from rtpengine and raise an event * Initialize uninitialized local variable * Pass 0 to pvar setf in case of an event raised -- File Changes -- M src/modules/rtpengine/doc/rtpengine.xml (7) M src/modules/rtpengine/doc/rtpengine_admin.xml (117) M src/modules/rtpengine/rtpengine.c (405) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3471.patch https://github.com/kamailio/kamailio/pull/3471.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3471 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3471(a)github.com>

1 year

git:master:bc544dae: async: use _async_timer_exec_last_slot = UINT_MAX for initial value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bc544daea2ee4bb568cf0314f6d32b8aa0c81ecc URL: https://github.com/kamailio/kamailio/commit/bc544daea2ee4bb568cf0314f6d32b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-31T11:53:14+02:00 async: use _async_timer_exec_last_slot = UINT_MAX for initial value --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/bc544daea2ee4bb568cf0314f6d32b8… Patch: https://github.com/kamailio/kamailio/commit/bc544daea2ee4bb568cf0314f6d32b8… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 42ada3b200c..605118be3da 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <limits.h> #include "../../core/dprint.h" #include "../../core/ut.h" @@ -272,7 +273,7 @@ int async_sleep(sip_msg_t *msg, int seconds, cfg_action_t *act, str *cbname) return 0; } -static unsigned int _async_timer_exec_last_slot = -1; +static unsigned int _async_timer_exec_last_slot = UINT_MAX; void async_timer_exec(unsigned int ticks, void *param) { @@ -293,7 +294,7 @@ void async_timer_exec(unsigned int ticks, void *param) return; } - if(_async_timer_exec_last_slot < 0) { + if(_async_timer_exec_last_slot == UINT_MAX) { _async_timer_exec_last_slot = idx; } slot = (_async_timer_exec_last_slot + 1) % ASYNC_RING_SIZE;

1 year

git:master:a059af04: sst: fix condition on sst_min_se for sst_check_min()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a059af04ac47fd31238ca4f22ad868529e035c43 URL: https://github.com/kamailio/kamailio/commit/a059af04ac47fd31238ca4f22ad8685… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-31T09:01:13+02:00 sst: fix condition on sst_min_se for sst_check_min() --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/a059af04ac47fd31238ca4f22ad8685… Patch: https://github.com/kamailio/kamailio/commit/a059af04ac47fd31238ca4f22ad8685… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index 9a159577af..549eeb0756 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -667,7 +667,7 @@ int ki_sst_check_min(struct sip_msg *msg, int flag) * too small. We will take the smaller of the messages * Session-expires and min-se if stated. */ - if(sst_min_se < MIN(minse, se.interval)) { + if(sst_min_se > MIN(minse, se.interval)) { /* * Too small. See if we need to send the 422 and are able * to send it.

1 year

git:master:b2f99145: cfgt: reworked test on dest.s for freeing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b2f99145fa7f4088c80dd3e759372445f93f5492 URL: https://github.com/kamailio/kamailio/commit/b2f99145fa7f4088c80dd3e75937244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-31T09:00:27+02:00 cfgt: reworked test on dest.s for freeing --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/b2f99145fa7f4088c80dd3e75937244… Patch: https://github.com/kamailio/kamailio/commit/b2f99145fa7f4088c80dd3e75937244… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 09a80d1c23..2509b3eb6e 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -79,7 +79,7 @@ void _cfgt_remove_report(const str *scen) DIR *folder = NULL; struct dirent *next_file = NULL; - if(_cfgt_get_filename(0, *scen, &dest, &dir) < 0) { + if(_cfgt_get_filename(0, *scen, &dest, &dir) < 0 || dest.s == NULL) { LM_ERR("can't build filename for uuid: %.*s\n", scen->len, scen->s); return; } @@ -124,10 +124,11 @@ void _cfgt_remove_report(const str *scen) } end: - if(filepath.s) + if(filepath.s) { pkg_free(filepath.s); - if(dest.s) - pkg_free(dest.s); + } + + pkg_free(dest.s); } int _cfgt_remove_uuid(const str *uuid, int remove_report)

1 year

git:master:cb633298: cdp: reworked switch for setting x->state = ACC_CC_ST_DISCON

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cb6332982edff5fd2f10b6ee41c22388cc9a39b3 URL: https://github.com/kamailio/kamailio/commit/cb6332982edff5fd2f10b6ee41c2238… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-31T08:56:19+02:00 cdp: reworked switch for setting x->state = ACC_CC_ST_DISCON --- Modified: src/modules/cdp/acctstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/cb6332982edff5fd2f10b6ee41c2238… Patch: https://github.com/kamailio/kamailio/commit/cb6332982edff5fd2f10b6ee41c2238… --- diff --git a/src/modules/cdp/acctstatemachine.c b/src/modules/cdp/acctstatemachine.c index 8dc694239c0..398526d86d7 100644 --- a/src/modules/cdp/acctstatemachine.c +++ b/src/modules/cdp/acctstatemachine.c @@ -221,8 +221,12 @@ int cc_acc_client_stateful_sm_process( case ACC_CC_EV_RECV_ANS_SUCCESS: x->state = ACC_CC_ST_DISCON; // update_gsu_response_timers(x, msg); + x->discon_time = time(0); + break; case ACC_CC_EV_RECV_ANS_UNSUCCESS: x->state = ACC_CC_ST_DISCON; + x->discon_time = time(0); + break; default: LM_DBG("Received event [%d] in state [%d] - cleaning up " "session regardless\n",

1 year

[kamailio/kamailio] t_newtran(): attempt to create transaction for a faked request - try to avoid it (Issue #3472)

by muslih_k_diy

### Description  my intention was to register to secondary remote proxy when primary remote proxy fails. iam using uac module for remote registration here i will ping the primary and secondary proxy using dispatcher module when the proxy is down, i will send registration to the other proxy which is up. ### Troubleshooting ``` 17(26) CRITICAL: <core> [core/mem/q_malloc.c:501]: qm_free(): BUG: bad pointer 0x7fa7ec666479 (out of memory block!) called from core: core/action.c: do_action(757) - ignoring 17(26) INFO: tm [t_lookup.c:1333]: t_newtran(): attempt to create transaction for a faked request - try to avoid it 17(26) NOTICE: tm [t_reply.c:2159]: relay_reply(): dst no longer set - skipped sending the reply out ``` #### Reproduction  basic_block ``` ### 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 /* 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 /* add local domain aliases */ # alias="sip.mydomain.com" /* uncomment and configure the following line if you want Kamailio to * bind on a specific interface/port/proto (default bind on all available) */ # listen=udp:10.0.0.10:5060 #!ifdef WITH_TLS enable_tls=yes #!endif /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ tcp_connection_lifetime=3605 ####### Custom Parameters ######### /* These parameters can be modified runtime via RPC interface * - see the documentation of 'cfg_rpc' module. * * Format: group.id = value 'desc' description * Access: $sel(cfg_get.group.id) or @cfg_get.group.id */ #!ifdef WITH_PSTN /* PSTN GW Routing * * - pstn.gw_ip: valid IP or hostname as string value, example: * pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address" * * - by default is empty to avoid misrouting */ pstn.gw_ip = "" desc "PSTN GW Address" pstn.gw_port = "" desc "PSTN GW Port" #!endif #!ifdef WITH_VOICEMAIL /* VoiceMail Routing on offline, busy or no answer * * - by default Voicemail server IP is empty to avoid misrouting */ voicemail.srv_ip = "" desc "VoiceMail IP Address" voicemail.srv_port = "5060" desc "VoiceMail Port" #!endif ####### Modules Section ######## /* set paths to location of modules */ # mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "ipops.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" loadmodule "counters.so" #!ifdef WITH_AUTH loadmodule "auth.so" loadmodule "auth_db.so" #!ifdef WITH_IPAUTH loadmodule "permissions.so" #!endif #!endif #!ifdef WITH_ALIASDB loadmodule "alias_db.so" #!endif #!ifdef WITH_SPEEDDIAL loadmodule "speeddial.so" #!endif #!ifdef WITH_MULTIDOMAIN loadmodule "domain.so" #!endif #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif #!ifdef WITH_NAT loadmodule "nathelper.so" loadmodule "rtpproxy.so" #!endif #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_ANTIFLOOD loadmodule "htable.so" loadmodule "pike.so" #!endif #!ifdef WITH_XMLRPC loadmodule "xmlrpc.so" #!endif #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif # ----------------- setting module-specific parameters --------------- # ----- jsonrpcs params ----- modparam("jsonrpcs", "pretty_format", 1) /* set the path to RPC fifo control file */ # modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ # modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- /* set the path to RPC unix socket control file */ # modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg #modparam("tm", "failure_reply_mode", 3) # default retransmission timeout: 30sec modparam("tm", "fr_timer", 2000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 40000) # ----- rr params ----- # set next param to 1 to add value to ;lr param (helps with some UAs) modparam("rr", "enable_full_lr", 1) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 1) #modparam("rr", "enable_double_rr", 2) # ----- registrar params ----- modparam("registrar", "method_filtering", 1) /* uncomment the next line to disable parallel forking via location */ # modparam("registrar", "append_branches", 0) /* uncomment the next line not to allow more than 10 contacts per AOR */ # modparam("registrar", "max_contacts", 10) /* max value for expires of registrations */ modparam("registrar", "max_expires", 3600) /* set it to 1 to enable GRUU */ modparam("registrar", "gruu_enabled", 0) # ----- acc params ----- /* what special events should be accounted ? */ modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) /* by default ww do not adjust the direct of the sequential requests. * if you enable this parameter, be sure the enable "append_fromtag" * in "rr" module */ modparam("acc", "detect_direction", 0) /* account triggers (flags) */ modparam("acc", "log_flag", FLT_ACC) modparam("acc", "log_missed_flag", FLT_ACCMISSED) modparam("acc", "log_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") modparam("acc", "failed_transaction_flag", FLT_ACCFAILED) /* enhanced DB accounting */ #!ifdef WITH_ACCDB modparam("acc", "db_flag", FLT_ACC) modparam("acc", "db_missed_flag", FLT_ACCMISSED) modparam("acc", "db_url", DBURL) modparam("acc", "db_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") #!endif # ----- usrloc params ----- /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) modparam("usrloc", "use_domain", MULTIDOMAIN) #!endif # ----- auth_db params ----- #!ifdef WITH_AUTH modparam("auth_db", "db_url", DBURL) modparam("auth_db", "calculate_ha1", yes) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") modparam("auth_db", "use_domain", MULTIDOMAIN) # ----- permissions params ----- #!ifdef WITH_IPAUTH modparam("permissions", "db_url", DBURL) modparam("permissions", "db_mode", 1) #!endif #!endif # ----- alias_db params ----- #!ifdef WITH_ALIASDB modparam("alias_db", "db_url", DBURL) modparam("alias_db", "use_domain", MULTIDOMAIN) #!endif # ----- speeddial params ----- #!ifdef WITH_SPEEDDIAL modparam("speeddial", "db_url", DBURL) modparam("speeddial", "use_domain", MULTIDOMAIN) #!endif # ----- domain params ----- #!ifdef WITH_MULTIDOMAIN modparam("domain", "db_url", DBURL) /* register callback to match myself condition with domains list */ modparam("domain", "register_myself", 1) #!endif #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) #!endif #!ifdef WITH_NAT # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("nathelper", "sipping_from", "sip:pinger@kamailio.org") # params needed for NAT traversal in other modules modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", FLB_NATB) #!endif #!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "config", "/etc/kamailio/tls.cfg") #!endif #!ifdef WITH_ANTIFLOOD # ----- pike params ----- modparam("pike", "sampling_time_unit", 2) modparam("pike", "reqs_density_per_unit", 16) modparam("pike", "remove_latency", 4) # ----- htable params ----- /* ip ban htable with autoexpire after 5 minutes */ modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif #!ifdef WITH_XMLRPC # ----- xmlrpc params ----- modparam("xmlrpc", "route", "XMLRPC"); modparam("xmlrpc", "url_match", "^/RPC") #!endif #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) modparam("debugger", "log_level_name", "exec") #!endif ``` uac_block ``` #!KAMAILIO loadmodule "uac.so" loadmodule "db_sqlite.so" modparam("uac", "reg_contact_addr", UAC_CONTACT_ADD) modparam("uac", "reg_db_url", "sqlite:///etc/kamailio/dbs/uac_reg.db") modparam("uac", "reg_retry_interval", 10) ``` dispatcher_block ``` #!KAMAILIO loadmodule "dispatcher.so" modparam("dispatcher", "force_dst", 1) modparam("dispatcher", "flags", 2) modparam("dispatcher", "xavp_dst", "dsdst") modparam("dispatcher", "xavp_dst_mode", 0) modparam("dispatcher", "ds_probing_mode", 1) modparam("dispatcher", "ds_ping_interval", 15) #modparam("dispatcher", "ds_ping_reply_codes", "class=2;class=3;class=4") modparam("dispatcher", "list_file", "/etc/kamailio/dispatcher.list") ``` route_block ``` event_route[dispatcher:dst-down] { xlog("L_ERR", "Destination down: $rm $ru ($du)\n"); $var(status) = uac_reg_status("+91XXX6"); xlog("L_NOTICE", "+91XXX_state : $var(status)\n\r"); if(uac_reg_request_to("+91XXX", 0)) { xlog("L_NOTICE", "Found remote user [$rU] on [$rd] via [$du]"); t_on_failure("REMOTE_AUTH"); $du="sip:10.*.32.1:5060"; t_relay(); } } failure_route[REMOTE_AUTH] { if ($T_reply_code == 401 or $T_reply_code == 407) { xlog("L_NOTICE", "Remote asked for authentication"); uac_auth(); } } ``` #### Debugging Data  ``` ``` #### Log Messages  ``` 17(26) ERROR: <script>: Destination down: OPTIONS sip:10.*.32.1:5060 (<null>) 17(26) NOTICE: <script>: 91XXX_state : 1 17(26) CRITICAL: <core> [core/mem/q_malloc.c:501]: qm_free(): BUG: bad pointer 0x7fa7ec666479 (out of memory block!) called from core: core/action.c: do_action(757) - ignoring 17(26) NOTICE: <script>: Found remote user [91XXX] on [sip.siptrunk.in] via [sip:10.*.33.1:5060] 17(26) INFO: tm [t_lookup.c:1333]: t_newtran(): attempt to create transaction for a faked request - try to avoid it 17(26) NOTICE: tm [t_reply.c:2159]: relay_reply(): dst no longer set - skipped sending the reply out ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` docker image kamailio/kamailio:5.4.6-buster ``` * **Operating System**:  ``` "Debian GNU/Linux 10 (buster)" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3472 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3472(a)github.com>

1 year

[kamailio/kamailio] rtpengine: support receiving dtmf events from rtpengine and raise an event (PR #3470)

by Joey Golan

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3470 -- Commit Summary -- * imc: add support to modify member role * imc: call handle_modify * imc: db_mode support * Merge branch 'kamailio:master' into master * imc: destroy db only if db_mode is not 0 * Merge remote-tracking branch 'joeygo/master' * imc: propagate content-type header * Merge branch 'kamailio:master' into master * Merge remote-tracking branch 'joeygo/master' * Merge branch 'kamailio:master' into master * rtpengine: support receiving dtmf events from rtpengine and raise an event -- File Changes -- M src/modules/rtpengine/doc/rtpengine.xml (7) M src/modules/rtpengine/doc/rtpengine_admin.xml (117) M src/modules/rtpengine/rtpengine.c (405) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3470.patch https://github.com/kamailio/kamailio/pull/3470.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3470 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3470(a)github.com>

1 year

[kamailio/kamailio] ipops: srv_query and naptr_query do not trigger DNS request (Issue #3419)

by sergey-safarov

### Description I found `srv_query` and `naptr_query` do not trigger DNS requests. This was checked via Kamailio logs and via tcpdump utility. #### Reproduction Required start Kamailio with config like ``` #!define L_DBG 3 #!define IPV4_ADDR 127.0.0.1 loadmodule "debugger.so" modparam("debugger", "cfgtrace", 1) modparam("debugger", "log_level_name", "exec") debug=L_DBG log_stderror=yes loadmodule "ipops.so" listen=udp:IPV4_ADDR name "ipv4_udp" request_route { naptr_query ("example.com", "res"); srv_query ("_sip._udp.example.com", "udp"); dns_query("test.com", "xyz"); drop; } ``` #### Log Messages ``` 28(2324390) DEBUG: <core> [core/ip_addr.c:580]: print_ip(): tcpconn_new: new tcp connection: 2600:1f18:578:5702:0:0:0:cc 28(2324390) DEBUG: <core> [core/tcp_main.c:1216]: tcpconn_new(): on port 34664, type 2, socket 46 28(2324390) DEBUG: <core> [core/tcp_main.c:1548]: tcpconn_add(): hashes: 1351:58:985, 2 28(2324390) DEBUG: <core> [core/io_wait.h:374]: io_watch_add(): processing io_watch_add(0x9ff548, 46, 2, 0xffff901ff268) - fd_no=40 28(2324390) DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0x9ff548, 46, -1, 0x0) fd_no=41 called 28(2324390) DEBUG: <core> [core/tcp_main.c:4547]: handle_tcpconn_ev(): sending to child, events 1 28(2324390) DEBUG: <core> [core/tcp_main.c:4217]: send2child(): selected tcp worker idx:1 proc:21 pid:2324383 for activity on [tcp:[2605:84c0:88:42::1]:5060], 0xffff901ff268 21(2324383) DEBUG: <core> [core/tcp_read.c:1735]: handle_io(): received n=8 con=0xffff901ff268, fd=6 21(2324383) DEBUG: <core> [core/tcp_read.c:1533]: tcp_read_req(): content-length=782 21(2324383) DEBUG: <core> [core/parser/parse_fline.c:249]: parse_first_line(): first line type 1 (request) flags 1 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:679]: parse_msg(): SIP Request: 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:680]: parse_msg(): method: <INVITE> 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:682]: parse_msg(): uri: <urn:service:sos> 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:684]: parse_msg(): version: <SIP/2.0> 21(2324383) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Record-Route] type 10 21(2324383) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Record-Route] type 10 21(2324383) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Via] type 1 21(2324383) DEBUG: <core> [core/parser/parse_via.c:1300]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKb72a.e5268cd9ad7d121798072d354270bec4.0>; state=6 21(2324383) DEBUG: <core> [core/parser/parse_via.c:1300]: parse_via_param(): Found param type 236, <i> = <6c7781>; state=16 21(2324383) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:555]: parse_headers(): Via found, flags=2 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:557]: parse_headers(): this is the first via 21(2324383) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Via] type 1 21(2324383) DEBUG: <core> [core/parser/parse_via.c:1300]: parse_via_param(): Found param type 234, <received> = <2600:1f18:578:5704:62c1:bea:3535:6449>; state=6 21(2324383) DEBUG: <core> [core/parser/parse_via.c:1300]: parse_via_param(): Found param type 235, <rport> = <34895>; state=6 21(2324383) DEBUG: <core> [core/parser/parse_via.c:1300]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKrB4pr8Sa2gaKQ>; state=16 21(2324383) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:555]: parse_headers(): Via found, flags=78 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:568]: parse_headers(): this is the second via 21(2324383) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Max-Forwards] type 8 21(2324383) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [From] type 4 21(2324383) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [To] type 3 21(2324383) DEBUG: <core> [core/parser/parse_addr_spec.c:884]: parse_addr_spec(): end of header reached, state=10 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): <To> [19]; uri=[urn:service:sos] 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:174]: get_hdr_field(): to body (19)[<urn:service:sos> ], to tag (0)[] 21(2324383) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Call-ID] type 6 21(2324383) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [CSeq] type 5 21(2324383) DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <66360993> <INVITE> 21(2324383) DEBUG: <core> [core/receive.c:389]: receive_msg(): --- received sip message - request - call-id: [b12b3938-ddf8-11ed-8503-e9120e4ae1c8] - cseq: [66360993 INVITE] 21(2324383) DEBUG: <core> [core/receive.c:261]: ksr_evrt_pre_routing(): event route core:pre-routing not defined 21(2324383) DEBUG: <core> [core/receive.c:471]: receive_msg(): preparing to run routing scripts... 21(2324383) exec: *** cfgtrace:dbg_cfg_trace(): request_route=[DEFAULT_ROUTE] c=[/etc/sip-aggregator/kamailio2.cfg] l=34 a=26 n=naptr_query 21(2324383) DEBUG: ipops [ipops_pv.c:1483]: naptr_update_pv(): ipops_pv.c:1483 naptr_update_pv - called: naptrname => [example.com], pvid => [res] 21(2324383) DEBUG: ipops [ipops_pv.c:1204]: sr_naptr_add_item(): ipops_pv.c:1204 sr_naptr_add_item - called: pvid => [res] findflg => [1] 21(2324383) DEBUG: ipops [ipops_pv.c:1503]: naptr_update_pv(): pvid not found: res 21(2324383) exec: *** cfgtrace:dbg_cfg_trace(): request_route=[DEFAULT_ROUTE] c=[/etc/sip-aggregator/kamailio2.cfg] l=35 a=26 n=srv_query 21(2324383) DEBUG: ipops [ipops_pv.c:1034]: srv_update_pv(): pvid not found: udp 21(2324383) exec: *** cfgtrace:dbg_cfg_trace(): request_route=[DEFAULT_ROUTE] c=[/etc/sip-aggregator/kamailio2.cfg] l=36 a=26 n=dns_query 21(2324383) DEBUG: ipops [ipops_pv.c:390]: dns_update_pv(): attempting to resolve: test.com 21(2324383) DEBUG: ipops [ipops_pv.c:421]: dns_update_pv(): #0 - type 4 addr: 67.225.146.248 (2) 21(2324383) DEBUG: ipops [ipops_pv.c:434]: dns_update_pv(): dns PV updated for: test.com (1) 21(2324383) exec: *** cfgtrace:dbg_cfg_trace(): request_route=[DEFAULT_ROUTE] c=[/etc/sip-aggregator/kamailio2.cfg] l=37 a=2 n=drop 21(2324383) DEBUG: <core> [core/receive.c:528]: receive_msg(): request-route executed in: 4324 usec 21(2324383) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 21(2324383) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 21(2324383) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 21(2324383) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 21(2324383) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 21(2324383) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 21(2324383) DEBUG: <core> [core/xavp.c:541]: xavp_destroy_list(): destroying xavp list (nil) 21(2324383) DEBUG: <core> [core/xavp.c:541]: xavp_destroy_list(): destroying xavp list (nil) 21(2324383) DEBUG: <core> [core/xavp.c:541]: xavp_destroy_list(): destroying xavp list (nil) 21(2324383) DEBUG: <core> [core/receive.c:628]: receive_msg(): cleaning up 21(2324383) DEBUG: <core> [core/io_wait.h:374]: io_watch_add(): processing io_watch_add(0xa437d8, 6, 2, 0xffff901ff268) - fd_no=1 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` Here is little modified 5.6.4 ``` version: kamailio 5.6.4 (aarch64/linux) 5583a2 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-NOSMP, 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: 5583a2 compiled on 00:00:00 Sep 13 2022 with gcc 12.2.1 ``` * **Operating System**: ``` NAME="Fedora Linux" VERSION="37.20230322.3.0 (CoreOS)" ID=fedora VERSION_ID=37 VERSION_CODENAME="" PLATFORM_ID="platform:f37" PRETTY_NAME="Fedora CoreOS 37.20230322.3.0" ANSI_COLOR="0;38;2;60;110;180" LOGO=fedora-logo-icon CPE_NAME="cpe:/o:fedoraproject:fedora:37" HOME_URL="https://getfedora.org/coreos/" DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora-coreos/" SUPPORT_URL="https://github.com/coreos/fedora-coreos-tracker/" BUG_REPORT_URL="https://github.com/coreos/fedora-coreos-tracker/" REDHAT_BUGZILLA_PRODUCT="Fedora" REDHAT_BUGZILLA_PRODUCT_VERSION=37 REDHAT_SUPPORT_PRODUCT="Fedora" REDHAT_SUPPORT_PRODUCT_VERSION=37 SUPPORT_END=2023-11-14 VARIANT="CoreOS" VARIANT_ID=coreos OSTREE_VERSION='37.20230322.3.0' ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3419 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3419(a)github.com>

1 year

[kamailio/kamailio] tm:t_lookup_callid use only trans Call-ID header value to match with … (PR #3393)

by descartin

…callid param   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ 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  Using kamailio 5.4 version, we have had an issue with a carrier that sent a CANCEL with to-tag. To be able to process that request, we used the function t_cancel_callid, to convert that abnormal CANCEL to a regular one cancelling the current transaction for that call. But we saw that it was not working since they sent the callid header named as CALL-ID. Seems the matching between the stored callid header in memory and the param passed for the callid lookup matching, is being done in case sensitive way with a generated Call-ID: XXXXXXXX based on the called param of the function. we have tested a wasy to do the comparision only with the callid header value, so we strip from the callid header stored at memory the Call-ID: (or CALL-ID:) part. maybe there is another way to do that in other part of the code, but seems at least this worked for the tests thanks a lot and regards david You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3393 -- Commit Summary -- * tm:t_lookup_callid use only trans Call-ID header value to match with callid param -- File Changes -- M src/modules/tm/t_lookup.c (10) M src/modules/tm/t_msgbuilder.c (9) M src/modules/tm/t_msgbuilder.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3393.patch https://github.com/kamailio/kamailio/pull/3393.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3393 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3393(a)github.com>

1 year

← Newer
1
...
10
11
12
13
14
15
16
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2023