- sr-dev - kamailio.org

git:master:39a2679f: htable: docs for in operator for remove functions
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: 39a2679fe165e34a225615ec32c58692fdcaf6a8 URL: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T14:00:40+02:00 htable: docs for in operator for remove functions --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… Patch: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index c5cc20e22ed..23a159c6982 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -916,6 +916,11 @@ sht_rm_value_re("ha=>.*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>in</emphasis> - match the val parameter as 'includes'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables. @@ -962,6 +967,11 @@ sht_rm_name("ha", "re", ".*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>in</emphasis> - match the val parameter as 'includes'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables.

1 0

git:master:c0d80f9e: htable: added in operator for rm functions
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: c0d80f9eb42b025802c4680f19d788d01497301a URL: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:53:31+02:00 htable: added in operator for rm functions --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… Patch: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index afda3dc6c54..ecc49b547d6 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1389,8 +1389,12 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) == 0) { match = 1; } + } else if(op == HT_RM_OP_IN) { + if(sre->len <= it->name.len + && str_search(&it->name, sre) != NULL) { + match = 1; + } } - } else { if(op == HT_RM_OP_SW) { if(it->flags & AVP_VAL_STR) { @@ -1410,6 +1414,13 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) match = 1; } } + } else if(op == HT_RM_OP_IN) { + if(it->flags & AVP_VAL_STR) { + if(sre->len <= it->value.s.len + && str_search(&it->value.s, sre) != NULL) { + match = 1; + } + } } } if(match == 1) { diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 7c7642ef5df..f7bd8ed42c0 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -126,6 +126,8 @@ int ht_reset_content(ht_t *ht); #define HT_RM_OP_SW 3 #define HT_RM_OP_EW 3 #define HT_RM_OP_RE 4 +#define HT_RM_OP_IN 5 + int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op); int ht_match_cell_op_str(str *sre, ht_t *ht, int mode, int op); diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index 7577e445a76..5388d8e00df 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -40,7 +40,8 @@ typedef enum HT_DMQ_DEL_CELL, HT_DMQ_RM_CELL_RE, HT_DMQ_RM_CELL_SW, - HT_DMQ_RM_CELL_EW + HT_DMQ_RM_CELL_EW, + HT_DMQ_RM_CELL_IN } ht_dmq_action_t; int ht_dmq_initialize(); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 6f775bb33ce..414bd5556b1 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -527,6 +527,18 @@ static int ht_rm_items(sip_msg_t *msg, str *hname, str *op, str *val, int mkey) return -1; } return 1; + } else if(strncmp(op->s, "ew", 2) == 0) { + isval.s = *val; + if((ht->dmqreplicate > 0) + && ht_dmq_replicate_action(HT_DMQ_RM_CELL_IN, &ht->name, + NULL, AVP_VAL_STR, &isval, mkey) + != 0) { + LM_ERR("dmq replication failed (op %d)\n", mkey); + } + if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_IN) < 0) { + return -1; + } + return 1; } LM_WARN("unsupported match operator: %.*s\n", op->len, op->s); break;

1 0

git:5.8:e76d755d: tcpops: removed unused variable introduced recently
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: 5.8 Commit: e76d755de6482e51c9ddac5bba3834cb58ad79b2 URL: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:50:44+02:00 tcpops: removed unused variable introduced recently (cherry picked from commit fe8f052c29528b656062927626f9784b32b7c8f6) --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… Patch: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9c648c1f2a3..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,7 +248,6 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; - int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git:master:fe8f052c: tcpops: removed unused variable introduced recently
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: fe8f052c29528b656062927626f9784b32b7c8f6 URL: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:49:58+02:00 tcpops: removed unused variable introduced recently --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… Patch: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9c648c1f2a3..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,7 +248,6 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; - int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

- URL: https://github.com/kamailio/kamailio/commit/bb48da13adfe36716c3d958ed1d9c41… Author: Jannik Volkland <volkland(a)sipgate.de> Date: 2024-04-25T13:31:15+02:00 db_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… (cherry picked from commit 40a50243f0bae782b7acd97cf0a9b1138185068b) - URL: https://github.com/kamailio/kamailio/commit/f337f13cdbc7e8805c0130dbae3befa… Author: Jannik Volkland <volkland(a)sipgate.de> Date: 2024-04-25T13:31:21+02:00 ndb_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… (cherry picked from commit 6faa180661e799187eff3a498f8b13e96719fa92) - URL: https://github.com/kamailio/kamailio/commit/855c76780c4399d6d9881ce3c525a7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:31:50+02:00 sdpops: reformat the codecs map (cherry picked from commit 359a442e14a156b0bcf60dc5b2580cbc57924e34) - URL: https://github.com/kamailio/kamailio/commit/7295607e680ad1dd5290b15dab7fed7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:32:18+02:00 core: parser/sdp - rename parameter to suggest better its role (cherry picked from commit b03ec73589c12e566b11ce2c653401daa915c805) - URL: https://github.com/kamailio/kamailio/commit/8d312ded02559b325cdd691bde61c54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:33:01+02:00 siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri (cherry picked from commit d1118064d04bb77c818540e68edf1766db1d560a) - URL: https://github.com/kamailio/kamailio/commit/800ed174b9402d1b253b2cb4ab04b5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:33:24+02:00 ims_ipsec_pcscf: log error message made info (cherry picked from commit 92d3573b500374d100639484e5a84cb640dc6b1d) - URL: https://github.com/kamailio/kamailio/commit/595d3f472179402dce7a51672c2dbfb… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:34:17+02:00 corex: Fix unknown af in list_sockets (cherry picked from commit 8bc64a9e6820243336387d9cd9acf81f24d89993) - URL: https://github.com/kamailio/kamailio/commit/d2cf78f5c70977639f3b7f66b852350… Author: vijay kumar <vijay.kumar(a)exotel.in> Date: 2024-04-25T13:35:18+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket (cherry picked from commit b4753ae4216b0c960ac094f4be8232fb4d0147b0) - URL: https://github.com/kamailio/kamailio/commit/2661594bf7f31558e6ac7524f33ebb3… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:38+02:00 tcp_main: Add protocol argument for searching tcp/tls connections (cherry picked from commit 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8) - URL: https://github.com/kamailio/kamailio/commit/0c070443b585c597d2d6249ac6ac324… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:45+02:00 tcp_main: Add proto argument to tcpconn_exists function (cherry picked from commit 6779efd430178adff0ae438d178e38c003e4e05c) - URL: https://github.com/kamailio/kamailio/commit/a19e6e0e49d9881ab990d23ad31a957… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:57+02:00 tcp_main: Update comment docs (cherry picked from commit 0a28a93c6e060081267dc686e342d45ef03358e7) - URL: https://github.com/kamailio/kamailio/commit/7d103cf3887401fca32d95f7ea7ee10… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:36:25+02:00 core/forward: Match protocol when forwarding (cherry picked from commit d81e5113884b933251499630d112ec5b1150b8a4) - URL: https://github.com/kamailio/kamailio/commit/3052565e3ce14d5d3c45d790877a562… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:36:39+02:00 tcp_main: Match wss protocol (cherry picked from commit 175d755c40bc50b78b2cf4f18ad22429289af90d) - URL: https://github.com/kamailio/kamailio/commit/28bbcd5a50f45b8217125481706180a… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2024-04-25T13:37:16+02:00 usrloc: check on db delete the return value of memchr When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. (cherry picked from commit 49276a1f43b1a3bf4a8d681888df964000360c79) - URL: https://github.com/kamailio/kamailio/commit/db2e96ec2aacde1bd50b65ea6357388… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:37+02:00 core: tcp - keep connection id on event route cb structure (cherry picked from commit 11e7d71e5c2ee9428298658ed3b9a0f625d40f00) - URL: https://github.com/kamailio/kamailio/commit/c9fe59d6cd73179aa75e21b3b215bc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:46+02:00 tcpops: reworked some debug messages (cherry picked from commit 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81) - URL: https://github.com/kamailio/kamailio/commit/069de99576b5f8bff002176331ed2f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:54+02:00 core: tcp - set a global shortcut to tcp connection for event route (cherry picked from commit d114d11724dc4157e7e5809504531d26da6bcc57) - URL: https://github.com/kamailio/kamailio/commit/7e987d8937349246f2abfa041679f56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:01+02:00 pv: use global tcp connection callback for event route on $conid (cherry picked from commit f5c05a68ae72881ab0691bb8488112356fc67c79) - URL: https://github.com/kamailio/kamailio/commit/794c2edeaffe059bf8de6ab1d3df5db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:09+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 (cherry picked from commit 66b3c04a9653425b1602c82dd2456a7eb7cf59d1) - URL: https://github.com/kamailio/kamailio/commit/eaacc171adbcd84fb2b95b4c182cd1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:17+02:00 regex: init globals for safer shutdown on failure (cherry picked from commit 84517c14ca38a8371c67b858077a42019c2217a8) - URL: https://github.com/kamailio/kamailio/commit/c8f685359c411ac43000dd77cbc2e4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:24+02:00 regex: allocate pcres array - GH #3812 (cherry picked from commit 2cc62133db4f6875f55e73e044f37dafbb2274c2) - URL: https://github.com/kamailio/kamailio/commit/3ff024fd0057d3a9d045d3f20df5d1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:34+02:00 regex: reformat exported structures (cherry picked from commit 0ebfddd20b43396d602b4c68a88f7c2bc58ed211)

1 0

[kamailio/kamailio] Chaining Transformations {uri.param,received}{uri.host} does not work for IPv6 (Issue #3794)
by ChristianBergerSipgate 25 Apr '24

25 Apr '24

### Description Chaining the transformations {uri.param,received} and {uri.host} does not work if the address is IPv6. It works for IPv4 addresses. #### Reproduction We tested this with the following code: ``` if ($du != $null) { $var(received_uri)=$(du{uri.param,received}); if ($var(received_uri)!="") { $var(subscriber_host)=$(var(received_uri){uri.host}); } $var(test_tmp)=$(du{uri.param,received}{uri.host}); xlog("L_ERR", "WURST subscriber_host=$var(subscriber_host) test_tmp=$var(test_tmp) du=$du received_uri=$var(received_uri)"); } } #### Log Messages For IPv6 this gives us: ``` "module": "pv", "file": "pv_trans.c", "line": 1545, "function": "tr_eval_uri", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": **"invalid uri [ab:cdef:dead:beef]:1234]\n"** "module": "core", "file": "core/lvalue.c", "line": 351, "function": "lval_pvar_assign", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "non existing right pvar\n" "module": "core", "file": "core/lvalue.c", "line": 411, "function": "lval_assign", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "assignment failed at pos: (1432,19-1432,53)\n" "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "WURST subscriber_host=[2001:db8:0123:4567:89ab:cdef:dead:beef] test_tmp=0 du=sip:1.2.4.129;lr;received=sip[2001:db8:0123:4567:89ab:cdef:dead:beef]:1234 received_uri=sip:[2001:db8:0123:4567:89ab:cdef:dead:beef]:1234" "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "determineSubscribeIpFamily: contacts worked path=0 ip=[2001:db8:0123:4567:89ab:cdef:dead:beef] af=6" ``` For IPv4 it works: `{ "idx": 8, "pid": 577, "level": "ERROR", "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "WURST subscriber_host=12.34.56.78 test_tmp=12.34.56.78 du=sip:1.2.4.149;lr;received=sip:12.34.56.78:1234 received_uri=sip:12.34.56.78:1234" } ` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3794 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3794(a)github.com>

3 3

[kamailio/kamailio] Error by installing new Rel. 5.8 (Issue #3825)
by leila Mohammadinafchi 25 Apr '24

25 Apr '24

I am using this docker file for installaing kamailio. I wana use it with open5gs for trynig VoNR , I used before it for VoLTE it works but right now I have this error in installation process. ![log](https://github.com/kamailio/kamailio/assets/161492387/42017f48-3a7f-4cbe-bdf0-48dbb3443f5f) and there is docker file that Im using: FROM ubuntu:focal ENV DEBIAN_FRONTEND=noninteractive # Install updates and dependencies RUN apt-get update && \ apt-get -y install mysql-server tcpdump screen tmux ntp ntpdate git-core dkms \ gcc flex bison libmysqlclient-dev make libssl-dev libcurl4-openssl-dev \ libxml2-dev libpcre2-dev bash-completion g++ autoconf libmnl-dev \ libsctp-dev libradcli-dev libradcli4 libjson-c-dev pkg-config iproute2 net-tools \ iputils-ping # Fetch Kamailio code (branch 5.3) RUN mkdir -p /usr/local/src/ && cd /usr/local/src/ && \ git clone https://github.com/kamailio/kamailio && \ cd kamailio && git checkout 5.8 # Build and Install Kamailio RUN cd /usr/local/src/kamailio && make cfg COPY modules.lst /usr/local/src/kamailio/src RUN cd /usr/local/src/kamailio && \ make -j`nproc` Q=0 all | tee make_all.txt && \ make install | tee make_install.txt && \ ldconfig COPY kamailio_init.sh / CMD /kamailio_init.sh -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3825 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3825(a)github.com>

2 3

[kamailio/kamailio] ndb_reids module in event_route[tcp:closed] route block error: "no redis context for server" (Issue #3768)
by liangbaolin 25 Apr '24

25 Apr '24

### Description The process of using kamailio prompts the following error： ERROR: ndb_redis [redis_client.c:963]: redisc_exec(): no redis context for server: srvN I did not encounter similar errors in version 5.4.8, and there were no similar errors in other routing blocks. Suspect that the new core version has unknown logical issues with the routing block of the module in event_route.  #### Log Messages  ``` 2024-02-26T03:39:11.161557654Z 51(97) DEBUG: <core> [core/tcp_read.c:280]: tcp_read_data(): EOF on connection 0x7f24539006a0 (state: 0, flags: c018) - FD 24, bytes 0, rd-flags 10000 ([12.0.1.6]:22827 -> [12.0.1.6]:5060)51(97) DEBUG: <core> [core/tcp_read.c:343]: tcp_read(): read 0 bytes: 2024-02-26T03:39:11.161563494Z 2024-02-26T03:39:11.161567864Z 51(97) DEBUG: <core> [core/tcp_read.c:1532]: tcp_read_req(): read= 0 bytes, parsed=0, state=0, error=1 2024-02-26T03:39:11.161574144Z 51(97) DEBUG: <core> [core/tcp_read.c:1534]: tcp_read_req(): last char=0x00, parsed msg= 2024-02-26T03:39:11.161579134Z 2024-02-26T03:39:11.161584594Z 51(97) DEBUG: <core> [core/tcp_read.c:1544]: tcp_read_req(): EOF 2024-02-26T03:39:11.161598914Z 51(97) DEBUG: <core> [core/io_wait.h:598]: io_watch_del(): DBG: io_watch_del (0x563e1ce29740, 24, -1, 0x10) fd_no=2 called 2024-02-26T03:39:11.161604494Z 51(97) DEBUG: <core> [core/tcp_read.c:1927]: handle_io(): removing from list 0x7f24539006a0 id 1 fd 24, state 2, flags c018, main fd 132, refcnt 2 ([12.0.1.6]:22827 -> [12.0.1.6]:5060) 2024-02-26T03:39:11.161610294Z 51(97) DEBUG: <core> [core/tcp_read.c:1702]: release_tcpconn(): releasing con 0x7f24539006a0, state -1, fd=24, id=1 ([12.0.1.6]:22827 -> [12.0.1.6]:5060) 2024-02-26T03:39:11.161615934Z 51(97) DEBUG: <core> [core/tcp_read.c:1705]: release_tcpconn(): extra_data (nil) 2024-02-26T03:39:11.162263374Z 83(129) DEBUG: <core> [core/tcp_main.c:3747]: handle_tcp_child(): reader response= 7f24539006a0, -1 from 0 2024-02-26T03:39:11.162286594Z 83(129) DEBUG: <core> [core/tcp_main.c:3671]: tcp_emit_closed_event(): TCP closed event creation triggered (reason: 0) 2024-02-26T03:39:11.162293034Z 83(129) DEBUG: tcpops [tcpops.c:311]: tcpops_handle_tcp_closed(): received TCP closed event 2024-02-26T03:39:11.162299134Z 83(129) DEBUG: tcpops [tcpops.c:261]: tcpops_tcp_closed_run_route(): event reason id: 0 rt: 1 2024-02-26T03:39:11.162304234Z 83(129) ERROR: tcpops [tcpops.c:278]: tcpops_tcp_closed_run_route(): run_top_route() before tev->id: 1 2024-02-26T03:39:11.162311444Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162316784Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162322944Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162328584Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162333764Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162338674Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162343764Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162349254Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162355494Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 101 2024-02-26T03:39:11.162360924Z 83(129) ERROR: <script>: tcp connection closed conid: (1), tcp(conid): 1, Ri: 12.0.1.185, Rp: 5060 , si: 12.0.1.6 , sp: 22827 2024-02-26T03:39:11.162375744Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162381944Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162388024Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162395164Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162400884Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162406634Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162412284Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162417034Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162422294Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 27 2024-02-26T03:39:11.162427844Z 83(129) ERROR: <script>: tcp connection closed (1) 2024-02-26T03:39:11.162433574Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162439254Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162444184Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162449324Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162454724Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 1 2024-02-26T03:39:11.162460094Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 52 2024-02-26T03:39:11.162466084Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162471724Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162477324Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162482144Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162487154Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 52 2024-02-26T03:39:11.162501164Z 83(129) DEBUG: ndb_redis [redis_client.c:399]: redisc_get_server(): Hash 2100282857 (srvN) 2024-02-26T03:39:11.162508124Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209461 (12.0.1.9:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162514104Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209462 (12.0.1.8:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162520554Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209448 (12.0.1.7:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162526404Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210133 (12.0.1.9:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162532034Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210134 (12.0.1.8:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162537324Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210120 (12.0.1.7:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162542824Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100282854 (srvM), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162548064Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100282857 (srvN), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162554074Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100306023 (srvTPS), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162559184Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209461 (12.0.1.9:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162564524Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209462 (12.0.1.8:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162569904Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209448 (12.0.1.7:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162575334Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210133 (12.0.1.9:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162580154Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210134 (12.0.1.8:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162585964Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210120 (12.0.1.7:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162592294Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2100282854 (srvM), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162597644Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2100282857 (srvN), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162611324Z 83(129) DEBUG: ndb_redis [redis_client.c:413]: redisc_get_server(): Using entry 2100282857 (srvN) 2024-02-26T03:39:11.162617084Z 83(129) DEBUG: ndb_redis [redis_client.c:960]: redisc_exec(): rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162622004Z 83(129) ERROR: ndb_redis [redis_client.c:963]: redisc_exec(): no redis context for server: srvN 2024-02-26T03:39:11.162627834Z 83(129) ERROR: tcpops [tcpops.c:280]: tcpops_tcp_closed_run_route(): run_top_route() after tev->id: 1 2024-02-26T03:39:11.162633294Z 83(129) DEBUG: <core> [core/tcp_main.c:3904]: handle_tcp_child(): case CONN_EOF tcp_emit_closed_event before 5 ``` #### SIP Traffic  ``` event_route[tcp:closed] { xlog("L_ERR", "$proto connection closed conid: ($conid), tcp(conid): $tcp(conid), Ri: $Ri, Rp: $Rp , si: $si , sp: $sp\n"); if($conid ne $null) { xlog("L_ERR", "$proto connection closed ($conid)\n"); route(TCPEVENT); } } route[TCPEVENT] { if(redis_cmd("srvN", "get %s", "$conid", "r")) { ..... } } #redis module config loadmodule "ndb_redis" modparam("ndb_redis", "cluster", 1) modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "server", "name=srvN;addr=NDB_N_REDIS_CLUSTER_MAINADDR;port=NDB_N_REDIS_CLUSTER_MAINPORT;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=srvM;addr=NDB_M_REDIS_CLUSTER_MAINADDR;port=NDB_M_REDIS_CLUSTER_MAINPORT;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.7:7369;addr=12.0.1.7;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.8:7369;addr=12.0.1.8;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.9:7369;addr=12.0.1.9;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.7:7469;addr=12.0.1.7;port=7469;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.8:7469;addr=12.0.1.8;port=7469;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.9:7469;addr=12.0.1.9;port=7469;pass=NDB_REDIS_PASSWORD") ``` * **Operating System**:  ``` version: kamailio 5.7.4 (x86_64/linux) 9920d9-dirty flags: , EXTRA_DEBUGUSE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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: 9920d9 -dirty compiled on 09:59:52 Feb 26 2024 with gcc 7.5.0 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3768 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3768(a)github.com>

3 10

git:master:0ebfddd2: regex: reformat exported structures
by Daniel-Constantin Mierla 24 Apr '24

24 Apr '24

Module: kamailio Branch: master Commit: 0ebfddd20b43396d602b4c68a88f7c2bc58ed211 URL: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-24T21:34:28+02:00 regex: reformat exported structures --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… Patch: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 4bb4d7cdcee..292af692136 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -113,48 +113,54 @@ static int w_pcre_match_group(struct sip_msg *_msg, char *_s1, char *_s2); /* * Exported functions */ +/* clang-format off */ static cmd_export_t cmds[] = { - {"pcre_match", (cmd_function)w_pcre_match, 2, fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, - fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, - fixup_spve_null, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"pcre_match", (cmd_function)w_pcre_match, 2, fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, + fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, + fixup_spve_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"file", PARAM_STRING, &file}, - {"max_groups", INT_PARAM, &max_groups}, - {"group_max_size", INT_PARAM, &group_max_size}, - {"pcre_caseless", INT_PARAM, &pcre_caseless}, - {"pcre_multiline", INT_PARAM, &pcre_multiline}, - {"pcre_dotall", INT_PARAM, &pcre_dotall}, - {"pcre_extended", INT_PARAM, &pcre_extended}, {0, 0, 0}}; +static param_export_t params[] = { + {"file", PARAM_STRING, &file}, + {"max_groups", INT_PARAM, &max_groups}, + {"group_max_size", INT_PARAM, &group_max_size}, + {"pcre_caseless", INT_PARAM, &pcre_caseless}, + {"pcre_multiline", INT_PARAM, &pcre_multiline}, + {"pcre_dotall", INT_PARAM, &pcre_dotall}, + {"pcre_extended", INT_PARAM, &pcre_extended}, + {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "regex", /*!< module name */ - DEFAULT_DLFLAGS, /*!< dlopen flags */ - cmds, /*!< exported functions */ - params, /*!< exported parameters */ - 0, /*!< exported RPC functions */ - 0, /*!< exported pseudo-variables */ - 0, /*!< response handling function */ - mod_init, /*!< module initialization function */ - 0, /*!< per-child init function */ - destroy /*!< destroy function */ + "regex", /*!< module name */ + DEFAULT_DLFLAGS, /*!< dlopen flags */ + cmds, /*!< exported functions */ + params, /*!< exported parameters */ + 0, /*!< exported RPC functions */ + 0, /*!< exported pseudo-variables */ + 0, /*!< response handling function */ + mod_init, /*!< module initialization function */ + 0, /*!< per-child init function */ + destroy /*!< destroy function */ }; +/* clang-format on */ static void *pcre2_malloc(size_t size, void *ext)

1 0

[kamailio/kamailio] ERROR cfgtrace:dbg_cfg_trace() (Issue #3821)
by happytulubi 24 Apr '24

24 Apr '24

May I ask what the problem is? It prompts an error but does not affect the program's operation. Is it that the configuration file and the deployed version are inconsistent? 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=706 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=695 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=695 a=16 n=if 13(682) INFO: <script>: Call from Websocket endpoint at the DURI {sip:117.80.229.36:15060} for callee {3008} 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=691 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=685 a=25 n=has_body Here is the code for my kamailio.cfg section branch_route[MANAGE_BRANCH]{ xlog("L_INFO","Call to ru:{$ru} '$du'/'$proto'\n"); if(($du=~"transport=ws") || ($du=~"transport=wss")){ if ($du=~"transport=tls") { #sdp_remove_media("video"); xlog("L_INFO","Call to TLS endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { rtpengine_manage("record-call=off metadata=6:$ci force trust-address replace-origin replace-session-connection UDP/TLS/RTP/SAVPF"); } t_on_reply("REPLY_FROM_TLS"); $fs="tls:MY_IP_ADDR:MY_WSS_PORT"; } else if ($du=~"transport=ws") { xlog("L_INFO","Call to Websocket endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { route(GET_REAL_IP_FOR_RTPENGINE); #rtpengine_manage("record-call=off metadata=7:$ci replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=7:$ci replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"); } t_on_reply("REPLY_FROM_WS"); $du = $du + ";transport=ws"; $fs="tcp:MY_IP_ADDR:MY_WS_PORT"; } }else { if ($proto=~ "tls") { #sdp_remove_media("video"); xlog("L_INFO","Call from WSS endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { rtpengine_manage("record-call=off metadata=8:$ci trust-address replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP"); } xlog("L_INFO","media adress is $(du{s.select,1,:})\n"); t_on_reply("REPLY_TO_TLS"); } else if ($proto =~ "ws"){ xlog("L_INFO","Call from Websocket endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { route(GET_REAL_IP_FOR_RTPENGINE); #rtpengine_manage("record-call=off metadata=9:$ci replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=9:$ci replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP"); } xlog("L_INFO","media adress is $(du{s.select,1,:})\n"); t_on_reply("REPLY_TO_WS"); } if (($proto=~ "udp") || ($proto=~"tcp")) { #sdp_remove_media("video"); xlog("L_INFO","UDP Branch is {$du} for {$tU}\n"); # $avp(mediaAddr) = ''; if ( has_body('application/sdp')) { #rtpengine_manage("record-call=off metadata=10:$ci replace-origin replace-session-connection media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=10:$ci replace-origin replace-session-connection"); } t_on_reply("STANDART"); } } xlog("L_INFO", "t_on_reply set\n"); if is_method("BYE|CANCEL") { rtpengine_manage(); } } -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3821 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3821(a)github.com>

2 2

[kamailio/kamailio] tools/kemi: escape docstrings when required (PR #3824)
by tsearle 24 Apr '24

24 Apr '24

some of the documentation contains \ which need escaping   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3824 -- Commit Summary -- * tools/kemi: escape docstrings when required -- File Changes -- M misc/tools/kemi/python_mock/kemi_mock.py (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3824.patch https://github.com/kamailio/kamailio/pull/3824.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3824 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3824(a)github.com>

1 1

git:master:999d0c65: tools/kemi: escape docstrings when required (#3824)
by GitHub 24 Apr '24

24 Apr '24

Module: kamailio Branch: master Commit: 999d0c65402c99491683d694d77a01a5c1f91ecf URL: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-24T11:28:49+02:00 tools/kemi: escape docstrings when required (#3824) some of the documentation contains \ which need escaping --- Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… Patch: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… --- diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 145fcb34b3a..918551a1887 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -129,7 +129,7 @@ def generate_function_doc(module_name, func, prefix): print(prefix + "\t\"\"\"") documentation_lines = documentation[module_name]["functions"][function_prefix].split("\n") for line in documentation_lines: - print(prefix + "\t" + line) + print(prefix + "\t" + line.replace("\\", "\\\\\\\\")) print(prefix + "\t\"\"\"") break

1 0

git:master:2cc62133: regex: allocate pcres array
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 2cc62133db4f6875f55e73e044f37dafbb2274c2 URL: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T12:08:30+02:00 regex: allocate pcres array - GH #3812 --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… Patch: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 8e8c1645f0e..4bb4d7cdcee 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -462,6 +462,15 @@ static int load_pcres(int action) } shm_free(pcres); } + + if(pcres == NULL) { + if((pcres = shm_malloc(sizeof(pcre2_code *) * num_pcres_tmp)) == 0) { + LM_ERR("no more memory for pcres\n"); + goto err; + } + memset(pcres, 0, sizeof(pcre2_code *) * num_pcres_tmp); + } + *num_pcres = num_pcres_tmp; *pcres = *pcres_tmp; *pcres_addr = pcres;

1 0

git:master:84517c14: regex: init globals for safer shutdown on failure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 84517c14ca38a8371c67b858077a42019c2217a8 URL: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T11:49:23+02:00 regex: init globals for safer shutdown on failure --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… Patch: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index e7aaada852d..8e8c1645f0e 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -68,7 +68,7 @@ gen_lock_t *reload_lock; /* * Module exported parameter variables */ -static char *file; +static char *file = NULL; static int max_groups = MAX_GROUPS; static int group_max_size = GROUP_MAX_SIZE; static int pcre_caseless = 0; @@ -83,9 +83,9 @@ static int pcre_extended = 0; static pcre2_general_context *pcres_gctx = NULL; static pcre2_match_context *pcres_mctx = NULL; static pcre2_compile_context *pcres_ctx = NULL; -static pcre2_code **pcres; -static pcre2_code ***pcres_addr; -static int *num_pcres; +static pcre2_code **pcres = NULL; +static pcre2_code ***pcres_addr = NULL; +static int *num_pcres = NULL; static int pcre_options = 0x00000000;

1 0

[kamailio/kamailio] TSILO: ts_append_to(): transaction 11743:1310842517: error updating dset (-1) (Issue #3782)
by vteliatnykov 23 Apr '24

23 Apr '24

After the transaction was suspended, 1st user registered, got INVITE message, there is 2nd user wakes up and send REGISTER. Kamailio check if transaction suspended (for 2nd user, it is not suspended anymore), and checks if there is stored transaction. So, for 2nd user we have stored transaction, then it should append new branch. ts_append failed. if ($var(suspended) == 0) { if ($var(stored)) { # no suspended INVITE (i.e. there was at least one # registered contact for target) and 'stored' set # (i.e. ongoing transaction) -> this newly just # registered contact needs alerting. ts_append("location", "sip:$avp(extension)@LOCALVIRTUALIP"); xinfo("appending branches for sip:$avp(extension)@LOCALVIRTUALIP, result $rc"); } else { xinfo("no suspended transactions for $tu"); } return; } Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1339] <script>: -----------122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1348] <script>: var(suspended)=0, tsilo=>suspended::122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1349] <script>: var(stored)=1, tsilo=>stored::122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: ERROR: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1357] tsilo [ts_append.c:152]: ts_append_to(): transaction 11743:1310842517: error updating dset (-1) Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1359] <script>: appending branches for sip:1000@10.160.201.190, result 1 At this moment we have active transaction `{ cell: 0x7f313d43cda8 tindex: 11743 tlabel: 1310842517 method: INVITE from: From: "9988" <sip:9988@10.156.0.6>;tag=as081c0936 to: To: <sip:1000@10.160.201.190:5070> callid: Call-ID: 66d9dace125df36915783fb379f4e3dd@10.156.0.6:5060 cseq: CSeq: 102 uas_request: yes tflags: 69 outgoings: 3 ref_count: 1 lifetime: 5402832 } ` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3782 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3782(a)github.com>

2 3

[kamailio/kamailio] Misleading source IP of 1.0.0.127 in event routes (Issue #3817)
by Jukka Väisänen 23 Apr '24

23 Apr '24

### Description Event routes that are executed without a real SIP message available use the default "fake SIP message". The fake message has a source IPv4 address of 1.0.0.127 which belongs to CloudFlare (1.0.0.0/24).. and this led us to believe that traffic is coming from CF but could not find the messages on tcpdumps or HEP exports. Had a bit of a wild goose chase there trying to find the source. I believe the original intention has been to use 127.0.0.1 loopback address but the bytes are reversed at: https://github.com/kamailio/kamailio/blob/master/src/core/fmsg.c#L78 It would be best to change this address to well ANYTHING that doesn't imply CloudFlare is pinging you 😂 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3817 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3817(a)github.com>

3 4

git:master:66b3c04a: core: fmsg - parse loopback ip when initializing faked msg structure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 66b3c04a9653425b1602c82dd2456a7eb7cf59d1 URL: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T11:19:30+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… Patch: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 7a4f9ba87e5..b30ca9f69cf 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -25,6 +25,7 @@ #include "dprint.h" #include "globals.h" #include "dset.h" +#include "resolve.h" #include "fmsg.h" @@ -57,6 +58,8 @@ static void faked_msg_buf_init(void) static int faked_msg_init_new(sip_msg_t *fmsg) { + str loip = str_init("127.0.0.1"); + faked_msg_buf_init(); /* init faked sip msg */ @@ -75,13 +78,9 @@ static int faked_msg_init_new(sip_msg_t *fmsg) fmsg->rcv.proto = PROTO_UDP; fmsg->rcv.src_port = 5060; - fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; - fmsg->rcv.src_ip.af = AF_INET; - fmsg->rcv.src_ip.len = 4; + str2ipbuf(&loip, &fmsg->rcv.src_ip); fmsg->rcv.dst_port = 5060; - fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; - fmsg->rcv.dst_ip.af = AF_INET; - fmsg->rcv.dst_ip.len = 4; + str2ipbuf(&loip, &fmsg->rcv.dst_ip); return 0; }

1 0

git:master:f5c05a68: pv: use global tcp connection callback for event route on $conid
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: f5c05a68ae72881ab0691bb8488112356fc67c79 URL: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:42:02+02:00 pv: use global tcp connection callback for event route on $conid --- Modified: src/modules/pv/pv_core.c Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… Patch: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 40557ba4628..b10b7513a6f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2927,6 +2927,13 @@ int pv_get_tcpconn_id(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(msg == NULL) return -1; + /* use first the connection set for event_route[tcp:...] */ + con = ksr_tcpcon_evcb_get(); + if(con != NULL) { + return pv_get_sintval(msg, param, res, con->id); + } + + /* find connection from sip message structure */ if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) return pv_get_null(msg, param, res); diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 97068c627bb..9c648c1f2a3 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,6 +248,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; + int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git:master:d114d117: core: tcp - set a global shortcut to tcp connection for event route
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: d114d11724dc4157e7e5809504531d26da6bcc57 URL: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:36:35+02:00 core: tcp - set a global shortcut to tcp connection for event route --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… Patch: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 5b579b2ffb9..57dff5a291b 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -434,4 +434,6 @@ typedef struct ws_event_info int id; } ws_event_info_t; +tcp_connection_t *ksr_tcpcon_evcb_get(void); + #endif diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 957a9b97c0f..2456459cfa2 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3670,6 +3670,12 @@ int _tcpconn_write_nb( return n; } +static tcp_connection_t *_ksr_tcpcon_evcb = NULL; + +tcp_connection_t *ksr_tcpcon_evcb_get(void) +{ + return _ksr_tcpcon_evcb; +} static int tcp_emit_closed_event(struct tcp_connection *con) { @@ -3692,7 +3698,9 @@ static int tcp_emit_closed_event(struct tcp_connection *con) tev.id = con->id; tev.con = con; evp.data = (void *)(&tev); + _ksr_tcpcon_evcb = con; ret = sr_event_exec(SREV_TCP_CLOSED, &evp); + _ksr_tcpcon_evcb = NULL; } else { LM_DBG("no callback registering for handling TCP closed event\n"); }

1 0

git:master:27e3b7f3: tcpops: reworked some debug messages
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81 URL: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:21:20+02:00 tcpops: reworked some debug messages --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… Patch: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 2b767a9470e..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -249,6 +249,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sr_kemi_eng_t *keng = NULL; str *evname; + LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) { rt = -1; keng = sr_kemi_eng_get(); @@ -258,9 +259,10 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) } } else { rt = tcp_closed_routes[tev->reason]; - LM_DBG("event reason id: %d rt: %d\n", tev->reason, rt); - if(rt == -1) + if(rt == -1) { + LM_DBG("event reason id: %d - event route not set\n", tev->reason); return; + } } if(faked_msg_init() < 0) {

1 0

git:master:11e7d71e: core: tcp - keep connection id on event route cb structure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 11e7d71e5c2ee9428298658ed3b9a0f625d40f00 URL: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:19:29+02:00 core: tcp - keep connection id on event route cb structure --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… Patch: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 13301563945..5b579b2ffb9 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -422,6 +422,7 @@ typedef struct tcp_event_info typedef struct tcp_closed_event_info { enum tcp_closed_reason reason; + int id; struct tcp_connection *con; } tcp_closed_event_info_t; diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index b71e7ad37f2..957a9b97c0f 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3689,6 +3689,7 @@ static int tcp_emit_closed_event(struct tcp_connection *con) if(likely(sr_event_enabled(SREV_TCP_CLOSED))) { memset(&tev, 0, sizeof(tcp_closed_event_info_t)); tev.reason = reason; + tev.id = con->id; tev.con = con; evp.data = (void *)(&tev); ret = sr_event_exec(SREV_TCP_CLOSED, &evp);

1 0

git:master:6e6b4f06: xhttp_prom: use %lu for printing pkg fields
by Daniel-Constantin Mierla 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: 6e6b4f06546a0d9ad942847ee745b17a5aeb7f6a URL: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-22T21:54:26+02:00 xhttp_prom: use %lu for printing pkg fields --- Modified: src/modules/xhttp_prom/prom.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… Patch: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index efe111b752a..71accf21845 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -253,7 +253,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) for(; i < pkg_proc_stats_no; i++) { if(prom_body_printf(ctx, "%.*spkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " - "%d %" PRIu64 "\n", + "%lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].used, ts) @@ -263,7 +263,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_available{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].available, ts) @@ -273,7 +273,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_real_used{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].real_used, ts) @@ -283,7 +283,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_total_frags{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_frags, ts) @@ -293,7 +293,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_total_size{pid=\"%u\", rank=\"%d\" " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_size, ts)

1 0

git:master:b96de87a: ipops: define hostname size for ptr structure
by Daniel-Constantin Mierla 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: b96de87ae94db2285d7a5f022c38a746d69ae5ef URL: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-22T21:43:40+02:00 ipops: define hostname size for ptr structure - replace the strncpy with strlen with straight strcpy --- Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… Patch: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 034ec696594..acbe08a4283 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -429,7 +429,7 @@ int ptr_update_pv(str *ip_address, str *name) sr_dns_item_t *dr = NULL; struct sockaddr_in sa; struct sockaddr_in6 sa6; - char hostname[256]; + char hostname[SR_DNS_HOSTNAME_SIZE]; int result; int ip_type; if(ip_address->len > INET6_ADDRSTRLEN) { @@ -499,8 +499,7 @@ int ptr_update_pv(str *ip_address, str *name) } /* Store the hostname in the sr_dns_item_t structure. */ - strncpy(dr->hostname, hostname, strlen(hostname)); - dr->hostname[strlen(hostname)] = '\0'; + strcpy(dr->hostname, hostname); dr->count = 1; LM_DBG("reverse dns PV updated for: %s (%d)\n", dr->r[0].addr, dr->count); diff --git a/src/modules/ipops/ipops_pv.h b/src/modules/ipops/ipops_pv.h index 5e9a19be1da..cede3b4217c 100644 --- a/src/modules/ipops/ipops_pv.h +++ b/src/modules/ipops/ipops_pv.h @@ -27,7 +27,7 @@ #define PV_DNS_ADDR 64 #define PV_DNS_RECS 32 #define SR_DNS_PVIDX 1 - +#define SR_DNS_HOSTNAME_SIZE 256 typedef struct _sr_dns_record { int type; @@ -38,7 +38,7 @@ typedef struct _sr_dns_item { str name; unsigned int hashid; - char hostname[256]; + char hostname[SR_DNS_HOSTNAME_SIZE]; int count; int ipv4; int ipv6;

1 0

[kamailio/kamailio] tools/kemi: add dockstrings to the mocking (PR #3818)
by tsearle 22 Apr '24

22 Apr '24

kemi_mock.py can now optionally consume documentation information generated by the vscode-kamailio-hover project   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3818 -- Commit Summary -- * tools/kemi: add dockstrings to the mocking -- File Changes -- M misc/tools/kemi/python_mock/README.md (15) M misc/tools/kemi/python_mock/kemi_mock.py (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3818.patch https://github.com/kamailio/kamailio/pull/3818.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3818 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3818(a)github.com>

1 1

git:master:6b29df73: tools/kemi: add dockstrings to the mocking (#3818)
by GitHub 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: 6b29df73115682424daf7b276d0138f004e274f7 URL: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-22T12:53:48+02:00 tools/kemi: add dockstrings to the mocking (#3818) kemi_mock.py can now optionally consume documentation information generated by the vscode-kamailio-hover project --- Modified: misc/tools/kemi/python_mock/README.md Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… Patch: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… --- diff --git a/misc/tools/kemi/python_mock/README.md b/misc/tools/kemi/python_mock/README.md index 5e72e738c58..385cbd5656a 100644 --- a/misc/tools/kemi/python_mock/README.md +++ b/misc/tools/kemi/python_mock/README.md @@ -2,7 +2,7 @@ Generate a mocking framework base on the output of app_python.api_list -Usage: +### Usage: ``` /usr/sbin/kamctl rpc app_python.api_list > api.json ./kemi_mock.py api.json > KSR.py @@ -15,6 +15,19 @@ the Union type add the --no-union flag ./kemi_mock.py api.json --no-union > KSR.py ``` +### Usage with Documentation: +run the generate.py from the following project + +https://github.com/braams/vscode-kamailio-hover + +this creates a modules.json file in a tmp directory. This file can be used to generate the KSR.py file with documentation + +pass the modules.json as a 2nd parameter to kemi_mock.py +``` +./kemi_mock.py api.json modules.json > KSR.py +``` + +## Mocking Return values can be injected through the dictionary \_mock\_data ```python diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 48a73efa232..145fcb34b3a 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -113,21 +113,41 @@ def printFunction(module_name, func, indent): else: print(prefix + "def " + func['name'] +"("+params+"):") + generate_function_doc(module_name, func, prefix) + print(prefix + "\tprint(\"Calling " + log_format_params + "\" % "+log_params+")") printMocReturn(module_name, func, indent+1) print("") +def generate_function_doc(module_name, func, prefix): + if documentation is not None and module_name in documentation: + function_parts = func['name'].split("_") + for i in range(len(function_parts), 0, -1): + function_prefix = "_".join(function_parts[:i]) + if function_prefix in documentation[module_name]["functions"]: + print(prefix + "\t\"\"\"") + documentation_lines = documentation[module_name]["functions"][function_prefix].split("\n") + for line in documentation_lines: + print(prefix + "\t" + line) + print(prefix + "\t\"\"\"") + break + + classes = defaultdict(list) if len(sys.argv) < 2: print("Please specify the json file to parse") sys.exit(-1) +documentation = None if len(sys.argv) > 2: for i in range(2,len(sys.argv)): if sys.argv[i] == "--no-union": noUnion = True + else: + with open(sys.argv[i]) as f: + documentation = json.load(f) if not noUnion: print("from typing import Union") @@ -193,12 +213,23 @@ def printFunction(module_name, func, indent): print("") printFunction('', func, 0) + +def document_module(module_name): + if documentation is not None and module_name in documentation: + print("\"\"\"") + documentation_lines = documentation[module_name]["overview"].split("\n") + for line in documentation_lines: + print("" + line) + print("\"\"\"") + + for module_name in classes.keys(): if module_name != "": if module_name in reserved_keywords: print("setattr(sys.modules[__name__], '" + module_name + "', " + module_name.capitalize() + "())") else: print(module_name + " = "+module_name.capitalize()+"()") + document_module(module_name) print("")

1 0

[kamailio/kamailio] usrloc: check on db delete the return value of memchr (PR #3815)
by Rick Barenthin 20 Apr '24

20 Apr '24

#### 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) - [ ] 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  When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3815 -- Commit Summary -- * usrloc: check on db delete the return value of memchr -- File Changes -- M src/modules/usrloc/urecord.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3815.patch https://github.com/kamailio/kamailio/pull/3815.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3815 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3815(a)github.com>

3 5

git:master:49276a1f: usrloc: check on db delete the return value of memchr
by Henning Westerholt 20 Apr '24

20 Apr '24

Module: kamailio Branch: master Commit: 49276a1f43b1a3bf4a8d681888df964000360c79 URL: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-20T06:35:51+02:00 usrloc: check on db delete the return value of memchr When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. --- Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… Patch: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… --- diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index e027affc8aa..3c394a24a10 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -491,13 +491,17 @@ int db_delete_urecord(urecord_t *_r) vals[0].val.str_val.len = _r->aor.len; if(ul_use_domain) { - dom = memchr(_r->aor.s, '@', _r->aor.len); - vals[0].val.str_val.len = dom - _r->aor.s; - vals[1].type = DB1_STR; vals[1].nul = 0; - vals[1].val.str_val.s = dom + 1; - vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom - 1; + dom = memchr(_r->aor.s, '@', _r->aor.len); + if(dom == 0) { + vals[0].val.str_val.len = 0; + vals[1].val.str_val = _r->aor; + } else { + vals[0].val.str_val.len = dom - _r->aor.s; + vals[1].val.str_val.s = dom + 1; + vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom - 1; + } } if(ul_dbf.use_table(ul_dbh, _r->domain) < 0) {

1 0

[kamailio/kamailio] Core parameters user_agent_header fail to take effect (Issue #3816)
by suiyuemanbu 19 Apr '24

19 Apr '24

I want kamailio use User-Agent header, not Server head My setup is as follows: kamailio.cfg server_signature=no user_agent_header="User-Agent: carrierroute-kam" the result is : SIP/2.0 100 trying -- your call is important to us Via: SIP/2.0/UDP xxx From: xxxxxxtag=N856ZmNXa4S6D To: xxx Call-ID: 5ab0 CSeq: 82194 INVITE Content-Length: 0 **not have User-Agent header** please help me,How to make it appear the User-Agent field? thank you version: kamailio 5.7.0 (x86_64/linux) f1e91d -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3816 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3816(a)github.com>

2 2

git:master:d4c23324: cfgutils: initialize the optional key
by Victor Seva 18 Apr '24

18 Apr '24

Module: kamailio Branch: master Commit: d4c23324a84d9727653e0b67c4455f9cf6be3d0c URL: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-18T16:12:33+02:00 cfgutils: initialize the optional key * bug introduced at 424769743c93dea5a4d2c21f7a0ef8ea8779a5bb --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… Patch: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index f7aea690e88..487f68aaab0 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -691,7 +691,7 @@ static int cfg_lock_helper(str *lkey, str *lkey2, int mode) unsigned int pos; str *key2 = NULL; - if(lkey2 && lkey2->len > 0) { + if(lkey2 && lkey2->s && lkey2->len > 0) { key2 = lkey2; } @@ -770,7 +770,8 @@ static int cfg_trylock_key2(sip_msg_t *msg, str *lkey, str *lkey2) static int w_cfg_lock_wrapper( struct sip_msg *msg, gparam_p key, gparam_p key2, int mode) { - str s1, s2; + str s1; + str s2 = STR_NULL; if(key == NULL) { return -1; }

1 0

git:master:38226473: cfgutils: reformat exported structures
by Victor Seva 18 Apr '24

18 Apr '24

Module: kamailio Branch: master Commit: 382264730393afac09a319df46044c6ac0753ea7 URL: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-18T14:25:45+02:00 cfgutils: reformat exported structures --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6… Patch: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6…

1 0

git:master:175d755c: tcp_main: Match wss protocol
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 175d755c40bc50b78b2cf4f18ad22429289af90d URL: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Match wss protocol --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… Patch: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e3323736cc0..b71e7ad37f2 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5435,7 +5435,7 @@ int wss_send(dest_info_t *dst, const char *buf, unsigned len) if(tcp_connection_match == TCPCONN_MATCH_STRICT) { con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - PROTO_NONE); + dst->proto); } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:d81e5113: core/forward: Match protocol when forwarding
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: d81e5113884b933251499630d112ec5b1150b8a4 URL: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 core/forward: Match protocol when forwarding --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… Patch: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… --- diff --git a/src/core/forward.h b/src/core/forward.h index 46bd3a36171..7b51e1a5559 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -189,7 +189,7 @@ static inline int msg_send_buffer( if(tcp_connection_match == TCPCONN_MATCH_STRICT) { con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - PROTO_NONE); + dst->proto); } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:0a28a93c: tcp_main: Update comment docs
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 0a28a93c6e060081267dc686e342d45ef03358e7 URL: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Update comment docs --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… Patch: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 0ea1b541ea6..e3323736cc0 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1697,8 +1697,8 @@ void tcpconn_rm(struct tcp_connection *c) /* finds a connection, if id=0 uses the ip addr, port, local_ip and local port * (host byte order) and tries to find the connection that matches all of - * them. Wild cards can be used for local_ip and local_port (a 0 filled - * ip address and/or a 0 local port). + * them. Wild cards can be used for local_ip, local_port and proto (a 0 filled + * ip address and/or a 0 local port and/or PROTO_NONE). * WARNING: unprotected (locks) use tcpconn_get unless you really * know what you are doing */ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, @@ -1754,7 +1754,7 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, /** - * find if a tcp connection exits by id or remote+local address/port + * find if a tcp connection exits by id or remote+local address/port and protocol * - return: 1 if found; 0 if not found */ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, @@ -1774,6 +1774,7 @@ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, /* TCP connection find with locks and timeout * - local_addr contains the desired local ip:port. If null any local address * will be used. IN*ADDR_ANY or 0 port are wild cards. + * - proto is the protocol to match (PROTO_NONE for any) * - try_local_port makes the search use it first, instead of port from local_addr * If found, the connection's reference counter will be incremented, you might * want to decrement it after use.

1 0

git:master:6779efd4: tcp_main: Add proto argument to tcpconn_exists function
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 6779efd430178adff0ae438d178e38c003e4e05c URL: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Add proto argument to tcpconn_exists function --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… Patch: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 73e2ef6163d..0ea1b541ea6 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1758,13 +1758,12 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, * - return: 1 if found; 0 if not found */ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, - ip_addr_t *local_ip, int local_port) + ip_addr_t *local_ip, int local_port, sip_protos_t proto) { tcp_connection_t *c; TCPCONN_LOCK; - c = _tcpconn_find( - conn_id, peer_ip, peer_port, local_ip, local_port, PROTO_NONE); + c = _tcpconn_find(conn_id, peer_ip, peer_port, local_ip, local_port, proto); TCPCONN_UNLOCK; if(c) { return 1; @@ -4497,7 +4496,8 @@ static inline int handle_new_connect(struct socket_info *si) if(likely(tcpconn)) { if(tcp_accept_unique) { if(tcpconn_exists(0, &tcpconn->rcv.dst_ip, tcpconn->rcv.dst_port, - &tcpconn->rcv.src_ip, tcpconn->rcv.src_port)) { + &tcpconn->rcv.src_ip, tcpconn->rcv.src_port, + si->proto)) { LM_ERR("duplicated connection by local and remote addresses\n"); _tcpconn_free(tcpconn); tcp_safe_close(new_sock);

1 0

git:master:4a40b16d: tcp_main: Add protocol argument for searching tcp/tls connections
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8 URL: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Add protocol argument for searching tcp/tls connections --- Modified: src/core/forward.h Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… Patch: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e…

1 0

[kamailio/kamailio] tcp/docs: Added tcp_accept_iplimit config sample (PR #3792)
by Arnis Voitkāns 16 Apr '24

16 Apr '24

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description We noticed that configuration option tcp_accept_iplimit was included in newer kamailio versions (most notably 5.7.4), and it was a breaking change for us. Added sample configuration value in /etc/kamailio.cfg file - already tested in our production deployment. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3792 -- Commit Summary -- * tcp/docs: Added tcp_accept_iplimit config sample -- File Changes -- M etc/kamailio.cfg (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3792.patch https://github.com/kamailio/kamailio/pull/3792.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3792 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3792(a)github.com>

3 5

git:master:30a0fe2e: etc/kamailio.cfg: added tcp_accept_iplimit config sample
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 30a0fe2ea4b1b59bb8e552f9abd3a65e1c7226ec URL: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… Author: Arnis Voitkans <a.voitkans(a)dynatech.lv> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T12:40:09Z etc/kamailio.cfg: added tcp_accept_iplimit config sample --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… Patch: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 3f9a5fe793f..cd2ecd0109f 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -211,6 +211,9 @@ tcp_connection_lifetime=3605 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 +/* upper limit for TCP connections for one ip address - default 1024 */ +#tcp_accept_iplimit=1024 + #!ifdef WITH_JSONRPC tcp_accept_no_cl=yes #!endif

1 0

[kamailio/kamailio] rtpengine: fix pkg mem leak in send_rtpp_command() (PR #3813)
by vijaykumar-exotel 16 Apr '24

16 Apr '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3777 #### Description  - freed request.s after sending request to websocket in send_rtpp_command method. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3813 -- Commit Summary -- * rtpengine: fix pkg mem leak in send_rtpp_command() -- File Changes -- M src/modules/rtpengine/rtpengine.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3813.patch https://github.com/kamailio/kamailio/pull/3813.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3813 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3813(a)github.com>

2 5

git:master:b4753ae4: rtpengine: fix pkg mem leak in send_rtpp_command()
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: b4753ae4216b0c960ac094f4be8232fb4d0147b0 URL: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… Author: vijay kumar <vijay.kumar(a)exotel.in> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:38:27+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… Patch: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index c51b4742081..6d62b92900d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3672,6 +3672,7 @@ static char *send_rtpp_command( len = _rtpe_lwscb.request(&node->rn_url, (str *)&rtpe_proto, &request, &response, rtpengine_tout_ms * 1000); + pkg_free(request.s); if(len < 0) { LM_ERR("failed to do websocket request\n");

1 0

git:master:f4332447: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: f43324473bfd9b6c5db59c5691e316d32c15be81 URL: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-15T21:31:23+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… Patch: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 666f8844a52..bbe356a17d5 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1150,7 +1150,7 @@ modparam("acc", "cdr_facility", "LOG_DAEMON") Example 1.35. cdr_extra example ... -modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" +modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)") ... 6.36. cdr_extra_nullable (integer)

1 0

git:master:1adc0724: acc: docs - small fix to cdr_extra param example
by Daniel-Constantin Mierla 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 1adc07240c153b40f6bf5cb700145f8789070bcc URL: https://github.com/kamailio/kamailio/commit/1adc07240c153b40f6bf5cb700145f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-15T21:29:54+02:00 acc: docs - small fix to cdr_extra param example --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1adc07240c153b40f6bf5cb700145f8… Patch: https://github.com/kamailio/kamailio/commit/1adc07240c153b40f6bf5cb700145f8… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 69be72fe2e6..37a1365627e 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1156,7 +1156,7 @@ modparam("acc", "cdr_facility", "LOG_DAEMON") <title>cdr_extra example</title> <programlisting format="linespecific"> ... -modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" +modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)") ... </programlisting> </example>

1 0

Maintenance work overnight on kamailio.org server
by Daniel-Constantin Mierla 15 Apr '24

15 Apr '24

Hello, there is some planned work on the data center infrastructure hosting kamailio.org server that is going to affect briefly the web server (web site, wiki) and the mailing lists. The downtime is expected to be 10-15 minutes around 1:00am Western Europe time (CEST / GMT+2), but if it takes longer or repeats, be patient for a while. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 0

[kamailio/kamailio] Option to not add received via param (Issue #3515)
by zusrut 15 Apr '24

15 Apr '24

### Description Hello. Probably I'm doing something wrong but I can't get rid of **received** parameter in the **Via** header in responses from kamailio by websocket transport. According [RFC 7118](https://datatracker.ietf.org/doc/rfc7118/): `` When a SIP WebSocket Server receives a request, it MAY decide not to add a "received" parameter to the top Via header. Therefore, SIP WebSocket Clients MUST accept responses without such a parameter in the top Via header regardless of whether the **Via** "sent-by" field contains a domain name. `` ### Expected behavior For responses to websocket transport have a way to not add **received** parameter in **Via** header #### Actual observed behavior Responses to OPTION or REGISTER methods trough websocket got **received** containing IP we want to not show to the end users. ### Possible Solutions maybe add a param in **tm** module or something ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.1 (x86_64/linux) ``` and ``` kamailio 5.6.1 (x86_64/linux) b36a13 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3515 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3515(a)github.com>

4 7

git:master:70f19ddd: pkg/kamailio: app_lua_sr module relocated to archive [skip ci]
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 70f19ddd16b392f46e32b41536bde6fba8e7e14a URL: https://github.com/kamailio/kamailio/commit/70f19ddd16b392f46e32b41536bde6f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T11:09:40+02:00 pkg/kamailio: app_lua_sr module relocated to archive [skip ci] --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/70f19ddd16b392f46e32b41536bde6f… Patch: https://github.com/kamailio/kamailio/commit/70f19ddd16b392f46e32b41536bde6f… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 0696216564a..a2c1f4ac238 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -157,7 +157,7 @@ _mod_list_presence="presence presence_conference presence_dialoginfo \ rls xcap_client xcap_server" # - modules depending on lua library -_mod_list_lua="app_lua app_lua_sr" +_mod_list_lua="app_lua" # - modules depending on perl library _mod_list_perl="app_perl db_perlvdb" diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6d79bb8ec9f..a9a33082316 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2054,9 +2054,7 @@ fi %files lua %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.app_lua -%doc %{_docdir}/kamailio/modules/README.app_lua_sr %{_libdir}/kamailio/modules/app_lua.so -%{_libdir}/kamailio/modules/app_lua_sr.so %endif

1 0

git:master:0c49d30f: app_lua_sr: module relocated to archive
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 0c49d30f9d5ae1b1c4b5210851e30725dfa7aa8b URL: https://github.com/kamailio/kamailio/commit/0c49d30f9d5ae1b1c4b5210851e3072… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T11:09:02+02:00 app_lua_sr: module relocated to archive --- Modified: src/Makefile.groups Removed: src/modules/app_lua_sr/Makefile Removed: src/modules/app_lua_sr/README Removed: src/modules/app_lua_sr/app_lua_sr_api.c Removed: src/modules/app_lua_sr/app_lua_sr_api.h Removed: src/modules/app_lua_sr/app_lua_sr_exp.c Removed: src/modules/app_lua_sr/app_lua_sr_exp.h Removed: src/modules/app_lua_sr/app_lua_sr_mod.c Removed: src/modules/app_lua_sr/doc/Makefile Removed: src/modules/app_lua_sr/doc/app_lua_sr.xml Removed: src/modules/app_lua_sr/doc/app_lua_sr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0c49d30f9d5ae1b1c4b5210851e3072… Patch: https://github.com/kamailio/kamailio/commit/0c49d30f9d5ae1b1c4b5210851e3072…

1 0

git:master:94b9cd5d: modules: readme files regenerated - cfgutils ... [skip ci]
by Kamailio Dev 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 94b9cd5d5ffafde86fbcbede2d9a018fc616b6b1 URL: https://github.com/kamailio/kamailio/commit/94b9cd5d5ffafde86fbcbede2d9a018… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-15T11:01:29+02:00 modules: readme files regenerated - cfgutils ... [skip ci] --- Modified: src/modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/94b9cd5d5ffafde86fbcbede2d9a018… Patch: https://github.com/kamailio/kamailio/commit/94b9cd5d5ffafde86fbcbede2d9a018… --- diff --git a/src/modules/cfgutils/README b/src/modules/cfgutils/README index b7c8075fad9..cb6251b6719 100644 --- a/src/modules/cfgutils/README +++ b/src/modules/cfgutils/README @@ -65,9 +65,9 @@ Daniel-Constantin Mierla 4.12. set_gflag(flag) 4.13. reset_gflag(flag) 4.14. is_gflag(flag) - 4.15. lock(key) - 4.16. trylock(key) - 4.17. unlock(key) + 4.15. lock(key [, key2]) + 4.16. trylock(key [, key2]) + 4.17. unlock(key [, key2]) 4.18. check_route_exists(route) 4.19. route_if_exists(route) 4.20. core_hash(string1, string2, size) @@ -154,9 +154,9 @@ Chapter 1. Admin Guide 4.12. set_gflag(flag) 4.13. reset_gflag(flag) 4.14. is_gflag(flag) - 4.15. lock(key) - 4.16. trylock(key) - 4.17. unlock(key) + 4.15. lock(key [, key2]) + 4.16. trylock(key [, key2]) + 4.17. unlock(key [, key2]) 4.18. check_route_exists(route) 4.19. route_if_exists(route) 4.20. core_hash(string1, string2, size) @@ -304,9 +304,9 @@ modparam("cfgutils", "lock_set_size", 4) 4.12. set_gflag(flag) 4.13. reset_gflag(flag) 4.14. is_gflag(flag) - 4.15. lock(key) - 4.16. trylock(key) - 4.17. unlock(key) + 4.15. lock(key [, key2]) + 4.16. trylock(key [, key2]) + 4.17. unlock(key [, key2]) 4.18. check_route_exists(route) 4.19. route_if_exists(route) 4.20. core_hash(string1, string2, size) @@ -506,16 +506,18 @@ if(is_gflag("4")) }; ... -4.15. lock(key) +4.15. lock(key [, key2]) Lock the key. Can be used to synchronize operations in config file, a - hash id is computed over the key and appropriate lock is set in the + hash id is computed over the keys and appropriate lock is set in the lock array controlled by parameter "lock_set_size". Do not use lock() after another lock() unless you are sure the keys hit different array entries. ��key�� can be static string or string with PVs. + ��key2�� is optional and can be static string or string with PVs. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. @@ -524,13 +526,15 @@ if(is_gflag("4")) lock("$rU"); ... -4.16. trylock(key) +4.16. trylock(key [, key2]) Try to lock the key. If the lock can not be obtained (possibly already locked), the function returns an error and script execution continues. ��key�� can be static string or string with PVs. + ��key2�� is optional and can be static string or string with PVs. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. @@ -542,12 +546,14 @@ if (trylock("$rU")) { } ... -4.17. unlock(key) +4.17. unlock(key [, key2]) Unlock the key. ��key�� can be static string or string with PVs. + ��key2�� is optional and can be static string or string with PVs. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE.

1 0

[kamailio/kamailio] cfgutils lock (PR #3808)
by Victor Seva 15 Apr '24

15 Apr '24

#### 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 #### Description expose in config via cfgutils ``core_case_hash`` optional second string key for hashing You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3808 -- Commit Summary -- * cfgutils: expose optional second string key for hashing at locks * cfgutils: document second optional string for hashing on lock functions family [skip ci] * app_lua_sr: support second str for cfgutils lock -- File Changes -- M src/modules/app_lua_sr/app_lua_sr_exp.c (30) M src/modules/cfgutils/api.h (4) M src/modules/cfgutils/cfgutils.c (103) M src/modules/cfgutils/doc/cfgutils_admin.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3808.patch https://github.com/kamailio/kamailio/pull/3808.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3808 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3808(a)github.com>

2 2

git:master:92ac41c1: app_lua_sr: support second str for cfgutils lock
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 92ac41c1e770077d39516fc049358b3c3897d590 URL: https://github.com/kamailio/kamailio/commit/92ac41c1e770077d39516fc049358b3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T10:50:26+02:00 app_lua_sr: support second str for cfgutils lock --- Modified: src/modules/app_lua_sr/app_lua_sr_exp.c --- Diff: https://github.com/kamailio/kamailio/commit/92ac41c1e770077d39516fc049358b3… Patch: https://github.com/kamailio/kamailio/commit/92ac41c1e770077d39516fc049358b3… --- diff --git a/src/modules/app_lua_sr/app_lua_sr_exp.c b/src/modules/app_lua_sr/app_lua_sr_exp.c index 522f0cfb87a..80a4cb69042 100644 --- a/src/modules/app_lua_sr/app_lua_sr_exp.c +++ b/src/modules/app_lua_sr/app_lua_sr_exp.c @@ -2783,20 +2783,29 @@ static const luaL_Reg _sr_sanity_Map[] = { static int lua_sr_cfgutils_lock(lua_State *L) { int ret; - str lkey; + str lkey, lkey2; if(!(_sr_lua_exp_reg_mods & SR_LUA_EXP_MOD_CFGUTILS)) { LM_WARN("weird: cfgutils function executed but module not " "registered\n"); return app_lua_return_error(L); } - if(lua_gettop(L) != 1) { + ret = lua_gettop(L); + if(ret < 1 || ret > 3) { LM_WARN("invalid number of parameters from Lua\n"); return app_lua_return_error(L); } + if(ret > 1) { + lkey2.s = (char *)lua_tostring(L, -1); + lkey2.len = strlen(lkey2.s); + } lkey.s = (char *)lua_tostring(L, -1); lkey.len = strlen(lkey.s); - ret = _lua_cfgutilsb.mlock(&lkey); + if(ret > 1) { + ret = _lua_cfgutilsb.mlock(&lkey, &lkey2); + } else { + ret = _lua_cfgutilsb.mlock(&lkey, NULL); + } return app_lua_return_int(L, ret); } @@ -2808,20 +2817,29 @@ static int lua_sr_cfgutils_lock(lua_State *L) static int lua_sr_cfgutils_unlock(lua_State *L) { int ret; - str lkey; + str lkey, lkey2; if(!(_sr_lua_exp_reg_mods & SR_LUA_EXP_MOD_CFGUTILS)) { LM_WARN("weird: cfgutils function executed but module not " "registered\n"); return app_lua_return_error(L); } - if(lua_gettop(L) != 1) { + ret = lua_gettop(L); + if(ret < 1 || ret > 3) { LM_WARN("invalid number of parameters from Lua\n"); return app_lua_return_error(L); } + if(ret > 1) { + lkey2.s = (char *)lua_tostring(L, -1); + lkey2.len = strlen(lkey2.s); + } lkey.s = (char *)lua_tostring(L, -1); lkey.len = strlen(lkey.s); - ret = _lua_cfgutilsb.munlock(&lkey); + if(ret > 1) { + ret = _lua_cfgutilsb.munlock(&lkey, &lkey2); + } else { + ret = _lua_cfgutilsb.munlock(&lkey, NULL); + } return app_lua_return_int(L, ret); }

1 0

git:master:235591cd: cfgutils: document second optional string for hashing on lock functions family [skip ci]
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 235591cd704529589bbde700b6232ac55281d071 URL: https://github.com/kamailio/kamailio/commit/235591cd704529589bbde700b6232ac… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T10:50:26+02:00 cfgutils: document second optional string for hashing on lock functions family [skip ci] --- Modified: src/modules/cfgutils/doc/cfgutils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/235591cd704529589bbde700b6232ac… Patch: https://github.com/kamailio/kamailio/commit/235591cd704529589bbde700b6232ac… --- diff --git a/src/modules/cfgutils/doc/cfgutils_admin.xml b/src/modules/cfgutils/doc/cfgutils_admin.xml index 1cab1284fd5..35721e31c6d 100644 --- a/src/modules/cfgutils/doc/cfgutils_admin.xml +++ b/src/modules/cfgutils/doc/cfgutils_admin.xml @@ -485,10 +485,10 @@ if(is_gflag("4")) </example> </section> <section id="cfgutils.f.lock"> - <title><function moreinfo="none">lock(key)</function></title> + <title><function moreinfo="none">lock(key [, key2])</function></title> <para> Lock the key. Can be used to synchronize operations in config file, - a hash id is computed over the key and appropriate lock is set in the + a hash id is computed over the keys and appropriate lock is set in the lock array controlled by parameter "lock_set_size". Do not use lock() after another lock() unless you are sure the keys hit different array entries. @@ -497,6 +497,9 @@ if(is_gflag("4")) <quote>key</quote> can be static string or string with PVs. </para> <para> + <quote>key2</quote> is optional and can be static string or string with PVs. + </para> + <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. </para> @@ -510,7 +513,7 @@ lock("$rU"); </example> </section> <section id="cfgutils.f.trylock"> - <title><function moreinfo="none">trylock(key)</function></title> + <title><function moreinfo="none">trylock(key [, key2])</function></title> <para> Try to lock the key. If the lock can not be obtained (possibly already locked), the function returns an error and script execution continues. @@ -519,6 +522,9 @@ lock("$rU"); <quote>key</quote> can be static string or string with PVs. </para> <para> + <quote>key2</quote> is optional and can be static string or string with PVs. + </para> + <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. </para> @@ -535,7 +541,7 @@ if (trylock("$rU")) { </example> </section> <section id="cfgutils.f.unlock"> - <title><function moreinfo="none">unlock(key)</function></title> + <title><function moreinfo="none">unlock(key [, key2])</function></title> <para> Unlock the key. </para> @@ -543,6 +549,9 @@ if (trylock("$rU")) { <quote>key</quote> can be static string or string with PVs. </para> <para> + <quote>key2</quote> is optional and can be static string or string with PVs. + </para> + <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. </para> @@ -854,4 +863,3 @@ if (rand_event()) { </section> </section> </chapter> -

1 0

git:master:42476974: cfgutils: expose optional second string key for hashing at locks
by Victor Seva 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: 424769743c93dea5a4d2c21f7a0ef8ea8779a5bb URL: https://github.com/kamailio/kamailio/commit/424769743c93dea5a4d2c21f7a0ef8e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-15T10:50:26+02:00 cfgutils: expose optional second string key for hashing at locks --- Modified: src/modules/cfgutils/api.h Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/424769743c93dea5a4d2c21f7a0ef8e… Patch: https://github.com/kamailio/kamailio/commit/424769743c93dea5a4d2c21f7a0ef8e…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev