- sr-dev - kamailio.org

git:5.8:1ee553a6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: 1ee553a6f406af5eb4838a8c46a992c4099dd30b URL: https://github.com/kamailio/kamailio/commit/1ee553a6f406af5eb4838a8c46a992c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T17:31:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README Modified: src/modules/ims_usrloc_scscf/README Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/1ee553a6f406af5eb4838a8c46a992c… Patch: https://github.com/kamailio/kamailio/commit/1ee553a6f406af5eb4838a8c46a992c…

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 07 May '24

07 May '24

- URL: https://github.com/kamailio/kamailio/commit/0bf03aa1987b9cff2fc0d776605620e… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T17:05:58+02:00 core: spelling fix in comment and log message (cherry picked from commit db176a4918c0b500f5f051cad16fd8d442450ab7) - URL: https://github.com/kamailio/kamailio/commit/b2352bc1c6f3eff3aba85a087107f4c… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T17:06:04+02:00 uid_auth_db: spelling fix in documentation (cherry picked from commit 9f28450312749dfbc021a8cbc23472c8a39d3fef) - URL: https://github.com/kamailio/kamailio/commit/1dd7c4038eb9a0c7eec506994a58a56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:06:14+02:00 ims_usrloc_scscf: reformat exported structures (cherry picked from commit 15d859e1e96552fca2708cf56047021beae29711) - URL: https://github.com/kamailio/kamailio/commit/620aa3f2a0faf3a4d54908bac0aa3ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:06:20+02:00 ims_usrloc_scscf: enclose examples in dotted lines for better visibility (cherry picked from commit 8506a6fe781e6e0b0b1418f4087db50480db6b57) - URL: https://github.com/kamailio/kamailio/commit/89343b6031f186c59ecd6707109bd02… Author: Ostap <ostap_mal(a)hotmail.com> Date: 2024-05-07T17:06:39+02:00 modules/statsd: ensure statsd failures do not stop execution (#3819) * modules/statsd: avoid stopping flow when sending statsd metric fails Currently statsd functions return bool: `true` or `false` depending when the function succeeds or fails respectively. This value gets implicitly converted to `int`: `true` -> `1`, `false` -> `0`. For Kamailio `1` means succesfull execution, but `0` means to stop processing messages, which is not what we want as statsd should not impact flow execution. Instead we want to return `-1` which signifies error, but the flow continues. * modules/statsd: do not fail module initilization when statsd init fails statsd_init executes `statsd_connect` which tries to connect to statd server. If connection fails then kamailio fails to start. This is not the desired behaviour as: 1. Kamailio should continue working even if statsd server is down, metrics should not impact runtime. 2. `statsd_connect` is also re-executed each time we try to send the metric https://github.com/salemove/kamailio/blame/master/src/modules/statsd/lib_st…, so it's initial result is not essential. Note, that before 5.8 the result of init was already ignored due to implicit conversion of `false` to `0` until after https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… was introduced (which could be considered a breaking change even if it seemingly fixes a bug in conversion). (cherry picked from commit 5e66ba23851f115bcb88d7e3f71f78ab33fc1e30) - URL: https://github.com/kamailio/kamailio/commit/8af0605ade36566597ff691a2adc1e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:06:49+02:00 ims_registrar_scscf: init variable to fix analyzer warning (cherry picked from commit 8558947034f16b162c15eda39d18f5f5df4ef562) - URL: https://github.com/kamailio/kamailio/commit/1387c32dfa601496c38f9c10d554c49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:01+02:00 ims_ipsec_pcscf: decouple IPSEC_FORWARD_USEVIA and IPSEC_TCPPORT_UEC for requests - both flags should be avaible for use at the same time in ipsec_forward() - for request IPSEC_FORWARD_USEVIA gets the protocol from the next hop address (cherry picked from commit ab261540d656ed456bac8876f77f940457a9baf6) - URL: https://github.com/kamailio/kamailio/commit/7e202ec38593462559e81db7b0f97e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:11+02:00 ims_ipsec_pcscf: docs updated for ipsec_forward() flags (cherry picked from commit 575b17d23cd5fa060f775bc56b42c735048bc849) - URL: https://github.com/kamailio/kamailio/commit/9493dc0c895d1dde50239c903fd976c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:18+02:00 ims_ipsec_pcscf: updated comments for ipsec_forward() flags (cherry picked from commit f7f93828993b5975dfe5f26ad63ba6c489aa69f7) - URL: https://github.com/kamailio/kamailio/commit/00f51e28875c209cbf25a47c96e60c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:24+02:00 ims_ipsec_pcscf: handle tls for replies (cherry picked from commit 48dab490965fa7f2f7200d95edd7dbb1407b2536) - URL: https://github.com/kamailio/kamailio/commit/4aa0920b2e573661959d5c9149ee041… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:07:38+02:00 ims_registrar_scscf: fix uninitialized arguments in save() The script "save" command can be used with different arguments: 2, 3 and 4. But internally for all save() calls the exact same function is use, w_save(). When calling save("PRE_REG_SAR_REPLY","location"); as given by the examples, kamailio will call w_save(). Because the command code will cast the function pointer, the w_save() function is called with 2 uninitialized arguments *mode, *c_flags. mode is unused, seems a legacy argument. c_flags is referenced resulting in a crash if not null. Use separate wrapper functions to handle different argument number. Fixes: a627c9a04a74 ("ims_registrar_scscf: Extend save() with optional flag") (cherry picked from commit 20a75004d53a06da0f22b11804a4d83496ad8919) - URL: https://github.com/kamailio/kamailio/commit/8bb9f0601eb94597f3bfab4ede97971… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:08:03+02:00 ims_registrar_scscf: refactor save_fixup4 Rename function to match argument number. Use assign_save_fixup3_async instead of the code copy (cherry picked from commit 82a6d7ea6edbaca60879a38c5e74e40920e89342) - URL: https://github.com/kamailio/kamailio/commit/569662043b656063be97d0ea0e22dd8… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:08:11+02:00 ims_registrar_scscf: fix typo in function name uint_fixup (cherry picked from commit 6f908f05d4691abcb1b3a745048d3cc2a9996676) - URL: https://github.com/kamailio/kamailio/commit/4b3620d0f0d7d636bf1d9e4c2b19bf5… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:08:22+02:00 ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter The free_uint_fixup() freed the wrong parameter in the past. (cherry picked from commit c3e6c1edc7531406208efe2965243e6e81506127) - URL: https://github.com/kamailio/kamailio/commit/4e98a4ae06ec0bbff408af211680c97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:08:32+02:00 ims_ipsec_pcscf: cascade on options to get the uri for fill_contact() (cherry picked from commit 60d2ab6464657abf38136a771c297c6f5536e27a) - URL: https://github.com/kamailio/kamailio/commit/3aac0c7379577480fb09902bfb31b9a… Author: Jannik <40364587+volkland(a)users.noreply.github.com> Date: 2024-05-07T17:08:41+02:00 sipcapture: docs - fix default value for parameter (cherry picked from commit 265c948286f2df5136179c95fbb1d7f1255e4c71) - URL: https://github.com/kamailio/kamailio/commit/fc54fdcd67e244ad075c54b5f24bb64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:08:52+02:00 tm: free new buffer on drop for local requests - GH #3403 (cherry picked from commit ee06666c43d96029315dae7618e10d381265a85a) - URL: https://github.com/kamailio/kamailio/commit/f9ca6854d88e4fcc161e1083a953f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:08:58+02:00 tm: cb flag to mark local uac on request drop (cherry picked from commit f5da773c5fa29edbf9d0e65a83a62f495928ddec) - URL: https://github.com/kamailio/kamailio/commit/a86d7d2bad119fc4cccf5c19719b445… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:06+02:00 tm: cb_flags made unsigned for uac_req (cherry picked from commit ebd1c6c75a1b832ce85d576aad134b99d47b5738) - URL: https://github.com/kamailio/kamailio/commit/e54b03fc41bc55486430b09d9a4839b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:15+02:00 pv_headers: print also the new TMCB_LOCAL_REQUEST_DROP in debug function (cherry picked from commit 68624c2da093ab789d4e8d35df65ef1bce024bca) - URL: https://github.com/kamailio/kamailio/commit/965a02ba4aca9283e4f43f8153ebeb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:25+02:00 presence: check if the local notify was dropped in event route - free tm cb parameter on drop - related to GH #3403 (cherry picked from commit d12fc31056cb37aac347ec05f9ada7bafa5f52de) - URL: https://github.com/kamailio/kamailio/commit/46c8e1a5b0e11162eee2c0b201bb535… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:39+02:00 uac: check if local requests are dropped and free the param (cherry picked from commit 00aac8d48370fac356eecff535835d918c631cc5) - URL: https://github.com/kamailio/kamailio/commit/244319c67a191cf1f093b2220fa1a85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:49+02:00 pua: check if local requests are dropped and free the param (cherry picked from commit 53e1a29c265df1489c9bd91deddc0719f8ca2092) - URL: https://github.com/kamailio/kamailio/commit/5b97d29f1bbac2656eba506c7fd94b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:10:17+02:00 core: parser/contact - add limit for max number of contacts - defined to 256 (cherry picked from commit d6b0beb5a219ae57a62e9e7201a6ec1fe66e5a96) - URL: https://github.com/kamailio/kamailio/commit/d75dba611808322356fc8d1ebc9f8c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:10:25+02:00 core: parser/contact - basic validation tests for contact uri (cherry picked from commit fc52a54370c085d6fa951da876eee99580677922) - URL: https://github.com/kamailio/kamailio/commit/11f0cfec4d2fc6043d282cdb2258520… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:11:19+02:00 core: parse/contact: jump to error on too many contacts (cherry picked from commit f69b22d44cb5abc803c2b58790dd33f2310c1c59) - URL: https://github.com/kamailio/kamailio/commit/24e43d27544bdfa1acfce7ebb8b6e3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:11:35+02:00 ctl: removed level and function names from log messages (cherry picked from commit 65bafaffd6bcfebc508b774cfbb78120e68bb3f0) - URL: https://github.com/kamailio/kamailio/commit/b5eb4f5ca037239f2ec1d99a16a71af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:11:46+02:00 ctl: info log on ECONNRESET (connection reset by peer) - not a type of error that can be controlled by kamailio (cherry picked from commit 446c75e0e2194b6e42d768d2e3c79b5f0222905f)

1 0

git:master:446c75e0: ctl: info log on ECONNRESET (connection reset by peer)
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 446c75e0e2194b6e42d768d2e3c79b5f0222905f URL: https://github.com/kamailio/kamailio/commit/446c75e0e2194b6e42d768d2e3c79b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T16:55:24+02:00 ctl: info log on ECONNRESET (connection reset by peer) - not a type of error that can be controlled by kamailio --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/446c75e0e2194b6e42d768d2e3c79b5… Patch: https://github.com/kamailio/kamailio/commit/446c75e0e2194b6e42d768d2e3c79b5… --- diff --git a/src/modules/ctl/io_listener.c b/src/modules/ctl/io_listener.c index eb93f5f960d..4c15a6b1f21 100644 --- a/src/modules/ctl/io_listener.c +++ b/src/modules/ctl/io_listener.c @@ -486,7 +486,11 @@ static int handle_stream_read(struct stream_connection *s_c, int idx) } else if(errno == EINTR) { goto again; } - LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + if(errno == ECONNRESET) { + LOG(L_INFO, "error reading: %s [%d]\n", strerror(errno), errno); + } else { + LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + } goto error_read; } else if(bytes_read == 0) { /* eof */ DBG("handle_stream read: eof on %s\n", s_c->parent->name); @@ -602,7 +606,11 @@ static int handle_fifo_read(struct ctrl_socket *cs, int idx) goto no_read; /* nothing has been read */ } else if(errno == EINTR) goto again; - LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + if(errno == ECONNRESET) { + LOG(L_INFO, "error reading: %s [%d]\n", strerror(errno), errno); + } else { + LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + } goto error_read; } else if(bytes_read == 0) { /* eof */ DBG("eof on %s\n", cs->name);

1 0

git:master:65bafaff: ctl: removed level and function names from log messages
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 65bafaffd6bcfebc508b774cfbb78120e68bb3f0 URL: https://github.com/kamailio/kamailio/commit/65bafaffd6bcfebc508b774cfbb7812… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T16:49:49+02:00 ctl: removed level and function names from log messages --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/65bafaffd6bcfebc508b774cfbb7812… Patch: https://github.com/kamailio/kamailio/commit/65bafaffd6bcfebc508b774cfbb7812…

1 0

git:master:6cb26e9e: core: cfg socket struct - option to bind to a range of sockets
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 6cb26e9e7045eeec9c08867fe264c71c697bb9d8 URL: https://github.com/kamailio/kamailio/commit/6cb26e9e7045eeec9c08867fe264c71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-06T18:40:41+02:00 core: cfg socket struct - option to bind to a range of sockets - bind can be: proto:addr:portstart-portend - bind=udp:127.0.0.1:5060-5080 - start and end ports are inclusive --- Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/6cb26e9e7045eeec9c08867fe264c71… Patch: https://github.com/kamailio/kamailio/commit/6cb26e9e7045eeec9c08867fe264c71… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index eb0ecaf2087..e026b1b8b9a 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -840,6 +840,19 @@ socket_lattr: tmp_sa.bindaddr.len = strlen(tmp_sa.bindaddr.s); tmp_sa.bindport = $5; } + | BIND EQUAL proto COLON listen_id COLON port MINUS port { + tmp_sa.bindproto = $3; + tmp_sa.bindaddr.s = $5; + tmp_sa.bindaddr.len = strlen(tmp_sa.bindaddr.s); + tmp_sa.bindport = $7; + tmp_sa.bindportend = $9; + } + | BIND EQUAL listen_id COLON port MINUS port { + tmp_sa.bindaddr.s = $3; + tmp_sa.bindaddr.len = strlen(tmp_sa.bindaddr.s); + tmp_sa.bindport = $5; + tmp_sa.bindportend = $7; + } | BIND EQUAL proto COLON listen_id { tmp_sa.bindproto = $3; tmp_sa.bindaddr.s = $5; diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index a8f9660b9c6..e475986d1a2 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -163,6 +163,7 @@ typedef struct socket_attrs int bindproto; str bindaddr; int bindport; + int bindportend; int useproto; str useaddr; int useport; diff --git a/src/core/socket_info.c b/src/core/socket_info.c index ab59df73dd6..fe7d04636e6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1255,6 +1255,9 @@ int add_listen_socket(socket_attrs_t *sa) { socket_info_t *newsi; name_lst_t addr_l; + char sname[128]; + char *psname = NULL; + int i; if(sa->bindaddr.s == NULL) { LM_ERR("no bind address provided\n"); @@ -1263,11 +1266,31 @@ int add_listen_socket(socket_attrs_t *sa) memset(&addr_l, 0, sizeof(name_lst_t)); addr_l.name = sa->bindaddr.s; - newsi = add_listen_socket_info(sa->bindaddr.s, &addr_l, sa->bindport, - sa->bindproto, sa->useproto, sa->useaddr.s, sa->useport, - sa->sockname.s, sa->sflags); + /* binding on single port */ + if(sa->bindportend <= sa->bindport) { + newsi = add_listen_socket_info(sa->bindaddr.s, &addr_l, sa->bindport, + sa->bindproto, sa->useproto, sa->useaddr.s, sa->useport, + sa->sockname.s, sa->sflags); + return (newsi != NULL) ? 0 : -1; + } - return (newsi != NULL) ? 0 : -1; + /* binding on a range of ports */ + for(i = 0; sa->bindport + i <= sa->bindportend; i++) { + if(sa->sockname.s != NULL) { + /* socketname gets port appended */ + snprintf(sname, 128, "%s%d", sa->sockname.s, sa->bindport + i); + psname = sname; + } else { + psname = NULL; + } + newsi = add_listen_socket_info(sa->bindaddr.s, &addr_l, + sa->bindport + i, sa->bindproto, sa->useproto, sa->useaddr.s, + sa->useport + i, psname, sa->sflags); + if(newsi == NULL) { + return -1; + } + } + return 0; } #ifdef __OS_linux

1 0

[kamailio/kamailio] Kamailio incoming call error (Issue #3842)
by Jasubek 07 May '24

07 May '24

kamailio.cfg #!KAMAILIO # # Kamailio SIP Server v5.5 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio # # Direct your questions about this file to: <sr-users(a)lists.kamailio.org> # # Refer to the Core CookBook at https://www.kamailio.org/wiki/ # for an explanation of possible statements, functions and parameters. # # Note: the comments can be: # - lines starting with #, but not the pre-processor directives, # which start with #!, like #!define, #!ifdef, #!endif, #!else, #!trydef, # #!subst, #!substdef, ... # - lines starting with // # - blocks enclosed in between /* */ # Note: the config performs symmetric SIP signaling # - it sends the reply to the source address of the request # - remove the use of force_rport() for asymmetric SIP signaling # # Several features can be enabled using '#!define WITH_FEATURE' directives: # # *** To run in debug mode: # - define WITH_DEBUG # - debug level increased to 3, logs still sent to syslog # - debugger module loaded with cfgtrace endabled # # *** To enable mysql: # - define WITH_MYSQL # # *** To enable authentication execute: # - enable mysql # - define WITH_AUTH # - add users using 'kamctl' or 'kamcli' # # *** To enable IP authentication execute: # - enable mysql # - enable authentication # - define WITH_IPAUTH # - add IP addresses with group id '1' to 'address' table # # *** To enable persistent user location execute: # - enable mysql # - define WITH_USRLOCDB # # *** To enable presence server execute: # - enable mysql # - define WITH_PRESENCE # - if modified headers or body in config must be used by presence handling: # - define WITH_MSGREBUILD # # *** To enable nat traversal execute: # - define WITH_NAT # - option for NAT SIP OPTIONS keepalives: WITH_NATSIPPING # - install RTPProxy: http://www.rtpproxy.org # - start RTPProxy: # rtpproxy -l _your_public_ip_ -s udp:localhost:7722 # # *** To use RTPEngine (instead of RTPProxy) for nat traversal execute: # - define WITH_RTPENGINE # - install RTPEngine: https://github.com/sipwise/rtpengine # - start RTPEngine: # rtpengine --listen-ng=127.0.0.1:2223 ... # # *** To enable PSTN gateway routing execute: # - define WITH_PSTN # - set the value of pstn.gw_ip # - check route[PSTN] for regexp routing condition # # *** To enable database aliases lookup execute: # - enable mysql # - define WITH_ALIASDB # # *** To enable speed dial lookup execute: # - enable mysql # - define WITH_SPEEDDIAL # # *** To enable multi-domain support execute: # - enable mysql # - define WITH_MULTIDOMAIN # # *** To enable TLS support execute: # - adjust CFGDIR/tls.cfg as needed # - define WITH_TLS # # *** To enable JSONRPC over HTTP(S) support execute: # - define WITH_JSONRPC # - adjust event_route[xhttp:request] for access policy # # *** To enable anti-flood detection execute: # - adjust pike and htable=>ipban settings as needed (default is # block if more than 16 requests in 2 seconds and ban for 300 seconds) # - define WITH_ANTIFLOOD # # *** To block 3XX redirect replies execute: # - define WITH_BLOCK3XX # # *** To block 401 and 407 authentication replies execute: # - define WITH_BLOCK401407 # # *** To enable VoiceMail routing execute: # - define WITH_VOICEMAIL # - set the value of voicemail.srv_ip # - adjust the value of voicemail.srv_port # # *** To enhance accounting execute: # - enable mysql # - define WITH_ACCDB # - add following columns to database #!ifdef ACCDB_COMMENT ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; #!endif ####### Include Local Config If Exists ######### import_file "kamailio-local.cfg" ####### Defined Values ######### #!substdef "!MY_IP_ADDR!public ip!g" #!substdef "!MY_DOMAIN!test.sip.domain.com" #!substdef "!MY_WS_PORT!5065!g" #!substdef "!MY_WSS_PORT!443!g" #!substdef "!MY_MSRP_PORT!9000!g" #!substdef "!MY_WS_ADDR!tcp:MY_IP_ADDR:MY_WS_PORT!g" #!substdef "!MY_WSS_ADDR!tls:MY_IP_ADDR:MY_WSS_PORT!g" #!substdef "!MY_MSRP_ADDR!tls:MY_IP_ADDR:MY_MSRP_PORT!g" #!substdef "!MSRP_MIN_EXPIRES!1800!g" #!substdef "!MSRP_MAX_EXPIRES!3600!g" #!define WITH_MYSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_ACCDB #!define WITH_WEBSOCKETS #!define WITH_NAT #!define WITH_NATSIPPING #!define WITH_DEBUG # *** Value defines - IDs used later in config #!ifdef WITH_DEBUG #!define DBGLEVEL 2 #!else #!define DBGLEVEL 2 #!endif #!ifdef WITH_MYSQL #loadmodule "db_mysql.so" # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. #!trydef DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" #!endif #!ifdef WITH_MULTIDOMAIN # - the value for 'use_domain' parameters #!define MULTIDOMAIN 1 #!else #!define MULTIDOMAIN 0 #!endif # - flags # FLT_ - per transaction (message) flags #!define FLT_ACC 1 #!define FLT_ACCMISSED 2 #!define FLT_ACCFAILED 3 #!define FLT_NATS 5 # FLB_ - per branch flags #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 ####### Global Parameters ######### /* LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR, ... */ debug=DBGLEVEL /* set to 'yes' to print log messages to terminal or use '-E' cli option */ log_stderror=no memdbg=5 memlog=5 log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " /* number of SIP routing processes for each UDP socket * - value inherited by tcp_children and sctp_children when not set explicitely */ children=8 /* uncomment the next line to disable TCP (default on) */ # disable_tcp=yes /* number of SIP routing processes for all TCP/TLS sockets */ # tcp_children=8 /* 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 - it can be set many times */ # alias="sip.mydomain.com" /* listen sockets - if none set, Kamailio binds to all local IP addresses * - basic prototype (full prototype can be found in Wiki - Core Cookbook): * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ # listen=udp:10.0.0.10:5060 /* 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 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 #!ifdef WITH_JSONRPC tcp_accept_no_cl=yes #!endif #!ifdef WITH_WEBSOCKETS tcp_accept_no_cl=yes tcp_rd_buf_size=65535 enable_tls=yes #!endif #!ifdef WITH_TLS /* upper limit for TLS connections */ tls_max_connections=2048 #!endif /* set it to yes to enable sctp and load sctp.so module */ enable_sctp=no ####### 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 = "sip.domain.com" voicemail.srv_port = "5060" #!endif listen=MY_IP_ADDR #!ifdef WITH_WEBSOCKETS listen=MY_WS_ADDR #!ifdef WITH_TLS listen=MY_WSS_ADDR #!endif #!endif #!ifdef WITH_MSRP listen=MY_MSRP_ADDR #!endif tcp_connection_lifetime=3604 tcp_accept_no_cl=yes tcp_rd_buf_size=16384 ####### 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 #!ifdef WITH_JSONRPC loadmodule "xhttp.so" #!endif 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 "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "textopsx.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" #!ifdef WITH_RTPENGINE loadmodule "rtpengine.so" #!else loadmodule "rtpproxy.so" #!endif #!endif #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_ANTIFLOOD loadmodule "htable.so" loadmodule "pike.so" #!endif #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif #!ifdef WITH_WEBSOCKETS loadmodule "websocket.so" loadmodule "xhttp.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", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ # modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") #!ifdef WITH_JSONRPC modparam("jsonrpcs", "transport", 7) #!endif # ----- ctl params ----- /* set the path to RPC unix socket control file */ # modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- sanity params ----- modparam("sanity", "autodrop", 0) # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) # default retransmission timeout: 30sec modparam("tm", "fr_timer", 30000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 120000) # ----- 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) # ----- 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) /* set it to 0 to disable Path handling */ modparam("registrar", "use_path", 1) /* save Path even if not listed in Supported header */ modparam("registrar", "path_mode", 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 ----- modparam("usrloc", "timer_interval", 60) modparam("usrloc", "timer_procs", 1) modparam("usrloc", "use_domain", MULTIDOMAIN) /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) #!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", "load_backends", 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 #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:22222") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") #!endif # ----- 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_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) modparam("debugger", "log_level_name", "exec") #!endif #!ifdef WITH_WEBSOCKETS modparam("websocket", "keepalive_mechanism", 0) modparam("websocket", "keepalive_timeout", 100) #!endif ####### Routing Logic ######## /* Main SIP request routing logic * - processing of any incoming SIP request starts with this route * - note: this is the same as route { ... } */ request_route { # per request initial checks route(REQINIT); # NAT detection route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle retransmissions if (!is_method("ACK")) { if(t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); } # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) # # authentication # route(AUTH); # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); if (is_method("INVITE|SUBSCRIBE")) { record_route(); } # account only INVITEs if (is_method("INVITE")) { setflag(FLT_ACC); # do accounting } # dispatch requests to foreign domains route(SIPOUT); ### requests for my local domains # handle presence related requests route(PRESENCE); # handle registrations route(REGISTRAR); if ($rU==$null) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; } # dispatch destinations to PSTN route(PSTN); # user location service # route(LOCATION); } # Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests # - serial forking, RTP relaying handling, a.s.o. if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH"); } if (is_method("INVITE|SUBSCRIBE|UPDATE")) { if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); } if (is_method("INVITE")) { if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); } if (!t_relay()) { sl_reply_error(); } exit; } # Per SIP request initial checks route[REQINIT] { # no connect for sending replies set_reply_no_connect(); # enforce symmetric signaling # - send back replies to the source address of request force_rport(); #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if(src_ip!=myself) { if($sht(ipban=>$si)!=$null) { # ip is already blocked xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); exit; } if (!pike_check_req()) { xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); $sht(ipban=>$si) = 1; exit; } } #!endif if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit; } if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); exit; } if(is_method("OPTIONS") && uri==myself && $rU==$null) { sl_send_reply("200","Keepalive"); exit; } if(!sanity_check("17895", "7")) { xlog("Malformed SIP request from $si:$sp\n"); exit; } } # Handle requests within SIP dialogs route[WITHINDLG] { if (!has_totag()) return; # sequential request withing a dialog should # take the path determined by record-routing if (loose_route()) { route(DLGURI); if (is_method("BYE")) { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); } else if ( is_method("NOTIFY") ) { # Add Record-Route for in-dialog NOTIFY as per RFC 6665. record_route(); } route(RELAY); exit; } if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); exit; } if ( is_method("ACK") ) { if ( t_check_trans() ) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 from upstream server route(RELAY); exit; } else { # ACK without matching transaction ... ignore and discard exit; } } sl_send_reply("404","Not here"); exit; } # Handle SIP registrations route[REGISTRAR] { if (!is_method("REGISTER")) return; if(isflagset(FLT_NATS)) { setbflag(FLB_NATB); #!ifdef WITH_NATSIPPING # do SIP NAT pinging setbflag(FLB_NATSIPPING); #!endif } if (!save("location")) { sl_reply_error(); } exit; } # User location service route[LOCATION] { #!ifdef WITH_SPEEDDIAL # search for short dialing - 2-digit extension if($rU=~"^[0-9][0-9]$") { if(sd_lookup("speed_dial")) { route(SIPOUT); } } #!endif #!ifdef WITH_ALIASDB # search in DB-based aliases if(alias_db_lookup("dbaliases")) { route(SIPOUT); } #!endif $avp(oexten) = $rU; if (!lookup("location")) { $var(rc) = $rc; route(TOVOICEMAIL); t_newtran(); switch ($var(rc)) { case -1: case -3: send_reply("404", "Not Found"); exit; case -2: send_reply("405", "Method Not Allowed"); exit; } } # when routing via usrloc, log the missed calls also if (is_method("INVITE")) { setflag(FLT_ACCMISSED); } route(RELAY); exit; } # Presence server processing route[PRESENCE] { if(!is_method("PUBLISH|SUBSCRIBE")) return; if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") { route(TOVOICEMAIL); # returns here if no voicemail server is configured sl_send_reply("404", "No voicemail service"); exit; } #!ifdef WITH_PRESENCE #!ifdef WITH_MSGREBUILD # apply changes in case the request headers or body were modified msg_apply_changes(); #!endif if (!t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { handle_publish(); t_release(); } else if(is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif # if presence enabled, this part will not be executed if (is_method("PUBLISH") || $rU==$null) { sl_send_reply("404", "Not here"); exit; } return; } # IP authorization and user authentication route[AUTH] { #!ifdef WITH_AUTH #!ifdef WITH_IPAUTH if((!is_method("REGISTER")) && allow_source_address()) { # source IP allowed return; } #!endif if (is_method("REGISTER") || from_uri==myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header if(!is_method("REGISTER|PUBLISH")) consume_credentials(); } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here if (from_uri!=myself && uri!=myself) { sl_send_reply("403","Not relaying"); exit; } #!else # authentication not enabled - do not relay at all to foreign networks if(uri!=myself) { sl_send_reply("403","Not relaying"); exit; } #!endif return; } # Caller NAT detection route[NATDETECT] { #!ifdef WITH_NAT if (nat_uac_test("19")) { if (is_method("REGISTER")) { fix_nated_register(); } else { if(is_first_hop()) { set_contact_alias(); } } setflag(FLT_NATS); } #!endif return; } # RTPProxy control and signaling updates for NAT traversal route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) { if(has_totag()) { if(check_route_param("nat=yes")) { setbflag(FLB_NATB); } } } if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE if(nat_uac_test("8")) { rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); } else { rtpengine_manage("replace-origin replace-session-connection"); } #!else if(nat_uac_test("8")) { rtpproxy_manage("co"); } else { rtpproxy_manage("cor"); } #!endif if (is_request()) { if (!has_totag()) { if(t_is_branch_route()) { add_rr_param(";nat=yes"); } } } if (is_reply()) { if(isbflagset(FLB_NATB)) { if(is_first_hop()) set_contact_alias(); } } if(isbflagset(FLB_NATB)) { # no connect message in a dialog involving NAT traversal if (is_request()) { if(has_totag()) { set_forward_no_connect(); } } } #!endif return; } # URI update for dialog requests route[DLGURI] { #!ifdef WITH_NAT if(!isdsturiset()) { handle_ruri_alias(); } #!endif return; } # Routing to foreign domains route[SIPOUT] { if (uri==myself) return; append_hf("P-Hint: outbound\r\n"); route(RELAY); exit; } # PSTN GW routing route[PSTN] { #!ifdef WITH_PSTN # check if PSTN GW IP is defined if (strempty($sel(cfg_get.pstn.gw_ip))) { xlog("SCRIPT: PSTN routing enabled but pstn.gw_ip not defined\n"); return; } # route to PSTN dialed numbers starting with '+' or '00' # (international format) # - update the condition to match your dialing rules for PSTN routing if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$")) return; # only local users allowed to call if(from_uri!=myself) { sl_send_reply("403", "Not Allowed"); exit; } # normalize target number for pstn gateway # - convert leading 00 to + if (starts_with("$rU", "00")) { strip(2); prefix("+"); } if (strempty($sel(cfg_get.pstn.gw_port))) { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); } else { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip) + ":" + $sel(cfg_get.pstn.gw_port); } route(RELAY); exit; #!endif return; } # JSONRPC over HTTP(S) routing #!ifdef WITH_JSONRPC event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if(src_ip!=127.0.0.1) { xhttp_reply("403", "Forbidden", "text/html", "<html><body>Not allowed from $si</body></html>"); exit; } if ($hu =~ "^/RPC") { jsonrpc_dispatch(); exit; } xhttp_reply("200", "OK", "text/html", "<html><body>Wrong URL $hu</body></html>"); exit; } #!endif #!ifdef WITH_WEBSOCKETS event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if ($hdr(Upgrade)=~"websocket" && $hdr(Connection)=~"Upgrade" && $rm=~"GET") { # Validate Host - make sure the client is using the correct # alias for WebSockets if ($hdr(Host) == $null || !is_myself("sip:" + $hdr(Host))) { xlog("L_WARN", "Bad host $hdr(Host)\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } if (ws_handle_handshake()) { # Optional... cache some information about the # successful connection exit; } } xhttp_reply("404", "Not Found", "", ""); } #!endif # Routing to voicemail server route[TOVOICEMAIL] { #!ifdef WITH_VOICEMAIL if(!is_method("INVITE|SUBSCRIBE")) return; # check if VoiceMail server IP is defined if (strempty($sel(cfg_get.voicemail.srv_ip))) { xlog("SCRIPT: VoiceMail routing enabled but IP not defined\n"); return; } if(is_method("INVITE")) { if($avp(oexten)==$null) return; $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } else { if($rU==$null) return; $ru = "sip:" + $rU + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } route(RELAY); exit; #!endif return; } # Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); route(NATMANAGE); } # Manage incoming replies reply_route { if(!sanity_check("17604", "6")) { xlog("Malformed SIP response from $si:$sp\n"); drop; } } # Manage incoming replies in transaction context onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") { route(NATMANAGE); } } # Manage failure routing cases failure_route[MANAGE_FAILURE] { route(NATMANAGE); if (t_is_canceled()) exit; #!ifdef WITH_BLOCK3XX # block call redirect based on 3xx replies. if (t_check_status("3[0-9][0-9]")) { t_reply("404","Not found"); exit; } #!endif #!ifdef WITH_BLOCK401407 # block call redirect based on 401, 407 replies. if (t_check_status("401|407")) { t_reply("404","Not found"); exit; } #!endif #!ifdef WITH_VOICEMAIL # serial forking # - route to voicemail on busy or no answer (timeout) if (t_check_status("486|408")) { $du = $null; route(TOVOICEMAIL); exit; } #!endif } * **Operating System**: Ubuntu 22.04 SIP/2.0 500 Service Unavailable Via: SIP/2.0/WS 5h7t17u4ne29.invalid;branch=z9hG4bK1035487;rport=45366;received=178.218.200.29 To: <sip:107@sip.domain.com>;tag=ae7c22ff3e5ea89a75cf77ccdbc930c9-148e0000 From: <sip:107@sip.domain.com>;tag=i6hcmqvl9p Call-ID: of4dmvvehi37ai051i83 CSeq: 1146 INVITE Server: kamailio (5.5.4 (x86_64/linux)) Content-Length: 0 ![2024-05-07_09-42](https://github.com/kamailio/kamailio/assets/57658965/71939878-0f56-4380-beee-ca7091a4aec9) !g -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3842 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3842(a)github.com>

2 2

[kamailio/kamailio] uac_req_send crash Kamailio (Issue #3522)
by suharik71 07 May '24

07 May '24

### Description  Hello. I use uac_req_send to send registration to the asterisk pool. If some asterisk did not authorize and re-sent the 401 code, the module causes a kamailio crash ### Troubleshooting ds_select("BACKENDS","0"); while(ds_set_dst()) { xlog("L_DBG",">>> BACKEND du=$du\n"); $uac_req(ruri)="sip:" + $(du{uri.host}); $uac_req(furi)="sip:" + $avp(username) + "@" + $(du{uri.host}); $uac_req(turi)=$uac_req(furi); uac_req_send(); ds_next_dst(); } #### Reproduction  #### Debugging Data  ``` [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00005557272803b9 in timer_list_expire (t=1180105352, h=0x7f73b30a3bb8, slow_l=0x7f73b30a73a0, slow_mark=2907) at core/timer.c:846 846 core/timer.c: No such file or directory. (gdb) bt full #0 0x00005557272803b9 in timer_list_expire (t=1180105352, h=0x7f73b30a3bb8, slow_l=0x7f73b30a73a0, slow_mark=2907) at core/timer.c:846 tl = 0x7f73b3a49a88 ret = 0 #1 0x00005557272809cf in timer_handler () at core/timer.c:922 saved_ticks = 1180105352 run_slow_timer = 0 i = 859 __func__ = "timer_handler" #2 0x0000555727280f53 in timer_main () at core/timer.c:961 No locals. #3 0x0000555726f77736 in main_loop () at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:1831 i = 6 pid = 0 si = 0x0 si_desc = "udp receiver child=5 sock=10.153.5.40:5060\000\000\020\000\000\000\003\000\000\000!\000\000\000\000\262\270\224RE&\035(\247K'WU\000\000WqA'WU\000\000\000\000\000\000\000\000\000\000c\367@'WU\000\000!\000\000\000\000\000\000\000\260\325\022\371s\177\000\000 \236.\220\375\177\000\000ݕ\024'WU\000" nrprocs = 6 woneinit = 1 __func__ = "main_loop" #4 0x0000555726f83d11 in main (argc=12, argv=0x7ffd902ea398) at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:3078 cfg_stream = 0x555727e12380 c = -1 r = 0 tmp = 0x7ffd902ebe36 "" tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x55572744e898 ":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 = 4270110361 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffd902ea398 p = 0x7ffd902ea310 "" st = {st_dev = 25, st_ino = 5514, st_nlink = 2, st_mode = 16888, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1690276408, tv_nsec = 971865637}, st_mtim = {tv_sec = 1690276408, tv_nsec = 971865637}, st_ctim = {tv_sec = 1690276408, tv_nsec = 971865637}, __glibc_reserved = {0, 0, 0}} tbuf = '\000' <repeats 80 times>, "\377\000\000\000\377\000\000\000\000\377\000\000\000\000\000\000", '/' <repeats 16 times>, "\230\r", '\000' <repeats 14 times>, "`", '\000' <repeats 15 times>, "\001", '\000' <repeats 144 times>... option_index = 12 long_options = {{name = 0x55572740a2e9 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55572740b84a "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x55572740f6e4 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55572740a2ee "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55572740a2f4 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55572740a2fd "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55572740a307 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55572740a311 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55572740a31c "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55572740a325 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55572740b967 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x55572740a330 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55572740a33a "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals tl = 0x7f73b3a49a88 ret = 0 (gdb) list 841 in core/timer.c (gdb) ``` ``` [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f73f575d4d0 in free_hash_table () at /build/kamailio-5.6.4+ubuntu22.04/src/modules/tm/h_table.c:464 464 /build/kamailio-5.6.4+ubuntu22.04/src/modules/tm/h_table.c: No such file or directory. (gdb) bt full #0 0x00007f73f575d4d0 in free_hash_table () at /build/kamailio-5.6.4+ubuntu22.04/src/modules/tm/h_table.c:464 p_cell = 0x0 tmp_cell = 0x0 i = 64459 __func__ = "free_hash_table" #1 0x00007f73f5793e46 in tm_shutdown () at /build/kamailio-5.6.4+ubuntu22.04/src/modules/tm/t_funcs.c:88 __func__ = "tm_shutdown" #2 0x00005557271db17b in destroy_modules () at core/sr_module.c:842 t = 0x7f73f68a65a0 foo = 0x7f73f68a59e0 __func__ = "destroy_modules" #3 0x0000555726f64029 in cleanup (show_status=1) at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:561 memlog = 0 __func__ = "cleanup" #4 0x0000555726f66044 in shutdown_children (sig=15, show_status=1) at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:704 __func__ = "shutdown_children" #5 0x0000555726f697dc in handle_sigs () at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:802 chld = 0 chld_status = 139 any_chld_stopped = 1 memlog = 0 __func__ = "handle_sigs" #6 0x0000555726f78f42 in main_loop () at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:1900 i = 6 pid = 37846 si = 0x0 si_desc = "udp receiver child=5 sock=10.153.5.40:5060\000\000\020\000\000\000\003\000\000\000!\000\000\000\000\262\270\224RE&\035(\247K'WU\000\000WqA'WU\000\000\000\000\000\000\000\000\000\000c\367@'WU\000\000!\000\000\000\000\000\000\000\260\325\022\371s\177\000\000 \236.\220\375\177\000\000ݕ\024'WU\000" nrprocs = 6 woneinit = 1 __func__ = "main_loop" #7 0x0000555726f83d11 in main (argc=12, argv=0x7ffd902ea398) at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:3078 cfg_stream = 0x555727e12380 c = -1 r = 0 tmp = 0x7ffd902ebe36 "" tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x55572744e898 ":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 = 4270110361 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffd902ea398 p = 0x7ffd902ea310 "" st = {st_dev = 25, st_ino = 5514, st_nlink = 2, st_mode = 16888, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1690276408, tv_nsec = 971865637}, st_mtim = {tv_sec = 1690276408, tv_nsec = 971865637}, st_ctim = {tv_sec = 1690276408, tv_nsec = 971865637}, __glibc_reserved = {0, 0, 0}} tbuf = '\000' <repeats 80 times>, "\377\000\000\000\377\000\000\000\000\377\000\000\000\000\000\000", '/' <repeats 16 times>, "\230\r", '\000' <repeats 14 times>, "`", '\000' <repeats 15 times>, "\001", '\000' <repeats 144 times>... option_index = 12 long_options = {{name = 0x55572740a2e9 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55572740b84a "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x55572740f6e4 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55572740a2ee "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55572740a2f4 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55572740a2fd "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55572740a307 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55572740a311 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55572740a31c "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55572740a325 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55572740b967 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x55572740a330 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55572740a33a "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals p_cell = 0x0 tmp_cell = 0x0 i = 64459 __func__ = "free_hash_table" (gdb) list 459 in /build/kamailio-5.6.4+ubuntu22.04/src/modules/tm/h_table.c ``` #### Log Messages  ``` CRITICAL: <core> [core/mem/q_malloc.c:519]: qm_free(): BUG: freeing already freed pointer (0x7f8a6c440050), called from uac: uac_send.c: uac_send_tm_callback(860), first free uac: uac_send.c: uac_send_info_clone(110) - ignoring CRITICAL: <core> [core/mem/q_malloc.c:123]: qm_debug_check_frag(): BUG: qm: fragm. 0x7f74379f46b0 (address 0x7f74379f46e8) beginning overwritten (0)! Memory allocator was called from uac: uac_send.c:860. Fragment marked by (null):0. Exec from core/mem/q_malloc.c:511. ``` #### SIP Traffic  ``` proto:UDP 2023-07-25T10:00:44.452898Z 10.153.5.40:5060 ---> 192.168.50.107:5060 REGISTER sip:192.168.50.107 SIP/2.0 Via: SIP/2.0/UDP 10.153.5.40;branch=z9hG4bK6a0b.834627a6000000000000000000000000.0 To: <sip:3408@192.168.50.107> From: <sip:3408@192.168.50.107>;tag=b2f228866a24b161d346cfb256d45132-a0527658 CSeq: 10 REGISTER Call-ID: 2332840947916a3e-39417(a)10.153.5.40 Max-Forwards: 70 Content-Length: 0 Contact: <sip:3408@10.153.5.40:5060> Expires: 150 User-Agent: PortSIP UC Client Android - v11.8.1 proto:UDP 2023-07-25T10:00:44.464436Z 192.168.50.107:5060 ---> 10.153.5.40:5060 SIP/2.0 401 Unauthorized Via: SIP/2.0/UDP 10.153.5.40;rport=5060;received=10.153.5.40;branch=z9hG4bK6a0b.834627a6000000000000000000000000.0 Call-ID: 2332840947916a3e-39417(a)10.153.5.40 From: <sip:3408@192.168.50.107>;tag=b2f228866a24b161d346cfb256d45132-a0527658 To: <sip:3408@192.168.50.107>;tag=z9hG4bK6a0b.834627a6000000000000000000000000.0 CSeq: 10 REGISTER WWW-Authenticate: Digest realm="vpp",nonce="1690279244/67fc12dbaf6a76fa34181a4bd504de00",opaque="1680d45809efac86",algorithm=md5,qop="auth" Server: Asterisk Content-Length: 0 proto:UDP 2023-07-25T10:00:44.466447Z 10.153.5.40:5060 ---> 192.168.50.107:5060 REGISTER sip:192.168.50.107 SIP/2.0 Via: SIP/2.0/UDP 10.153.5.40;branch=z9hG4bK7a0b.5673b4d4000000000000000000000000.0 To: <sip:3408@192.168.50.107> From: <sip:3408@192.168.50.107>;tag=b2f228866a24b161d346cfb256d45132-a0527658 CSeq: 11 REGISTER Call-ID: 2332840947916a3e-39417(a)10.153.5.40 Max-Forwards: 70 Content-Length: 0 Contact: <sip:3408@10.153.5.40:5060> Expires: 150 Authorization: Digest username="3408", realm="vpp", nonce="1690279244/67fc12dbaf6a76fa34181a4bd504de00", uri="sip:192.168.50.107", opaque="1680d45809efac86", qop=auth, nc=00000001, cnonce="1935694403", response="38bc75e831e1267ce943bcc50f76390a", algorithm=MD5 User-Agent: PortSIP UC Client Android - v11.8.1 proto:UDP 2023-07-25T10:00:44.477675Z 192.168.50.107:5060 ---> 10.153.5.40:5060 SIP/2.0 401 Unauthorized Via: SIP/2.0/UDP 10.153.5.40;rport=5060;received=10.153.5.40;branch=z9hG4bK7a0b.5673b4d4000000000000000000000000.0 Call-ID: 2332840947916a3e-39417(a)10.153.5.40 From: <sip:3408@192.168.50.107>;tag=b2f228866a24b161d346cfb256d45132-a0527658 To: <sip:3408@192.168.50.107>;tag=z9hG4bK7a0b.5673b4d4000000000000000000000000.0 CSeq: 11 REGISTER WWW-Authenticate: Digest realm="vpp",nonce="1690279244/67fc12dbaf6a76fa34181a4bd504de00",opaque="5adc30b867f02d18",algorithm=md5,qop="auth" Server: Asterisk Content-Length: 0 ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.4 (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_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: unknown compiled with gcc 11.3.0 ``` * **Operating System**:  ``` 5.15.0-76-generic #83-Ubuntu SMP Thu Jun 15 19:16:32 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3522 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3522(a)github.com>

5 11

[kamailio/kamailio] kamailio re-INVITE (Issue #3840)
by happytulubi 06 May '24

06 May '24

Now there is a call scenario where freeswitch ->kamailio ->rtpengine ->webrtc (jsSIP) voice and video cannot be displayed. Is there a problem with my handling and how can I solve it? 1、Freeswitch INVITE to kamailio without video code 2、kamailio request to rtpengine(rtpengine_offer("record-call=off force trust-address replace-origin replace-session-connection UDP/TLS/RTP/SAVPF"))and call to jsSIP 3、jsSIP response with "SIP/2.0 200 OK" to kamailio without video code 4、kamailio request to(rtpengine_answer("record-call=off replace-origin replace-session-connection DTLS=passive ICE=remove RTP/SAVPF"))and response to Freeswitch 5、jsSIP send re-INVITE to kamailio with video code 6、kamailio request to(rtpengine_offer("record-call=off replace-origin replace-session-connection DTLS=passive ICE=remove SDES-off UDP/TLS/RTP/SAVPF"))and response to Freeswitch 7、Freeswitch response with "SIP/2.0 200 OK" to kamailio with video code 8、kamailio request to(rtpengine_answer("record-call=off replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"))and response to jsSIP 9、Freeswitch send re-INVITE to kamailio with video code 10、kamailio request to(rtpengine_offer("record-call=off replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"))and response to jsSIP 11、jsSIP response with "SIP/2.0 200 OK" to kamailio with video code 12、kamailio request to(rtpengine_answer("record-call=off replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"))and response to Freeswitch -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3840 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3840(a)github.com>

2 2

git:master:61660322: core: new udp receiver mode - one multi-threaded process
by Daniel-Constantin Mierla 06 May '24

06 May '24

Module: kamailio Branch: master Commit: 61660322ad07be24cdc98c0debb01119960124ea URL: https://github.com/kamailio/kamailio/commit/61660322ad07be24cdc98c0debb0111… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-04T20:18:51+02:00 core: new udp receiver mode - one multi-threaded process - activated with udp_receiver_mode=1 - one process is created that starts one receiver thread per UDP socket - SIP messages are pushed to "udp" async tasks group - sending is still done by any of processes --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/udp_server.c Modified: src/core/udp_server.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/61660322ad07be24cdc98c0debb0111… Patch: https://github.com/kamailio/kamailio/commit/61660322ad07be24cdc98c0debb0111…

2 2

git:master:2503a6fa: core: udp server - lookup async task group for multi thread receiver
by Daniel-Constantin Mierla 06 May '24

06 May '24

Module: kamailio Branch: master Commit: 2503a6fa6d45bb44ae390819636ad96269029b75 URL: https://github.com/kamailio/kamailio/commit/2503a6fa6d45bb44ae390819636ad96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-06T07:56:28+02:00 core: udp server - lookup async task group for multi thread receiver - cache it locally for runtime usage --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/2503a6fa6d45bb44ae390819636ad96… Patch: https://github.com/kamailio/kamailio/commit/2503a6fa6d45bb44ae390819636ad96… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 0db76b4e599..263a0610963 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -952,12 +952,12 @@ void udpworker_task_exec(void *param) /** * */ -int udpworker_task_send(char *buf, int len, receive_info_t *rcv) +int udpworker_task_send( + async_wgroup_t *awg, char *buf, int len, receive_info_t *rcv) { async_task_t *at = NULL; udpworker_task_t *utp = NULL; int dsize; - str gname = str_init("udp"); dsize = sizeof(async_task_t) + sizeof(udpworker_task_t) + (len + 1) * sizeof(char); @@ -975,7 +975,7 @@ int udpworker_task_send(char *buf, int len, receive_info_t *rcv) utp->len = len; memcpy(&utp->rcv, rcv, sizeof(receive_info_t)); - return async_task_group_push(&gname, at); + return async_task_group_send(awg, at); } /** @@ -989,6 +989,8 @@ void *ksr_udp_mtworker(void *si) union sockaddr_union *fromaddr; unsigned int fromaddrlen; receive_info_t rcvi; + async_wgroup_t *awg = NULL; + str gname = str_init("udp"); tsock = (socket_info_t *)si; @@ -1014,6 +1016,8 @@ void *ksr_udp_mtworker(void *si) rcvi.dst_ip = tsock->address; rcvi.proto = PROTO_UDP; + awg = async_task_group_find(&gname); + while(1) { fromaddrlen = sizeof(union sockaddr_union); len = recvfrom(tsock->socket, buf, BUF_SIZE, 0, @@ -1049,7 +1053,12 @@ void *ksr_udp_mtworker(void *si) su2ip_addr(&rcvi.src_ip, fromaddr); rcvi.src_port = su_getport(fromaddr); - udpworker_task_send(buf, len, &rcvi); + if(awg == NULL) { + awg = async_task_group_find(&gname); + } + if(awg == NULL) { + udpworker_task_send(awg, buf, len, &rcvi); + } } }

1 0

git:master:f8b08d01: core: async task - functions to find group and send tasks
by Daniel-Constantin Mierla 05 May '24

05 May '24

Module: kamailio Branch: master Commit: f8b08d01a98be3e5c823af769e20f0ccee1af629 URL: https://github.com/kamailio/kamailio/commit/f8b08d01a98be3e5c823af769e20f0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-05T19:53:14+02:00 core: async task - functions to find group and send tasks --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/f8b08d01a98be3e5c823af769e20f0c… Patch: https://github.com/kamailio/kamailio/commit/f8b08d01a98be3e5c823af769e20f0c… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index 376924ae571..bce7ed51faa 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -413,6 +413,26 @@ int async_task_push(async_task_t *task) return 0; } +/** + * + */ +async_wgroup_t *async_task_group_find(str *gname) +{ + async_wgroup_t *awg = NULL; + + if(_async_wgroup_list == NULL) { + LM_WARN("no async group\n"); + return NULL; + } + for(awg = _async_wgroup_list; awg != NULL; awg = awg->next) { + if(awg->name.len == gname->len + && memcmp(awg->name.s, gname->s, gname->len) == 0) { + return awg; + } + } + return NULL; +} + /** * */ @@ -445,6 +465,27 @@ int async_task_group_push(str *gname, async_task_t *task) return 0; } +/** + * + */ +int async_task_group_send(async_wgroup_t *awg, async_task_t *task) +{ + int len; + if(awg == NULL) { + LM_WARN("group not provided\n"); + return -1; + } + len = write(awg->sockets[1], &task, sizeof(async_task_t *)); + if(len <= 0) { + LM_ERR("failed to pass the task [%p] to group [%.*s]\n", task, + awg->name.len, awg->name.s); + return -1; + } + LM_DBG("task [%p] sent to group [%.*s]\n", task, awg->name.len, + awg->name.s); + return 0; +} + /** * */ diff --git a/src/core/async_task.h b/src/core/async_task.h index 5a3cc19e232..58386bba8bd 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -53,7 +53,9 @@ int async_task_set_usleep(int n); int async_task_workers_get(void); int async_task_workers_active(void); async_wgroup_t *async_task_workers_get_crt(void); +async_wgroup_t *async_task_group_find(str *gname); int async_task_group_push(str *gname, async_task_t *task); +int async_task_group_send(async_wgroup_t *awg, async_task_t *task); #endif

1 0

git:master:f69b22d4: core: parse/contact: jump to error on too many contacts
by Daniel-Constantin Mierla 04 May '24

04 May '24

Module: kamailio Branch: master Commit: f69b22d44cb5abc803c2b58790dd33f2310c1c59 URL: https://github.com/kamailio/kamailio/commit/f69b22d44cb5abc803c2b58790dd33f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-04T20:18:51+02:00 core: parse/contact: jump to error on too many contacts --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/f69b22d44cb5abc803c2b58790dd33f… Patch: https://github.com/kamailio/kamailio/commit/f69b22d44cb5abc803c2b58790dd33f… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index c67fe681d51..007949e88c4 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -340,7 +340,7 @@ int parse_contacts(str *_s, contact_t **_c) if(n > KSR_MAX_CONTACTS) { LM_ERR("too many contacts: %d\n", n); - return -1; + goto error; } if(_s->len == 0) { LM_ERR("text after comma missing\n");

1 0

git:master:77de8690: tls: document handling of thread-locals
by S-P Chan 04 May '24

04 May '24

Module: kamailio Branch: master Commit: 77de86909ac8c156335e1e789bb3067932f9eff5 URL: https://github.com/kamailio/kamailio/commit/77de86909ac8c156335e1e789bb3067… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-05-04T19:48:21+08:00 tls: document handling of thread-locals --- Added: src/modules/tls/OpenSSL3-README.md --- Diff: https://github.com/kamailio/kamailio/commit/77de86909ac8c156335e1e789bb3067… Patch: https://github.com/kamailio/kamailio/commit/77de86909ac8c156335e1e789bb3067… --- diff --git a/src/modules/tls/OpenSSL3-README.md b/src/modules/tls/OpenSSL3-README.md new file mode 100644 index 00000000000..6b6a7814129 --- /dev/null +++ b/src/modules/tls/OpenSSL3-README.md @@ -0,0 +1,55 @@ +# OpenSSL 3 Developer Notes + +## Background + +OpenSSL since 1.1.1 uses thread-local storage. The OpenSSL internal API +is `CRYPTO_THREAD_set_local()` and it is implemented on Linux using `pthread_setspecific()`. + +In a new thread, the value of a thread-local variable is 0x0; the first access of this +variable by OpenSSL will allocate new dynamic memory. The implication for Kamailio is that +if such variables are initialized in rank 0, then all workers will reuse the same memory +location as Kamailio uses shared memory for OpenSSL. + +## OpenSSL 1.1.1 shmmem Corruption + +In OpenSSL 1.1.1 there are three variables that impact Kamailio: `private_drbg`, `public_drbg`, and +`err_thread_local`. The first two variables are circumvented by an early call to `RAND_set_rand_method()`. + +The third variable, i.e., `err_thread_local` is reused by all workers and leads to shmmem corruption +particularly with other users of OpenSSL such as libcurl, and db modules with TLS. + +Historically, since 2019, this was a low-impact bug due to use of static variables in the OpenSSL 1.1.1 +implementation. + + +## OpenSSL 3 shmmem Corruption + +In OpenSSL 3 there is one variable that impacts Kamailio: `err_thread_local`. + +OpenSSL 3 uses more dynamic memory to handle the error stack and shmmem corruption is easily +reproducible, even without libcurl or db modules. + +## Resolution + +This resolution uses non-portable internal knowledge of pthreads on Linux: that `pthread_key_t` +is a small integer, and that it is incremented when a new thread-local key is requested + +OpenSSL 3 uses 6 thread-locals, and OpenSSL 1.1.1 uses 4 thread-locals. + +The first attempt (5.8.0/5.8.1) to resolve this issue uses the following technique: +* `tls_threads_mode = 1`: for each function that might initialize OpenSSL, run it in + a temporary thread; this leaves the thread-local variables in rank 0, main thread at their + default value of 0x0 +* `tls_threads_mode = 2`: add an at-fork handler to set thread-local variables to 0x0. + The implementation will set thread-local keys from 0-15 to have value 0x0.<br> + +Limitation: the limitation of this method is some libraries like libpython cannot be initialized +other than in the primary thread and they will initialize thread-locals. + +The revised method makes a few OpenSSL function calls so +that OpenSSL will initialize all required thread-locals, and the tls.so sets a high-water mark. +It is assumed that all `pthread_key_t` values at the high-water mark or greater are set +by non-OpenSSL libraries. During fork, tls.so will clear all thread-locals up to the high-water +mark. + +

1 0

git:5.7:d8907b62: tls: clear thread-local variables up to tls_pthreads_key_mark
by S-P Chan 04 May '24

04 May '24

Module: kamailio Branch: 5.7 Commit: d8907b6290d37965d07ceaf30e6c06956a59c90a URL: https://github.com/kamailio/kamailio/commit/d8907b6290d37965d07ceaf30e6c069… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-05-04T19:35:23+08:00 tls: clear thread-local variables up to tls_pthreads_key_mark - other libraries may set thread-locals via pthread_setspecific - assume that tls_pthreads_key_mark demarcates libssl's values - only clean thread-local values up to tls_pthreads_key_mark Currently only used by app_python[s] (cherry picked from commit fe6f4fcde2fa06a3c00479cef169c27dc32ae490) --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/d8907b6290d37965d07ceaf30e6c069… Patch: https://github.com/kamailio/kamailio/commit/d8907b6290d37965d07ceaf30e6c069… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index c2a3c8de271..524419dd854 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -343,9 +343,11 @@ static tls_domains_cfg_t* tls_use_modparams(void) * is < 10 * */ +static int tls_pthreads_key_mark; static void fork_child(void) { - for(int k = 0; k < 16; k++) { + int k; + for(k = 0; k < tls_pthreads_key_mark; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); } @@ -355,6 +357,8 @@ static int mod_init(void) { int method; int verify_client; + unsigned char rand_buf[32]; + int k; if(tls_disable) { LM_WARN("tls support is disabled " @@ -463,6 +467,23 @@ static int mod_init(void) if(ksr_tls_threads_mode == 2) { pthread_atfork(NULL, NULL, &fork_child); } + +#if OPENSSL_VERSION_NUMBER >= 0x010101000L + /* + * force creation of all thread-locals now so that other libraries + * that use pthread_key_create(), e.g. python, + * will have larger key values + */ + if(ksr_tls_threads_mode > 0) { + ERR_clear_error(); + RAND_bytes(rand_buf, sizeof(rand_buf)); + for(k = 0; k < 32; k++) { + if(pthread_getspecific(k)) + tls_pthreads_key_mark = k + 1; + } + LM_WARN("set maximum pthreads key to %d\n", tls_pthreads_key_mark); + } +#endif return 0; error: tls_h_mod_destroy_f(); @@ -499,6 +520,7 @@ static int mod_child_hook(int *rank, void *dummy) if(tls_fix_domains_cfg(*tls_domains_cfg, &mod_params, &mod_params) < 0) return -1; } + return 0; } @@ -508,6 +530,8 @@ static OSSL_LIB_CTX *new_ctx; #endif static int mod_child(int rank) { + int k; + if(tls_disable || (tls_domains_cfg == 0)) return 0; @@ -519,6 +543,13 @@ static int mod_child(int rank) return run_thread4PP((_thread_proto4PP)mod_child_hook, &rank, NULL); } + if(ksr_tls_threads_mode == 1 && rank && rank != PROC_INIT + && rank != PROC_POSTCHILDINIT) { + for(k = 0; k < tls_pthreads_key_mark; k++) + pthread_setspecific(k, 0x0); + LM_WARN("clean-up of thread-locals key < %d\n", tls_pthreads_key_mark); + } + #ifdef KSR_SSL_COMMON /* * after the child is fork()ed we go through the TLS domains diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 58ddc853acd..7bbcf3a628c 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -21,10 +21,10 @@ #define _TLS_RAND_H_ #include <openssl/ssl.h> +#include <openssl/rand.h> #if OPENSSL_VERSION_NUMBER >= 0x10100000L \ && OPENSSL_VERSION_NUMBER < 0x030000000L -#include <openssl/rand.h> const RAND_METHOD *RAND_ksr_krand_method(void); const RAND_METHOD *RAND_ksr_fastrand_method(void);

1 0

git:5.7:bec4ad64: phonenum: Makefile - option to set C standard version
by Victor Seva 04 May '24

04 May '24

Module: kamailio Branch: 5.7 Commit: bec4ad646f127a1f5bbf31604e6185b246867770 URL: https://github.com/kamailio/kamailio/commit/bec4ad646f127a1f5bbf31604e6185b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-04T11:55:35+02:00 phonenum: Makefile - option to set C standard version - can be set via option CSTDVER - defaults now to c++17 - GH #3659 (cherry picked from commit 6dd5598fc043fe3d2582e643d7d4ef675c9e6480) --- Modified: src/modules/phonenum/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/bec4ad646f127a1f5bbf31604e6185b… Patch: https://github.com/kamailio/kamailio/commit/bec4ad646f127a1f5bbf31604e6185b… --- diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index f465226a974..47780869232 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -7,6 +7,7 @@ NAME=phonenum.so CXX?=g++ LD?=g++ +CSTDVER?="c++17" LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding DEFS+=-I$(LOCALBASE)/include @@ -18,7 +19,7 @@ include ../../Makefile.modules cphonenumber.o: cphonenumber.cpp cphonenumber.h @echo "Compiling $<" - $(CXX) -std=c++11 $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ + $(CXX) -std=$(CSTDVER) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ phonenum.so: cphonenumber.o

1 0

[kamailio/kamailio] phonenum: fails to build on sid (Issue #3839)
by Victor Seva 04 May '24

04 May '24

Forwarded from: **https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069199** ``` Source: kamailio Version: 5.7.4-1 Severity: serious Tags: ftbfs Justification: fails to build from source (but built successfully in the past) X-Debbugs-Cc: sramacher(a)debian.org https://buildd.debian.org/status/fetch.php?pkg=kamailio&arch=amd64&ver=5.7.… g++ -std=c++11 -fPIC -DPIC -funroll-loops -Wcast-align -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -DVERSION_NODATE -Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing -fPIC -DPIC -funroll-loops -Wcast-align -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.7.4"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 13.2.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5007004 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/local/include -DMOD_NAME='"phonenum"' -c cphonenumber.cpp -o cphonenumber.o cc1plus: warning: ‘-Werror=’ argument ‘-Werror=implicit-function-declaration’ is not valid for C++ cc1plus: warning: ‘-Werror=’ argument ‘-Werror=implicit-function-declaration’ is not valid for C++ In file included from /usr/include/absl/base/config.h:86, from /usr/include/absl/base/const_init.h:25, from /usr/include/absl/synchronization/mutex.h:67, from /usr/include/phonenumbers/geocoding/phonenumber_offline_geocoder.h:24, from cphonenumber.cpp:24: /usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than C++14 are not supported." 79 | #error "C++ versions less than C++14 are not supported." | ^~~~~ Cheers -- Sebastian Ramacher ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3839 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3839(a)github.com>

1 2

[kamailio/kamailio] support zero media stream for sdp parsing module (Issue #3779)
by Dakna adnane 04 May '24

04 May '24

when using sdp module to parse sdp I noticed that function called from sdp_get return -1 when no m-lines are present in sdp , normally we should accept sdp without m -line because it can be at a later time through a modified offer , how can we accept such sdp without changing source code for function "parse_sdp_session" -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3779 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3779(a)github.com>

2 2

git:master:fc52a543: core: parser/contact - basic validation tests for contact uri
by Daniel-Constantin Mierla 03 May '24

03 May '24

Module: kamailio Branch: master Commit: fc52a54370c085d6fa951da876eee99580677922 URL: https://github.com/kamailio/kamailio/commit/fc52a54370c085d6fa951da876eee99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-03T14:57:47+02:00 core: parser/contact - basic validation tests for contact uri --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/fc52a54370c085d6fa951da876eee99… Patch: https://github.com/kamailio/kamailio/commit/fc52a54370c085d6fa951da876eee99… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 322a22e9590..c67fe681d51 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -232,10 +232,12 @@ int parse_contacts(str *_s, contact_t **_c) param_hooks_t hooks; str sv; int n; + int star; sv = *_s; n = 0; + star = 0; while(1) { /* Allocate and clear contact structure */ c = (contact_t *)pkg_malloc(sizeof(contact_t)); @@ -277,6 +279,25 @@ int parse_contacts(str *_s, contact_t **_c) LM_ERR("invalid contact uri\n"); goto error; } + if(c->uri.len == 1) { + if(c->uri.s[0] == '*') { + if(star == 1) { + LM_ERR("too many star contacts - index %d\n", n); + goto error; + } else { + star = 1; + } + } else { + LM_ERR("contact uri size 1 is too short - index %d\n", n); + goto error; + } + } else if(c->uri.len < 3) { + /* minimum length 's:a' (s - schema; a - address) */ + LM_ERR("contact uri size %d is too short - index %d\n", n, + c->uri.len); + goto error; + } + if(_s->len == 0) goto ok;

1 0

git:master:d6b0beb5: core: parser/contact - add limit for max number of contacts
by Daniel-Constantin Mierla 03 May '24

03 May '24

Module: kamailio Branch: master Commit: d6b0beb5a219ae57a62e9e7201a6ec1fe66e5a96 URL: https://github.com/kamailio/kamailio/commit/d6b0beb5a219ae57a62e9e7201a6ec1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-03T14:36:29+02:00 core: parser/contact - add limit for max number of contacts - defined to 256 --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/d6b0beb5a219ae57a62e9e7201a6ec1… Patch: https://github.com/kamailio/kamailio/commit/d6b0beb5a219ae57a62e9e7201a6ec1… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index dd522a6cd3c..322a22e9590 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -221,6 +221,8 @@ static inline void contact_append(contact_t **head, contact_t *node) ptr->next = node; } +#define KSR_MAX_CONTACTS 256 + /* * Parse contacts in a Contact HF */ @@ -229,9 +231,11 @@ int parse_contacts(str *_s, contact_t **_c) contact_t *c; param_hooks_t hooks; str sv; + int n; sv = *_s; + n = 0; while(1) { /* Allocate and clear contact structure */ c = (contact_t *)pkg_malloc(sizeof(contact_t)); @@ -273,7 +277,6 @@ int parse_contacts(str *_s, contact_t **_c) LM_ERR("invalid contact uri\n"); goto error; } - if(_s->len == 0) goto ok; @@ -312,7 +315,12 @@ int parse_contacts(str *_s, contact_t **_c) contact_append(_c, c); c = NULL; + n++; + if(n > KSR_MAX_CONTACTS) { + LM_ERR("too many contacts: %d\n", n); + return -1; + } if(_s->len == 0) { LM_ERR("text after comma missing\n"); goto error;

1 0

git:master:f1baf7dd: nghttp2: set the data field for event route
by Daniel-Constantin Mierla 02 May '24

02 May '24

Module: kamailio Branch: master Commit: f1baf7dd48c4ccb8d2d0ab0b24547f2793bb8588 URL: https://github.com/kamailio/kamailio/commit/f1baf7dd48c4ccb8d2d0ab0b24547f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-02T10:15:48+02:00 nghttp2: set the data field for event route - reset ctx fields when nothing was set from session/stream --- Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/f1baf7dd48c4ccb8d2d0ab0b24547f2… Patch: https://github.com/kamailio/kamailio/commit/f1baf7dd48c4ccb8d2d0ab0b24547f2… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index d8c23220a13..6f5faf02ad6 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -518,11 +518,25 @@ static int on_request_recv(nghttp2_session *session, if(stream_data->request_method) { _ksr_nghttp2_ctx.method.s = stream_data->request_method; _ksr_nghttp2_ctx.method.len = strlen(_ksr_nghttp2_ctx.method.s); + } else { + _ksr_nghttp2_ctx.method.s = NULL; + _ksr_nghttp2_ctx.method.len = 0; } if(session_data->client_addr) { _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); + } else { + _ksr_nghttp2_ctx.srcip.s = NULL; + _ksr_nghttp2_ctx.srcip.len = 0; + } + + if(stream_data->request_data.len > 0) { + _ksr_nghttp2_ctx.data.s = stream_data->request_data.s; + _ksr_nghttp2_ctx.data.len = stream_data->request_data.len; + } else { + _ksr_nghttp2_ctx.data.s = NULL; + _ksr_nghttp2_ctx.data.len = 0; } ksr_event_route(); @@ -567,16 +581,26 @@ static int on_frame_recv_callback( static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags, int32_t stream_id, const uint8_t *data, size_t len, void *user_data) { - struct Request *req; + http2_stream_data *stream_data; (void)flags; - (void)user_data; - req = nghttp2_session_get_stream_user_data(session, stream_id); - if(req) { + stream_data = nghttp2_session_get_stream_user_data(session, stream_id); + + if(stream_data) { LM_DBG("---------------------------- (DATA chunk) [%lu bytes]\n", (unsigned long int)len); LM_DBG("[[%.*s]]", (int)len, (char *)data); - LM_DBG("----------------------------\n"); + LM_DBG("\n----------------------------\n"); + stream_data->request_data.s = realloc(stream_data->request_data.s, + len + stream_data->request_data.len + 1); + if(stream_data->request_data.s == NULL) { + LM_ERR("failed to allocate system memory\n"); + return 0; + } + memcpy(stream_data->request_data.s + stream_data->request_data.len, + data, len); + stream_data->request_data.len += len; + stream_data->request_data.s[stream_data->request_data.len] = '\0'; } return 0; } diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index ac69a147313..63650db53af 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -80,6 +80,7 @@ typedef struct http2_stream_data char *request_pathfull; char *request_method; http2_msghdr_t *hdrlist; + str request_data; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:53e1a29c: pua: check if local requests are dropped and free the param
by Daniel-Constantin Mierla 02 May '24

02 May '24

Module: kamailio Branch: master Commit: 53e1a29c265df1489c9bd91deddc0719f8ca2092 URL: https://github.com/kamailio/kamailio/commit/53e1a29c265df1489c9bd91deddc071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-02T09:27:41+02:00 pua: check if local requests are dropped and free the param --- Modified: src/modules/pua/pua.c Modified: src/modules/pua/send_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/53e1a29c265df1489c9bd91deddc071… Patch: https://github.com/kamailio/kamailio/commit/53e1a29c265df1489c9bd91deddc071… --- diff --git a/src/modules/pua/pua.c b/src/modules/pua/pua.c index ef542e2d627..e57183427f3 100644 --- a/src/modules/pua/pua.c +++ b/src/modules/pua/pua.c @@ -700,6 +700,11 @@ int update_pua(ua_pres_t *p) ret_code = -1; goto done; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(cb_param); + ret_code = 0; + goto done; + } } else { str met = {"SUBSCRIBE", 9}; ua_pres_t *cb_param = NULL; diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 48e92e9728b..53644265633 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -624,6 +624,9 @@ int send_publish(publ_info_t *publ) LM_ERR("in t_request tm module function\n"); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(cb_param); + } done: ret = 0;

1 0

git:master:00aac8d4: uac: check if local requests are dropped and free the param
by Daniel-Constantin Mierla 01 May '24

01 May '24

Module: kamailio Branch: master Commit: 00aac8d48370fac356eecff535835d918c631cc5 URL: https://github.com/kamailio/kamailio/commit/00aac8d48370fac356eecff535835d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T07:00:58+02:00 uac: check if local requests are dropped and free the param --- Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/00aac8d48370fac356eecff535835d9… Patch: https://github.com/kamailio/kamailio/commit/00aac8d48370fac356eecff535835d9… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 4885f4d4023..bbe592ba04c 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -974,6 +974,10 @@ void uac_reg_tm_callback(struct cell *t, int type, struct tmcb_params *ps) ri->l_uuid.len, ri->l_uuid.s); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(uuid); + *ps->param = NULL; + } ri->flags |= UAC_REG_AUTHSENT; lock_release(ri->lock); @@ -1130,6 +1134,9 @@ int uac_reg_send(reg_uac_t *reg, time_t tn) reg->flags &= ~UAC_REG_ONGOING; return -1; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(uuid); + } return 0; } diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index c29e9b4b90e..f91a0c75b4f 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -794,6 +794,11 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) LM_ERR("failed to send request with authentication\n"); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(tp); + *ps->param = NULL; + tp = NULL; + } if(tp->evroute != 0) { return; @@ -871,6 +876,10 @@ int uac_req_send(void) shm_free(tp); return -1; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + if(tp != NULL) + shm_free(tp); + } return 1; }

1 0

git:master:d12fc310: presence: check if the local notify was dropped in event route
by Daniel-Constantin Mierla 01 May '24

01 May '24

Module: kamailio Branch: master Commit: d12fc31056cb37aac347ec05f9ada7bafa5f52de URL: https://github.com/kamailio/kamailio/commit/d12fc31056cb37aac347ec05f9ada7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T06:20:43+02:00 presence: check if the local notify was dropped in event route - free tm cb parameter on drop - related to GH #3403 --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/d12fc31056cb37aac347ec05f9ada7b… Patch: https://github.com/kamailio/kamailio/commit/d12fc31056cb37aac347ec05f9ada7b… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 4c9dece1a39..9a8af778c04 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1736,6 +1736,10 @@ int send_notify_request( shm_free(cb_param); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(cb_param); + goto done; + } LM_GEN2(pres_local_log_facility, pres_local_log_level, "NOTIFY %.*s via %.*s on behalf of %.*s for event %.*s : %.*s\n", @@ -1744,6 +1748,7 @@ int send_notify_request( subs->event->name.len, subs->event->name.s, subs->callid.len, subs->callid.s); +done: ps_free_tm_dlg(td); if(str_hdr.s)

1 0

git:master:68624c2d: pv_headers: print also the new TMCB_LOCAL_REQUEST_DROP in debug function
by Daniel-Constantin Mierla 01 May '24

01 May '24

Module: kamailio Branch: master Commit: 68624c2da093ab789d4e8d35df65ef1bce024bca URL: https://github.com/kamailio/kamailio/commit/68624c2da093ab789d4e8d35df65ef1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T06:08:28+02:00 pv_headers: print also the new TMCB_LOCAL_REQUEST_DROP in debug function --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/68624c2da093ab789d4e8d35df65ef1… Patch: https://github.com/kamailio/kamailio/commit/68624c2da093ab789d4e8d35df65ef1… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index c6196a1f5f6..c6ffe70753a 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -479,6 +479,8 @@ static inline char *tm_type_to_string(int type) return "TMCB_ON_BRANCH_FAILURE"; case TMCB_ON_BRANCH_FAILURE_RO: return "TMCB_ON_BRANCH_FAILURE_RO"; + case TMCB_LOCAL_REQUEST_DROP: + return "TMCB_LOCAL_REQUEST_DROP"; case TMCB_MAX: return "TMCB_MAX"; }

1 0

git:master:ebd1c6c7: tm: cb_flags made unsigned for uac_req
by Daniel-Constantin Mierla 01 May '24

01 May '24

Module: kamailio Branch: master Commit: ebd1c6c75a1b832ce85d576aad134b99d47b5738 URL: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T06:07:26+02:00 tm: cb_flags made unsigned for uac_req --- Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… Patch: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… --- diff --git a/src/modules/tm/uac.h b/src/modules/tm/uac.h index 59fa7f4e9ea..6fad3380cd8 100644 --- a/src/modules/tm/uac.h +++ b/src/modules/tm/uac.h @@ -47,7 +47,7 @@ typedef struct uac_req str *ssock; str *ssockname; dlg_t *dialog; - int cb_flags; + unsigned int cb_flags; transaction_cb *cb; void *cbp; str *callid;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev