- sr-dev - kamailio.org

[kamailio/kamailio] device keeps deregister (Issue #2929)
by Riccardo Speggiorin 11 Nov '21

11 Nov '21

I have a Kazoo installation with Kamailio. I have to VM, one with +700 devices regged and the other with +300 devices. The problem is that the devices registered on the first machine keeps randomly unregistered. I have 3 unregistrations happening every minute. If I reboot the machine the problem get solve fora couples of days and after that starts again. What I should check? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2929

2 2

DMQ userloc data not replicated after restarting the receiver service.
by Hardik Patel 11 Nov '21

11 Nov '21

Hello Team, We are using Kamailio 5.5.2 (DMQ + usrloc) modules. We want to replicate all users from server-2(Registration) to server-1(Proxy) . Replication worked perfectly fine but we noticed that after restarting the receiver (Proxy node) data has not been replicated automatically. If we re-register the users it is replicating to the receiver side but the old data is not replicated. Can you please guide us where we made the mistake? Please find the configuration SERVER-1 (Proxy) ======================== #--- dmq db param ---- modparam("dmq","server_address","sip:10.128.77.187:5060") modparam("dmq", "notification_address", "sip:10.128.77.188:5060") modparam("dmq", "num_workers", 6) modparam("dmq", "multi_notify", 1) #modparam("dmq", "worker_usleep", 0) modparam("dmq", "ping_interval", 60) #--- dmq usrloc db param ---- modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "replicate_socket_info", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "batch_size", 2000) modparam("dmq_usrloc", "batch_usleep", 1000) route[KMDQ_SAVE_LOCATION] { if(is_method("KDMQ")) { dmq_handle_message(); } if (dmq_is_from_node()) { if(!save("location")) xlogl("L_ERR", "Error saving contact\n"); } } SERVER-2 (Registration) ====================== #--- dmq db param ---- modparam("dmq","server_address","sip:10.128.77.188:5060") modparam("dmq", "notification_address", "sip:10.128.77.187:5060") modparam("dmq", "num_workers", 6) modparam("dmq", "multi_notify", 1) modparam("dmq", "ping_interval", 60) #--- dmq usrloc db param ---- modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "replicate_socket_info", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "batch_size", 2000) modparam("dmq_usrloc", "batch_usleep", 1000) route[SAVE_LOCATION]{ save("location"); } version: kamailio 5.5.2 (x86_64/linux) e2b6cc 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: e2b6cc -- Hardik Patel

2 4

[kamailio/kamailio] Get log formatting a way to add metadata into it's JSON (Issue #2927)
by Fernando H. E. Bellincanta 11 Nov '21

11 Nov '21

We currently can output our logs in a JSON format which gives us the ability to pump that into ELK just fine. The thing is those logs would be a lot more useful if we were able to inject more context metadata into it, i.e.: - Request original IP - Request original User Agent - Other request/response miscellaneous headers This would be appliable to get a dashboard built for Pike rate limiting and it's blocked IPs, or mapping out geolocations based on general requests IPs. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2927

2 2

git:master:378a2dc9: ctl: use unsigned literals for left bit shifting
by Daniel-Constantin Mierla 10 Nov '21

10 Nov '21

Module: kamailio Branch: master Commit: 378a2dc98beddaa08e192c0854f43929ed7076a7 URL: https://github.com/kamailio/kamailio/commit/378a2dc98beddaa08e192c0854f4392… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-10T20:09:24+01:00 ctl: use unsigned literals for left bit shifting --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/378a2dc98beddaa08e192c0854f4392… Patch: https://github.com/kamailio/kamailio/commit/378a2dc98beddaa08e192c0854f4392… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index 3642a0015b..bd7e2cb9c5 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -188,7 +188,7 @@ struct binrpc_val{ inline static int binrpc_get_int_len(int i) { int size; - for (size=4; size && ((i & (0xff<<24))==0); i<<=8, size--); + for (size=4; size && ((i & (0xffu<<24))==0); i<<=8, size--); return size; } @@ -216,7 +216,7 @@ inline static unsigned char* binrpc_write_int( unsigned char* p, { int size; - for (size=4; size && ((i & (0xff<<24))==0); i<<=8, size--); + for (size=4; size && ((i & (0xffu<<24))==0); i<<=8, size--); *len=size; for(; (p<end) && (size); p++, size--){ *p=(unsigned char)(i>>24);

1 0

[kamailio/kamailio] working with a file. (Issue #2924)
by ihsinme 09 Nov '21

09 Nov '21

Good afternoon. Do I understand correctly that the file is opened without restricting access rights (0666). https://github.com/kamailio/kamailio/blob/4e827b30dfc393caf17e2fce28b5eea46… it might be worth limiting them to at least 0644. thanks for taking the time to answer -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2924

3 3

git:5.5:2532b5f5: pv: fix condition in detecting the null string value when setting $var(...)
by Daniel-Constantin Mierla 09 Nov '21

09 Nov '21

Module: kamailio Branch: 5.5 Commit: 2532b5f5fc71d3828e1185c55ad6a6546df312d3 URL: https://github.com/kamailio/kamailio/commit/2532b5f5fc71d3828e1185c55ad6a65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-09T19:11:15+01:00 pv: fix condition in detecting the null string value when setting $var(...) - issue introduced in previous commit (cherry picked from commit ffe311939ebf58e7418940ec6c71bfaf9b21afad) --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/2532b5f5fc71d3828e1185c55ad6a65… Patch: https://github.com/kamailio/kamailio/commit/2532b5f5fc71d3828e1185c55ad6a65… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..5f4626b8d6 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:master:ffe31193: pv: fix condition in detecting the null string value when setting $var(...)
by Daniel-Constantin Mierla 09 Nov '21

09 Nov '21

Module: kamailio Branch: master Commit: ffe311939ebf58e7418940ec6c71bfaf9b21afad URL: https://github.com/kamailio/kamailio/commit/ffe311939ebf58e7418940ec6c71bfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-09T19:04:16+01:00 pv: fix condition in detecting the null string value when setting $var(...) - issue introduced in previous commit --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/ffe311939ebf58e7418940ec6c71bfa… Patch: https://github.com/kamailio/kamailio/commit/ffe311939ebf58e7418940ec6c71bfa… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..5f4626b8d6 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:master:4e827b30: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: 4e827b30dfc393caf17e2fce28b5eea460aa51f7 URL: https://github.com/kamailio/kamailio/commit/4e827b30dfc393caf17e2fce28b5eea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-08T13:01:18+01:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/4e827b30dfc393caf17e2fce28b5eea… Patch: https://github.com/kamailio/kamailio/commit/4e827b30dfc393caf17e2fce28b5eea…

1 0

git:master:b9e8e09f: posops: docs for pos_set_char()
by Daniel-Constantin Mierla 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: b9e8e09fd56b9cd2f1bd926edb6faf421b2893a1 URL: https://github.com/kamailio/kamailio/commit/b9e8e09fd56b9cd2f1bd926edb6faf4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-08T12:46:53+01:00 posops: docs for pos_set_char() --- Modified: src/modules/posops/doc/posops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b9e8e09fd56b9cd2f1bd926edb6faf4… Patch: https://github.com/kamailio/kamailio/commit/b9e8e09fd56b9cd2f1bd926edb6faf4… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index fcfd23ac12..1a38b85c67 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -156,6 +156,32 @@ pos_insert("100", "kamailio-$si"); <programlisting format="linespecific"> ... pos_insert("100", "10"); +... + </programlisting> + </example> + </section> + <section id="posops.f.pos_set_char"> + <title> + <function moreinfo="none">pos_set_char(idx, val)</function> + </title> + <para> + Set the char at position index to first character in val. + </para> + <para> + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the buffer. + </para> + <para> + The val can be a static string or variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pos_set_char()</function> usage</title> + <programlisting format="linespecific"> +... +pos_set_char("100", "x"); ... </programlisting> </example>

1 0

git:master:531c78c4: posops: added posops_set_char() function
by Daniel-Constantin Mierla 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: 531c78c455ef679050c0ae8103a9b1913c2c225a URL: https://github.com/kamailio/kamailio/commit/531c78c455ef679050c0ae8103a9b19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-08T09:17:21+01:00 posops: added posops_set_char() function --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/531c78c455ef679050c0ae8103a9b19… Patch: https://github.com/kamailio/kamailio/commit/531c78c455ef679050c0ae8103a9b19… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 465d6490ed..d71368cfc0 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -41,6 +41,7 @@ static void mod_destroy(void); static int w_posops_pos_append(sip_msg_t* msg, char* p1idx, char* p2val); static int w_posops_pos_insert(sip_msg_t* msg, char* p1idx, char* p2val); static int w_posops_pos_rm(sip_msg_t* msg, char* p1idx, char* p2len); +static int w_posops_pos_set_char(sip_msg_t* msg, char* p1idx, char* p2val); static int w_posops_pos_headers_start(sip_msg_t* msg, char* p1, char* p2); static int w_posops_pos_headers_end(sip_msg_t* msg, char* p1, char* p2); static int w_posops_pos_body_start(sip_msg_t* msg, char* p1, char* p2); @@ -83,6 +84,8 @@ static cmd_export_t cmds[]={ fixup_free_igp_spve, ANY_ROUTE}, {"pos_rm", (cmd_function)w_posops_pos_rm, 2, fixup_igp_igp, fixup_free_igp_igp, ANY_ROUTE}, + {"pos_set_char", (cmd_function)w_posops_pos_set_char, 2, fixup_igp_spve, + fixup_free_igp_spve, ANY_ROUTE}, {"pos_headers_start", (cmd_function)w_posops_pos_headers_start, 0, 0, 0, ANY_ROUTE}, {"pos_headers_end", (cmd_function)w_posops_pos_headers_end, 0, 0, @@ -342,6 +345,56 @@ static int w_posops_pos_rm(sip_msg_t* msg, char* p1idx, char* p2len) return ki_posops_pos_rm(msg, idx, len); } +/** + * + */ +static int ki_posops_pos_set_char(sip_msg_t *msg, int idx, str *val) +{ + int offset; + + posops_data_init(); + if(val==NULL || val->s==NULL || val->len<=0) { + LM_ERR("invalid val parameter\n"); + return -1; + } + + if(idx<0) { + offset = msg->len + idx; + } else { + offset = idx; + } + if(offset>msg->len) { + LM_ERR("offset invalid: %d (msg-len: %d)\n", offset, msg->len); + return -1; + } + + msg->buf[offset] = val->s[0]; + + return 1; +} + +/** + * + */ +static int w_posops_pos_set_char(sip_msg_t* msg, char* p1idx, char* p2val) +{ + int idx = 0; + str val = STR_NULL; + + posops_data_init(); + if(fixup_get_ivalue(msg, (gparam_t*)p1idx, &idx)!=0) { + LM_ERR("unable to get idx parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)p2val, &val)!=0) { + LM_ERR("unable to get val parameter\n"); + return -1; + } + + return ki_posops_pos_set_char(msg, idx, &val); +} + /** * */ @@ -878,6 +931,11 @@ static sr_kemi_t sr_kemi_posops_exports[] = { { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("posops"), str_init("pos_set_char"), + SR_KEMIP_INT, ki_posops_pos_set_char, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("posops"), str_init("pos_headers_start"), SR_KEMIP_INT, ki_posops_pos_headers_start, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:6f401a7a: kamctl: srv modules subcommand
by Daniel-Constantin Mierla 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: 6f401a7aab1bc846aaebe50e0f451d7c16e2c55e URL: https://github.com/kamailio/kamailio/commit/6f401a7aab1bc846aaebe50e0f451d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-06T22:11:37+01:00 kamctl: srv modules subcommand - list the loaded modules --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/6f401a7aab1bc846aaebe50e0f451d7… Patch: https://github.com/kamailio/kamailio/commit/6f401a7aab1bc846aaebe50e0f451d7… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a5a1d34714..a83720fcde 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1799,6 +1799,11 @@ ksr_srv() { ctl_cmd_run corex.debug $2 fi ;; + modules) + require_ctlengine + mecho "list loaded modules" + ctl_cmd_run core.modules + ;; version) require_ctlengine mecho "list server version" diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 47747be85a..f3b9e1f667 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -556,6 +556,7 @@ cat <<EOF srv aliases ................... show the list of server aliases srv rpclist ................... show the list of server rpc commands srv debug [<level>] ........... control the server debug level + srv modules ................... show the list of loaded modules srv version ................... show the server version EOF }

1 0

[kamailio/kamailio] asan: load of misaligned address (Issue #2914)
by sergey-safarov 07 Nov '21

07 Nov '21

### Description I fave compiled Kamailio with ASAN and enabled alignment checks (`-fno-sanitize=alignment` do not used). And get error ``` core/cfg/cfg_script.c:120:10: runtime error: load of misaligned address 0xffff96900cdc for type 'struct cfg_script_var_t *', which requires 8 byte alignment 0xffff96900cdc: note: pointer points here 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 00 00 00 00 ``` I do not aware this is important or not. Leave it for your review. ### Additional Information Compiled 375f86b69e11cf835ae919873d3cd56f32d589c8 Arch aarch64 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2914

2 3

Packaging NATS module
by Olle E. Johansson 06 Nov '21

06 Nov '21

Hi! The NATS module which is getting a publisher update soon, depends on libuv and the nats.c library. Question for our heroes - the packagers! Will it be possible to package this module in your distro? I see that debian has libuv1, but fail to find nats.c libs. Cheers, /O

2 1

git:master:dd1b3ccb: pkg/kamailio/obs: packaged nats module
by Sergey Safarov 06 Nov '21

06 Nov '21

Module: kamailio Branch: master Commit: dd1b3ccbc9e4674b28e420d97fe96bbe028fa009 URL: https://github.com/kamailio/kamailio/commit/dd1b3ccbc9e4674b28e420d97fe96bb… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-11-06T18:43:39+03:00 pkg/kamailio/obs: packaged nats module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/dd1b3ccbc9e4674b28e420d97fe96bb… Patch: https://github.com/kamailio/kamailio/commit/dd1b3ccbc9e4674b28e420d97fe96bb… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5e15376879..5b87a501bc 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -18,6 +18,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without mongodb +%bcond_without nats %bcond_without perl %bcond_without phonenum %bcond_without python3 @@ -51,6 +52,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_with mongodb +%bcond_with nats %bcond_without perl %bcond_with phonenum %bcond_with python3 @@ -85,6 +87,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without mongodb +%bcond_with nats %bcond_without perl %bcond_without phonenum %bcond_without python3 @@ -129,6 +132,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without mongodb +%bcond_without nats %bcond_without perl %bcond_without phonenum %bcond_without python3 @@ -156,6 +160,7 @@ %bcond_with kazoo %bcond_without memcached %bcond_with mongodb +%bcond_with nats %bcond_without perl %bcond_with phonenum %bcond_without python3 @@ -216,8 +221,9 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-http_client < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver -Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver +Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver +Conflicts: kamailio-nats < %ver Conflicts: kamailio-rabbitmq < %ver Conflicts: kamailio-memcached < %ver, kamailio-mongodb < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver @@ -687,6 +693,18 @@ BuildRequires: mysql-devel MySQL database connectivity for Kamailio. +%if %{with nats} +%package nats +Summary: NATS consumer for Kamailio +Group: %{PKGGROUP} +Requires: libnats, kamailio = %ver +BuildRequires: libnats-devel + +%description nats +The module provides an NATS consumer for Kamailio. NATS is a real time distributed messaging platform, more details about it can be found at nats.io. +%endif + + %package outbound Summary: Outbound (RFC 5626) support for Kamailio Group: %{PKGGROUP} @@ -1210,6 +1228,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kmongodb \ %endif kmysql koutbound \ +%if %{with nats} + knats \ +%endif %if %{with perl} kperl \ %endif @@ -1308,6 +1329,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kmongodb \ %endif kmysql koutbound \ +%if %{with nats} + knats \ +%endif %if %{with perl} kperl \ %endif @@ -1997,6 +2021,14 @@ fi %{_datadir}/kamailio/mysql/* +%if %{with nats} +%files nats +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.nats +%{_libdir}/kamailio/modules/nats.so +%endif + + %files outbound %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.outbound

1 0

[kamailio/kamailio] cannot pase IPv6 Via (Issue #2898)
by sergey-safarov 05 Nov '21

05 Nov '21

### Description Kamailio cannot parse Via header with full IPv6 address. And generate errors like ``` ERROR: <core> [core/parser/msg_parser.c:340]: parse_headers(): bad header field [Via: SIP/2.0/TCP [2a00:1370:8131:ffdf:4398:8903:f613:58b6];branch=z9hG4bK02cc.edc691e200000000000000] ``` #### SIP Traffic OPTIONS messages cannot be parsed ``` OPTIONS sip:example.com:5080;transport=tcp SIP/2.0 Via: SIP/2.0/TCP [2a00:1370:8131:ffdf:4398:8903:f613:58b6];branch=z9hG4bK0241.2e5db116000000000000000000000000.0 To: <sip:example.com:5080;transport=tcp> From: <sip:proxy@example.com>;tag=ecfe220eb77cee2ab0369a33b85d6b69-54b37dee CSeq: 10 OPTIONS Call-ID: 0d2146aa2a479f0d-2232(a)192.168.1.6 Max-Forwards: 70 Content-Length: 0 ``` OPTIONS messages parsed successfully. ``` OPTIONS sip:example.com.com:5080;transport=tcp SIP/2.0 Via: SIP/2.0/TCP [2600:1f1c:6d5:aa00::6];branch=z9hG4bK67a6.b0578ab2000000000000000000000000.0 To: <sip:example.com:5080;transport=tcp> From: <sip:proxy@example.com>;tag=c9c2897ae0601f24edc14b3f5f65b7e4-02fff025 CSeq: 10 OPTIONS Call-ID: 3555c29958953393-581752(a)3.101.84.6 Max-Forwards: 70 Content-Length: 0 ``` ### Additional Information compiled commit 1483ddb735c3fa3ea77b6e2d54ec67584e56e15b * **Operating System**: lsb_release -a ``` [safarov@safarov-dell config]$ lsb_release -a LSB Version: :core-4.1-amd64:core-4.1-noarch Distributor ID: Fedora Description: Fedora release 33 (Thirty Three) Release: 33 Codename: ThirtyThree ``` uname -a ``` [root@safarov-dell kamailio]# uname -a Linux safarov-dell.home 5.14.9-100.fc33.x86_64 #1 SMP Thu Sep 30 12:45:49 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2898

2 4

git:master:63a34963: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: 63a34963c8376a2c17b7919847f7723fde6434f5 URL: https://github.com/kamailio/kamailio/commit/63a34963c8376a2c17b7919847f7723… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-05T11:46:16+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/63a34963c8376a2c17b7919847f7723… Patch: https://github.com/kamailio/kamailio/commit/63a34963c8376a2c17b7919847f7723… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 540bd20d4d..7c31188ac7 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1331,10 +1331,11 @@ modparam("acc", "cdr_on_failed", 0) 6.49. acc_extra_size (int) - This parameter is meant to replace MAX_ACC_EXTRA fixed size with - desired size. + Set the maximum number of extra attributes that can be stored in the + accounting record (event accounting record). It is related to log_extra + and db_extra module parameters. - Default value is 64 (MAX_ACC_EXTRA). + Default value is 64. Example 1.49. acc_extra_size ... @@ -1343,10 +1344,11 @@ modparam("acc", "acc_extra_size", 100) 6.50. cdr_extra_size (int) - This parameter is meant to replace MAX_CDR_EXTRA fixed size with - desired size. + Set the maximum number of extra attributes that can be stored in the + call data record (cdr by dialog module). It is related to cdr_extra + module parameter. - Default value is 64 (MAX_CDR_EXTRA). + Default value is 64. Example 1.50. cdr_extra_size ...

1 0

git:master:9d65e090: acc: updated docs for acc_extra_size and cdr_extra_size
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: 9d65e09056c89d5a1391a2c29458005929516ce0 URL: https://github.com/kamailio/kamailio/commit/9d65e09056c89d5a1391a2c29458005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T11:37:41+01:00 acc: updated docs for acc_extra_size and cdr_extra_size --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9d65e09056c89d5a1391a2c29458005… Patch: https://github.com/kamailio/kamailio/commit/9d65e09056c89d5a1391a2c29458005… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 0fd643c7a7..036163da14 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1447,10 +1447,12 @@ modparam("acc", "cdr_on_failed", 0) <section id="acc.p.acc_extra_size"> <title><varname>acc_extra_size</varname> (int)</title> <para> - This parameter is meant to replace MAX_ACC_EXTRA fixed size with desired size. + Set the maximum number of extra attributes that can be stored in the + accounting record (event accounting record). It is related to log_extra + and db_extra module parameters. </para> <para> - Default value is 64 (MAX_ACC_EXTRA). + Default value is 64. </para> <example> <title>acc_extra_size</title> @@ -1465,10 +1467,12 @@ modparam("acc", "acc_extra_size", 100) <section id="acc.p.cdr_extra_size"> <title><varname>cdr_extra_size</varname> (int)</title> <para> - This parameter is meant to replace MAX_CDR_EXTRA fixed size with desired size. + Set the maximum number of extra attributes that can be stored in the + call data record (cdr by dialog module). It is related to cdr_extra + module parameter. </para> <para> - Default value is 64 (MAX_CDR_EXTRA). + Default value is 64. </para> <example> <title>cdr_extra_size</title>

1 0

[kamailio/kamailio] build: detect GCC 11 (PR #2917)
by aalba6675 05 Nov '21

05 Nov '21

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Increase largest version of GCC detected to 11 from 10. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2917 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2917/commits/4d11948402ae315c94ff…">build: detect GCC 11</a> -- File Changes -- M src/Makefile.defs (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2917.patch https://github.com/kamailio/kamailio/pull/2917.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2917

2 2

git:master:bf8a989f: build: detect GCC 11
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: bf8a989f54b1006cae6c764f4064998daa6fe0c0 URL: https://github.com/kamailio/kamailio/commit/bf8a989f54b1006cae6c764f4064998… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T11:23:40+01:00 build: detect GCC 11 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/bf8a989f54b1006cae6c764f4064998… Patch: https://github.com/kamailio/kamailio/commit/bf8a989f54b1006cae6c764f4064998… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5d76fbe2cc..cde1faa6df 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -308,7 +308,9 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) -e 's/9\.[0-9]\..*/9.0+/' \ -e 's/9\.[0-9]$$/9.0+/' \ -e 's/10\.[0-9]\..*/9.0+/' \ - -e 's/10\.[0-9]$$/9.0+/') + -e 's/10\.[0-9]$$/9.0+/' \ + -e 's/11\.[0-9]\..*/9.0+/' \ + -e 's/11\.[0-9]$$/9.0+/') ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER)))) # dependencies can be generated on-the-fly while compiling *.c CC_MKDEP_OPTS=-MMD -MP

1 0

git:5.4:d84a89db: app_python3: for Python >= 3.7 call pre-fork hook
by Anthony Alba 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.4 Commit: d84a89dba261d7a75ec35125174fe6723cf13295 URL: https://github.com/kamailio/kamailio/commit/d84a89dba261d7a75ec35125174fe67… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-11-05T18:17:36+08:00 app_python3: for Python >= 3.7 call pre-fork hook (cherry picked from commit 138ef5630402448ea2643097a3d25d4dcead6d70) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d84a89dba261d7a75ec35125174fe67… Patch: https://github.com/kamailio/kamailio/commit/d84a89dba261d7a75ec35125174fe67… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 0ce93b71cd..8ec252039c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -175,6 +175,17 @@ static int mod_init(void) static int child_init(int rank) { if(rank==PROC_INIT) { + /* + * this is called before any process is forked + * so the Python internal state handler + * should be called now. + * + * TODO: is PyOS_AfterFork_Parent() necesary + * in the main process? + */ +#if PY_VERSION_HEX >= 0x03070000 + PyOS_BeforeFork() ; +#endif return 0; } _apy_process_rank = rank;

1 0

git:5.5:2b10b505: app_python3: for Python >= 3.7 call pre-fork hook
by Anthony Alba 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 2b10b50518950246ad3a224b13e9817b00877a90 URL: https://github.com/kamailio/kamailio/commit/2b10b50518950246ad3a224b13e9817… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-11-05T18:13:36+08:00 app_python3: for Python >= 3.7 call pre-fork hook (cherry picked from commit 138ef5630402448ea2643097a3d25d4dcead6d70) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2b10b50518950246ad3a224b13e9817… Patch: https://github.com/kamailio/kamailio/commit/2b10b50518950246ad3a224b13e9817… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 0ce93b71cd..8ec252039c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -175,6 +175,17 @@ static int mod_init(void) static int child_init(int rank) { if(rank==PROC_INIT) { + /* + * this is called before any process is forked + * so the Python internal state handler + * should be called now. + * + * TODO: is PyOS_AfterFork_Parent() necesary + * in the main process? + */ +#if PY_VERSION_HEX >= 0x03070000 + PyOS_BeforeFork() ; +#endif return 0; } _apy_process_rank = rank;

1 0

git:master:138ef563: app_python3: for Python >= 3.7 call pre-fork hook
by Anthony Alba 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: 138ef5630402448ea2643097a3d25d4dcead6d70 URL: https://github.com/kamailio/kamailio/commit/138ef5630402448ea2643097a3d25d4… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-11-05T17:31:34+08:00 app_python3: for Python >= 3.7 call pre-fork hook --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/138ef5630402448ea2643097a3d25d4… Patch: https://github.com/kamailio/kamailio/commit/138ef5630402448ea2643097a3d25d4… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 0ce93b71cd..8ec252039c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -175,6 +175,17 @@ static int mod_init(void) static int child_init(int rank) { if(rank==PROC_INIT) { + /* + * this is called before any process is forked + * so the Python internal state handler + * should be called now. + * + * TODO: is PyOS_AfterFork_Parent() necesary + * in the main process? + */ +#if PY_VERSION_HEX >= 0x03070000 + PyOS_BeforeFork() ; +#endif return 0; } _apy_process_rank = rank;

1 0

git:5.5:5ad04534: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 5ad0453472411d1a958023944340fab6c2b841fa URL: https://github.com/kamailio/kamailio/commit/5ad0453472411d1a958023944340fab… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-05T09:01:53+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/acc_json/README Modified: src/modules/rtpengine/README Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/5ad0453472411d1a958023944340fab… Patch: https://github.com/kamailio/kamailio/commit/5ad0453472411d1a958023944340fab… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index baff8e8b32..af9c65037e 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1074,9 +1074,12 @@ modparam("acc", "db_insert_mode", 1) 6.30. cdr_enable (integer) - Should CDR-based logging be enabled? + Enable CDR reporting - one record per call reported to "acc_cdrs" + table, relying on dialog module. - 0 - off (default). 1 - on. + The value can be: + * 0 - off (default). + 1 - on. Example 1.30. cdr_enable example ... diff --git a/src/modules/acc_json/README b/src/modules/acc_json/README index 8897fe609a..e2192ec375 100644 --- a/src/modules/acc_json/README +++ b/src/modules/acc_json/README @@ -41,7 +41,7 @@ Julien Chavanton 3.8. acc_output_syslog (integer) 3.9. acc_log_facility (integer) 3.10. acc_log_level (integer) - 3.11. cdr_enable (str) + 3.11. cdr_enable (int) 3.12. cdr_extra (str) 3.13. cdr_json_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) @@ -92,7 +92,7 @@ Chapter 1. Admin Guide 3.8. acc_output_syslog (integer) 3.9. acc_log_facility (integer) 3.10. acc_log_level (integer) - 3.11. cdr_enable (str) + 3.11. cdr_enable (int) 3.12. cdr_extra (str) 3.13. cdr_json_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) @@ -142,7 +142,7 @@ Chapter 1. Admin Guide 3.8. acc_output_syslog (integer) 3.9. acc_log_facility (integer) 3.10. acc_log_level (integer) - 3.11. cdr_enable (str) + 3.11. cdr_enable (int) 3.12. cdr_extra (str) 3.13. cdr_json_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) @@ -325,11 +325,14 @@ modparam("acc_json", "acc_log_facility", "LOG_LOCAL0") modparam("acc_json", "acc_log_level", 2) # Set acc_log_level to 2 (L_INFO) ... -3.11. cdr_enable (str) +3.11. cdr_enable (int) - Enable Call Data Record generation. + Enable CDR reporting - one record per call is reported, relying on + dialog module. - Default value is 0 (disabled). + The value can be: + * 0 - off (default). + 1 - on. Example 1.11. cdr_enable example ... diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 6f962d4aed..103e397c77 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -478,6 +478,7 @@ Chapter 1. Admin Guide The following modules must be loaded before this module: * tm module - (optional) if you want to have rtpengine_manage() fully functional + lwsc module - (optional) if you plan to use “wsapi” parameter 3.2. External Libraries or Applications diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index a699336f53..fc57366006 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -296,8 +296,8 @@ event_route[sipdump:msg] { examples shows how to delete the files older than 2 days using Kamailio modules. ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

1 0

[kamailio/kamailio] rtpengine -> send_rtpp_command(): mismatched cookie in websocket response (#2862)
by marcinkowalczyk 05 Nov '21

05 Nov '21

### Description Hi, I've pushed some production traffic over latest 5.5.2 release on top of rtpengine connected over websocket ( jus ws://xxx.xx.xx.xx) . `modparam("rtpengine", "wsapi", "lwsc")` but from time to time I can see following error and rtpengine_manage fails ``` Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> lwsc [lwsc_mod.c:367]: ksr_lwsc_callback(): losing read buffer of 4096 bytes Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:3008]: send_rtpp_command(): mismatched cookie in websocket response Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:2678]: rtpp_function_call(): no available proxies ``` RTT towards rtpengine ~100-150ms #### Debugging Data #### Log Messages ``` Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: New request - M=INVITE R=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain F=sip:+XXXXX@172.31.12.244 T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.136.115:5060) ID=bgfmx.localdomain_654888 Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Add to rr sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain => c2lwOmNiMmU5NjRmLTFlYjctNDFmZS1hN2QzLTVmYWZlYmY0ZjNjOUBiZ2ZteC5jcmF6eWNhbGwuY29t Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTPEngineID bgfmx.localdomain set from header to 3 ID=bgfmx.localdomain_654888 Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Generated MOS A label for bgfmx.localdomain_654888 - a324492e-ea41-44c1-982e-8397799a08b1 Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Generated MOS B label for bgfmx.localdomain_654888 - 8882300b-c07e-4f45-a864-1158b8412b60 Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: SIP > WebRTC Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTP Selected ws://xx.xx.xx.xx:22222 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Fix SDP BUNDLE for iOS devices Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: stored transaction [36958:1549764233] sip:+XXXXX@172.31.12.244 => sip:474tnvd1@15j11kooqfes.invalid;transport=ws Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply - S=100 - Trying M=INVITE IP=<null>:<null> (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply from websocket to SIP: 100 M=INVITE R=<null> F=sip:+XXXXX@bgfmx.localdomain T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply - S=180 - Ringing M=INVITE IP=<null>:<null> (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply from websocket to SIP: 180 M=INVITE R=<null> F=sip:+XXXXX@bgfmx.localdomain T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply - S=200 - OK M=INVITE IP=<null>:<null> (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply from websocket to SIP: 200 M=INVITE R=<null> F=sip:+XXXXX@bgfmx.localdomain T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: New request - M=ACK R=sip:474tnvd1@15j11kooqfes.invalid;alias=10.23.245.162~29794~5;transport=ws F=sip:+XXXXX@172.31.12.244 T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.136.115:5060) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Desination WS - lookup sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Restored from RR header 15j11kooqfes.invalid -RTPEngineID 3 inst:<null> ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists A label for bgfmx.localdomain_654888 - a324492e-ea41-44c1-982e-8397799a08b1 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists B label for bgfmx.localdomain_654888 - 8882300b-c07e-4f45-a864-1158b8412b60 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: stored transaction [<null>:<null>] sip:+XXXXX@172.31.12.244 => sip:474tnvd1@15j11kooqfes.invalid;transport=ws Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: New request - M=INFO R=sip:474tnvd1@15j11kooqfes.invalid;alias=10.23.245.162~29794~5;transport=ws F=sip:+XXXXX@172.31.12.244 T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.136.115:5060) ID=bgfmx.localdomain_654888 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Desination WS - lookup sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain ID=bgfmx.localdomain_654888 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Restored from RR header 15j11kooqfes.invalid -RTPEngineID 3 inst:<null> ID=bgfmx.localdomain_654888 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists A label for bgfmx.localdomain_654888 - a324492e-ea41-44c1-982e-8397799a08b1 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists B label for bgfmx.localdomain_654888 - 8882300b-c07e-4f45-a864-1158b8412b60 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: SIP-INFO received start recording ID=bgfmx.localdomain_654888 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTPENGINE STATS: mos_average/mos_average_packetloss/mos_average_jitter/mos_average_roundtrip 4.3/0/0/143763 Sep 24 19:44:16 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: New request - M=BYE R=sip:474tnvd1@15j11kooqfes.invalid;alias=10.23.245.162~29794~5;transport=ws F=sip:+XXXXX@172.31.12.244 T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.136.115:5060) ID=bgfmx.localdomain_654888 Sep 24 19:44:16 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Restored from RR header 15j11kooqfes.invalid -RTPEngineID 3 inst:<null> ID=bgfmx.localdomain_654888 Sep 24 19:44:16 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists A label for bgfmx.localdomain_654888 - 8882300b-c07e-4f45-a864-1158b8412b60 Sep 24 19:44:16 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists B label for bgfmx.localdomain_654888 - a324492e-ea41-44c1-982e-8397799a08b1 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> lwsc [lwsc_mod.c:367]: ksr_lwsc_callback(): losing read buffer of 4096 bytes Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:3008]: send_rtpp_command(): mismatched cookie in websocket response Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:2678]: rtpp_function_call(): no available proxies Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTPENGINE STATS: mos_average/mos_average_packetloss/mos_average_jitter/mos_average_roundtrip <null>/<null>/<null>/<null> Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Stop mediaproxy for all branches - R=sip:474tnvd1@15j11kooqfes.invalid;alias=10.23.245.162~29794~5;transport=ws ID=bgfmx.localdomain_654888 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:2678]: rtpp_function_call(): no available proxies Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:2678]: rtpp_function_call(): no available proxies Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Desination WS - lookup sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain ID=bgfmx.localdomain_654888 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Restored from RR header 15j11kooqfes.invalid -RTPEngineID 3 inst:<null> ID=bgfmx.localdomain_654888 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists A label for bgfmx.localdomain_654888 - 8882300b-c07e-4f45-a864-1158b8412b60 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists B label for bgfmx.localdomain_654888 - a324492e-ea41-44c1-982e-8397799a08b1 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: SIP > WebRTC Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:2678]: rtpp_function_call(): no available proxies Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTPEngine Failover no X-RTPEngineID-failover header failing to 1 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: post RTP Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTP Selected ws://52.209.63.240:22222 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: stored transaction [36971:163653632] sip:+XXXXX@172.31.12.244 => sip:474tnvd1@15j11kooqfes.invalid;transport=ws Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15922]: INFO: [BYE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply - S=200 - OK M=BYE IP=<null>:<null> (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15922]: INFO: [BYE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply from websocket to SIP: 200 M=BYE R=<null> F=sip:+XXXXX@bgfmx.localdomain T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.245.162:29794) ID=bgfmx.localdomain_654888 ``` RTPEngine log ``` Sep 24 19:42:58 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Received command 'offer' from 52.49.87.3:1816 Sep 24 19:42:58 ip-172-28-11-189 rtpengine[18874]: NOTICE: [bgfmx.localdomain_654888]: [core] Creating new call Sep 24 19:42:58 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Replying to 'offer' from 52.49.87.3:1816 (elapsed time 0.001349 sec) Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888 port 32358]: [crypto] DTLS-SRTP successfully negotiated using AEAD_AES_256_GCM Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888 port 32358]: [crypto] DTLS-SRTP successfully negotiated using AEAD_AES_256_GCM Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Received command 'answer' from 52.49.87.3:2192 Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [core] Received answer SDP with media ID ('audio') when no media ID was offered Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [crypto] DTLS: Peer certificate accepted Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Replying to 'answer' from 52.49.87.3:2192 (elapsed time 0.000811 sec) Sep 24 19:43:03 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888 port 32358]: [core] Confirmed peer address as 103.102.144.211:52093 Sep 24 19:43:03 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888 port 32380]: [core] Confirmed peer address as 52.209.63.245:56876 Sep 24 19:43:03 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888 port 32381]: [core] Confirmed peer address as 52.209.63.245:56877 Sep 24 19:43:13 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Received command 'start recording' from 52.49.87.3:30337 Sep 24 19:43:13 ip-172-28-11-189 rtpengine[18874]: ERR: [bgfmx.localdomain_654888]: [core] Call recording requested, but no spool directory configured Sep 24 19:43:13 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Replying to 'start recording' from 52.49.87.3:30337 (elapsed time 0.000009 sec) Sep 24 19:43:13 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Received command 'query' from 52.49.87.3:30337 Sep 24 19:43:13 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Replying to 'query' from 52.49.87.3:30337 (elapsed time 0.000131 sec) Sep 24 19:44:16 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Received command 'query' from 52.49.87.3:43726 Sep 24 19:44:16 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Replying to 'query' from 52.49.87.3:43726 (elapsed time 0.000156 sec) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.2 (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 10.2.1 ``` * **Operating System**: ``` root@kamailio5:~# kamailio -v version: kamailio 5.5.2 (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 10.2.1 root@kamailio5:~# uname -a Linux kamailio5 5.10.0-8-cloud-amd64 #1 SMP Debian 5.10.46-4 (2021-08-03) x86_64 GNU/Linux root@kamailio5:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye root@kamailio5:~# ``` rtpengine version on media proxy ``` ii ngcp-rtpengine 10.0.1.4+0~mr10.0.1.4 all NGCP RTP/media proxy - meta package ii ngcp-rtpengine-daemon 10.0.1.4+0~mr10.0.1.4 amd64 proxy for RTP and media streams used in NGCP, userspace part ii ngcp-rtpengine-iptables 10.0.1.4+0~mr10.0.1.4 amd64 IPtables extension module for the kernel-space NGCP media proxy ii ngcp-rtpengine-kernel-dkms 10.0.1.4+0~mr10.0.1.4 all IPtables kernel module for the NGCP media proxy - DKMS ii ngcp-rtpengine-kernel-source 10.0.1.4+0~mr10.0.1.4 all IPtables kernel module for the NGCP media proxy - source ii ngcp-rtpengine-recording-daemon 10.0.1.4+0~mr10.0.1.4 amd64 recording daemon for RTP and media streams ii ngcp-rtpengine-utils 10.0.1.4+0~mr10.0.1.4 all scripts and Perl modules for NGCP rtpengine ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2862

5 15

git:5.5:0b0e1352: drouting: remove unused trim function
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 0b0e13527059e6d3ae96235430e585203082dcc2 URL: https://github.com/kamailio/kamailio/commit/0b0e13527059e6d3ae96235430e5852… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:47:06+01:00 drouting: remove unused trim function (cherry picked from commit 38ae44336e8478c10e1a558997669850c5d7b297) --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/0b0e13527059e6d3ae96235430e5852… Patch: https://github.com/kamailio/kamailio/commit/0b0e13527059e6d3ae96235430e5852… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 0988bccbb7..55d09a57ca 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -45,34 +45,6 @@ static inline int strz2int(char *_bp) } -static inline char *trim(char *_s) -{ - int len; - char *end; - - /* Null pointer, there is nothing to do */ - if(!_s) - return _s; - - /* Remove spaces and tabs from the beginning of string */ - while((*_s == ' ') || (*_s == '\t')) - _s++; - - len = strlen(_s); - - end = _s + len - 1; - - /* Remove trailing spaces and tabs */ - while((*end == ' ') || (*end == '\t')) - end--; - if(end != (_s + len - 1)) { - *(end + 1) = '\0'; - } - - return _s; -} - - /************************ imported from "ac_tm.c" ***************************/ /* #define USE_YWEEK_U // Sunday system

1 0

git:5.5:2b432d35: pv: handle case when var value ha flag str but null pointer
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 2b432d35f0691d9ef6b12908909d809dbb1fa57b URL: https://github.com/kamailio/kamailio/commit/2b432d35f0691d9ef6b12908909d809… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:47:23+01:00 pv: handle case when var value ha flag str but null pointer (cherry picked from commit 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc) --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/2b432d35f0691d9ef6b12908909d809… Patch: https://github.com/kamailio/kamailio/commit/2b432d35f0691d9ef6b12908909d809… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 255f9f2040..456e21963a 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if(value==NULL) + if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:5.5:280a1650: lwsc: wait to read more data if not last ws fragment
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 280a165086b5c45ae4c0310d889c5df927fff058 URL: https://github.com/kamailio/kamailio/commit/280a165086b5c45ae4c0310d889c5df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:47:54+01:00 lwsc: wait to read more data if not last ws fragment - GH #2862 (cherry picked from commit 1ea717032d90fcc98a5de07e746ec367eaeed3be) --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/280a165086b5c45ae4c0310d889c5df… Patch: https://github.com/kamailio/kamailio/commit/280a165086b5c45ae4c0310d889c5df… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index a6985acb6dc..7eb1f4285ea 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -144,6 +144,7 @@ typedef struct lwsc_endpoint { /* first LWS_PRE bytes must preserved for headers */ str wbuf; str rbuf; + int rdone; int tlson; struct lws_protocols protocols[2]; struct lws_context_creation_info crtinfo; @@ -226,6 +227,7 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, lwsc_endpoint_t *ep = NULL; str rbuf = STR_NULL; str wbuf = STR_NULL; + int blen = 0; if(_lwsc_verbosity>1) { LM_DBG("callback called with reason %d\n", reason); @@ -349,28 +351,35 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, LM_DBG("LWS_CALLBACK_RECEIVE - wsi: %p len: %lu\n", wsi, (unsigned long)len); #endif + ep = lwsc_get_endpoint_by_wsi(wsi); + if(ep==NULL) { + LM_ERR("no endpoint for wsi %p\n", wsi); + goto done; + } + pthread_mutex_lock(&ep->wslock); if(len>0) { - ep = lwsc_get_endpoint_by_wsi(wsi); - if(ep==NULL) { - LM_ERR("no endpoint for wsi %p\n", wsi); - goto done; - } - rbuf.s = (char*)pkg_malloc(len + 1); + blen = ep->rbuf.len + len; + rbuf.s = (char*)pkg_malloc(blen + 1); if(rbuf.s==NULL) { PKG_MEM_ERROR; } else { - memcpy(rbuf.s, in, len); - rbuf.len = len; - rbuf.s[rbuf.len] = '\0'; - pthread_mutex_lock(&ep->wslock); if(ep->rbuf.s!=NULL) { - LM_ERR("losing read buffer of %d bytes\n", ep->rbuf.len); + LM_DBG("append to read buffer of %d bytes more %d bytes\n", + ep->rbuf.len, (int)len); + memcpy(rbuf.s, ep->rbuf.s, ep->rbuf.len); pkg_free(ep->rbuf.s); + ep->rbuf.s = NULL; } + memcpy(rbuf.s + ep->rbuf.len, in, len); + rbuf.len = blen; + rbuf.s[rbuf.len] = '\0'; ep->rbuf = rbuf; - pthread_mutex_unlock(&ep->wslock); } } + if (lws_is_final_fragment(wsi)) { + ep->rdone = 1; + } + pthread_mutex_unlock(&ep->wslock); break; case LWS_CALLBACK_WS_PEER_INITIATED_CLOSE: @@ -646,6 +655,7 @@ static int lwsc_api_request(str* wsurl, str *wsproto, str* sdata, ep->rbuf.s = NULL; ep->rbuf.len = 0; } + ep->rdone = 0; if(ep->wbuf.s!=NULL) { LM_ERR("losing write buffer content of %d bytes\n", ep->wbuf.len); pkg_free(ep->wbuf.s); @@ -659,10 +669,13 @@ static int lwsc_api_request(str* wsurl, str *wsproto, str* sdata, do { pthread_mutex_lock(&ep->wslock); - if(ep->rbuf.s!=NULL) { - *rdata = ep->rbuf; - ep->rbuf.s = NULL; - ep->rbuf.len = 0; + if(ep->rdone==1) { + if(ep->rbuf.s!=NULL) { + *rdata = ep->rbuf; + ep->rbuf.s = NULL; + ep->rbuf.len = 0; + } + ep->rdone = 0; } pthread_mutex_unlock(&ep->wslock); if(rdata->s==NULL) {

1 0

git:5.5:e87193a2: rtpengine: update dependencies
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: e87193a20ed4c0419aa13762257b1d8ff355e0dc URL: https://github.com/kamailio/kamailio/commit/e87193a20ed4c0419aa13762257b1d8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:45:16+01:00 rtpengine: update dependencies lwsc module is needed if wsapi parameter is set https://lists.kamailio.org/pipermail/sr-users/2021-October/113494.html (cherry picked from commit a602c26fe3c83a0f1b825927be145459a08730e2) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e87193a20ed4c0419aa13762257b1d8… Patch: https://github.com/kamailio/kamailio/commit/e87193a20ed4c0419aa13762257b1d8… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 9e8dee5d80..11431f57fc 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -120,6 +120,10 @@ <emphasis>tm module</emphasis> - (optional) if you want to have rtpengine_manage() fully functional </para> + <para> + <emphasis>lwsc module</emphasis> - (optional) if you plan to use + <quote>wsapi</quote> parameter + </para> </listitem> </itemizedlist> </para>

1 0

git:5.5:f5f4ba99: acc: docs - more details about cdr_enable parameter
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: f5f4ba994fa80ab44db3a4ddd7e36872a29b93a2 URL: https://github.com/kamailio/kamailio/commit/f5f4ba994fa80ab44db3a4ddd7e3687… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:46:10+01:00 acc: docs - more details about cdr_enable parameter (cherry picked from commit 808e58c4e9b785a58fd5cfd084089a217d0f96c3) --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f5f4ba994fa80ab44db3a4ddd7e3687… Patch: https://github.com/kamailio/kamailio/commit/f5f4ba994fa80ab44db3a4ddd7e3687… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index f88d403d2b..4fd15f5820 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1045,11 +1045,17 @@ modparam("acc", "db_insert_mode", 1) <section id="acc.p.cdr_enable"> <title><varname>cdr_enable</varname> (integer)</title> <para> - Should CDR-based logging be enabled? + Enable CDR reporting - one record per call reported to "acc_cdrs" table, + relying on dialog module. </para> <para> - 0 - off (default). - 1 - on. + The value can be: + <itemizedlist> + <listitem> + <para>0 - off (default).</para> + <para>1 - on.</para> + </listitem> + </itemizedlist> </para> <example> <title>cdr_enable example</title>

1 0

git:5.5:715e4eb3: acc_json: docs - more details about cdr_enable parameter
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 715e4eb38ca0e98b31d98a0508a0d661d58f6dfa URL: https://github.com/kamailio/kamailio/commit/715e4eb38ca0e98b31d98a0508a0d66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:46:21+01:00 acc_json: docs - more details about cdr_enable parameter (cherry picked from commit 041999bc8092d7abb42e68a5f5fb88bef09b225c) --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/715e4eb38ca0e98b31d98a0508a0d66… Patch: https://github.com/kamailio/kamailio/commit/715e4eb38ca0e98b31d98a0508a0d66… --- diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index 0f07b42e23..a794cae801 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -324,12 +324,19 @@ modparam("acc_json", "acc_log_level", 2) # Set acc_log_level to 2 (L_INFO) </section> <section id="acc.p.cdr_enable"> - <title><varname>cdr_enable</varname> (str)</title> + <title><varname>cdr_enable</varname> (int)</title> <para> - Enable Call Data Record generation. + Enable CDR reporting - one record per call is reported, + relying on dialog module. </para> <para> - Default value is 0 (disabled). + The value can be: + <itemizedlist> + <listitem> + <para>0 - off (default).</para> + <para>1 - on.</para> + </listitem> + </itemizedlist> </para> <example> <title>cdr_enable example</title>

1 0

git:5.5:f4ebe527: msrp: fix some tcpconn where memory was never cleaned up
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: f4ebe527c25ecedb3caffa8a361b5c42a2dd6b88 URL: https://github.com/kamailio/kamailio/commit/f4ebe527c25ecedb3caffa8a361b5c4… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:43:59+01:00 msrp: fix some tcpconn where memory was never cleaned up Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880 (cherry picked from commit bf371ccbfa1c89fefcd9d9322ae75189d97fc862) --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/f4ebe527c25ecedb3caffa8a361b5c4… Patch: https://github.com/kamailio/kamailio/commit/f4ebe527c25ecedb3caffa8a361b5c4… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

1 0

git:5.5:3e82cdbf: core: hashes - cast to unsigned int for left shifting
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 3e82cdbf2311deedb0a3cb528047b54e11d54808 URL: https://github.com/kamailio/kamailio/commit/3e82cdbf2311deedb0a3cb528047b54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:44:26+01:00 core: hashes - cast to unsigned int for left shifting (cherry picked from commit f7f9ea0f3cfb8e61a4f2f47a214cb4e89d713da4) --- Modified: src/core/hashes.h --- Diff: https://github.com/kamailio/kamailio/commit/3e82cdbf2311deedb0a3cb528047b54… Patch: https://github.com/kamailio/kamailio/commit/3e82cdbf2311deedb0a3cb528047b54… --- diff --git a/src/core/hashes.h b/src/core/hashes.h index 2afb8361c8..62708bdb35 100644 --- a/src/core/hashes.h +++ b/src/core/hashes.h @@ -273,7 +273,7 @@ static inline unsigned int core_hash(const str *s1, const str *s2, end=s1->s+s1->len; for ( p=s1->s ; p<=(end-4) ; p+=4 ){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; @@ -283,11 +283,11 @@ static inline unsigned int core_hash(const str *s1, const str *s2, if (s2) { end=s2->s+s2->len; for (p=s2->s; p<=(end-4); p+=4){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; - for (; p<end ; p++){ v<<=8; v+=*p;} + for (; p<end ; p++){ v<<=8; v+=p[0];} ch_h_inc; } h=((h)+(h>>11))+((h>>13)+(h>>23));

1 0

git:5.5:04591e08: avpops: removed unused function get_source_uri()
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 04591e08a4d74a9f57972b1552f941b86cbb6e55 URL: https://github.com/kamailio/kamailio/commit/04591e08a4d74a9f57972b1552f941b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:41:53+01:00 avpops: removed unused function get_source_uri() (cherry picked from commit c9b885ff791bd71fcbf40824369fc9369dcc6e48) --- Modified: src/modules/avpops/avpops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/04591e08a4d74a9f57972b1552f941b… Patch: https://github.com/kamailio/kamailio/commit/04591e08a4d74a9f57972b1552f941b… --- diff --git a/src/modules/avpops/avpops_impl.c b/src/modules/avpops/avpops_impl.c index c760becb43..8a6e4c2b2d 100644 --- a/src/modules/avpops/avpops_impl.c +++ b/src/modules/avpops/avpops_impl.c @@ -214,38 +214,6 @@ static int dbrow2avp(struct db_row *row, struct db_param *dbp, int_str attr, return add_avp( (unsigned short)db_flags, avp_attr, avp_val); } - -inline static str* get_source_uri(struct sip_msg* msg,int source) -{ - /* which uri will be used? */ - if (source&AVPOPS_USE_FROM) - { /* from */ - if (parse_from_header( msg )<0 ) - { - LM_ERR("failed to parse from\n"); - goto error; - } - return &(get_from(msg)->uri); - } else if (source&AVPOPS_USE_TO) - { /* to */ - if (parse_headers( msg, HDR_TO_F, 0)<0) - { - LM_ERR("failed to parse to\n"); - goto error; - } - return &(get_to(msg)->uri); - } else if (source&AVPOPS_USE_RURI) { /* RURI */ - if(msg->new_uri.s!=NULL && msg->new_uri.len>0) - return &(msg->new_uri); - return &(msg->first_line.u.request.uri); - } else { - LM_ERR("unknown source <%d>\n", source); - goto error; - } -error: - return 0; -} - static inline void int_str2db_val( int_str is_val, str *val, int is_s) { if (is_s)

1 0

git:5.5:a2043123: ctl: removed unused function safe_write()
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: a204312372bd09dcfb276e960892e14fbe2eceeb URL: https://github.com/kamailio/kamailio/commit/a204312372bd09dcfb276e960892e14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:42:26+01:00 ctl: removed unused function safe_write() (cherry picked from commit cc0cbad3660423f679fed62c42fcffb4a402081f) --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/a204312372bd09dcfb276e960892e14… Patch: https://github.com/kamailio/kamailio/commit/a204312372bd09dcfb276e960892e14… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index b40b079a1d..50507dd03b 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -947,29 +947,6 @@ static void rpc_fault(rpc_ctx_t* ctx, int code, char* fmt, ...) } -static inline int safe_write(FILE* f, char* fmt, ...) -{ - va_list ap; - - if (!*fmt) return 0; - va_start(ap, fmt); - - retry: - /* First line containing code and reason phrase */ - if (vfprintf(f, fmt, ap) <= 0) { - ERR("fifo write error: %s\n", strerror(errno)); - if ((errno == EINTR) || (errno == EAGAIN) || (errno == EWOULDBLOCK)) { - goto retry; - } - va_end(ap); - return -1; - } - va_end(ap); - return 0; -} - - - inline static int build_iovec(rpc_ctx_t* ctx, struct iovec* v, int v_size) { struct text_chunk* p;

1 0

git:5.5:c4821bda: core: unsigned literal for 1 used in left shifting for script callbacks
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: c4821bdaa44198dce153c1764b298c8c00652463 URL: https://github.com/kamailio/kamailio/commit/c4821bdaa44198dce153c1764b298c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:43:09+01:00 core: unsigned literal for 1 used in left shifting for script callbacks - GH #2897 (cherry picked from commit 6348de19626f691036fd94134be6f64fff4418ed) --- Modified: src/core/script_cb.c Modified: src/core/script_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/c4821bdaa44198dce153c1764b298c8… Patch: https://github.com/kamailio/kamailio/commit/c4821bdaa44198dce153c1764b298c8… --- diff --git a/src/core/script_cb.c b/src/core/script_cb.c index 2f83608e66..266037674a 100644 --- a/src/core/script_cb.c +++ b/src/core/script_cb.c @@ -78,11 +78,11 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) int i; /* type checkings */ - if ( (flags&((1<<SCRIPT_CB_NUM)-1))==0 ) { + if ( (flags&((1u<<SCRIPT_CB_NUM)-1))==0 ) { LM_BUG("callback flag not specified\n"); return -1; } - if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1<<SCRIPT_CB_NUM ) { + if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1u<<SCRIPT_CB_NUM ) { LM_BUG("unsupported callback flags: %u\n", flags); return -1; @@ -102,7 +102,7 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) * (as many times as many flags are set) */ for (i=0; i<SCRIPT_CB_NUM; i++) { - if ((flags&(1<<i)) == 0) + if ((flags&(1u<<i)) == 0) continue; if (add_callback(&cb_array[i], f, param) < 0) goto add_error; @@ -155,7 +155,7 @@ int exec_pre_script_cb( struct sip_msg *msg, enum script_cb_type type) return 0; } - flags = PRE_SCRIPT_CB | (1<<(type-1)); + flags = PRE_SCRIPT_CB | (1u<<(type-1)); for (cb=pre_script_cb[type-1]; cb ; cb=cb->next ) { /* stop on error */ if (cb->cbf(msg, flags, cb->param)==0) @@ -177,7 +177,7 @@ int exec_post_script_cb( struct sip_msg *msg, enum script_cb_type type) return 1; } - flags = POST_SCRIPT_CB | (1<<(type-1)); + flags = POST_SCRIPT_CB | (1u<<(type-1)); for (cb=post_script_cb[type-1]; cb ; cb=cb->next){ cb->cbf(msg, flags, cb->param); } diff --git a/src/core/script_cb.h b/src/core/script_cb.h index ece69b8e41..650bf053fa 100644 --- a/src/core/script_cb.h +++ b/src/core/script_cb.h @@ -33,8 +33,8 @@ typedef int (cb_function)(struct sip_msg *msg, unsigned int flags, void *param); -#define PRE_SCRIPT_CB (1<<30) -#define POST_SCRIPT_CB (1<<31) +#define PRE_SCRIPT_CB (1u<<30) +#define POST_SCRIPT_CB (1u<<31) /* Pre- and post-script callback flags. Use these flags to register * for the callbacks, and to check the type of the callback from the

1 0

git:5.5:992c5a34: core: parse main headers after updating msg buffer
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 992c5a349454e40c87c8918283ffde7302da9d8e URL: https://github.com/kamailio/kamailio/commit/992c5a349454e40c87c8918283ffde7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:39:39+01:00 core: parse main headers after updating msg buffer - same group of headers as for the case of receiving the message - applies for msg_apply_changes() as well - related to GH #2877 (cherry picked from commit d5c1b4693b6e47b4123b5f9417b5fd88d4dafd1f) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/992c5a349454e40c87c8918283ffde7… Patch: https://github.com/kamailio/kamailio/commit/992c5a349454e40c87c8918283ffde7… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 9fd5635655..bc1b9736df 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3328,7 +3328,13 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) * valid/safe for config */ return 0; } - + if(parse_headers(msg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) < 0) { + LM_ERR("parsing main headers of new sip message failed [[%.*s]]\n", + msg->len, msg->buf); + /* exit config execution - sip_msg_t structure is no longer + * valid/safe for config */ + return 0; + } return 1; }

1 0

git:5.5:8df8974b: sipdump: docs - fix example config snippet
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 8df8974bb0f9754b126cac75eed76360e12d8a22 URL: https://github.com/kamailio/kamailio/commit/8df8974bb0f9754b126cac75eed7636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:40:09+01:00 sipdump: docs - fix example config snippet (cherry picked from commit f202cfe647c6a1ac92a3c2b8e2ee056d678fb802) --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8df8974bb0f9754b126cac75eed7636… Patch: https://github.com/kamailio/kamailio/commit/8df8974bb0f9754b126cac75eed7636… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 7e642f6010..e728ebf3b0 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -318,8 +318,8 @@ event_route[sipdump:msg] { </para> <programlisting format="linespecific"> ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

1 0

git:5.5:058ed2e1: tls: print src/dst port in error message
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 058ed2e1e4fdaf4ff99cd6db5a96793d6b420483 URL: https://github.com/kamailio/kamailio/commit/058ed2e1e4fdaf4ff99cd6db5a96793… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:40:47+01:00 tls: print src/dst port in error message - related to GH #2872 (cherry picked from commit daedf1201c2776ccc1040e03f8f63d256e75a43a) --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/058ed2e1e4fdaf4ff99cd6db5a96793… Patch: https://github.com/kamailio/kamailio/commit/058ed2e1e4fdaf4ff99cd6db5a96793… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 2af43b9eb9..f75b111168 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1330,10 +1330,10 @@ int tls_h_read_f(struct tcp_connection* c, rd_conn_flags_t* flags) TLS_ERR(err_src); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); - ERR("source IP: %s\n", ip_buf); + ERR("src addr: %s:%d\n", ip_buf, c->rcv.src_port); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); - ERR("destination IP: %s\n", ip_buf); + ERR("dst addr: %s:%d\n", ip_buf, c->rcv.dst_port); goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/

1 0

[kamailio/kamailio] ims_usrloc_pcscf: new callbacks and some fixes (#2882)
by Erhan Onur Sendag 05 Nov '21

05 Nov '21

### Description  Other modules use ims_usrloc_pcscf's callback calls for following operations: #define PCSCF_CONTACT_INSERT (1<<0) #define PCSCF_CONTACT_UPDATE (1<<1) #define PCSCF_CONTACT_DELETE (1<<2) #define PCSCF_CONTACT_EXPIRE (1<<3) ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2882

2 2

[kamailio/kamailio] Topos not working correctly with loos_route() on a leg (Issue #2905)
by Anis Bedhiafi 05 Nov '21

05 Nov '21

### Description I noticed an issue regarding loose_route() when using Topos module. My architecture is the following: ``` Client (behind NAT or not) ------> Kamailio (Access SBC) -----------> Kamailio (Interconnect SBC) -----------> Carrier ``` Kamailio Access SBC is listening on 2 interfaces: ``` Public interface : udp:A.A.A.A:5060 Core interface : udp:B.B.B.B:5060 ``` Kamailio Interconnect SBC is listening on 2 interfaces: ``` Core interface : udp:C.C.C.C:5060 Carrier-side interface : udp:D.D.D.D:5060 ``` TOPOS is configured only on second kamailio box (Interconnect SBC). Record routing is used on both kamailios. TOPOS module is configured as follows: ``` modparam("ndb_redis", "server", "name=srv1;addr=127.0.0.1;port=6379") modparam("topos_redis", "serverid", "srv1") modparam("topos", "storage", "redis") modparam("topos", "contact_mode", 1) modparam("topos", "cparam_name", "id") modparam("topos", "rr_update", 1) ``` RR module is configured as follows: ``` modparam("rr", "enable_full_lr", 1) modparam("rr", "append_fromtag", 1) modparam("rr", "enable_double_rr", 1) ``` For an incomoing INVITE (direction: client to carrier) all is fine and topos can strip headers on bleg and insert the cookie on bleg contact as a param. When Callee sends a BYE or re-INVITE, topos inserts route headers in aleg as shown in the next trace: (BYE as received from the carrier on the carrier-side interface D.D.D.D) ``` BYE sip:D.D.D.D:5060 SIP/2.0 Via: SIP/2.0/UDP x.x.x.x:5060;branch=z9hG4bKrdhsvc001omkvssqvfk0sd0185mt1.1 From: <sip:+33123456789@my-carrier-domain;transport=UDP;user=phone>;tag=SD69ao497-1472568650-1635329820043 To: <sip:+33987654321@my-own-domain;transport=UDP;user=phone>;tag=3ab10616 Call-ID: NjZjMDgyMGMxNzdkN2FhYmJlYzQyYjA5YWIzZThmZmI. CSeq: 547381883 BYE Max-Forwards: 64 Content-Length: 0 Route: <sip:D.D.D.D;r2=on;lr=on;ftag=3ab10616>,<sip:C.C.C.C;r2=on;lr=on;ftag=3ab10616> Route: <sip:B.B.B.B;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2>,<sip:A.A.A.A;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> P-SR-XUID: atpsh-617925e5-82a5-1 ``` Topos on the kamailio interconnect handles the BYE/re-INVITE and forward it to the second interface C.C.C.C as shown in the following trace: ``` BYE sip:A.A.A.A;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2 SIP/2.0 Via: SIP/2.0/UDP 185.164.213.110;branch=z9hG4bKbd7.ab692eeb60369aa3a5e07f6b63cc9dd7.0 From: <sip:+33123456789@my-carrier-domain;transport=UDP;user=phone>;tag=SD69ao497-1472568650-1635329820043 To: <sip:+33987654321@my-own-domain;transport=UDP;user=phone>;tag=3ab10616 Call-ID: NjZjMDgyMGMxNzdkN2FhYmJlYzQyYjA5YWIzZThmZmI. CSeq: 547381883 BYE Max-Forwards: 63 Content-Length: 0 Route: <sip:C.C.C.C;r2=on;lr=on;ftag=3ab10616> Route: <sip:B.B.B.B;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> Contact: <sip:+33123456789@10.3.60.45;id=atpsh-617925e5-82a5-1> ``` When the BYE/re-INVITE request reaches the C.C.C.C interface, it is then forwarded directly to the ruri sip:A.A.A.A. Or what I expect to receive in C.C.C.C interface is the following : ``` BYE <HERE SHOULD BE THE CALLER CONTACT URI> SIP/2.0 Via: SIP/2.0/UDP 80.10.231.173:5060;branch=z9hG4bKrdhsvc001omkvssqvfk0sd0185mt1.1 From: <sip:+33123456789@my-carrier-domain;transport=UDP;user=phone>;tag=SD69ao497-1472568650-1635329820043 To: <sip:+33987654321@my-own-domain;transport=UDP;user=phone>;tag=3ab10616 Call-ID: NjZjMDgyMGMxNzdkN2FhYmJlYzQyYjA5YWIzZThmZmI. CSeq: 547381883 BYE Max-Forwards: 64 Content-Length: 0 Route: <sip:D.D.D.D;r2=on;lr=on;ftag=3ab10616> Route: <sip:C.C.C.C;r2=on;lr=on;ftag=3ab10616> Route: <sip:B.B.B.B;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> Route: <sip:A.A.A.A;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> Contact: <sip:+33123456789@10.3.60.45;id=atpsh-617925e5-82a5-1> ``` I could work around this issue by doing the following : 1. When receiving the BYE/re-INVITE on interface D.D.D.D, I explode the Route headers, delete old route headers and create new ones in order from the result of explode 2. I update the ru with the contact uri which I stored in a htable when the initial INVITE was received ``` # Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); # TOPOS FIX if (is_method("INVITE")) { $sht(tpsindlg=>$ci) = $ci; $sht(tpsindlg=>$ci:ft) = $ft; $sht(tpsindlg=>$ci:ct) = $ct; } } route[WITHINDLG] { if (!has_totag()) return; # Fix bad Route Headers caused by TOPOS module if ($Ri == "D.D.D.D") { $var(rh0) = $(hdr(Route)[0]{s.select,0,,}); $var(rh1) = $(hdr(Route)[0]{s.select,1,,}); $var(rh2) = $(hdr(Route)[1]{s.select,0,,}); $var(rh3) = $(hdr(Route)[1]{s.select,1,,}); remove_hf_re("^Route$"); append_hf("Route: $var(rh0)\r\n"); append_hf("Route: $var(rh1)\r\n"); append_hf("Route: $var(rh2)\r\n"); append_hf("Route: $var(rh3)\r\n"); } # sequential request within a dialog should # take the path determined by record-routing if (loose_route()) { # Fix R-URI caused by TOPOS module if ($Ri == "D.D.D.D") { if ($ci == $sht(tpsindlg=>$ci) && $tt == $sht(tpsindlg=>$ci:ft)) { $ru = $(sht(tpsindlg=>$ci:ct){s.strip,1}{s.striptail,1}); if (is_method("BYE")) { $sht(tpsindlg=>$ci) = $null; $sht(tpsindlg=>$ci:ft) = $null; $sht(tpsindlg=>$ci:ct) = $null; } } } route(RELAY); 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; } ``` Could you please tell if this is a normal behavior by TOPOS module or is it a bug? Thank you. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2905

2 2

[kamailio/kamailio] runtime error: null pointer passed as argument 2, which is declared to never be null (Issue #2913)
by sergey-safarov 05 Nov '21

05 Nov '21

### Description I have compiled Kamailio with google ASAN module and faced issue where the string PV with NULL value cannot be copied. Using GDB I found this function call triggers error when Google ASAN is used, `value->s.s = NULL`, `value->s.len = 0` ``` memcpy(var->v.value.s.s, value->s.s, value->s.len); ``` [Link](https://github.com/kamailio/kamailio/blob/caccb13e29ee12166c8101efa0d… This happens only when ASAN is used. Without ASAN same function call with the same values does not trigger an error. In my test case this function called from [`lost/functions.c:1285`](https://github.com/kamailio/kamailio/blob/caccb13e29ee12166c8101efa0d5ab2745876413/src/modules/lost/functions.c#L1285) To compile with asan used extra flags ``` -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment ``` ### Troubleshooting #### Log Messages ``` 0(913407) INFO: {1 1 INVITE 1-455779(a)172.21.0.84} lost [functions.c:891]: lost_function(): ### LOST urn [urn:sip:911@3.236.25.254:5060] 0(913407) INFO: {1 1 INVITE 1-455779(a)172.21.0.84} lost [functions.c:983]: lost_function(): ### LOST loc [<112233445566(a)jim.com>] 0(913407) ERROR: {1 1 INVITE 1-455779(a)172.21.0.84} lost [utilities.c:336]: lost_get_content(): could not get XML node content pv_svar.c:137:3: runtime error: null pointer passed as argument 2, which is declared to never be null ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` current master, test 375f86b69e11cf835ae919873d3cd56f32d589c8 * **Operating System**: Centos 8 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2913

2 6

git:master:6857234c: core: reorder fields of struct _cfg_group for better alignment
by Daniel-Constantin Mierla 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: 6857234c321faf33573e1a034ab666dc158eb549 URL: https://github.com/kamailio/kamailio/commit/6857234c321faf33573e1a034ab666d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T17:15:49+01:00 core: reorder fields of struct _cfg_group for better alignment --- Modified: src/core/cfg/cfg_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/6857234c321faf33573e1a034ab666d… Patch: https://github.com/kamailio/kamailio/commit/6857234c321faf33573e1a034ab666d… --- diff --git a/src/core/cfg/cfg_struct.h b/src/core/cfg/cfg_struct.h index e03024e700..03f38f322d 100644 --- a/src/core/cfg/cfg_struct.h +++ b/src/core/cfg/cfg_struct.h @@ -76,7 +76,6 @@ enum { CFG_GROUP_UNKNOWN = 0, CFG_GROUP_DYNAMIC, CFG_GROUP_STATIC }; /*! \brief linked list of registered groups */ #pragma pack(push, 1) typedef struct _cfg_group { - int num; /*!< number of variables within the group */ cfg_mapping_t *mapping; /*!< describes the mapping betweeen the cfg variable definition and the memory block */ char *vars; /*!< pointer to the memory block where the values @@ -85,6 +84,7 @@ typedef struct _cfg_group { cfg_add_var_t *add_var; /*!< Additional instances of the variables. This linked list is used only before the config is shmized. */ + int num; /*!< number of variables within the group */ int size; /*!< size of the memory block that has to be allocated to store the values */ int meta_offset; /*!< offset of the group within the @@ -100,9 +100,9 @@ typedef struct _cfg_group { to temporary set the handle in the main process and restore it later to its original value. */ - unsigned char dynamic; /*!< indicates whether the variables within the group - are dynamically allocated or not */ struct _cfg_group *next; + unsigned int dynamic; /*!< indicates whether the variables within the group + are dynamically allocated or not */ int name_len; char name[1]; } cfg_group_t;

1 0

[kamailio/kamailio] mqueue: add two new module parameters (#2825)
by Stefan Mititelu 04 Nov '21

04 Nov '21

Add mqueue_name and mqueue_size to define queues. Updated doc.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add 2 new mqueue module parameters to simplify config queue definition. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2825 -- Commit Summary -- * mqueue: add two new module parameters -- File Changes -- M src/modules/mqueue/doc/mqueue_admin.xml (58) M src/modules/mqueue/mqueue_mod.c (38) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2825.patch https://github.com/kamailio/kamailio/pull/2825.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2825

3 5

Re: [sr-dev] [kamailio/kamailio] nats: Add publish function (e736af9)
by Olle E. Johansson 04 Nov '21

04 Nov '21

Nice! Missing docs update. :-) Thank you - will try this out. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/e736af98038663cbbb2abf0a3c16c42…

1 0

git:master:2c68066d: pkg/kamailio/deb: version set 5.6.0~dev2
by Victor Seva 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: 2c68066dc8aa5f75de79cad1f4bea973db18bed7 URL: https://github.com/kamailio/kamailio/commit/2c68066dc8aa5f75de79cad1f4bea97… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-04T11:31:41+01:00 pkg/kamailio/deb: version set 5.6.0~dev2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/2c68066dc8aa5f75de79cad1f4bea97… Patch: https://github.com/kamailio/kamailio/commit/2c68066dc8aa5f75de79cad1f4bea97…

1 0

git:master:a48e1a9b: pua_dialoginfo: fix memory corruption
by Victor Seva 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: a48e1a9baf16752c49f7de68700659b947e9f3d8 URL: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-04T11:07:49+01:00 pua_dialoginfo: fix memory corruption * don't use SRUID_SIZE, just reserve the proper generated size * call sruid_init() at child_init too --- Modified: src/modules/pua_dialoginfo/dialog_publish.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… Patch: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… --- diff --git a/src/modules/pua_dialoginfo/dialog_publish.c b/src/modules/pua_dialoginfo/dialog_publish.c index 7f2751ffca..137823c21b 100644 --- a/src/modules/pua_dialoginfo/dialog_publish.c +++ b/src/modules/pua_dialoginfo/dialog_publish.c @@ -363,7 +363,7 @@ void dialog_publish(char *state, str* ruri, str *entity, str *peer, str *callid, } publ->id.s= (char*)publ+ size; memcpy(publ->id.s, "DIALOG_PUBLISH.", 15); - memcpy(publ->id.s+15, uuid->s, callid->len); + memcpy(publ->id.s+15, uuid->s, uuid->len); publ->id.len= 15+ uuid->len; size+= publ->id.len; diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 9af25b4b1d..0385ed90dd 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -108,7 +108,7 @@ send_publish_t pua_send_publish; /** module functions */ static int mod_init(void); - +static int child_init(int rank); static cmd_export_t cmds[]={ {0, 0, 0, 0, 0, 0} @@ -146,7 +146,7 @@ struct module_exports exports= { 0, /* exported pseudo-variables */ 0, /* response handling function */ mod_init, /* module initialization function */ - 0, /* per-child init function */ + child_init, /* per-child init function */ 0 /* module destroy function */ }; @@ -490,6 +490,13 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable int len; str* s=NULL; + // generate new random uuid + if(sruid_next_safe(&_puadi_sruid) < 0) { + return NULL; + } + LM_DBG("uuid generated: '%.*s'\n", + _puadi_sruid.uid.len, _puadi_sruid.uid.s); + /* create dlginfo structure to store important data inside the module*/ len = sizeof(struct dlginfo_cell) + dlg->from_uri.len @@ -498,7 +505,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable + dlg->tag[0].len + dlg->req_uri.len + dlg->contact[0].len - + SRUID_SIZE; + + _puadi_sruid.uid.len; dlginfo = (struct dlginfo_cell*)shm_malloc( len ); if (dlginfo==0) { @@ -524,7 +531,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable dlginfo->from_contact.s = dlginfo->req_uri.s + dlginfo->req_uri.len; dlginfo->from_contact.len = dlg->contact[0].len; dlginfo->uuid.s = dlginfo->from_contact.s + dlginfo->from_contact.len; - dlginfo->uuid.len = SRUID_SIZE; + dlginfo->uuid.len = _puadi_sruid.uid.len; memcpy(dlginfo->from_uri.s, dlg->from_uri.s, dlg->from_uri.len); memcpy(dlginfo->to_uri.s, dlg->to_uri.s, dlg->to_uri.len); @@ -532,13 +539,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable memcpy(dlginfo->from_tag.s, dlg->tag[0].s, dlg->tag[0].len); memcpy(dlginfo->req_uri.s, dlg->req_uri.s, dlg->req_uri.len); memcpy(dlginfo->from_contact.s, dlg->contact[0].s, dlg->contact[0].len); - - // generate new random uuid - sruid_next_safe(&_puadi_sruid); - strcpy(dlginfo->uuid.s, _puadi_sruid.uid.s); - dlginfo->uuid.len = _puadi_sruid.uid.len; - LM_DBG("uuid generated: '%.*s'\n", - dlginfo->uuid.len, dlginfo->uuid.s); + memcpy(dlginfo->uuid.s, _puadi_sruid.uid.s, _puadi_sruid.uid.len); if (use_pubruri_avps) { if(type==DLGCB_CREATED) { @@ -858,6 +859,22 @@ static int mod_init(void) return 0; } +/** + * @brief Initialize module children + */ +static int child_init(int rank) +{ + if(sruid_init(&_puadi_sruid, (char)'-', "padi", SRUID_INC)<0) { + return -1; + } + + if(rank != PROC_MAIN) { + return 0; + } + + return 0; +} + void free_dlginfo_cell(void *param) { struct dlginfo_cell *cell = NULL;

1 0

git:master:6eb67eaa: pv: handle case when var value ha flag str but null pointer
by Daniel-Constantin Mierla 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc URL: https://github.com/kamailio/kamailio/commit/6eb67eaa4fc27d1eb7da7b2b674ffe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T08:24:06+01:00 pv: handle case when var value ha flag str but null pointer --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/6eb67eaa4fc27d1eb7da7b2b674ffe8… Patch: https://github.com/kamailio/kamailio/commit/6eb67eaa4fc27d1eb7da7b2b674ffe8… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 255f9f2040..456e21963a 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if(value==NULL) + if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:master:fc3010cc: Makefile.defs: version set to 5.6.0-dev2
by Daniel-Constantin Mierla 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: fc3010cc2643d5398db12d92707d849cdc1d7d78 URL: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T08:06:31+01:00 Makefile.defs: version set to 5.6.0-dev2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… Patch: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 51a14f5ab4..5d76fbe2cc 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:b1e0d418: Merge pull request #2891 from smititelu/increase_defines
by GitHub 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: b1e0d41875f224da5bd5c511cbafd0f5e395d0b6 URL: https://github.com/kamailio/kamailio/commit/b1e0d41875f224da5bd5c511cbafd0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-03T12:59:34+01:00 Merge pull request #2891 from smititelu/increase_defines acc: increase extra and cdr variables --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_cdr.h Modified: src/modules/acc/acc_extra.c Modified: src/modules/acc/acc_extra.h Modified: src/modules/acc/acc_mod.c Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b1e0d41875f224da5bd5c511cbafd0f… Patch: https://github.com/kamailio/kamailio/commit/b1e0d41875f224da5bd5c511cbafd0f…

2 1

git:master:38ae4433: drouting: remove unused trim function
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: 38ae44336e8478c10e1a558997669850c5d7b297 URL: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:27:20+01:00 drouting: remove unused trim function --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… Patch: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 0988bccbb7..55d09a57ca 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -45,34 +45,6 @@ static inline int strz2int(char *_bp) } -static inline char *trim(char *_s) -{ - int len; - char *end; - - /* Null pointer, there is nothing to do */ - if(!_s) - return _s; - - /* Remove spaces and tabs from the beginning of string */ - while((*_s == ' ') || (*_s == '\t')) - _s++; - - len = strlen(_s); - - end = _s + len - 1; - - /* Remove trailing spaces and tabs */ - while((*end == ' ') || (*end == '\t')) - end--; - if(end != (_s + len - 1)) { - *(end + 1) = '\0'; - } - - return _s; -} - - /************************ imported from "ac_tm.c" ***************************/ /* #define USE_YWEEK_U // Sunday system

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev