- sr-dev - kamailio.org

git:master:daedf120: tls: print src/dst port in error message
by Daniel-Constantin Mierla 21 Oct '21

21 Oct '21

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

1 0

[kamailio/kamailio] rtpengine: Don't recheck node if disabled permanently (PR #2886)
by Stefan Mititelu 21 Oct '21

21 Oct '21

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Do not recheck node later, if is disabled permanent. @rfuchs let me know what you think of this. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2886 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2886/commits/04f30dce5f161ab3984c…">rtpengine: Don't recheck node if disabled permanently</a> -- File Changes -- M src/modules/rtpengine/rtpengine.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2886.patch https://github.com/kamailio/kamailio/pull/2886.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2886

4 7

git:master:d85096f5: rtpengine: Don't recheck node if disabled permanently
by Henning Westerholt 21 Oct '21

21 Oct '21

Module: kamailio Branch: master Commit: d85096f56f1d94b70f27978041d5ce574b7650de URL: https://github.com/kamailio/kamailio/commit/d85096f56f1d94b70f27978041d5ce5… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-21T11:47:33+02:00 rtpengine: Don't recheck node if disabled permanently --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/d85096f56f1d94b70f27978041d5ce5… Patch: https://github.com/kamailio/kamailio/commit/d85096f56f1d94b70f27978041d5ce5… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6db8da5524..738e55d312 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2707,7 +2707,8 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ } cp = send_rtpp_command(node, ng_flags.dict, &ret); - if (cp == NULL) { + /* if node is disabled permanent, don't recheck it later */ + if (cp == NULL && node->rn_recheck_ticks != RTPENGINE_MAX_RECHECK_TICKS) { node->rn_disabled = 1; node->rn_recheck_ticks = get_ticks() + cfg_get(rtpengine,rtpengine_cfg,rtpengine_disable_tout); }

1 0

git:master:1483ddb7: kamclt: subcommand tls gen-certs
by Daniel-Constantin Mierla 20 Oct '21

20 Oct '21

Module: kamailio Branch: master Commit: 1483ddb735c3fa3ea77b6e2d54ec67584e56e15b URL: https://github.com/kamailio/kamailio/commit/1483ddb735c3fa3ea77b6e2d54ec675… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-20T20:39:17+02:00 kamclt: subcommand tls gen-certs - generate self signed certificate in current directory --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/1483ddb735c3fa3ea77b6e2d54ec675… Patch: https://github.com/kamailio/kamailio/commit/1483ddb735c3fa3ea77b6e2d54ec675… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a2d839b50b..f629dfd41e 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2881,6 +2881,16 @@ tls_ca() { minfo "Certificate is locate at $USER_DIR/$USER-cert.pem " minfo "CA-List is locate at $USER_DIR/$USER-calist.pem " + elif [ "$1" = "gen-certs" ] ; then + mecho "Generating self signed certificates" + if [ -z "$CERTDAYS" ] ; then + CERTDAYS=365 + fi + if [ -n "$2" ] ; then + openssl req -x509 -newkey rsa:4096 -nodes -subj "/CN=${2}" -keyout kamailio-selfsigned.key -out kamailio-selfsigned.pem -days ${CERTDAYS} + else + openssl req -x509 -newkey rsa:4096 -nodes -keyout kamailio-selfsigned.key -out kamailio-selfsigned.pem -days ${CERTDAYS} + fi else merr "unknown TLS command $1" usage_tls diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index b088565069..47747be85a 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -381,9 +381,10 @@ usage_tls() { mecho " -- command 'tls'" echo cat <<EOF - tls rootCA [<etcdir>] .......... creates new rootCA + tls rootCA [<etcdir>] ............ creates new rootCA tls userCERT <user> [<etcdir>] ... creates user certificate - default <etcdir> is $ETCDIR/tls + * default <etcdir> is $ETCDIR/tls + tls gen-certs [<domain>] ......... generate self signed certificate EOF }

1 0

git:master:97f5f77f: core: generalize some comment messages
by Henning Westerholt 20 Oct '21

20 Oct '21

Module: kamailio Branch: master Commit: 97f5f77f2d003a5e32e39aacf8182787a2c83a43 URL: https://github.com/kamailio/kamailio/commit/97f5f77f2d003a5e32e39aacf818278… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-20T13:20:37Z core: generalize some comment messages --- Modified: src/core/sr_module.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/97f5f77f2d003a5e32e39aacf818278… Patch: https://github.com/kamailio/kamailio/commit/97f5f77f2d003a5e32e39aacf818278… --- diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 99c1dc1de1..c9c482dfc1 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -138,7 +138,7 @@ typedef int (*param_func_t)( modparam_t type, void* val); ((fixup) ? (fixup)(param, param_no) : 0) /* Macros - used as rank in child_init function */ -#define PROC_MAIN 0 /**< Main ser process */ +#define PROC_MAIN 0 /**< Main process */ #define PROC_TIMER -1 /**< Timer attendant process */ #define PROC_RPC -2 /**< RPC type process */ #define PROC_FIFO PROC_RPC /**< FIFO attendant process */ diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 3b46026027..f8ff8dea45 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3717,9 +3717,9 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) -/* handles io from a "generic" ser process (get fd or new_fd from a tcp_send) +/* handles io from a "generic" process (get fd or new_fd from a tcp_send) * - * params: p - pointer in the ser processes array (pt[]), to the entry for + * params: p - pointer in the processes array (pt[]), to the entry for * which an io event was detected * fd_i - fd index in the fd_array (useful for optimizing * io_watch_deletes) @@ -4636,7 +4636,7 @@ static inline void tcp_timer_run(void) /* keep in sync with tcpconn_destroy, the "delete" part should be * the same except for io_watch_del.. - * Note: this function is called only on shutdown by the main ser process via + * Note: this function is called only on shutdown by the main process via * cleanup(). However it's also safe to call it from the tcp_main process. * => with the ser shutdown exception, it cannot execute in parallel * with tcpconn_add() or tcpconn_destroy()*/ @@ -4750,7 +4750,7 @@ void tcp_main_loop() } } #endif - /* add all the unix sockets used for communcation with other ser processes + /* add all the unix sockets used for communcation with other processes * (get fd, new connection a.s.o) */ for (r=1; r<process_no; r++){ if (pt[r].unix_sock>0) /* we can't have 0, we never close it!*/

1 0

git:5.4:6883d5a1: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 20 Oct '21

20 Oct '21

Module: kamailio Branch: 5.4 Commit: 6883d5a1d0868d0d0b4461c0440fe7eb6574837f URL: https://github.com/kamailio/kamailio/commit/6883d5a1d0868d0d0b4461c0440fe7e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-20T14:46:51+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/6883d5a1d0868d0d0b4461c0440fe7e… Patch: https://github.com/kamailio/kamailio/commit/6883d5a1d0868d0d0b4461c0440fe7e… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 6ac5868ff0..dd1fc06a8b 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -733,7 +733,7 @@ set_reply_body("test", "text/plain"); Example 1.22. filter_body usage ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

git:5.5:a21c45df: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 20 Oct '21

20 Oct '21

Module: kamailio Branch: 5.5 Commit: a21c45df78a0cef3f4915b1b68a3b82732198733 URL: https://github.com/kamailio/kamailio/commit/a21c45df78a0cef3f4915b1b68a3b82… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-20T14:46:36+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/a21c45df78a0cef3f4915b1b68a3b82… Patch: https://github.com/kamailio/kamailio/commit/a21c45df78a0cef3f4915b1b68a3b82… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 08dd399246..3ea7696d4b 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -770,7 +770,7 @@ set_reply_body("test", "text/plain"); Example 1.23. filter_body usage ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

git:master:468a031e: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 20 Oct '21

20 Oct '21

Module: kamailio Branch: master Commit: 468a031ee9fa5c576d1abe177102f1fdf373a56c URL: https://github.com/kamailio/kamailio/commit/468a031ee9fa5c576d1abe177102f1f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-20T14:46:20+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/468a031ee9fa5c576d1abe177102f1f… Patch: https://github.com/kamailio/kamailio/commit/468a031ee9fa5c576d1abe177102f1f… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 5f6bf33867..9e5ae3e9e2 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -774,7 +774,7 @@ set_reply_body("test", "text/plain"); Example 1.23. filter_body usage ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

git:5.5:700cc0f3: textops: fix broken example for filter_body
by Henning Westerholt 20 Oct '21

20 Oct '21

Module: kamailio Branch: 5.5 Commit: 700cc0f3f419708b58a0eb8b2af3a9491c5f938d URL: https://github.com/kamailio/kamailio/commit/700cc0f3f419708b58a0eb8b2af3a94… Author: Sven Uhlig <git(a)resident-uhlig.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-20T12:33:12Z textops: fix broken example for filter_body (cherry picked from commit f8c1cabaeadb8ee145174843ed11bbbb0c3276b0) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/700cc0f3f419708b58a0eb8b2af3a94… Patch: https://github.com/kamailio/kamailio/commit/700cc0f3f419708b58a0eb8b2af3a94… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 82f6d2495f..cbc2fd2970 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -901,7 +901,7 @@ set_reply_body("test", "text/plain"); <programlisting format="linespecific"> ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

git:5.4:d9c34770: textops: fix broken example for filter_body
by Henning Westerholt 20 Oct '21

20 Oct '21

Module: kamailio Branch: 5.4 Commit: d9c34770caa305fc6cafa18e255f3c05342305dc URL: https://github.com/kamailio/kamailio/commit/d9c34770caa305fc6cafa18e255f3c0… Author: Sven Uhlig <git(a)resident-uhlig.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-20T12:32:40Z textops: fix broken example for filter_body (cherry picked from commit f8c1cabaeadb8ee145174843ed11bbbb0c3276b0) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d9c34770caa305fc6cafa18e255f3c0… Patch: https://github.com/kamailio/kamailio/commit/d9c34770caa305fc6cafa18e255f3c0… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 9f5f949e5a..55e7cf36aa 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -859,7 +859,7 @@ set_reply_body("test", "text/plain"); <programlisting format="linespecific"> ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

[kamailio/kamailio] textops: fix broken example for filter_body (PR #2889)
by Sven Uhlig 20 Oct '21

20 Oct '21

#### Pre-Submission Checklist - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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 This only fixes a typo in one of the examples in the documentation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2889 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2889/commits/04e5e73a32934868d5cd…">textops: fix broken example for filter_body</a> -- File Changes -- M src/modules/textops/doc/textops_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2889.patch https://github.com/kamailio/kamailio/pull/2889.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2889

2 2

git:master:f8c1caba: textops: fix broken example for filter_body
by Henning Westerholt 20 Oct '21

20 Oct '21

Module: kamailio Branch: master Commit: f8c1cabaeadb8ee145174843ed11bbbb0c3276b0 URL: https://github.com/kamailio/kamailio/commit/f8c1cabaeadb8ee145174843ed11bbb… Author: Sven Uhlig <git(a)resident-uhlig.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-20T14:32:05+02:00 textops: fix broken example for filter_body --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f8c1cabaeadb8ee145174843ed11bbb… Patch: https://github.com/kamailio/kamailio/commit/f8c1cabaeadb8ee145174843ed11bbb… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 974fbf568c..2a166f37a9 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -901,7 +901,7 @@ set_reply_body("test", "text/plain"); <programlisting format="linespecific"> ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

1 0

[kamailio/kamailio] carrierroute: Update cr dump structure (PR #2887)
by Stefan Mititelu 20 Oct '21

20 Oct '21

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

2 2

git:master:6cd97d30: carrierroute: Update cr dump structure
by Henning Westerholt 20 Oct '21

20 Oct '21

Module: kamailio Branch: master Commit: 6cd97d3023c7a29670ccfb3a2eab5e9d596b04f3 URL: https://github.com/kamailio/kamailio/commit/6cd97d3023c7a29670ccfb3a2eab5e9… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-20T10:53:39+02:00 carrierroute: Update cr dump structure --- Modified: src/modules/carrierroute/cr_rpc.c Modified: src/modules/carrierroute/cr_rpc_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/6cd97d3023c7a29670ccfb3a2eab5e9… Patch: https://github.com/kamailio/kamailio/commit/6cd97d3023c7a29670ccfb3a2eab5e9… --- diff --git a/src/modules/carrierroute/cr_rpc.c b/src/modules/carrierroute/cr_rpc.c index 8979d25e8b..0ea19f41f7 100644 --- a/src/modules/carrierroute/cr_rpc.c +++ b/src/modules/carrierroute/cr_rpc.c @@ -50,6 +50,7 @@ static void cr_rpc_reload_routes(rpc_t *rpc, void *c) { if (carrierroute_dbh==NULL) { carrierroute_dbh = carrierroute_dbf.init(&carrierroute_db_url); if(carrierroute_dbh==0 ) { + rpc->fault(c, 500, "Internal error -- cannot initialize database connection"); LM_ERR("cannot initialize database connection\n"); return; } @@ -57,6 +58,7 @@ static void cr_rpc_reload_routes(rpc_t *rpc, void *c) { } if ( (reload_route_data())!=0 ) { + rpc->fault(c, 500, "Internal error -- failed to load routing data\n"); LM_ERR("failed to load routing data\n"); return; } diff --git a/src/modules/carrierroute/cr_rpc_helper.c b/src/modules/carrierroute/cr_rpc_helper.c index 87a361b7f5..256b10f160 100644 --- a/src/modules/carrierroute/cr_rpc_helper.c +++ b/src/modules/carrierroute/cr_rpc_helper.c @@ -235,13 +235,13 @@ int dump_tree_recursor (rpc_t* rpc, void* ctx, void *gh, struct dtrie_node_t *node, char *prefix) { char s[256]; - char rbuf[1024]; char *p; int i,len; struct route_flags *rf; struct route_rule *rr; struct route_rule_p_list * rl; double prob; + void* hh, *ih; len=strlen(prefix); if (len > 254) { @@ -267,39 +267,45 @@ int dump_tree_recursor (rpc_t* rpc, void* ctx, void *gh, } else { prob = rr->prob; } - snprintf(rbuf, 1024, - "%10s: %0.3f %%, '%.*s': %s, '%i', '%.*s', '%.*s', '%.*s'", - len > 0 ? prefix : "NULL", prob * 100, - rr->host.len, rr->host.s, - (rr->status ? "ON" : "OFF"), rr->strip, - rr->local_prefix.len, rr->local_prefix.s, - rr->local_suffix.len, rr->local_suffix.s, - rr->comment.len, rr->comment.s); - if (rpc->array_add(gh, "s", rbuf)<0) + + if (rpc->array_add(gh, "{", &hh)<0) { rpc->fault(ctx, 500, "Failed to add data to response"); return -1; } + if(rpc->struct_add(hh, "sfSsdSSS", + "prefix", len > 0 ? prefix : "NULL", + "prob", prob * 100, + "host", &rr->host, + "status",(rr->status ? "ON" : "OFF"), + "strip", rr->strip, + "prefix", &rr->local_prefix, + "suffix", &rr->local_suffix, + "comment", &rr->comment)<0) + { + rpc->fault(ctx, 500, "Internal error - routes structure"); + return -1; + } + if(!rr->status && rr->backup && rr->backup->rr){ - snprintf(rbuf, 1024, - " Rule is backed up by: %.*s", - rr->backup->rr->host.len, rr->backup->rr->host.s); - if (rpc->array_add(gh, "s", rbuf)<0) + if (rpc->struct_add(hh, "S", "backup_by", &rr->backup->rr->host)<0) { rpc->fault(ctx, 500, "Failed to add backup by info to response"); return -1; } } if(rr->backed_up){ + if (rpc->struct_add(hh, "[", "backup_for", &ih)<0) + { + rpc->fault(ctx, 500, "Failed to add backup for data to response"); + return -1; + } rl = rr->backed_up; i=0; while(rl){ if(rl->rr){ - snprintf(rbuf, 1024, - " Rule is backup for: %.*s", - rl->rr->host.len, rl->rr->host.s); - if (rpc->array_add(gh, "s", rbuf)<0) + if (rpc->array_add(ih, "S", &rl->rr->host)<0) { rpc->fault(ctx, 500, "Failed to add backup for data to response"); return -1;

1 0

[kamailio/kamailio] topos module producing invalid SIP message (missing Via header) when handling 200 OK to OPTIONS request (#1350)
by George Diamantopoulos 20 Oct '21

20 Oct '21

Hello all, I've come across the following issue with topos on Kamailio 5.1.0-rc2. ### Description Kamailio acts as a proxy for asterisk instances residing in a private IP range. Asterisk's peers are configured with their public IP address or hostname, but asterisk will dispatch requests to them to kamailio instead (because kamailio's IP is set in outboundproxy option in peer definition). This works fine for INVITEs, but if qualify=yes is set for the peer, asterisk will send out OPTIONs to monitor these peers. If the topos module is loaded, 200 OK replies to these OPTIONs will be malformed when forwarded from kamailio to asterisk (no Via header present). Disabling the topos module will resolve this. ### Troubleshooting #### Reproduction Configure a peer in asterisk with outboundproxy option set to kamailio's IP address. Set qualify=yes. Adjust kamailio's default configuration so that OPTIONs to other hosts besides itself are routed. Change the following section in request_route: ``` if ($rU==$null) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; } ``` to: ``` if ( ($rU==$null) && !(is_method("OPTIONS")) ) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; } # Permit asterisk's monitoring using options if(is_method("OPTIONS") && uri!=myself) { route(RELAY); } ``` Enable and configure the topos module with database. #### SIP Traffic asterisk:5060 -> kamailio:5060 ``` OPTIONS sip:peer.domain.tld SIP/2.0 Via: SIP/2.0/UDP asterisk:5060;branch=z9hG4bK460330cf;rport Max-Forwards: 70 From: "asterisk" <sip:asterisk@domain.tld>;tag=as690c2406 To: <sip:peer.domain.tld> Contact: <sip:asterisk@asterisk:5060> Call-ID: 6548f43b2d8740122186bb0c6e72ac78(a)domain.tld CSeq: 102 OPTIONS User-Agent: myUA Date: Sun, 03 Dec 2017 00:39:38 GMT Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE Supported: replaces, timer Content-Length: 0 ``` kamailio:5060 -> peer:5060 ``` OPTIONS sip:peer.domain.tld SIP/2.0 Via: SIP/2.0/UDP kamailio:5060;branch=z9hG4bK460330cf;rport Max-Forwards: 69 From: "asterisk" <sip:asterisk@domain.tld>;tag=as690c2406 To: <sip:peer.domain.tld> Contact: <sip:asterisk@asterisk:5060> Call-ID: 6548f43b2d8740122186bb0c6e72ac78(a)domain.tld CSeq: 102 OPTIONS User-Agent: myUA Date: Sun, 03 Dec 2017 00:39:38 GMT Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE Supported: replaces, timer Content-Length: 0 ``` peer:5060 -> kamailio:5060 ``` SIP/2.0 200 OK Via: SIP/2.0/UDP kamailio;branch=z9hG4bKda8d.cc03bd2def8ad36e8c43f61ab31a636f.0;received=kamailio;rport=5060 From: "asterisk" <sip:asterisk@domain.tld>;tag=as690c2406 To: <sip:peer.domain.tld>;tag=as472874ee Call-ID: 6548f43b2d8740122186bb0c6e72ac78(a)domain.tld CSeq: 102 OPTIONS Server: myUA Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE Supported: replaces, timer Contact: <sip:peer:5060> Accept: application/sdp Content-Length: 0 ``` **kamailio:5060 -> asterisk:5060: Missing Via Header** ``` SIP/2.0 200 OK From: "asterisk" <sip:asterisk@domain.tld>;tag=as690c2406 To: <sip:peer.domain.tld>;tag=as472874ee Call-ID: 6548f43b2d8740122186bb0c6e72ac78(a)domain.tld CSeq: 102 OPTIONS Server: myUA Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE Supported: replaces, timer Contact: <sip:peer:5060> Accept: application/sdp Content-Length: 0 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.0-rc2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 ``` * **Operating System**: ``` Debian 9.1 ``` * **Other pertinent configuration information**: This kamailio box has several network interfaces. mhomed is not used, instead force_send_socket is called where necessary. I'm mentioning this in case it's what might trigger this issue with topos. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1350

4 18

TLS connection issue
by Lorenzo Campo 20 Oct '21

20 Oct '21

Hi guys, We are quite newby about Kamailio and we are trying to use it as a load balancer. While installing certificates we started having problems. We use Kamailio (vers. 5.5) deployed on a VM (Ubuntu, 20.04 LTS). We cannot connect via TLS Kamailio VM with clients or other TCP VM. Our Kamailio currently exposes only port 5060 in UDP and TCP. Even doing a port scan on localhost, port 5061, used for the TLS protocol, is instead closed. There are 3 things worth noting: - All ports for all protocols are open on the firewall; - Before we set the disable_tcp option to "no", the 5060 was only reachable in UDP; - Even if you put a non-existent certificate, the system does not return an error so we cannot understand if the goodness of the certificates affects the opening of the door. Furthermore, we did not find any different behavior when switching from crt format (key for the private key) to PEM. If someone can help us would be very appreciated. Thank you very much Here is our tls configuration: kamailio.cfg #!define WITH_TLS 1 ... disable_tcp=no auto_aliases=no …. loadmodule "sl.so" loadmodule "tls.so" ... modparam("tls", "private_key", "/etc/kamailio/key.pem") modparam("tls", "certificate", "/etc/kamailio/crt.pem") modparam("tls", "ca_list", "/etc/kamailio/ca.pem") enable_tls=yes tls.config [server:default] method = TLSv1.2+ verify_certificate = no require_certificate = no private_key = /etc/kamailio/kamailio-selfsigned.key certificate = /etc/kamailio/kamailio-selfsigned.pem #ca_list = /etc/kamailio/tls/cacert.pem #crl = /etc/kamailio/tls/crl.pem [client:default] #method = TLSv1.2+ verify_certificate = no require_certificate = no *Sent with Shift <https://tryshift.com/?utm_source=SentWithShift&utm_campaign=Sent+with+Shift…>*

2 1

git:master:3476eb3a: modules: readme files regenerated - sipdump ... [skip ci]
by Kamailio Dev 19 Oct '21

19 Oct '21

Module: kamailio Branch: master Commit: 3476eb3aebdbda622194131c008c8309f9ef8524 URL: https://github.com/kamailio/kamailio/commit/3476eb3aebdbda622194131c008c830… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-19T22:46:22+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/3476eb3aebdbda622194131c008c830… Patch: https://github.com/kamailio/kamailio/commit/3476eb3aebdbda622194131c008c830… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index d7da3a8bf7..8b03c3849f 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -313,8 +313,8 @@ event_route[sipdump:msg] { examples shows how to delete the files older than 2 days using Kamailio modules. ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

1 0

git:master:f202cfe6: sipdump: docs - fix example config snippet
by Daniel-Constantin Mierla 19 Oct '21

19 Oct '21

Module: kamailio Branch: master Commit: f202cfe647c6a1ac92a3c2b8e2ee056d678fb802 URL: https://github.com/kamailio/kamailio/commit/f202cfe647c6a1ac92a3c2b8e2ee056… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-19T22:32:53+02:00 sipdump: docs - fix example config snippet --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f202cfe647c6a1ac92a3c2b8e2ee056… Patch: https://github.com/kamailio/kamailio/commit/f202cfe647c6a1ac92a3c2b8e2ee056… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 301b667d80..f0dd9fc1b4 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -339,8 +339,8 @@ event_route[sipdump:msg] { </para> <programlisting format="linespecific"> ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

1 0

Proxy protocol issue
by Federico Cabiddu 18 Oct '21

18 Oct '21

Hi all, I've been recently testing kamailio support for proxy protocol which was introduced by https://github.com/kamailio/kamailio/issues/1757. As reported by others, even if kamailio is able to decode the proxy protocol and get the client's original IP address, it is unable to send SIP messages to the client which initiated the connection through the HA load balancer (nginx in my case). After investigation I've found that there is no alias added to the tcp connection aliases list for the tuple CLIENT_IP:CLIENT_PORT/LOCAL_KAMAILIO_IP:KAMAILIO_PORT. This means that when trying to forward a message to the originating client kamailio won't use the existing connection with the load balancer/proxy but will try to establish a new connection. The fact is that the function which parses the proxy header overwrites the dst ip/port of the connection with the "Destination IP" and "Destination Port" fields of the proxy header ( https://github.com/kamailio/kamailio/blob/f677dea597db6ceaa66a2755dd6e9e738… for v2, https://github.com/kamailio/kamailio/blob/f677dea597db6ceaa66a2755dd6e9e738… for v1). This fields contain the IP/port of the Load Balancer, not the kamailio IP/Port, and kamailio will fail to find a tcp connection toward the client's src IP since the Load Balancer IP is not a kamailio's local socket. I think that the destination IP of the connection shouldn't be rewritten with the load balancer IP, unless I'm missing something. Hopefully I've been clear enough explaining the issue :) If you agree with the analysis I can prepare a PR for it. Have you all a great weekend, Federico Cabiddu

4 6

git:master:f0e8898d: core: parser - detect pai/ppi headers spanning many lines
by Daniel-Constantin Mierla 15 Oct '21

15 Oct '21

Module: kamailio Branch: master Commit: f0e8898d83c54e5e4383b70ba54ad340c5ae13b6 URL: https://github.com/kamailio/kamailio/commit/f0e8898d83c54e5e4383b70ba54ad34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-15T16:51:19+02:00 core: parser - detect pai/ppi headers spanning many lines - GH #2837 --- Modified: src/core/parser/parse_ppi_pai.c --- Diff: https://github.com/kamailio/kamailio/commit/f0e8898d83c54e5e4383b70ba54ad34… Patch: https://github.com/kamailio/kamailio/commit/f0e8898d83c54e5e4383b70ba54ad34… --- diff --git a/src/core/parser/parse_ppi_pai.c b/src/core/parser/parse_ppi_pai.c index 4e4ebe392b..c60e33a9fd 100644 --- a/src/core/parser/parse_ppi_pai.c +++ b/src/core/parser/parse_ppi_pai.c @@ -65,6 +65,26 @@ int parse_pai_ppi_body(char *buf, int len, p_id_body_t **body) while ((*tmp == ',') && (num_uri < NUM_PAI_BODIES)) { tmp++; + while(tmp<buf+len && (*tmp==' ' || *tmp=='\t')) tmp++; + if(tmp>=buf+len) { + LM_ERR("no content after comma when parsing PAI/PPI body %u '%.*s'\n", + num_uri, len, buf); + return -1; + } + if((tmp<buf+len-1 && *tmp=='\n') + || (tmp<buf+len-2 && *tmp=='\r' && *(tmp+1)=='\n')) { + if(*tmp=='\n') { + tmp++; + } else { + tmp += 2; + } + if(*tmp!=' ' && *tmp!='\t') { + LM_ERR("no space after EOL when parsing PAI/PPI body %u '%.*s'\n", + num_uri, len, buf); + return -1; + } + tmp++; + } tmp = parse_addr_spec(tmp, buf+len, &uri_b[num_uri], 1); if (uri_b[num_uri].error == PARSE_ERROR) {

1 0

[kamailio/kamailio] snmpstats: get_statistic(): failed to retrieve statistics for local_replies (#2865)
by Marat 15 Oct '21

15 Oct '21

### Description I noticed in the logs messages similar to errors (in fact, this is INFO level).  ### Troubleshooting #### Reproduction Retrive **kamailioSIPSummaryOutResponses** statistic `snmpwalk -v 2c -c public localhost .1.3.6.1.4.1.34352.3.1.1.1.3.4` And you will see errors in log file.  #### Log Messages  ``` INFO /usr/local/sbin/kamailio[15984]: INFO: snmpstats [utilities.c:116]: get_statistic(): failed to retrieve statistics for local_replies INFO /usr/local/sbin/kamailio[15984]: INFO: snmpstats [utilities.c:116]: get_statistic(): failed to retrieve statistics for relayed_replies ``` ### Possible Solutions I found part of code https://github.com/kamailio/kamailio/blob/026119200117d20740cbe4d162a14767f… and it seems that tm module no longer has `local_replies` and `relayed_replies` statistics. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.3 (x86_64/linux) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2865

3 7

git:master:12ea639c: snmp: Update reply stats names
by Stefan Mititelu 15 Oct '21

15 Oct '21

Module: kamailio Branch: master Commit: 12ea639c45db95e31c73d632822baa31df98c6a5 URL: https://github.com/kamailio/kamailio/commit/12ea639c45db95e31c73d632822baa3… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2021-10-15T17:18:26+03:00 snmp: Update reply stats names Solves issue #2865. --- Modified: src/modules/snmpstats/snmpSIPCommonObjects.c --- Diff: https://github.com/kamailio/kamailio/commit/12ea639c45db95e31c73d632822baa3… Patch: https://github.com/kamailio/kamailio/commit/12ea639c45db95e31c73d632822baa3… --- diff --git a/src/modules/snmpstats/snmpSIPCommonObjects.c b/src/modules/snmpstats/snmpSIPCommonObjects.c index 3ddf6465b1..4b7b668f54 100644 --- a/src/modules/snmpstats/snmpSIPCommonObjects.c +++ b/src/modules/snmpstats/snmpSIPCommonObjects.c @@ -298,8 +298,8 @@ int handle_kamailioSIPSummaryOutResponses(netsnmp_mib_handler *handler, */ int fwd_replies = get_statistic("fwd_replies"); - int local_replies = get_statistic("local_replies"); - int relayed_replies = get_statistic("relayed_replies"); + int local_replies = get_statistic("rpl_generated"); + int relayed_replies = get_statistic("rpl_sent"); int sent_replies = get_statistic("sent_replies"); int result = fwd_replies + local_replies + relayed_replies + sent_replies; @@ -454,4 +454,4 @@ int handleSipEntityType(modparam_t type, void *val) } return 0; -} \ No newline at end of file +}

1 0

git:master:f677dea5: lcr: fix build
by Victor Seva 14 Oct '21

14 Oct '21

Module: kamailio Branch: master Commit: f677dea597db6ceaa66a2755dd6e9e738855dc35 URL: https://github.com/kamailio/kamailio/commit/f677dea597db6ceaa66a2755dd6e9e7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-14T15:16:52+02:00 lcr: fix build > lcr_mod.c: In function 'find_gateway_by_ip_and_port': > lcr_mod.c:930:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode > for (int i = 1; i <= gws[0].ip_addr.u.addr32[0]; i++) { > ^ > lcr_mod.c:930:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code > ../../Makefile.rules:100: recipe for target 'lcr_mod.o' failed > make[3]: *** [lcr_mod.o] Error 1 --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f677dea597db6ceaa66a2755dd6e9e7… Patch: https://github.com/kamailio/kamailio/commit/f677dea597db6ceaa66a2755dd6e9e7… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index d796c08c2c..630593bd36 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -925,9 +925,9 @@ static int comp_gws(const void *_g1, const void *_g2) * Compare a gateway using IP address and the src port */ static struct gw_info * find_gateway_by_ip_and_port(struct gw_info * gw, struct gw_info * gws) { - int tmp = 0, gw_index = 0; + int tmp = 0, gw_index = 0, i; - for (int i = 1; i <= gws[0].ip_addr.u.addr32[0]; i++) { + for (i = 1; i <= gws[0].ip_addr.u.addr32[0]; i++) { tmp = memcmp(gws[i].ip_addr.u.addr, gw->ip_addr.u.addr, gws[i].ip_addr.len); if (gws[i].ip_addr.af == gw->ip_addr.af && gws[i].ip_addr.len == gw->ip_addr.len &&

1 0

[kamailio/kamailio] dlgs: dlgs_tags_count(): always returns 1 and not count of dialogs (#2884)
by MikhailKalashnikov 14 Oct '21

14 Oct '21

### Description dlgs: dlgs_tags_count(): always returns 1 and not count of dialogs. ### Possible Solutions I guess [ki_dlgs_tags_count](https://github.com/kamailio/kamailio/blob/master/src/mo… should return `ret` instead of 1. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.5 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2884

2 4

git:5.4:4bee0582: dlgs: proper return for tags counting
by Daniel-Constantin Mierla 14 Oct '21

14 Oct '21

Module: kamailio Branch: 5.4 Commit: 4bee05821e9a9a1c72b73da8d1aae82735802602 URL: https://github.com/kamailio/kamailio/commit/4bee05821e9a9a1c72b73da8d1aae82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-14T10:36:45+02:00 dlgs: proper return for tags counting - GH #2884 (cherry picked from commit 1f12e2a03856f9c2d12cf62c1e65e84380729a06) (cherry picked from commit b6484e4614ebc0f3fd54224ba9470d6c5b322a6f) --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4bee05821e9a9a1c72b73da8d1aae82… Patch: https://github.com/kamailio/kamailio/commit/4bee05821e9a9a1c72b73da8d1aae82… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 503dd8c197..46de9d5c44 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -344,10 +344,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - if(ret<=0) { - return (ret-1); - } - return 1; + return (ret<=0)?(ret-1):ret; } /**

1 0

git:5.5:b6484e46: dlgs: proper return for tags counting
by Daniel-Constantin Mierla 14 Oct '21

14 Oct '21

Module: kamailio Branch: 5.5 Commit: b6484e4614ebc0f3fd54224ba9470d6c5b322a6f URL: https://github.com/kamailio/kamailio/commit/b6484e4614ebc0f3fd54224ba9470d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-14T10:35:32+02:00 dlgs: proper return for tags counting - GH #2884 (cherry picked from commit 1f12e2a03856f9c2d12cf62c1e65e84380729a06) --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b6484e4614ebc0f3fd54224ba9470d6… Patch: https://github.com/kamailio/kamailio/commit/b6484e4614ebc0f3fd54224ba9470d6… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 503dd8c197..46de9d5c44 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -344,10 +344,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - if(ret<=0) { - return (ret-1); - } - return 1; + return (ret<=0)?(ret-1):ret; } /**

1 0

git:master:1f12e2a0: dlgs: proper return for tags counting
by Daniel-Constantin Mierla 14 Oct '21

14 Oct '21

Module: kamailio Branch: master Commit: 1f12e2a03856f9c2d12cf62c1e65e84380729a06 URL: https://github.com/kamailio/kamailio/commit/1f12e2a03856f9c2d12cf62c1e65e84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-14T10:09:32+02:00 dlgs: proper return for tags counting - GH #2884 --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1f12e2a03856f9c2d12cf62c1e65e84… Patch: https://github.com/kamailio/kamailio/commit/1f12e2a03856f9c2d12cf62c1e65e84… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 503dd8c197..46de9d5c44 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -344,10 +344,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - if(ret<=0) { - return (ret-1); - } - return 1; + return (ret<=0)?(ret-1):ret; } /**

1 0

[kamailio/kamailio] dialog: fix dlg_onroute (#2878)
by Ivan Aponte 13 Oct '21

13 Oct '21

- adds a default value for when there is no call-id in the req struct. - reported in #2803   #### 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 #2803 #### Description  In some cases the callid field of the msg structure doesn't get initialized. In the case the dlg_onroute function is called with this msg and the dialog is not found a warning message is printed using the LM_WARN macro. This logger is called with a req->callid as argument and when this is null a segmentation fault happens. I added a small default value for this case. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2878 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2878/commits/1a9c0c930c009e09853c…">dialog: fix dlg_onroute</a> -- File Changes -- M src/modules/dialog/dlg_handlers.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2878.patch https://github.com/kamailio/kamailio/pull/2878.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2878

2 2

[kamailio/kamailio] core: fixup sip_msg_apply_changes (#2877)
by Ivan Aponte 13 Oct '21

13 Oct '21

- adds header parser to fill headers in msg structure. msg gets copied but many of the headers don't when msg_apply_changes is called. - reported in #2803   #### 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 #2803 #### Description adds header parser to fill headers in msg structure. msg gets copied but many of the headers don't get filled when msg_apply_changes is called. This can cause segmentation fault by calling null pointers. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2877 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2877/commits/a3a351c8b76abdd3da73…">core: fixup sip_msg_apply_changes</a> -- File Changes -- M src/core/msg_translator.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2877.patch https://github.com/kamailio/kamailio/pull/2877.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2877

2 2

git:master:d5c1b469: core: parse main headers after updating msg buffer
by Daniel-Constantin Mierla 13 Oct '21

13 Oct '21

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

1 0

git:master:f7965fc5: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 12 Oct '21

12 Oct '21

Module: kamailio Branch: master Commit: f7965fc52f0c9b65b78004ee68b9a9b5e6222a98 URL: https://github.com/kamailio/kamailio/commit/f7965fc52f0c9b65b78004ee68b9a9b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-12T22:31:16+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/f7965fc52f0c9b65b78004ee68b9a9b… Patch: https://github.com/kamailio/kamailio/commit/f7965fc52f0c9b65b78004ee68b9a9b…

1 0

git:master:f971ec45: htable: iterator functions to set the value of current item
by Daniel-Constantin Mierla 12 Oct '21

12 Oct '21

Module: kamailio Branch: master Commit: f971ec451f58e2a50dbe51de7fc8c5a9f65344fa URL: https://github.com/kamailio/kamailio/commit/f971ec451f58e2a50dbe51de7fc8c5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-12T14:17:17+02:00 htable: iterator functions to set the value of current item --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f971ec451f58e2a50dbe51de7fc8c5a… Patch: https://github.com/kamailio/kamailio/commit/f971ec451f58e2a50dbe51de7fc8c5a…

1 0

git:master:7f6248d1: htable: docs for iterator sets and seti functions
by Daniel-Constantin Mierla 12 Oct '21

12 Oct '21

Module: kamailio Branch: master Commit: 7f6248d15e8830d80cc7a898ee53754be2dc76be URL: https://github.com/kamailio/kamailio/commit/7f6248d15e8830d80cc7a898ee53754… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-12T22:19:37+02:00 htable: docs for iterator sets and seti functions --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7f6248d15e8830d80cc7a898ee53754… Patch: https://github.com/kamailio/kamailio/commit/7f6248d15e8830d80cc7a898ee53754… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 6793bff435..dca7cd279a 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1116,6 +1116,56 @@ sht_iterator_end("i1"); } sht_iterator_end("i1"); ... +</programlisting> + </example> + </section> + <section id="htable.f.sht_iterator_sets"> + <title> + <function moreinfo="none">sht_iterator_sets(iname, sval)</function> + </title> + <para> + Set the value of the current item to the string in the sval. + </para> + <para> + The parameters can be dynamic strings with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_iterator_sets</function> usage</title> + <programlisting format="linespecific"> +... + sht_iterator_start("i1", "h1"); + sht_iterator_next("i1"); + sht_iterator_sets("i1", "$ci"); + sht_iterator_end("i1"); +... +</programlisting> + </example> + </section> + <section id="htable.f.sht_iterator_seti"> + <title> + <function moreinfo="none">sht_iterator_seti(iname, ival)</function> + </title> + <para> + Set the value of the current item to the integer in the ival. + </para> + <para> + The parameters can be dynamic strings or integers with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_iterator_seti</function> usage</title> + <programlisting format="linespecific"> +... + sht_iterator_start("i1", "h1"); + sht_iterator_next("i1"); + sht_iterator_seti("i1", "20"); + sht_iterator_end("i1"); +... </programlisting> </example> </section>

1 0

[kamailio/kamailio] $msrp(srcaddr) hardcoded urls (#2881)
by sergey-safarov 11 Oct '21

11 Oct '21

### Description In my config used `msrp` and `tls` modules. When MSRP client is connected using TCP socket (not TLS), then `$msrp(srcaddr)` always returns "msrps" URL. When used TCP socket, then must be returned "msrp" URL. And no matter TLS module is loaded or not. [Relevant code](https://github.com/kamailio/kamailio/blob/d737c876cc36b4de802da77dfcd… -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2881

1 4

[kamailio/kamailio] lcr: improve the search for GW when IP address and src_port are used (#2876)
by zenichev 08 Oct '21

08 Oct '21

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  It has been noticed, that after a list of contributions into lcr: * 14e6fc80b3d2389567c73c4a2196bf8e6d92d8d2 * d8583d6ce1748c1ac8494616fced507b01dd4375 * 470fd5b8bedca56efcc5e6aa0225089fe3857ac9 * aa8d3ed4fe20efbd22db3b0b01a655789afa8818 the gateways matching when a search is being done based on the IP address and the src_port (through the array of GWs **with the same IP**) works, but not fully correct. It is only related to the usage with the third parameter 'src_port', when calling from_gw() and from_any_gw(), and, only when the search is done through the gateways array, which have **the same IP address** ,but different ports (let's say one has 30 GWs with the same IP in the lcr_gw). If gateways have different IPs, the issue is not catchable. The problem is in the algorithm used for matching based on two objects (ip_addr and src_port) - the binary search. It's not fully suitable for a search based on two (or more) objects. The binary works completely fine, when only one object is used for searching, but works not fully correct when the search is based on a comparison of two (or more) objects. A division happening based on the value of the first object, gives a chance that the second object will never be found in the current half being looked up. This commit concerns switching to a full cycling through the array of gateways of the same lcr_id, and gives a proper work of the do_from_gw(). The slight drawback of the new method is that we have to do a cycling through the whole array of GWs **of the same lcr_id**, but on the other hand it is much more efficient than trying to build up a matching using binary search based on two objects (ip_addr and src_port) being used for comparison. If we had to build this using bsearch() as well, then we would have to: - first prepare a sorted array of the gateways with the same IP (sorted in terms of ports) ,which already means with have to go through the whole GWs array to catch all needed GWs ; - do a bsearch() based on src_port only (using previously prepared sorted array) ; Which looks similar **to the full cycling** in terms of CPU resource consumption. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2876 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2876/commits/7f02e89622d6e9294906…">lcr: improve the search for GW when both IP address and src_port are used</a> -- File Changes -- M src/modules/lcr/lcr_mod.c (39) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2876.patch https://github.com/kamailio/kamailio/pull/2876.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2876

3 2

git:master:d737c876: lcr: improve the search for GW when both IP address and src_port are used
by Victor Seva 08 Oct '21

08 Oct '21

Module: kamailio Branch: master Commit: d737c876cc36b4de802da77dfcd361323ad7cd8e URL: https://github.com/kamailio/kamailio/commit/d737c876cc36b4de802da77dfcd3613… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-08T19:01:07+02:00 lcr: improve the search for GW when both IP address and src_port are used It has been noticed, that after a list of contributions into lcr: * 14e6fc80b3d2389567c73c4a2196bf8e6d92d8d2 * d8583d6ce1748c1ac8494616fced507b01dd4375 * 470fd5b8bedca56efcc5e6aa0225089fe3857ac9 * aa8d3ed4fe20efbd22db3b0b01a655789afa8818 the gateways matching when a search is being done based on the IP address and the src_port (through the list of GWs with the same IP) works, but not fully correct. It is only related to the usage with the third parameter 'src_port', when calling from_gw() and from_any_gw(), and, only when the search is done through the gateways list, which have the same IP address (but different ports). If gateways have different IPs, the issue is not catchable. The problem is in the algorithm used for matching based on two objects (ip_addr and src_port) - the binary search. It's not fully suitable for a search based on two (or more) objects. The binary works completely fine, when only one object is used for searching, but works not fully correct when the search is based on a comparison of two (or more) objects. A division happening based on the value of the first object, gives a chance that the second object will never be found in the current half being looked up. This commit concerns switching to a full cycling through the list of gateways of the same lcr_id, and gives a proper work of the do_from_gw(). The slight drawback of the new method is that we have to do a cycling through the whole list of GWs of the same lcr_id, but on the other hand it is much more efficient than trying to build up a matching using binary based on two objects (ip_addr and src_port) being used for comparison. --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d737c876cc36b4de802da77dfcd3613… Patch: https://github.com/kamailio/kamailio/commit/d737c876cc36b4de802da77dfcd3613… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 93c5181600..d796c08c2c 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -922,28 +922,24 @@ static int comp_gws(const void *_g1, const void *_g2) } /* - * Compare gateways based on their IP address and port + * Compare a gateway using IP address and the src port */ -static int comp_gws_include_port(const void *_g1, const void *_g2) -{ - struct gw_info *g1 = (struct gw_info *)_g1; - struct gw_info *g2 = (struct gw_info *)_g2; - - /* first address family comparison */ - if(g1->ip_addr.af < g2->ip_addr.af) - return -1; - if(g1->ip_addr.af > g2->ip_addr.af) - return 1; - if(g1->ip_addr.len < g2->ip_addr.len) - return -1; - if(g1->ip_addr.len > g2->ip_addr.len) - return 1; - - /* secondly ports comparison */ - if(g1->port != g2->port) - return -1; +static struct gw_info * find_gateway_by_ip_and_port(struct gw_info * gw, struct gw_info * gws) { + int tmp = 0, gw_index = 0; + + for (int i = 1; i <= gws[0].ip_addr.u.addr32[0]; i++) { + tmp = memcmp(gws[i].ip_addr.u.addr, gw->ip_addr.u.addr, gws[i].ip_addr.len); + if (gws[i].ip_addr.af == gw->ip_addr.af && + gws[i].ip_addr.len == gw->ip_addr.len && + tmp == 0 && /* a comparison of the IP address value */ + gws[i].port == gw->port) { + gw_index = i; + break; + } + } + if (gw_index != 0) return &(gws[gw_index]); - return memcmp(g1->ip_addr.u.addr, g2->ip_addr.u.addr, g1->ip_addr.len); + return NULL; } /* @@ -3025,8 +3021,7 @@ static int do_from_gw(struct sip_msg *_m, unsigned int lcr_id, if (src_port != 0) { /* Search for gw based on its ip address and port */ gw.port = src_port; - res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], - sizeof(struct gw_info), comp_gws_include_port); + res = find_gateway_by_ip_and_port(&gw, gws); } else { /* Search for gw based on its ip address */ res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0],

1 0

[kamailio/kamailio] Ability to use Publish/subscribe mechanism for N-to-N media forwarding using kamailio (#2874)
by Naveen Khanna 08 Oct '21

08 Oct '21

### Description Recently rtpengine has introduced Publish/subscribe mechanism for N-to-N media forwarding and recording. Is it already on Kamailio? I have gone through the document or rtpengine module in Kamailio and could not find anything that suggests the feature has been incorporated.  ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 ``` * **Operating System**:  ``` Linux secondary 4.19.0-17-amd64 #1 SMP Debian 4.19.194-3 (2021-07-18) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2874

4 7

[kamailio/kamailio] Memory leak in tcpconn_new() (#2875)
by Nacho G. 08 Oct '21

08 Oct '21

### Description  I found a memory leak which is causing some issues for us in our production. I think I was able to reproduce it and determine that this is happening when we set up an MSRP connection, and that connection is closed due to inactivity (for example when `tcp_connection_lifetime` is triggered). ### Troubleshooting #### Reproduction  In this environment we have a WebRTC SIP client, connected to Kamailio and a second party using SIP, both sending messages each via MSRP protocol. Web Client and SIP client establish a session normally, all fine here, they can communicate. At this point we have this status: ``` sudo netstat -natp | grep 10.22.22 tcp 0 0 10.22.22.21:5060 0.0.0.0:* LISTEN 28646/kamailio tcp 0 0 10.22.22.21:10000 0.0.0.0:* LISTEN 28646/kamailio tcp 0 0 10.22.22.21:8080 0.0.0.0:* LISTEN 28646/kamailio tcp 0 0 10.22.22.21:10001 0.0.0.0:* LISTEN 28646/kamailio tcp 0 0 10.22.22.21:10002 0.0.0.0:* LISTEN 28646/kamailio tcp 0 0 10.22.22.21:8080 10.22.22.1:58508 ESTABLISHED 28640/kamailio tcp 0 0 10.22.22.21:10000 10.22.22.190:32786 ESTABLISHED 28646/kamailio tcp 0 0 10.22.22.21:8080 10.22.22.1:58506 ESTABLISHED 28591/kamailio TESTER|centos8.4|tester21 [2021-10-06][16:23:57] [/home/vagrant]$ kamcmd -s udp:127.0.0.1:2046 mod.stats core all | grep tcp tcpconn_new(971): 198888 init_tcp(4700): 8192 init_tcp(4694): 32768 init_tcp(4686): 8 init_tcp(4679): 8 init_tcp(4672): 8 init_tcp(4666): 8 init_tcp(4654): 8 ``` In order to trigger this failure much faster, I set `tcp_connection_lifetime=60`. Then we just wait the required seconds to let the TCP connections closed. Then we finish the session, and stop our WebClient registering, so all connections are cleaned up. ``` TESTER|centos8.4|tester21 [2021-10-06][16:28:08] [/home/vagrant]$ sudo netstat -natp | grep 10.22.22 tcp 0 0 10.22.22.21:5060 0.0.0.0:* LISTEN 28646/kamailio tcp 0 0 10.22.22.21:10000 0.0.0.0:* LISTEN 28646/kamailio tcp 0 0 10.22.22.21:8080 0.0.0.0:* LISTEN 28646/kamailio tcp 0 0 10.22.22.21:10001 0.0.0.0:* LISTEN 28646/kamailio tcp 0 0 10.22.22.21:10002 0.0.0.0:* LISTEN 28646/kamailio TESTER|centos8.4|tester21 [2021-10-06][16:28:20] [/home/vagrant]$ kamcmd -s udp:127.0.0.1:2046 mod.stats core all | grep tcp tcpconn_new(971): 66296 init_tcp(4700): 8192 init_tcp(4694): 32768 init_tcp(4686): 8 init_tcp(4679): 8 init_tcp(4672): 8 init_tcp(4666): 8 init_tcp(4654): 8 ``` As you can see there are no connections but there is memory allocated by `tcpconn_new`. I know this is related to the MSRP because we noticed our SIP Web Client is not closing the socket, so we just wait for Kamailio to close it. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` 2021-07-25T23:54:41Z ERROR ERROR: <core> [mem/f_malloc.c:415]: fm_search_defrag(): fm_search_defrag(0x7f39a284c000, 66288); Free fragment not found! 2021-07-25T23:54:41Z ERROR ERROR: <core> [mem/f_malloc.c:498]: fm_malloc(): fm_malloc(0x7f39a284c000, 66288) called from core: tcp_main.c: tcpconn_new(957), module: core; Free fragment not found! 2021-07-25T23:54:41Z ERROR ERROR: <core> [tcp_main.c:959]: tcpconn_new(): mem. allocation failure 2021-07-25T23:54:41Z ERROR ERROR: <core> [tcp_main.c:3985]: handle_new_connect(): tcpconn_new failed, closing socket ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.6 (x86_64/linux) 7d1964 flags: STATS: Off, EXTRA_DEBUG, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, DBG_QM_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES 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: 7d1964 compiled on 13:54:09 Oct 5 2021 with gcc 8.4.1 ``` Already tried with the latest stable Kamailio version, with the same issue. * **Operating System**:  ``` Linux tester21 4.18.0-305.17.1.el8_4.x86_64 #1 SMP Wed Sep 8 14:00:07 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux centos 8 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2875

2 2

git:master:12f5376f: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 08 Oct '21

08 Oct '21

Module: kamailio Branch: master Commit: 12f5376f3af8331c5f0bccfe04c96e7930bbeaa7 URL: https://github.com/kamailio/kamailio/commit/12f5376f3af8331c5f0bccfe04c96e7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-08T10:01:20+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/12f5376f3af8331c5f0bccfe04c96e7… Patch: https://github.com/kamailio/kamailio/commit/12f5376f3af8331c5f0bccfe04c96e7…

1 0

git:master:c6b731ac: htable: added iterator function to remove current item
by Daniel-Constantin Mierla 08 Oct '21

08 Oct '21

Module: kamailio Branch: master Commit: c6b731ac1803a2a7fcbd2a9d00e74af576d3886c URL: https://github.com/kamailio/kamailio/commit/c6b731ac1803a2a7fcbd2a9d00e74af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-08T09:47:06+02:00 htable: added iterator function to remove current item --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/c6b731ac1803a2a7fcbd2a9d00e74af… Patch: https://github.com/kamailio/kamailio/commit/c6b731ac1803a2a7fcbd2a9d00e74af…

1 0

git:master:2e92a813: htable: use a function for finding the iterator
by Daniel-Constantin Mierla 08 Oct '21

08 Oct '21

Module: kamailio Branch: master Commit: 2e92a813cc0977e6f1e524bb8bafefb73efccba0 URL: https://github.com/kamailio/kamailio/commit/2e92a813cc0977e6f1e524bb8bafefb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-08T09:15:06+02:00 htable: use a function for finding the iterator --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/2e92a813cc0977e6f1e524bb8bafefb… Patch: https://github.com/kamailio/kamailio/commit/2e92a813cc0977e6f1e524bb8bafefb… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 7bade571c3..7eb7bfa0d7 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1700,19 +1700,16 @@ void ht_iterator_init(void) memset(_ht_iterators, 0, HT_ITERATOR_SIZE*sizeof(ht_iterator_t)); } -int ht_iterator_start(str *iname, str *hname) +static inline int ht_iterator_find(str *iname) { int i; int k; k = -1; - for(i=0; i<HT_ITERATOR_SIZE; i++) - { - if(_ht_iterators[i].name.len>0) - { + for(i=0; i<HT_ITERATOR_SIZE; i++) { + if(_ht_iterators[i].name.len>0) { if(_ht_iterators[i].name.len==iname->len - && strncmp(_ht_iterators[i].name.s, iname->s, iname->len)==0) - { + && strncmp(_ht_iterators[i].name.s, iname->s, iname->len)==0) { k = i; break; } @@ -1720,6 +1717,14 @@ int ht_iterator_start(str *iname, str *hname) if(k==-1) k = i; } } + return k; +} + +int ht_iterator_start(str *iname, str *hname) +{ + int k; + + k = ht_iterator_find(iname); if(k==-1) { LM_ERR("no iterator available - max number is %d\n", HT_ITERATOR_SIZE); @@ -1759,24 +1764,9 @@ int ht_iterator_start(str *iname, str *hname) int ht_iterator_next(str *iname) { - int i; int k; - k = -1; - for(i=0; i<HT_ITERATOR_SIZE; i++) - { - if(_ht_iterators[i].name.len>0) - { - if(_ht_iterators[i].name.len==iname->len - && strncmp(_ht_iterators[i].name.s, iname->s, iname->len)==0) - { - k = i; - break; - } - } else { - if(k==-1) k = i; - } - } + k = ht_iterator_find(iname); if(k==-1) { LM_ERR("iterator not found [%.*s]\n", iname->len, iname->s); @@ -1819,47 +1809,38 @@ int ht_iterator_next(str *iname) int ht_iterator_end(str *iname) { - int i; + int k; - for(i=0; i<HT_ITERATOR_SIZE; i++) + k = ht_iterator_find(iname); + if(k==-1 || _ht_iterators[k].name.len<=0) { - if(_ht_iterators[i].name.len>0) + LM_ERR("iterator not found [%.*s]\n", iname->len, iname->s); + return -1; + } + + if(_ht_iterators[k].ht!=NULL && _ht_iterators[k].it!=NULL) + { + if(_ht_iterators[k].slot>=0 && _ht_iterators[k].slot<_ht_iterators[k].ht->htsize) { - if(_ht_iterators[i].name.len==iname->len - && strncmp(_ht_iterators[i].name.s, iname->s, iname->len)==0) - { - if(_ht_iterators[i].ht!=NULL && _ht_iterators[i].it!=NULL) - { - if(_ht_iterators[i].slot>=0 && _ht_iterators[i].slot<_ht_iterators[i].ht->htsize) - { - ht_slot_unlock(_ht_iterators[i].ht, _ht_iterators[i].slot); - } - } - memset(&_ht_iterators[i], 0, sizeof(ht_iterator_t)); - return 0; - } + ht_slot_unlock(_ht_iterators[k].ht, _ht_iterators[k].slot); } } - - return -1; + memset(&_ht_iterators[k], 0, sizeof(ht_iterator_t)); + return 0; } ht_cell_t* ht_iterator_get_current(str *iname) { - int i; + int k; + if(iname==NULL || iname->len<=0) return NULL; - for(i=0; i<HT_ITERATOR_SIZE; i++) - { - if(_ht_iterators[i].name.len>0) - { - if(_ht_iterators[i].name.len==iname->len - && strncmp(_ht_iterators[i].name.s, iname->s, iname->len)==0) - { - return _ht_iterators[i].it; - } - } + k = ht_iterator_find(iname); + if(k==-1 || _ht_iterators[k].name.len<=0) { + LM_DBG("iterator not found [%.*s]\n", iname->len, iname->s); + return NULL; } - return NULL; + + return _ht_iterators[k].it; }

1 0

git:master:eaec3aaa: pv: {line.count} - count last line without \n
by Daniel-Constantin Mierla 07 Oct '21

07 Oct '21

Module: kamailio Branch: master Commit: eaec3aaac227eb4a8c48f93b45565d15d4a0a991 URL: https://github.com/kamailio/kamailio/commit/eaec3aaac227eb4a8c48f93b45565d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-07T09:21:20+02:00 pv: {line.count} - count last line without \n --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/eaec3aaac227eb4a8c48f93b45565d1… Patch: https://github.com/kamailio/kamailio/commit/eaec3aaac227eb4a8c48f93b45565d1… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index b63ad022f8..330c70cb6f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2435,19 +2435,22 @@ int tr_eval_line(struct sip_msg *msg, tr_param_t *tp, int subtype, break; case TR_LINE_COUNT: - n=0; - for(i=0; i<val->rs.len; i++) - if(val->rs.s[i]=='\n') + n = 0; + if(val->rs.len>0) { + for(i=0; i<val->rs.len; i++) { + if(val->rs.s[i]=='\n') { + n++; + } + } + if(val->rs.s[val->rs.len-1]!='\n') { n++; - if(n==0 && val->rs.len>0) - n = 1; + } + } val->flags = PV_TYPE_INT|PV_VAL_INT|PV_VAL_STR; val->ri = n; val->rs.s = int2str(val->ri, &val->rs.len); break; - break; - default: LM_ERR("unknown subtype %d\n", subtype);

1 0

[kamailio/kamailio] [FEATURE REQUEST] Add reload functionality for the configured database (path) in GeoIP2 module (#2870)
by Joel Serrano 05 Oct '21

05 Oct '21

### Description Currently there is no way to tell Kamailio to reload the GeoIP database that is configured without a restart. This feature request is for adding the possibility to hot-reload the GeoIP2 database. ### Possible Solutions Implement a RPC command to reload the database, similar to the way the TLS module implements `tls.reload` to reload the configured certificates without needing a restart. ### Example `kamcmd geoip2.reload` / `kamctl rpc geoip2.reload` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2870

1 2

git:5.5:0d53d9a6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Oct '21

05 Oct '21

Module: kamailio Branch: 5.5 Commit: 0d53d9a676747cd6583c6cfcdf5b3e8593b6c84a URL: https://github.com/kamailio/kamailio/commit/0d53d9a676747cd6583c6cfcdf5b3e8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-05T16:46:33+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/0d53d9a676747cd6583c6cfcdf5b3e8… Patch: https://github.com/kamailio/kamailio/commit/0d53d9a676747cd6583c6cfcdf5b3e8… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 24d02d1c5d..6f962d4aed 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2669,6 +2669,8 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); is enabled, the sessions are still allowed to finish for the hidden old nodes. + The execution of this command is limited to 10 seconds intervals. + Example 1.100. rtpengine.reload usage ... $ kamcmd rtpengine.reload diff --git a/src/modules/textops/README b/src/modules/textops/README index e86ff275d8..08dd399246 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -249,9 +249,13 @@ Chapter 1. Admin Guide The module implements text based operations over the SIP message processed by Kamailio. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the message - at text level, e.g., regular expression search and replace, Perl-like + at text level, e.g., regular expression search, replace or substitutions, checks for method type, header presence, insert of new - header and date, etc. + header and date, string comparisons, multi-part body operations, etc. + + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. 2. Known Limitations @@ -598,7 +602,7 @@ replace_hdrs_str("Kamailio", "Kamailio SIP Proxy", "a"); 4.16. subst('/re/repl/flags') - Replaces re with repl (sed or perl like). + Replaces re with repl. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -679,7 +683,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ 4.19. subst_body('/re/repl/flags') - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -700,7 +704,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; 4.20. subst_hf(hf, subexp, flags) - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. Meaning of the parameters is as follows: * hf - header field name.

1 0

Timer handling broken in 5.5.2
by Markus Bönke 05 Oct '21

05 Oct '21

Hello all, the handling of timer events is broken in 5.5.2. I get the following error: ERROR: <core> [core/parser/msg_parser.c:748]: parse_msg(): ERROR: parse_msg: message=<GET /timer HTTP/0.9#012#012> I think it was introduced by https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be… <https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be…> ... skip: msg->unparsed=tmp; if(msg->headers==NULL) { /* nothing parsed - invalid input sip message */ goto error1; } … Should’t thy be handled different already in parse_msg in msg_parser.c? Thanks and regards Markus

2 3

git:5.5:a78acd8f: textops: docs update to state regex params expect posix format
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: 5.5 Commit: a78acd8f40ed38b161a075bef74febd93acb092c URL: https://github.com/kamailio/kamailio/commit/a78acd8f40ed38b161a075bef74febd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T16:37:38+02:00 textops: docs update to state regex params expect posix format (cherry picked from commit b19aab7fe00f72d0c9e54a7a106ec7a065a3d02b) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a78acd8f40ed38b161a075bef74febd… Patch: https://github.com/kamailio/kamailio/commit/a78acd8f40ed38b161a075bef74febd… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 6f3ab09f9a..82f6d2495f 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -19,9 +19,15 @@ The module implements text based operations over the SIP message processed by &kamailio;. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the - message at text level, e.g., regular expression search and replace, - Perl-like substitutions, checks for method type, header presence, - insert of new header and date, etc. + message at text level, e.g., regular expression search, replace + or substitutions, checks for method type, header presence, + insert of new header and date, string comparisons, multi-part body + operations, etc. + </para> + <para> + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. </para> </section> <section> @@ -591,7 +597,7 @@ replace_hdrs_str("&kamailio;", "&kamailio; SIP Proxy", "a"); <function moreinfo="none">subst('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like). + Replaces re with repl. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -728,7 +734,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ <function moreinfo="none">subst_body('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -768,7 +774,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; <function moreinfo="none">subst_hf(hf, subexp, flags)</function> </title> <para> - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

1 0

git:5.5:a9c5f3e4: timer: extend internal static HTTP message to have one header
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: 5.5 Commit: a9c5f3e4d29dccda79eee8e594d4316e32196db5 URL: https://github.com/kamailio/kamailio/commit/a9c5f3e4d29dccda79eee8e594d4316… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T16:38:00+02:00 timer: extend internal static HTTP message to have one header (cherry picked from commit c3629f877500373028d2c7cdefd976cddda31c15) --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/a9c5f3e4d29dccda79eee8e594d4316… Patch: https://github.com/kamailio/kamailio/commit/a9c5f3e4d29dccda79eee8e594d4316… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index 9880a8420b..224a6bed57 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -159,7 +159,7 @@ static unsigned int timer_msg_no = 0; static ticks_t timer_handler(ticks_t ticks, struct timer_ln* tl, void* data) { /*?min length of first line of message is 16 char!?*/ -#define MSG "GET /timer HTTP/0.9\n\n" +#define MSG "GET /timer HTTP/0.9\r\nUser-Agent: internal\r\n\r\n" sip_msg_t* msg; timer_action_t *a; run_act_ctx_t ra_ctx;

1 0

git:5.5:a2aa9f66: core: jump to error in case of unexpected comma for parse addr spec
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: 5.5 Commit: a2aa9f66a3cb898d6cdfbf3aba6d3a8b8b804429 URL: https://github.com/kamailio/kamailio/commit/a2aa9f66a3cb898d6cdfbf3aba6d3a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T16:36:31+02:00 core: jump to error in case of unexpected comma for parse addr spec (cherry picked from commit 932e46b09176544cf6e085a32677980b26e4d2eb) --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/a2aa9f66a3cb898d6cdfbf3aba6d3a8… Patch: https://github.com/kamailio/kamailio/commit/a2aa9f66a3cb898d6cdfbf3aba6d3a8… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 1ff5a16908..f003e5f31a 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -494,6 +494,7 @@ static char *parse_to_param(char *const buffer, const char *const end, } LM_ERR("invalid character ',' in status %d: [%.*s]\n", status, (int)(tmp - buffer), ZSW(buffer)); + goto error; } default: switch(status) {

1 0

git:5.5:4dd8c636: async: docs - added section ids for parameters
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: 5.5 Commit: 4dd8c636701c778f50d11a37265e9b6300f45ecb URL: https://github.com/kamailio/kamailio/commit/4dd8c636701c778f50d11a37265e9b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T16:36:45+02:00 async: docs - added section ids for parameters (cherry picked from commit ed3b2506e13214d25a3dd78e487ed35ed13053ac) --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4dd8c636701c778f50d11a37265e9b6… Patch: https://github.com/kamailio/kamailio/commit/4dd8c636701c778f50d11a37265e9b6… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 5e9277a194..a56c60d7d2 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -68,7 +68,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="async.p.workers"> <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous @@ -88,7 +88,7 @@ modparam("async", "workers", 2) </programlisting> </example> </section> - <section> + <section id="async.p.ms_timer"> <title><varname>ms_timer</varname> (int)</title> <para> Enables millisecond timer for async_ms_sleep() and async_ms_route() functions.

1 0

git:5.5:37814e67: rtpengine: docs - note that rpc reload is limited to 10secs frequency
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: 5.5 Commit: 37814e67dac6772ff08e85133898182aea0f9de6 URL: https://github.com/kamailio/kamailio/commit/37814e67dac6772ff08e85133898182… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T16:37:02+02:00 rtpengine: docs - note that rpc reload is limited to 10secs frequency (cherry picked from commit a9c9b83c9dd1c09738b5a33362a8e339c20b786c) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/37814e67dac6772ff08e85133898182… Patch: https://github.com/kamailio/kamailio/commit/37814e67dac6772ff08e85133898182… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index ef7d5a4fd7..9e8dee5d80 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -3188,7 +3188,7 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); <title>RPC Commands</title> <section id="rtpengine.r.reload"> - <title>rtpengine.reload</title> + <title><function moreinfo="none">rtpengine.reload</function></title> <para> Reloads the database node table content <emphasis>if configured</emphasis>. Returns specific message related to success, failure and no db_url configured. @@ -3198,6 +3198,9 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); hides old ones, based on the database content. If allow_op modparam is enabled, the sessions are still allowed to finish for the hidden old nodes. </para> + <para> + The execution of this command is limited to 10 seconds intervals. + </para> <example> <title> <function moreinfo="none">rtpengine.reload</function> usage</title>

1 0

git:master:c3629f87: timer: extend internal static HTTP message to have one header
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: c3629f877500373028d2c7cdefd976cddda31c15 URL: https://github.com/kamailio/kamailio/commit/c3629f877500373028d2c7cdefd976c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T14:26:30+02:00 timer: extend internal static HTTP message to have one header --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/c3629f877500373028d2c7cdefd976c… Patch: https://github.com/kamailio/kamailio/commit/c3629f877500373028d2c7cdefd976c… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index 9880a8420b..224a6bed57 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -159,7 +159,7 @@ static unsigned int timer_msg_no = 0; static ticks_t timer_handler(ticks_t ticks, struct timer_ln* tl, void* data) { /*?min length of first line of message is 16 char!?*/ -#define MSG "GET /timer HTTP/0.9\n\n" +#define MSG "GET /timer HTTP/0.9\r\nUser-Agent: internal\r\n\r\n" sip_msg_t* msg; timer_action_t *a; run_act_ctx_t ra_ctx;

1 0

git:master:f23d48b9: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: f23d48b975bdfe06d3c07c4b65f60a2a19b38541 URL: https://github.com/kamailio/kamailio/commit/f23d48b975bdfe06d3c07c4b65f60a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-05T14:16:12+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/f23d48b975bdfe06d3c07c4b65f60a2… Patch: https://github.com/kamailio/kamailio/commit/f23d48b975bdfe06d3c07c4b65f60a2… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 670cd7bb0b..2af6b9a703 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1376,7 +1376,8 @@ modparam("tm", "callid_matching", 1) 3.33. callid_cseq_matching (int) If set to something other than 0, will do transaction matching using - callid and cseq header values instead of via branch md5 value. + callid and cseq header values instead of via branch md5 value. Note + that this behavior is non-RFC conpliant! Default value is 0.

1 0

git:master:fe3e6e7f: tm: update doc for callid_cseq_matching
by Stefan Mititelu 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: fe3e6e7f64199dd6d2f55d6762dbd17ca0160817 URL: https://github.com/kamailio/kamailio/commit/fe3e6e7f64199dd6d2f55d6762dbd17… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2021-10-05T15:05:17+03:00 tm: update doc for callid_cseq_matching --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/fe3e6e7f64199dd6d2f55d6762dbd17… Patch: https://github.com/kamailio/kamailio/commit/fe3e6e7f64199dd6d2f55d6762dbd17… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index d2e2f4db0e..8614fdac85 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1002,6 +1002,10 @@ modparam("tm", "callid_matching", 1) <para> If set to something other than 0, will do transaction matching using callid and cseq header values instead of via branch md5 value. + + <emphasis> + Note that this behavior is non-RFC conpliant! + </emphasis> </para> <para> <emphasis>

1 0

[kamailio/kamailio] tm: Add callid_cseq_matching param (#2868)
by Stefan Mititelu 05 Oct '21

05 Oct '21

Enable transaction matching using callid and cseq values instead of via md5 value.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hello, We had an issue with kamailio that the generated tm p_cell->md5 was not sent out in Via "branch=" parameter. Instead, other value was sent. Thus when comparing the replies Via "branch=" md5 value back to p_cell->md5, the transactions mismatched and dialogs were not setup. This happened for the most of the transactions/dialogs. We could not really figure out why the above was happening. Because this was an isolated system, we decided to do this workaround using callid and cseq matching for transactions, and it helped. Now most of the dialogs are setup. Let me know what you think, if other had this problem and if this PR helps. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2868 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2868/commits/ab42c71fa814a9d2f3d8…">tm: Add callid_cseq_matching param</a> -- File Changes -- M src/modules/tm/config.c (3) M src/modules/tm/config.h (1) M src/modules/tm/doc/params.xml (23) M src/modules/tm/t_lookup.c (20) M src/modules/tm/tm.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2868.patch https://github.com/kamailio/kamailio/pull/2868.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2868

3 8

git:master:93ab4950: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: 93ab49502d418556cffd9aba13411ba464ad1513 URL: https://github.com/kamailio/kamailio/commit/93ab49502d418556cffd9aba13411ba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-05T13:46:30+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/93ab49502d418556cffd9aba13411ba… Patch: https://github.com/kamailio/kamailio/commit/93ab49502d418556cffd9aba13411ba…

1 0

git:master:b6cebaa7: tm: Add callid_cseq_matching param
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: b6cebaa76eaa4b98bbba6e271c50dbfa14a8f9f7 URL: https://github.com/kamailio/kamailio/commit/b6cebaa76eaa4b98bbba6e271c50dbf… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T13:45:23+02:00 tm: Add callid_cseq_matching param Enable transaction matching using callid and cseq values instead of via md5 value. --- Modified: src/modules/tm/config.c Modified: src/modules/tm/config.h Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/b6cebaa76eaa4b98bbba6e271c50dbf… Patch: https://github.com/kamailio/kamailio/commit/b6cebaa76eaa4b98bbba6e271c50dbf…

1 0

[kamailio/kamailio] Correcting rank value passed to fork_process #2809 (#2863)
by ErhanOnur 05 Oct '21

05 Oct '21

PROC_SIPINIT has a special meaning representing the first SIP worker.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2863 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2863/commits/df5f41ccc3c779848bdb…">Correcting rank value passed to fork_process #2809</a> -- File Changes -- M src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2863.patch https://github.com/kamailio/kamailio/pull/2863.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2863

2 2

git:master:25ef591f: Correcting rank value passed to fork_process #2809
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: 25ef591f5c160515b2b8c4e53036fccf8a9671bc URL: https://github.com/kamailio/kamailio/commit/25ef591f5c160515b2b8c4e53036fcc… Author: 67456745 <erhan.sendag(a)i2i-systems.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T13:43:31+02:00 Correcting rank value passed to fork_process #2809 PROC_SIPINIT has a special meaning representing the first SIP worker --- Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/25ef591f5c160515b2b8c4e53036fcc… Patch: https://github.com/kamailio/kamailio/commit/25ef591f5c160515b2b8c4e53036fcc… --- diff --git a/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c b/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c index 8eb3c7b4a4..b5bb650098 100644 --- a/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c +++ b/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c @@ -325,7 +325,7 @@ static int child_init(int rank) LM_DBG("Initialization of module in child [%d] \n", rank); if ((subscribe_to_reginfo == 1) && (rank == PROC_MAIN)) { LM_DBG("Creating RegInfo Event Processor process\n"); - int pid = fork_process(PROC_SIPINIT, "RegInfo Event Processor", 1); + int pid = fork_process(PROC_NOCHLDINIT, "RegInfo Event Processor", 1); if (pid < 0) return -1; //error if (pid == 0) {

1 0

git:master:3a042b99: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: 3a042b99e0ae21c3127d69d41dcce8925dbaa185 URL: https://github.com/kamailio/kamailio/commit/3a042b99e0ae21c3127d69d41dcce89… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-05T10:01:29+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/3a042b99e0ae21c3127d69d41dcce89… Patch: https://github.com/kamailio/kamailio/commit/3a042b99e0ae21c3127d69d41dcce89… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 4f0097535d..5f6bf33867 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -252,9 +252,13 @@ Chapter 1. Admin Guide The module implements text based operations over the SIP message processed by Kamailio. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the message - at text level, e.g., regular expression search and replace, Perl-like + at text level, e.g., regular expression search, replace or substitutions, checks for method type, header presence, insert of new - header and date, etc. + header and date, string comparisons, multi-part body operations, etc. + + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. 2. Known Limitations @@ -602,7 +606,7 @@ replace_hdrs_str("Kamailio", "Kamailio SIP Proxy", "a"); 4.16. subst('/re/repl/flags') - Replaces re with repl (sed or perl like). + Replaces re with repl. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -683,7 +687,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ 4.19. subst_body('/re/repl/flags') - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -704,7 +708,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; 4.20. subst_hf(hf, subexp, flags) - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. Meaning of the parameters is as follows: * hf - header field name.

1 0

git:master:b19aab7f: textops: docs update to state regex params expect posix format
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: b19aab7fe00f72d0c9e54a7a106ec7a065a3d02b URL: https://github.com/kamailio/kamailio/commit/b19aab7fe00f72d0c9e54a7a106ec7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T09:57:40+02:00 textops: docs update to state regex params expect posix format --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b19aab7fe00f72d0c9e54a7a106ec7a… Patch: https://github.com/kamailio/kamailio/commit/b19aab7fe00f72d0c9e54a7a106ec7a… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 4427ee1e00..974fbf568c 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -19,9 +19,15 @@ The module implements text based operations over the SIP message processed by &kamailio;. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the - message at text level, e.g., regular expression search and replace, - Perl-like substitutions, checks for method type, header presence, - insert of new header and date, etc. + message at text level, e.g., regular expression search, replace + or substitutions, checks for method type, header presence, + insert of new header and date, string comparisons, multi-part body + operations, etc. + </para> + <para> + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. </para> </section> <section> @@ -591,7 +597,7 @@ replace_hdrs_str("&kamailio;", "&kamailio; SIP Proxy", "a"); <function moreinfo="none">subst('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like). + Replaces re with repl. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -728,7 +734,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ <function moreinfo="none">subst_body('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -768,7 +774,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; <function moreinfo="none">subst_hf(hf, subexp, flags)</function> </title> <para> - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

1 0

git:5.5:2ce38e6c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 04 Oct '21

04 Oct '21

Module: kamailio Branch: 5.5 Commit: 2ce38e6ca5e822210e47b7966a335adcf8df7e23 URL: https://github.com/kamailio/kamailio/commit/2ce38e6ca5e822210e47b7966a335ad… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-04T17:46:39+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/2ce38e6ca5e822210e47b7966a335ad… Patch: https://github.com/kamailio/kamailio/commit/2ce38e6ca5e822210e47b7966a335ad… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 49b786ac13..ef7c0e9634 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -44,8 +44,8 @@ Frederic Gaisnon 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -76,8 +76,8 @@ Frederic Gaisnon 1.11. Set contact_mode parameter 1.12. Set cparam_name parameter 1.13. Set xavu_cfg parameter - 1.14. Set xavu_filed_a_contact parameter - 1.15. Set xavu_filed_b_contact parameter + 1.14. Set xavu_field_a_contact parameter + 1.15. Set xavu_field_b_contact parameter 1.16. Set xavu_field_contact_host parameter 1.17. Set rr_update parameter 1.18. Set context parameter @@ -112,8 +112,8 @@ Chapter 1. Admin Guide 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -182,8 +182,8 @@ Chapter 1. Admin Guide 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -320,7 +320,7 @@ modparam("topos", "event_mode", 2) 3.10. contact_host (str) You may need to control the host part of the Contact header added by - topos. If the xavu_filed_contact_host parameter is set, this value is + topos. If the xavu_field_contact_host parameter is set, this value is ignored. For example when using TLS with TOPOS the remote UAS must be able to open a new TLS socket to the contact header. In this case, the contact header must contain a domain name with a trusted CA signed @@ -388,12 +388,12 @@ modparam("topos", "cparam_name", "xyz") Example 1.13. Set xavu_cfg parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... -3.14. xavu_filed_a_contact (str) +3.14. xavu_field_a_contact (str) Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the A-side Contact Header user part. This parameter is only @@ -401,15 +401,15 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") Default value is “NULL” (disabled). - Example 1.14. Set xavu_filed_a_contact parameter + Example 1.14. Set xavu_field_a_contact parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... -3.15. xavu_filed_b_contact (str) +3.15. xavu_field_b_contact (str) Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the B-side Contact Header user part. This parameter is only @@ -417,10 +417,10 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") Default value is “NULL” (disabled). - Example 1.15. Set xavu_filed_b_contact parameter + Example 1.15. Set xavu_field_b_contact parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_b_contact", "b_contact") +modparam("topos", "xavu_field_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "...";

1 0

git:master:b163e40a: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 04 Oct '21

04 Oct '21

Module: kamailio Branch: master Commit: b163e40a8d13201cc07c1df69a58855cba0df540 URL: https://github.com/kamailio/kamailio/commit/b163e40a8d13201cc07c1df69a58855… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-04T17:46:22+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/b163e40a8d13201cc07c1df69a58855… Patch: https://github.com/kamailio/kamailio/commit/b163e40a8d13201cc07c1df69a58855… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 49b786ac13..ef7c0e9634 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -44,8 +44,8 @@ Frederic Gaisnon 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -76,8 +76,8 @@ Frederic Gaisnon 1.11. Set contact_mode parameter 1.12. Set cparam_name parameter 1.13. Set xavu_cfg parameter - 1.14. Set xavu_filed_a_contact parameter - 1.15. Set xavu_filed_b_contact parameter + 1.14. Set xavu_field_a_contact parameter + 1.15. Set xavu_field_b_contact parameter 1.16. Set xavu_field_contact_host parameter 1.17. Set rr_update parameter 1.18. Set context parameter @@ -112,8 +112,8 @@ Chapter 1. Admin Guide 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -182,8 +182,8 @@ Chapter 1. Admin Guide 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -320,7 +320,7 @@ modparam("topos", "event_mode", 2) 3.10. contact_host (str) You may need to control the host part of the Contact header added by - topos. If the xavu_filed_contact_host parameter is set, this value is + topos. If the xavu_field_contact_host parameter is set, this value is ignored. For example when using TLS with TOPOS the remote UAS must be able to open a new TLS socket to the contact header. In this case, the contact header must contain a domain name with a trusted CA signed @@ -388,12 +388,12 @@ modparam("topos", "cparam_name", "xyz") Example 1.13. Set xavu_cfg parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... -3.14. xavu_filed_a_contact (str) +3.14. xavu_field_a_contact (str) Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the A-side Contact Header user part. This parameter is only @@ -401,15 +401,15 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") Default value is “NULL” (disabled). - Example 1.14. Set xavu_filed_a_contact parameter + Example 1.14. Set xavu_field_a_contact parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... -3.15. xavu_filed_b_contact (str) +3.15. xavu_field_b_contact (str) Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the B-side Contact Header user part. This parameter is only @@ -417,10 +417,10 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") Default value is “NULL” (disabled). - Example 1.15. Set xavu_filed_b_contact parameter + Example 1.15. Set xavu_field_b_contact parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_b_contact", "b_contact") +modparam("topos", "xavu_field_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "...";

1 0

[kamailio/kamailio] topos/topos_redis, error: "could not evaluate a_contact xavu" when in-dialog msg have Rexord-Rourte header. (#2852)
by Dennis 04 Oct '21

04 Oct '21

Hi ! topos+redis used in the folowing configuration: modparam("ndb_redis", "server", "REDIS_SERVER") modparam("ndb_redis", "init_without_redis", 1) modparam("topos", "storage", "redis") modparam("topos_redis", "serverid", "srv1") modparam("topos", "contact_mode", 2) modparam("topos", "xavu_cfg", "_tps_") modparam("topos", "xavu_field_a_contact", "a_contact") modparam("topos", "xavu_field_b_contact", "b_contact") modparam("topos", "xavu_field_contact_host", "contact_host") In the inital INVITE xavu variables a_contact and b_contact are set by script, topos work as expected at this point, but when the following in-dalog messages from upstream have Record-Route header, topos fails with error message: Sep 13 18:50:01 gw481 /usr/sbin/kamailio[29874]: ERROR: {1 1 ACK 1-20643(a)87.250.237.98} topos [tps_storage.c:331]: tps_storage_fill_contact(): could not evaluate a_contact xavu Sep 13 18:50:01 gw481 /usr/sbin/kamailio[29874]: ERROR: {1 1 ACK 1-20643(a)87.250.237.98} topos [tps_storage.c:604]: tps_storage_record(): failed to store In case of absent Record-Route headers the are no errors. #### Debugging Data Signaling dump and debug log in attachment. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.5.1 (x86_64/linux) ``` * **Operating System**:  ``` Ubuntu 18.04.5 LTS ``` [dump.txt](https://github.com/kamailio/kamailio/files/7157118/dump.txt) [call.log](https://github.com/kamailio/kamailio/files/7157120/call.log) -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2852

3 13

git:5.5:11ae371e: topos: spelling fix in README for contact parameter
by Henning Westerholt 04 Oct '21

04 Oct '21

Module: kamailio Branch: 5.5 Commit: 11ae371e59496c6ea3036c15d44afcd3488ca9e9 URL: https://github.com/kamailio/kamailio/commit/11ae371e59496c6ea3036c15d44afcd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-04T15:39:04Z topos: spelling fix in README for contact parameter (cherry picked from commit 0a9b039f79de90a45e263325cb247f49a31d9f36) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/11ae371e59496c6ea3036c15d44afcd… Patch: https://github.com/kamailio/kamailio/commit/11ae371e59496c6ea3036c15d44afcd… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 4218dae3fe..dee94df414 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -294,7 +294,7 @@ modparam("topos", "event_mode", 2) <title><varname>contact_host</varname> (str)</title> <para> You may need to control the host part of the Contact header added - by topos. If the xavu_filed_contact_host parameter is set, this value is + by topos. If the xavu_field_contact_host parameter is set, this value is ignored. For example when using TLS with TOPOS the remote UAS must be able to open @@ -397,7 +397,7 @@ modparam("topos", "cparam_name", "xyz") <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... @@ -405,7 +405,7 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </example> </section> <section id="topos.p.xavu_field_a_contact"> - <title><varname>xavu_filed_a_contact</varname> (str)</title> + <title><varname>xavu_field_a_contact</varname> (str)</title> <para> Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the A-side Contact Header user part. This parameter @@ -417,11 +417,11 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_a_contact</varname> parameter</title> + <title>Set <varname>xavu_field_a_contact</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... @@ -429,7 +429,7 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </example> </section> <section id="topos.p.xavu_field_b_contact"> - <title><varname>xavu_filed_b_contact</varname> (str)</title> + <title><varname>xavu_field_b_contact</varname> (str)</title> <para> Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the B-side Contact Header user part. This parameter @@ -441,11 +441,11 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_b_contact</varname> parameter</title> + <title>Set <varname>xavu_field_b_contact</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_b_contact", "b_contact") +modparam("topos", "xavu_field_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "...";

1 0

git:master:0a9b039f: topos: spelling fix in README for contact parameter
by Henning Westerholt 04 Oct '21

04 Oct '21

Module: kamailio Branch: master Commit: 0a9b039f79de90a45e263325cb247f49a31d9f36 URL: https://github.com/kamailio/kamailio/commit/0a9b039f79de90a45e263325cb247f4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-04T15:38:23Z topos: spelling fix in README for contact parameter --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0a9b039f79de90a45e263325cb247f4… Patch: https://github.com/kamailio/kamailio/commit/0a9b039f79de90a45e263325cb247f4… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 4218dae3fe..dee94df414 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -294,7 +294,7 @@ modparam("topos", "event_mode", 2) <title><varname>contact_host</varname> (str)</title> <para> You may need to control the host part of the Contact header added - by topos. If the xavu_filed_contact_host parameter is set, this value is + by topos. If the xavu_field_contact_host parameter is set, this value is ignored. For example when using TLS with TOPOS the remote UAS must be able to open @@ -397,7 +397,7 @@ modparam("topos", "cparam_name", "xyz") <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... @@ -405,7 +405,7 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </example> </section> <section id="topos.p.xavu_field_a_contact"> - <title><varname>xavu_filed_a_contact</varname> (str)</title> + <title><varname>xavu_field_a_contact</varname> (str)</title> <para> Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the A-side Contact Header user part. This parameter @@ -417,11 +417,11 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_a_contact</varname> parameter</title> + <title>Set <varname>xavu_field_a_contact</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... @@ -429,7 +429,7 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </example> </section> <section id="topos.p.xavu_field_b_contact"> - <title><varname>xavu_filed_b_contact</varname> (str)</title> + <title><varname>xavu_field_b_contact</varname> (str)</title> <para> Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the B-side Contact Header user part. This parameter @@ -441,11 +441,11 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_b_contact</varname> parameter</title> + <title>Set <varname>xavu_field_b_contact</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_b_contact", "b_contact") +modparam("topos", "xavu_field_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "...";

1 0

Syntax error
by Scherney Theodor 04 Oct '21

04 Oct '21

Hello, I have tested following scenario: Alice "calls" Bob. Call is established. At the end of the call, Bob disconnects (hangs up) first and generates a BYE message. If there is a syntax error in FROM Header of BYE message, a 400 “Bad From header” is responded by the Proxy. If there is a syntax error in TO Header of BYE message, the message is discarded. According RFC 3261 this is not correct. Is it okay, to implement the same logic for TO Header as done for FROM Header? RFC 3261: 16.2 Stateful Proxy ………. For all new requests, including any with unknown methods, an element intending to proxy the request MUST: 1. Validate the request (Section 16.3) 2. Preprocess routing information (Section 16.4) 3. Determine target(s) for the request (Section 16.5) +--------------------+ | | +---+ | | | C | | | | T | | | +---+ +---+ | Proxy | +---+ CT = Client Transaction | S | | "Higher" Layer | | C | | T | | | | T | ST = Server Transaction +---+ | | +---+ | | +---+ | | | C | | | | T | | | +---+ +--------------------+ Figure 3: Stateful Proxy Model 4. Forward the request to each target (Section 16.6) 5. Process all responses (Section 16.7) 16.3 Request Validation Before an element can proxy a request, it MUST verify the message’s validity. A valid message must pass the following checks: 1. Reasonable Syntax 2. URI scheme 3. Max-Forwards 4. (Optional) Loop Detection 5. Proxy-Require 6. Proxy-Authorization If any of these checks fail, the element MUST behave as a user agent server (see Section 8.2) and respond with an error code. LOGs: BYE with syntax error in FROM header: Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:555]: parse_to_param(): unexpected end of header, status 20: [;transport=UDP;tag=b3af-8e5a-1e36-79340f18;#015] . Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:881]: parse_addr_spec(): invalid To - unexpected end of header in state 11 Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_from.c:75]: parse_from_header(): bad From header [sip:catt180@vict-ims.net;transport=UDP;tag=b3af-8e5a-1e36-79340f18;] Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="pv"] ERROR: pv [pv_core.c:468]: pv_get_from_attr(): cannot parse From header Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="xlog"] INFO: <script>: route BYE (<null> (193.154.113.40:5065) to sip:catt181@vict-ims.net, 1632235417904catt180, ) Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="xlog"] INFO: <script>: BYE (BYE sip:catt181@193.154.113.40:5065;transport=UDP;rinstance=317-catt181 SIP/2.0#015#012From: sip:catt180@vict-ims.net;transport=UDP;tag=b3af-8e5a-1e36-79340f18;#015#012To: sip:catt181@vict-ims.net;transport=UDP;tag=9d7b-d1c6-c06b-7a1dbec7#015#012Call-ID: 1632235417904catt180#015#012CSeq: 2 BYE#015#012Contact: sip:catt180@193.154.113.40:5065;transport=UDP;rinstance=317-catt180#015#012Content-Length: 0#015#012Max-Forwards: 70#015#012Route: sip:mo@172.29.21.60;r2=on;lr;ftag=b3af-8e5a-1e36-79340f18;rm=8;did=8ed.6e12#015#012Route: sip:mo@pcscf-1.vict-ims.net:5060;r2=on;lr;ftag=b3af-8e5a-1e36-79340f18;rm=8;did=8ed.6e12#015#012Route: sip:mo@vict-ims.net;lr;ftag=b3af-8e5a-1e36-79340f18;did=8ed.e7b1#015#012Route: sip:mt@vict-ims.net;lr;ftag=b3af-8e5a-1e36-79340f18;did=8ed.e7b1#015#012Route: sip:mt@pcscf-1.vict-ims.net;r2=on;lr;ftag=b3af-8e5a-1e36-79340f18;rm=7;did=8ed.7e12#015#012Route: sip:mt@172.29.21.60:5060;r2=on;lr;ftag=b3af-8e5a-1e36-79340f18;rm=7;did=8ed.7e12#015#012Via: SIP/2.0/UDP 193.154.113.40:5065;branch=z9hG4bKf7057b36-0#015#012#015#012) Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:555]: parse_to_param(): unexpected end of header, status 20: [;transport=UDP;tag=b3af-8e5a-1e36-79340f18;#015] . Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:881]: parse_addr_spec(): invalid To - unexpected end of header in state 11 Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="sanity"] WARNING: sanity [sanity.c:776]: check_parse_uris(): failed to parse From header [sip:catt180@vict-ims.net;transport=UDP;tag=b3af-8e5a-1e36-79340f18;] Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="xlog"] INFO: <script>: t_relay_send_reply_sl - BYE (SIP/2.0 400 Bad From header#015#012From: sip:catt180@vict-ims.net;transport=UDP;tag=b3af-8e5a-1e36-79340f18;#015#012To: sip:catt181@vict-ims.net;transport=UDP;tag=9d7b-d1c6-c06b-7a1dbec7#015#012Call-ID: 1632235417904catt180#015#012CSeq: 2 BYE#015#012Via: SIP/2.0/UDP 193.154.113.40:5065;branch=z9hG4bKf7057b36-0#015#012Server: Kamailio P-CSCF#015#012Content-Length: 0#015#012#015#012) BYE with syntax error in TO header: Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:555]: parse_to_param(): unexpected end of header, status 20: [;transport=UDP;tag=1ba4-ff0c-82af-415174d1;#015#012] . Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:881]: parse_addr_spec(): invalid To - unexpected end of header in state 13 Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/msg_parser.c:167]: get_hdr_field(): bad to header Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/msg_parser.c:337]: parse_headers(): bad header field [To: sip:catt181@vict] Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/msg_parser.c:687]: parse_msg(): ERROR: parse_msg: message=<BYE sip:catt181@193.154.113.40:5065;transport=UDP;rinstance=317-catt181 SIP/2.0#015#012From: sip:catt180@vict-ims.net;transport=UDP;tag=b7fb-dd8f-30fd-2a93fc86#015#012To: sip:catt181@vict-ims.net;transport=UDP;tag=1ba4-ff0c-82af-415174d1;#015#012Call-ID: 1632235194213catt180#015#012CSeq: 2 BYE#015#012Contact: sip:catt180@193.154.113.40:5065;transport=UDP;rinstance=317-catt180#015#012Content-Length: 0#015#012Max-Forwards: 70#015#012Route: sip:mo@172.29.21.60;r2=on;lr;ftag=b7fb-dd8f-30fd-2a93fc86;rm=8;did=281.c9a1#015#012Route: sip:mo@pcscf-1.vict-ims.net:5060;r2=on;lr;ftag=b7fb-dd8f-30fd-2a93fc86;rm=8;did=281.c9a1#015#012Route: sip:mo@vict-ims.net;lr;ftag=b7fb-dd8f-30fd-2a93fc86;did=281.b871#015#012Route: sip:mt@vict-ims.net;lr;ftag=b7fb-dd8f-30fd-2a93fc86;did=281.b871#015#012Route: sip:mt@pcscf-1.vict-ims.net;r2=on;lr;ftag=b7fb-dd8f-30fd-2a93fc86;rm=7;did=281.d9a1#015#012Route: sip:mt@172.29.21.60:5060;r2=on;lr;ftag=b7fb-dd8f-30fd-2a93fc86;rm=7;did=281.d9a1#015#012Via: SIP/2.0/UDP 193.154.113.40:5065;branch=z9hG4bK0850615e-0#015#012#015#012> Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/receive.c:199]: receive_msg(): core parsing of SIP message failed (193.154.113.40:5065/1) BR Theo

2 2

[kamailio/kamailio] SIP Preconditions Settings? (#2866)
by JoelBorrego 04 Oct '21

04 Oct '21

Hi GitHub Team, We are trying to find how to disable the SIP Precondition flag in the Kamailio, because until now the only way to do any changes is via UE (Smartphones with debug SW). According with the RFC3312 (https://datatracker.ietf.org/doc/html/rfc3312) The SDP parameters are the following We define the following media level SDP attributes: current-status = "a=curr:" precondition-type SP status-type SP direction-tag desired-status = "a=des:" precondition-type SP strength-tag SP status-type SP direction-tag confirm-status = "a=conf:" precondition-type SP status-type SP direction-tag **precondition-type = "qos" | token strength-tag = ("mandatory" | "optional" | "none" = | "failure" | "unknown")** status-type = ("e2e" | "local" | "remote") direction-tag = ("none" | "send" | "recv" | "sendrecv") Which one should be the equivalent in the Kamailio?, is the a specific module? Br, Joel -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2866

3 4

git:master:1ea71703: lwsc: wait to read more data if not last ws fragment
by Daniel-Constantin Mierla 01 Oct '21

01 Oct '21

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

1 0

git:master:e4e07a9c: posops: set index relative to the buffer for search functions
by Daniel-Constantin Mierla 01 Oct '21

01 Oct '21

Module: kamailio Branch: master Commit: e4e07a9cca8d91cb4acce8cbf7c8def9c3df06d9 URL: https://github.com/kamailio/kamailio/commit/e4e07a9cca8d91cb4acce8cbf7c8def… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-01T08:43:22+02:00 posops: set index relative to the buffer for search functions --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e4e07a9cca8d91cb4acce8cbf7c8def… Patch: https://github.com/kamailio/kamailio/commit/e4e07a9cca8d91cb4acce8cbf7c8def… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 9c6f7d702f..5710b83da2 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -684,7 +684,7 @@ static int ki_posops_pos_search_helper(sip_msg_t *msg, int idx, regex_t *re) return -1; } - _posops_data.idx = (int)(msg->buf + idx + pmatch.rm_so); + _posops_data.idx = idx + pmatch.rm_so; _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; _posops_data.len = pmatch.rm_eo-pmatch.rm_so; @@ -757,7 +757,7 @@ static int ki_posops_pos_rsearch_helper(sip_msg_t *msg, int idx, regex_t *re) return -1; } - _posops_data.idx = (int)(msg->buf + i + pmatch.rm_so); + _posops_data.idx = i + pmatch.rm_so; _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; _posops_data.len = pmatch.rm_eo-pmatch.rm_so;

1 0

git:master:0f851d79: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 30 Sep '21

30 Sep '21

Module: kamailio Branch: master Commit: 0f851d791d1d452be079ced5271e64a1a6a2ab69 URL: https://github.com/kamailio/kamailio/commit/0f851d791d1d452be079ced5271e64a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-30T12:31:26+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/0f851d791d1d452be079ced5271e64a… Patch: https://github.com/kamailio/kamailio/commit/0f851d791d1d452be079ced5271e64a… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index fb2fbe0a8c..43a05c6833 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -42,6 +42,7 @@ Daniel-Constantin Mierla 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) 4.12. pos_search(idx, re) + 4.13. pos_rsearch(idx, re) 5. Pseudo Variables @@ -60,6 +61,7 @@ Daniel-Constantin Mierla 1.11. pos_find_str() usage 1.12. pos_rfindi_str() usage 1.13. pos_search() usage + 1.14. pos_rsearch() usage Chapter 1. Admin Guide @@ -89,6 +91,7 @@ Chapter 1. Admin Guide 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) 4.12. pos_search(idx, re) + 4.13. pos_rsearch(idx, re) 5. Pseudo Variables @@ -148,6 +151,7 @@ modparam("posops", "idx0", -200) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) 4.12. pos_search(idx, re) + 4.13. pos_rsearch(idx, re) 4.1. pos_append(idx, val) @@ -345,6 +349,26 @@ $var(idx) = pos_rfindi_str("100", "kamailio"); $var(idx) = pos_search("100", "[0-9]+"); ... +4.13. pos_rsearch(idx, re) + + Return the position of last match that starts matching the regular + expression re in message buffer starting at idx. In case of not finding + it or error, the return code is negative. If val is at index 0, it + returns the value specified by modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The re can be a static regular expression string. + + This function can be used from ANY_ROUTE. + + Example 1.14. pos_rsearch() usage +... +$var(idx) = pos_rsearch("100", "[0-9]+"); +... + 5. Pseudo Variables The module exports a pseudo-variable class, $pos(key), to access

1 0

git:master:d92cf070: posops: pos_rsearch() - search last occurence of a regex
by Daniel-Constantin Mierla 30 Sep '21

30 Sep '21

Module: kamailio Branch: master Commit: d92cf070a06c1528207c2ddab76d99641f7a9dc2 URL: https://github.com/kamailio/kamailio/commit/d92cf070a06c1528207c2ddab76d996… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-30T08:43:08+02:00 posops: pos_rsearch() - search last occurence of a regex --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d92cf070a06c1528207c2ddab76d996… Patch: https://github.com/kamailio/kamailio/commit/d92cf070a06c1528207c2ddab76d996…

1 0

git:master:02611920: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 29 Sep '21

29 Sep '21

Module: kamailio Branch: master Commit: 026119200117d20740cbe4d162a14767fe560fc5 URL: https://github.com/kamailio/kamailio/commit/026119200117d20740cbe4d162a1476… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-29T10:01:26+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/026119200117d20740cbe4d162a1476… Patch: https://github.com/kamailio/kamailio/commit/026119200117d20740cbe4d162a1476… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index 6e126f645f..fb2fbe0a8c 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -43,6 +43,8 @@ Daniel-Constantin Mierla 4.11. pos_rfindi_str(idx, val) 4.12. pos_search(idx, re) + 5. Pseudo Variables + List of Examples 1.1. Set idx0 parameter @@ -88,6 +90,8 @@ Chapter 1. Admin Guide 4.11. pos_rfindi_str(idx, val) 4.12. pos_search(idx, re) + 5. Pseudo Variables + 1. Overview The module exports utility functions to work with position inside the @@ -340,3 +344,11 @@ $var(idx) = pos_rfindi_str("100", "kamailio"); ... $var(idx) = pos_search("100", "[0-9]+"); ... + +5. Pseudo Variables + + The module exports a pseudo-variable class, $pos(key), to access + attributes upon specific function execution. + + These are documented in the appropriate Wiki pages hosted on the + project web site.

1 0

git:master:4f44fc43: posops: docs - section with notes about exported variables
by Daniel-Constantin Mierla 29 Sep '21

29 Sep '21

Module: kamailio Branch: master Commit: 4f44fc435b7819645ec39c44e37f25629809290a URL: https://github.com/kamailio/kamailio/commit/4f44fc435b7819645ec39c44e37f256… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-29T09:40:06+02:00 posops: docs - section with notes about exported variables --- Modified: src/modules/posops/doc/posops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4f44fc435b7819645ec39c44e37f256… Patch: https://github.com/kamailio/kamailio/commit/4f44fc435b7819645ec39c44e37f256… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index 8f3ea7a44b..ac824f988b 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -382,5 +382,17 @@ $var(idx) = pos_search("100", "[0-9]+"); </section> </section> + <section id="posops.pvs"> + <title>Pseudo Variables</title> + <para> + The module exports a pseudo-variable class, $pos(key), to access + attributes upon specific function execution. + </para> + <para> + These are documented in the appropriate Wiki pages hosted on the + project web site. + </para> + </section> + </chapter>

1 0

git:master:c1087058: posops: store len of matched string with search function
by Daniel-Constantin Mierla 29 Sep '21

29 Sep '21

Module: kamailio Branch: master Commit: c108705810e3e84c18c91bcc7755077002443643 URL: https://github.com/kamailio/kamailio/commit/c108705810e3e84c18c91bcc7755077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-29T09:23:42+02:00 posops: store len of matched string with search function --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c108705810e3e84c18c91bcc7755077… Patch: https://github.com/kamailio/kamailio/commit/c108705810e3e84c18c91bcc7755077… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 7e219e63e5..6efb201ae4 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -54,6 +54,7 @@ static int w_posops_pos_search(sip_msg_t* msg, char* p1idx, char* p2re); typedef struct posops_data { int ret; int idx; + int len; } posops_data_t; static int posops_idx0 = -255; @@ -659,6 +660,7 @@ static int ki_posops_pos_search_helper(sip_msg_t *msg, int idx, regex_t *re) _posops_data.idx = (int)(msg->buf + idx + pmatch.rm_so); _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; + _posops_data.len = pmatch.rm_eo-pmatch.rm_so; return _posops_data.ret; } @@ -708,6 +710,8 @@ static int pv_posops_get_pos(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, _posops_data.idx); case 1: /* ret */ return pv_get_sintval(msg, param, res, _posops_data.ret); + case 2: /* len */ + return pv_get_sintval(msg, param, res, _posops_data.len); } return pv_get_null(msg, param, res); } @@ -723,6 +727,8 @@ static int pv_posops_parse_pos_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "ret", 3)==0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "len", 3)==0) + sp->pvp.pvn.u.isname.name.n = 2; else goto error; break;

1 0

git:master:f6e93064: posops: init data structure for each function
by Daniel-Constantin Mierla 29 Sep '21

29 Sep '21

Module: kamailio Branch: master Commit: f6e9306428d28a65783034f981734ccb8b853e5e URL: https://github.com/kamailio/kamailio/commit/f6e9306428d28a65783034f981734cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-29T09:32:50+02:00 posops: init data structure for each function --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f6e9306428d28a65783034f981734cc… Patch: https://github.com/kamailio/kamailio/commit/f6e9306428d28a65783034f981734cc…

1 0

git:5.5:548e14cb: topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852)
by Henning Westerholt 28 Sep '21

28 Sep '21

Module: kamailio Branch: 5.5 Commit: 548e14cb12a9d39374ee20c9e5ab35b84c609a0c URL: https://github.com/kamailio/kamailio/commit/548e14cb12a9d39374ee20c9e5ab35b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-28T11:30:29Z topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852) (cherry picked from commit 5484b7a2bf662d3bced662d11a04e1f25f965023) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/548e14cb12a9d39374ee20c9e5ab35b… Patch: https://github.com/kamailio/kamailio/commit/548e14cb12a9d39374ee20c9e5ab35b… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index b94a960340..1a67c0252c 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -352,7 +352,8 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, td->cp++; } - /* contact_host xavu takes preference */ + /* contact_host xavu takes preference, reset vavu */ + vavu = NULL; if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, &_tps_xavu_field_contact_host);

1 0

git:master:5484b7a2: topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852)
by Henning Westerholt 28 Sep '21

28 Sep '21

Module: kamailio Branch: master Commit: 5484b7a2bf662d3bced662d11a04e1f25f965023 URL: https://github.com/kamailio/kamailio/commit/5484b7a2bf662d3bced662d11a04e1f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-28T11:27:50Z topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5484b7a2bf662d3bced662d11a04e1f… Patch: https://github.com/kamailio/kamailio/commit/5484b7a2bf662d3bced662d11a04e1f… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index b94a960340..1a67c0252c 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -352,7 +352,8 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, td->cp++; } - /* contact_host xavu takes preference */ + /* contact_host xavu takes preference, reset vavu */ + vavu = NULL; if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, &_tps_xavu_field_contact_host);

1 0

git:master:d0e51c2f: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 28 Sep '21

28 Sep '21

Module: kamailio Branch: master Commit: d0e51c2f862ce0089c899d97c16906b037c485b3 URL: https://github.com/kamailio/kamailio/commit/d0e51c2f862ce0089c899d97c16906b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-28T10:46:28+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/d0e51c2f862ce0089c899d97c16906b… Patch: https://github.com/kamailio/kamailio/commit/d0e51c2f862ce0089c899d97c16906b… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 9d5e39f488..a9caf8951f 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2748,6 +2748,8 @@ ackets, 0 errors is enabled, the sessions are still allowed to finish for the hidden old nodes. + The execution of this command is limited to 10 seconds intervals. + Example 1.103. rtpengine.reload usage ... $ kamcmd rtpengine.reload

1 0

git:master:a9c9b83c: rtpengine: docs - note that rpc reload is limited to 10secs frequency
by Daniel-Constantin Mierla 28 Sep '21

28 Sep '21

Module: kamailio Branch: master Commit: a9c9b83c9dd1c09738b5a33362a8e339c20b786c URL: https://github.com/kamailio/kamailio/commit/a9c9b83c9dd1c09738b5a33362a8e33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-28T10:35:12+02:00 rtpengine: docs - note that rpc reload is limited to 10secs frequency --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a9c9b83c9dd1c09738b5a33362a8e33… Patch: https://github.com/kamailio/kamailio/commit/a9c9b83c9dd1c09738b5a33362a8e33… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 2106241f8d..c3201bbf37 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -3285,7 +3285,7 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); <title>RPC Commands</title> <section id="rtpengine.r.reload"> - <title>rtpengine.reload</title> + <title><function moreinfo="none">rtpengine.reload</function></title> <para> Reloads the database node table content <emphasis>if configured</emphasis>. Returns specific message related to success, failure and no db_url configured. @@ -3295,6 +3295,9 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); hides old ones, based on the database content. If allow_op modparam is enabled, the sessions are still allowed to finish for the hidden old nodes. </para> + <para> + The execution of this command is limited to 10 seconds intervals. + </para> <example> <title> <function moreinfo="none">rtpengine.reload</function> usage</title>

1 0

seas module
by dpaape 27 Sep '21

27 Sep '21

I’m attempting to connect my application to kamailio via the seas module. Kamailio ver. 5.3.2 I have loaded all the necessary configuration file components. I start kamailio and everything looks good. I then start my app server which connects to the loopback ports 5040 and 5041 and send my counted string “servername” to each connection. Again everything looks good. Seas module responds with : “… EUREKA, we have a new connected AS: myappserver I then send a register request to kamailio. Request_route calls as_relay_t(myappserver) and I subsequently get an ERROR – w_as_relay_t(): no processer found for packet dst xxx.xxx.xxx.xxx:pppp As best as I can figure out from the source…. It looks as if something else needs to be sent to kamailio (from myappserver) in order for a processor_id to be assigned to ‘as->bound_processor[i] My application server is just straight up C code. I must be forgetting something or maybe completely off the mark as to how the seas module functions. Any help would be greatly appreciated. Thanks, Dan Sent from Mail for Windows

1 0

git:master:2fdf550a: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: 2fdf550ac0a865ba2336e80ce2d450f3c378ad50 URL: https://github.com/kamailio/kamailio/commit/2fdf550ac0a865ba2336e80ce2d450f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-27T12:46:18+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/2fdf550ac0a865ba2336e80ce2d450f… Patch: https://github.com/kamailio/kamailio/commit/2fdf550ac0a865ba2336e80ce2d450f… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index d5f49f0cbb..6e126f645f 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -41,6 +41,7 @@ Daniel-Constantin Mierla 4.9. pos_findi_str(idx, val) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) + 4.12. pos_search(idx, re) List of Examples @@ -56,6 +57,7 @@ Daniel-Constantin Mierla 1.10. pos_findi_str() usage 1.11. pos_find_str() usage 1.12. pos_rfindi_str() usage + 1.13. pos_search() usage Chapter 1. Admin Guide @@ -84,6 +86,7 @@ Chapter 1. Admin Guide 4.9. pos_findi_str(idx, val) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) + 4.12. pos_search(idx, re) 1. Overview @@ -140,6 +143,7 @@ modparam("posops", "idx0", -200) 4.9. pos_findi_str(idx, val) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) + 4.12. pos_search(idx, re) 4.1. pos_append(idx, val) @@ -316,3 +320,23 @@ $var(idx) = pos_rfind_str("100", "kamailio"); ... $var(idx) = pos_rfindi_str("100", "kamailio"); ... + +4.12. pos_search(idx, re) + + Return the position that starts matching the regular expression re in + message buffer starting at idx. In case of not finding it or error, the + return code is negative. If val is at index 0, it returns the value + specified by modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The re can be a static regular expression string. + + This function can be used from ANY_ROUTE. + + Example 1.13. pos_search() usage +... +$var(idx) = pos_search("100", "[0-9]+"); +...

1 0

git:master:efe64a9a: posops: function to get the position of a regexp match
by Daniel-Constantin Mierla 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: efe64a9a14af608c47819678520c08eac98f52d7 URL: https://github.com/kamailio/kamailio/commit/efe64a9a14af608c47819678520c08e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-27T12:35:47+02:00 posops: function to get the position of a regexp match --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/efe64a9a14af608c47819678520c08e… Patch: https://github.com/kamailio/kamailio/commit/efe64a9a14af608c47819678520c08e…

1 0

git:master:421ba0ad: core: fixup helper for igp and regexp params
by Daniel-Constantin Mierla 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: 421ba0adde21ebc9f1e7a2289901a9574cc37259 URL: https://github.com/kamailio/kamailio/commit/421ba0adde21ebc9f1e7a2289901a95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-27T12:31:59+02:00 core: fixup helper for igp and regexp params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/421ba0adde21ebc9f1e7a2289901a95… Patch: https://github.com/kamailio/kamailio/commit/421ba0adde21ebc9f1e7a2289901a95… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 49dbb44f1f..148ba50227 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -251,6 +251,50 @@ int fixup_free_regexp_regexp(void** param, int param_no) return fixup_free_regexp_null(param, 1); } +int fixup_igp_regexp(void** param, int param_no) +{ + struct regex_fixup* re; + + if (param_no == 1) { + return fixup_igp_null(param, param_no); + } + if (param_no == 2) { + if ((re=pkg_malloc(sizeof(*re))) ==0) { + PKG_MEM_ERROR; + goto error; + } + if (regcomp(&re->regex, *param, + REG_EXTENDED|REG_ICASE|REG_NEWLINE)) + goto error; + re->orig = *param; + *param = re; + } + return 0; +error: + if (re) + pkg_free(re); + return E_UNSPEC; +} + +int fixup_free_igp_regexp(void** param, int param_no) +{ + struct regex_fixup* re; + + if (param_no == 1) { + return fixup_free_igp_null(param, param_no); + } + if (param_no == 2) { + if (*param) { + re = *param; + *param = re->orig; + regfree(&re->regex); + pkg_free(re); + } + } + return 0; +} + + /* fixup_pvar_*() has to be written "by hand", since it needs to save the original pointer (the fixup users expects a pointer to the pv_spec_t in *param and hence the original value diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 29d937a261..f91e489f68 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -159,4 +159,7 @@ free_fixup_function mod_fix_get_fixup_free(fixup_function f); int fixup_vstr_all(void** param, int param_no); int fixup_free_vstr_all(void** param, int param_no); int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); + +int fixup_igp_regexp(void** param, int param_no); +int fixup_free_igp_regexp(void** param, int param_no); #endif

1 0

git:master:ed3b2506: async: docs - added section ids for parameters
by Daniel-Constantin Mierla 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: ed3b2506e13214d25a3dd78e487ed35ed13053ac URL: https://github.com/kamailio/kamailio/commit/ed3b2506e13214d25a3dd78e487ed35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-27T11:38:42+02:00 async: docs - added section ids for parameters --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ed3b2506e13214d25a3dd78e487ed35… Patch: https://github.com/kamailio/kamailio/commit/ed3b2506e13214d25a3dd78e487ed35… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 5e9277a194..a56c60d7d2 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -68,7 +68,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="async.p.workers"> <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous @@ -88,7 +88,7 @@ modparam("async", "workers", 2) </programlisting> </example> </section> - <section> + <section id="async.p.ms_timer"> <title><varname>ms_timer</varname> (int)</title> <para> Enables millisecond timer for async_ms_sleep() and async_ms_route() functions.

1 0

mod_pike is broken in 5.4 branch ?
by Markus Bönke 24 Sep '21

24 Sep '21

Hello all, It looks like mod_pike is broken in 5.4 branch since 5.4.6 because this patch is missing: https://github.com/kamailio/kamailio/commit/79fbb7c6df5d4c742b1283b752c2df0… <https://github.com/kamailio/kamailio/commit/79fbb7c6df5d4c742b1283b752c2df0…> If I test my script and send a lot of REGISTER messages, I only see this DEBUG message, the IP is never added to the tree: DEBUG: {1 [100-6380(a)10.211.55.12 <mailto:100-6380@10.211.55.12>] [1 REGISTER] [0]} pike [ip_tree.c:291]: mark_node(): search on branch 10 (top=(nil)) Versions 5.5.x are OK again. Thanks and regards Markus

2 1

git:5.4:523085f0: pike: fixed regression
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: 5.4 Commit: 523085f0a3c0953faa47bed7113507eb3c8b4f2c URL: https://github.com/kamailio/kamailio/commit/523085f0a3c0953faa47bed7113507e… Author: Boris Korzun <korzun(a)miatel.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T18:06:32+02:00 pike: fixed regression - removed unnecessary NULL-return from mark_node() after previous commit (cherry picked from commit 79fbb7c6df5d4c742b1283b752c2df0f51e77f09) (cherry picked from commit b62a773c8f0c1daf1aa3d1cd57845d414eea5bac) --- Modified: src/modules/pike/ip_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/523085f0a3c0953faa47bed7113507e… Patch: https://github.com/kamailio/kamailio/commit/523085f0a3c0953faa47bed7113507e… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index c0324c0476..1fe9227a5f 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -301,10 +301,6 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, } } - if(node==NULL) { - return NULL; - } - LM_DBG("only first %d were matched!\n",byte_pos); *flag = 0; *father = 0;

1 0

git:master:932e46b0: core: jump to error in case of unexpected comma for parse addr spec
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: 932e46b09176544cf6e085a32677980b26e4d2eb URL: https://github.com/kamailio/kamailio/commit/932e46b09176544cf6e085a32677980… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T14:43:40+02:00 core: jump to error in case of unexpected comma for parse addr spec --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/932e46b09176544cf6e085a32677980… Patch: https://github.com/kamailio/kamailio/commit/932e46b09176544cf6e085a32677980… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 1ff5a16908..f003e5f31a 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -494,6 +494,7 @@ static char *parse_to_param(char *const buffer, const char *const end, } LM_ERR("invalid character ',' in status %d: [%.*s]\n", status, (int)(tmp - buffer), ZSW(buffer)); + goto error; } default: switch(status) {

1 0

git:master:9d32ae36: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: 9d32ae36488ae988a8e6c13698f8f95eaab906f6 URL: https://github.com/kamailio/kamailio/commit/9d32ae36488ae988a8e6c13698f8f95… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-24T12:31:20+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9d32ae36488ae988a8e6c13698f8f95… Patch: https://github.com/kamailio/kamailio/commit/9d32ae36488ae988a8e6c13698f8f95…

1 0

git:master:f5d73407: textopsx: exported msg_set_buffer(data) function
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: f5d7340773b9fb0f69644a6a1187ce5ef8cd55b8 URL: https://github.com/kamailio/kamailio/commit/f5d7340773b9fb0f69644a6a1187ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T12:17:19+02:00 textopsx: exported msg_set_buffer(data) function - it was available to KEMI --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/f5d7340773b9fb0f69644a6a1187ce5… Patch: https://github.com/kamailio/kamailio/commit/f5d7340773b9fb0f69644a6a1187ce5… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index b5a6cac103..3de3a6c8e6 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -46,6 +46,34 @@ if(msg_apply_changes()) } } ... +</programlisting> + </example> + </section> + + <section id="textopsx.f.msg_set_buffer"> + <title> + <function moreinfo="none">msg_set_buffer(data)</function> + </title> + <para> + Set the content of the SIP message buffer, replacing the exiting data. + The parameter can contain variables, its value must be a valid SIP + request or reply, a matter of what the old message is. + </para> + <para> + This function can be used from REQUEST_ROUTE or core REPLY_ROUTE. + </para> + <para> + Note: It must be used before the transaction is created in + request_route and not inside the onreply_route[name] executed by tm + module. Also, do not use after resuming a suspended request or reply, + at that moment the transaction is already created. + </para> + <example> + <title><function>msg_set_buffer()</function> usage</title> + <programlisting format="linespecific"> +... +msg_set_buffer("INVITE sip:..."); +... </programlisting> </example> </section> diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index a9a60f9ed8..5ddeffa2c7 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -46,6 +46,7 @@ MODULE_VERSION static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2); +static int msg_set_buffer_f(sip_msg_t *msg, char *p1data, char *p2); static int change_reply_status_f(sip_msg_t *, char *, char *); static int change_reply_status_fixup(void **param, int param_no); @@ -121,6 +122,9 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"msg_apply_changes", (cmd_function)msg_apply_changes_f, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"msg_set_buffer", (cmd_function)msg_set_buffer_f, 1, + fixup_spve_null, fixup_free_spve_null, + REQUEST_ROUTE | ONREPLY_ROUTE}, {"change_reply_status", change_reply_status_f, 2, change_reply_status_fixup, 0, ONREPLY_ROUTE}, {"change_reply_status_code", change_reply_status_code_f, 1, @@ -242,6 +246,21 @@ static int ki_msg_set_buffer(sip_msg_t *msg, str *obuf) return ki_msg_update_buffer(msg, obuf); } +/** + * + */ +static int msg_set_buffer_f(sip_msg_t *msg, char *p1data, char *p2) +{ + str data = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)p1data, &data) < 0) { + LM_ERR("could not get string param value\n"); + return -1; + } + + return ki_msg_set_buffer(msg, &data); +} + /** * */

1 0

git:master:e51fa240: modules: readme files regenerated - sworker ... [skip ci]
by Kamailio Dev 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: e51fa240a0b8a39757c42f62fbdba21b3c1a2a11 URL: https://github.com/kamailio/kamailio/commit/e51fa240a0b8a39757c42f62fbdba21… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-24T10:46:17+02:00 modules: readme files regenerated - sworker ... [skip ci] --- Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/e51fa240a0b8a39757c42f62fbdba21… Patch: https://github.com/kamailio/kamailio/commit/e51fa240a0b8a39757c42f62fbdba21… --- diff --git a/src/modules/sworker/README b/src/modules/sworker/README index c5d571a179..d4aa30b864 100644 --- a/src/modules/sworker/README +++ b/src/modules/sworker/README @@ -23,15 +23,20 @@ Daniel-Constantin Mierla 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Functions + 3. Parameters - 3.1. sworker_active() - 3.2. swork_task(gname) + 3.1. xdata (str) + + 4. Functions + + 4.1. sworker_active() + 4.2. swork_task(gname) List of Examples - 1.1. sworker_active() usage - 1.2. sworker_task() usage + 1.1. xdata usage + 1.2. sworker_active() usage + 1.3. sworker_task() usage Chapter 1. Admin Guide @@ -43,10 +48,14 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Functions + 3. Parameters + + 3.1. xdata (str) - 3.1. sworker_active() - 3.2. swork_task(gname) + 4. Functions + + 4.1. sworker_active() + 4.2. swork_task(gname) 1. Overview @@ -81,19 +90,39 @@ Chapter 1. Admin Guide running Kamailio with this module loaded: * None -3. Functions +3. Parameters + + 3.1. xdata (str) + +3.1. xdata (str) + + Name of a script variable from where to take additional data to be + passed to special worker along with the SIP message. Same variable will + be set by the special worker, therefore it has to be a writable + variable. Moreover, it must be a variable that can be set without the + SIP message structure, like $var(name), otherwise it can lead to a + crash. + + Default value: not set. + + Example 1.1. xdata usage +... +modparam("sworker", "xdata", "$var(xdata)") +... + +4. Functions - 3.1. sworker_active() - 3.2. swork_task(gname) + 4.1. sworker_active() + 4.2. swork_task(gname) -3.1. sworker_active() +4.1. sworker_active() Return 1 (true) if the processing happens in an asyn process, or -1 (false) if the processing is happening in a SIP receiving process. This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE. - Example 1.1. sworker_active() usage + Example 1.2. sworker_active() usage ... request_route { ... @@ -103,7 +132,7 @@ request_route { } ... -3.2. swork_task(gname) +4.2. swork_task(gname) Delegate the processing of SIP message to a group of async workers. The function is restricted to be used inside event_route[core:pre-routing]. @@ -119,7 +148,7 @@ request_route { This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE. - Example 1.2. sworker_task() usage + Example 1.3. sworker_task() usage ... event_route[core:pre-routing] { if(sworker_task("default")) {

1 0

git:master:d60c758e: sworker: added parameter to be able to pass extra data to worker
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: d60c758e26048d2c9f055e8715ac54eee0b5a5ee URL: https://github.com/kamailio/kamailio/commit/d60c758e26048d2c9f055e8715ac54e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T10:31:12+02:00 sworker: added parameter to be able to pass extra data to worker --- Modified: src/modules/sworker/doc/sworker_admin.xml Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d60c758e26048d2c9f055e8715ac54e… Patch: https://github.com/kamailio/kamailio/commit/d60c758e26048d2c9f055e8715ac54e…

1 0

git:master:b6431ea5: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: b6431ea5044897e6152d5785a30af71ed759e19c URL: https://github.com/kamailio/kamailio/commit/b6431ea5044897e6152d5785a30af71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-24T08:46:16+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/b6431ea5044897e6152d5785a30af71… Patch: https://github.com/kamailio/kamailio/commit/b6431ea5044897e6152d5785a30af71…

1 0

git:master:f23008ea: pv: added functions for xavu params explode/implode
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: f23008ea338e3fa67f50bab8fabf93cacc07804b URL: https://github.com/kamailio/kamailio/commit/f23008ea338e3fa67f50bab8fabf93c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T08:32:31+02:00 pv: added functions for xavu params explode/implode --- Modified: src/modules/pv/doc/pv_admin.xml Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/f23008ea338e3fa67f50bab8fabf93c… Patch: https://github.com/kamailio/kamailio/commit/f23008ea338e3fa67f50bab8fabf93c…

1 0

Releasing Kamailio 5.3.9
by Henning Westerholt 23 Sep '21

23 Sep '21

Hello, I am planning to release in two weeks (likely on Wednesday 7th October) the next minor version out of branch 5.3, version 5.3.9. Backports of fixed issues from other stable branches will be integrated as usual. If you are aware of new issues which were not yet reported on the issue tracker or are missing back-ports, report them. Please note that this will be the last minor release created from the 5.3.x stable branch. The stable branches are usually maintained from the Kamailio development team for a period of two years. The other two stable branches of Kamailio will still be maintained (5.4.x and 5.5.x). Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:master:e41d23e2: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: e41d23e2955ab9e311f4292b6ffe58e4e4a4432b URL: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-23T09:46:23+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… Patch: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index 319e654c50..d5f49f0cbb 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -39,6 +39,8 @@ Daniel-Constantin Mierla 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) List of Examples @@ -52,6 +54,8 @@ Daniel-Constantin Mierla 1.8. pos_body_end() usage 1.9. pos_find_str() usage 1.10. pos_findi_str() usage + 1.11. pos_find_str() usage + 1.12. pos_rfindi_str() usage Chapter 1. Admin Guide @@ -78,6 +82,8 @@ Chapter 1. Admin Guide 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) 1. Overview @@ -132,6 +138,8 @@ modparam("posops", "idx0", -200) 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) 4.1. pos_append(idx, val) @@ -236,7 +244,9 @@ $var(pos) = pos_body_end(); case of not finding it or error, the return code is negative. If val is at index 0, it returns the value specified by modparam idx0. - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. The val can be a static string or variables. @@ -254,7 +264,9 @@ $var(idx) = pos_find_str("100", "kamailio"); code is negative. If val is at index 0, it returns the value specified by modparam idx0. - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. The val can be a static string or variables. @@ -264,3 +276,43 @@ $var(idx) = pos_find_str("100", "kamailio"); ... $var(idx) = pos_findi_str("100", "kamailio"); ... + +4.10. pos_rfind_str(idx, val) + + Return the last position of the val in message buffer starting at idx + (reverse search). In case of not finding it or error, the return code + is negative. If val is at index 0, it returns the value specified by + modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.11. pos_find_str() usage +... +$var(idx) = pos_rfind_str("100", "kamailio"); +... + +4.11. pos_rfindi_str(idx, val) + + Return the last position of the val (matching case insensitive) in + message buffer starting at idx (reverse search). In case of not finding + it or error, the return code is negative. If val is at index 0, it + returns the value specified by modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.12. pos_rfindi_str() usage +... +$var(idx) = pos_rfindi_str("100", "kamailio"); +...

1 0

git:master:2cd6f16f: posops: functions for getting the position by reverse search
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 2cd6f16f9a377bf35a6f3f840dbedc5780897736 URL: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:25:43+02:00 posops: functions for getting the position by reverse search --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5… Patch: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5…

1 0

git:master:2ae296f5: posops: handle negative index parameter for find functions
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 2ae296f5d8fa2baa2d451213d668fdd8fabe06d9 URL: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:06:51+02:00 posops: handle negative index parameter for find functions --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… Patch: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index 7aa9620343..b0b67b117e 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -246,7 +246,8 @@ $var(pos) = pos_body_end(); val is at index 0, it returns the value specified by modparam idx0. </para> <para> - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the buffer. </para> <para> The val can be a static string or variables. @@ -274,7 +275,8 @@ $var(idx) = pos_find_str("100", "kamailio"); by modparam idx0. </para> <para> - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the buffer. </para> <para> The val can be a static string or variables. diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 8c538720ce..6e367c53aa 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -427,13 +427,15 @@ static int ki_posops_pos_find_str(sip_msg_t *msg, int idx, str *val) char *p; str text; - if(idx<0 || val==NULL || val->s==NULL || val->len<=0) { + if(val==NULL || val->s==NULL || val->len<=0) { return -1; } - if(idx > msg->len - val->len) { + if(idx<0) { + idx += msg->len; + } + if(idx<0 || idx > msg->len - val->len) { return -1; } - text.s = msg->buf + idx; text.len = msg->len - idx; p = str_search(&text, val); @@ -476,10 +478,13 @@ static int ki_posops_pos_findi_str(sip_msg_t *msg, int idx, str *val) char *p; str text; - if(idx<0 || val==NULL || val->s==NULL || val->len<=0) { + if(val==NULL || val->s==NULL || val->len<=0) { return -1; } - if(idx > msg->len - val->len) { + if(idx<0) { + idx += msg->len; + } + if(idx<0 || idx > msg->len - val->len) { return -1; }

1 0

git:master:747ed6d1: core: ut - functions for reverse search of str value
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 747ed6d1c9434a90b77fd86c4dae35e447da9185 URL: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:22:21+02:00 core: ut - functions for reverse search of str value --- Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… Patch: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… --- diff --git a/src/core/ut.c b/src/core/ut.c index 00254eba23..8dde51aaff 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -392,6 +392,49 @@ char *str_casesearch_strz(str *text, char *needlez) return str_casesearch(text, &needle); } +/** + * @brief search for last occurence of needle in text (reverse search) + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_rsearch(str *text, str *needle) +{ + char *p; + + if(text==NULL || text->s==NULL || needle==NULL || needle->s==NULL + || text->len<needle->len) + return NULL; + + for (p = text->s + text->len - needle->len; p >= text->s; p--) { + if (*p == *needle->s && memcmp(p, needle->s, needle->len)==0) { + return p; + } + } + + return NULL; +} + +/** + * @brief case insensitive search for last occurence of needle in text (reverse search) + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_rcasesearch(str *text, str *needle) +{ + int i,j; + for(i=text->len-needle->len;i>=0;i--) { + for(j=0;j<needle->len;j++) { + if ( !((text->s[i+j]==needle->s[j]) || + ( isalpha((int)text->s[i+j]) + && ((text->s[i+j])^(needle->s[j]))==0x20 )) ) + break; + } + if (j==needle->len) + return text->s+i; + } + return NULL; +} + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or diff --git a/src/core/ut.h b/src/core/ut.h index f2173d3dcf..385db99ca7 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1110,6 +1110,10 @@ char *strz_casesearch_strz(char *textz, char *needlez); char *str_casesearch_strz(str *text, char *needlez); +char *str_rsearch(str *text, str *needle); + +char *str_rcasesearch(str *text, str *needle); + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or

1 0

git:master:706dd0c9: posops: adjust offset on negative index for update ops
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: master Commit: 706dd0c9bf528881d758bc5c26f05870d8f22e35 URL: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T21:19:01+02:00 posops: adjust offset on negative index for update ops --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… Patch: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 4c0c1b1535..8c538720ce 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -153,7 +153,7 @@ static int ki_posops_pos_append(sip_msg_t *msg, int idx, str *val) } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; } @@ -206,7 +206,7 @@ static int ki_posops_pos_insert(sip_msg_t *msg, int idx, str *val) } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; } @@ -259,7 +259,7 @@ static int ki_posops_pos_rm(sip_msg_t *msg, int idx, int len) return -1; } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; }

1 0

[kamailio/kamailio] how to choose 2 different rr heads (#2861)
by hance2010 22 Sep '21

22 Sep '21

### Description how to choose 2 different rr heads when relay a public call to lan? Thanks! ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.5.1 ``` * **Operating System**:  ``` debian10 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2861

2 2

Kamailio v5.4.7 Released
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Hello, Kamailio SIP Server v5.4.7 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.6. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.7. Note that 5.4 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.5, with v5.5.2 being release out of it. For more details about version 5.4.7 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/09/kamailio-v5-4-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:5.4:b647485d: Makefile.defs: version set to 5.4.7
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: b647485d7e5f91c7ecfed167289ff21a91c739fa URL: https://github.com/kamailio/kamailio/commit/b647485d7e5f91c7ecfed167289ff21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T12:27:56+02:00 Makefile.defs: version set to 5.4.7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b647485d7e5f91c7ecfed167289ff21… Patch: https://github.com/kamailio/kamailio/commit/b647485d7e5f91c7ecfed167289ff21… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 542ac73cdc..c7695a973d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:a19fe100: ChangeLog: content updated for v5.4.7
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: a19fe100777c2c53e275804568cee99e3d61f466 URL: https://github.com/kamailio/kamailio/commit/a19fe100777c2c53e275804568cee99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T12:28:15+02:00 ChangeLog: content updated for v5.4.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/a19fe100777c2c53e275804568cee99… Patch: https://github.com/kamailio/kamailio/commit/a19fe100777c2c53e275804568cee99…

1 0

git:5.4:de082004: pkg/kamailoio: version set to 5.4.7 for rpm and alpine specs
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: de082004b3e5f4719b961850045a3971b7feba8e URL: https://github.com/kamailio/kamailio/commit/de082004b3e5f4719b961850045a397… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T10:51:41+02:00 pkg/kamailoio: version set to 5.4.7 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/de082004b3e5f4719b961850045a397… Patch: https://github.com/kamailio/kamailio/commit/de082004b3e5f4719b961850045a397… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f4ff87ce2d..b9d6a15066 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.6 +pkgver=5.4.7 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index e73c048b22..695c46797c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.6 +%define ver 5.4.7 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.4:d8d5eeab: pkg/kamailio/deb: version set 5.4.7
by Victor Seva 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: d8d5eeab5f5ff7945b13dd16cc215c0f790461ba URL: https://github.com/kamailio/kamailio/commit/d8d5eeab5f5ff7945b13dd16cc215c0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-09-22T10:16:53+02:00 pkg/kamailio/deb: version set 5.4.7 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/d8d5eeab5f5ff7945b13dd16cc215c0… Patch: https://github.com/kamailio/kamailio/commit/d8d5eeab5f5ff7945b13dd16cc215c0…

1 0

git:5.5:3b523ff4: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.5 Commit: 3b523ff4d0bc276ece043f4d4d613662afc0a0d4 URL: https://github.com/kamailio/kamailio/commit/3b523ff4d0bc276ece043f4d4d61366… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-22T08:46:41+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/kazoo/README --- Diff: https://github.com/kamailio/kamailio/commit/3b523ff4d0bc276ece043f4d4d61366… Patch: https://github.com/kamailio/kamailio/commit/3b523ff4d0bc276ece043f4d4d61366… --- diff --git a/src/modules/kazoo/README b/src/modules/kazoo/README index ab9206a243..7497dd20e8 100644 --- a/src/modules/kazoo/README +++ b/src/modules/kazoo/README @@ -443,9 +443,9 @@ modparam("kazoo", "amqp_connection", "kazoo://guest:guest@otherhost:5672") handles control to the next sub-loop. ... while(true) // main loop - while(ACK or timeout) // acknowledge from worker process - while(SEND or timeout) // anything to send ? - while(CONSUME or timeout) // any data on consumed exchanges ? +while(ACK or timeout) // acknowledge from worker process +while(SEND or timeout) // anything to send ? +while(CONSUME or timeout) // any data on consumed exchanges ? ... 4.2.1. amqp_consumer_loop_count(int) @@ -652,11 +652,11 @@ modparam("kazoo", "pua_mode", 0) Example 1.22. kazoo_publish usage ... -$var(amqp_payload_request) = "{'Event-Category' : 'directory', 'Event-Name' : 'r -eg_success', 'Contact' : '" + $var(fs_contact) + "', 'Call-ID' : '" + $ci + "', -'Realm' : '" + $fd +"', 'Username' : '" + $fU + "', 'From-User' : '" + $fU + "', - 'From-Host' : '" + $fd + "', 'To-User' : '" + $tU +"', 'To-Host' : '" + $td + " -', 'User-Agent' : '" + $ua +"' ," + $var(register_contants)+ " }"; +$var(amqp_payload_request) = $_s({"Event-Category" : "directory", "Event-Name" : + "reg_success", "Contact" : "$(ct{s.escape.common}{s.replace,\','}{s.replace,$$, +})", "Call-ID" : "$ci", "Realm" : "$fd", "Username" : "$fU", "From-User" : "$fU" +, "From-Host" : "$fd", "To-User" : "$tU", "To-Host" : "$td", "User-Agent" : "$(u +a{s.escape.common}{s.replace,\','}{s.replace,$$,})" }); $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $fU; kazoo_publish("callmgr", $var(amqp_routing_key), $var(amqp_payload_request)); ...

1 0

git:5.4:296ff8b9: core: parser - additioal check for content lenght spanning next line
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: 296ff8b988386ebc5b083e1a1d0ecca7380a6304 URL: https://github.com/kamailio/kamailio/commit/296ff8b988386ebc5b083e1a1d0ecca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T08:42:37+02:00 core: parser - additioal check for content lenght spanning next line (cherry picked from commit bf6bd11a9b969c02a106f94ebf40cefbe8028456) (cherry picked from commit ecfcab9af6f3927c9dfe170826f1cbae5d28a447) --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/296ff8b988386ebc5b083e1a1d0ecca… Patch: https://github.com/kamailio/kamailio/commit/296ff8b988386ebc5b083e1a1d0ecca… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index cda4b8177d..aff70f8660 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -224,8 +224,8 @@ char* parse_content_length(char* const buffer, const char* const end, goto error; } /* search the begining of the number */ - while ( p<end && (*p==' ' || *p=='\t' || - (*p=='\n' && (*(p+1)==' '||*(p+1)=='\t')) )) + while ( p<end && (*p==' ' || *p=='\t' + || (*p=='\n' && p+1<end && (*(p+1)==' ' || *(p+1)=='\t')) ) ) p++; if (p==end) goto error;

1 0

git:5.4:81d8e4cf: core: parse identityinfo - log message on end of buffer
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: 81d8e4cfbb991f046ea2123c9dfa431f407aa5f1 URL: https://github.com/kamailio/kamailio/commit/81d8e4cfbb991f046ea2123c9dfa431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T08:43:04+02:00 core: parse identityinfo - log message on end of buffer (cherry picked from commit 1e212088091183aac8fcd418656beea523950870) (cherry picked from commit 8a6c44d2f0504f81b2ef1d97732499b5f721b4a7) --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/81d8e4cfbb991f046ea2123c9dfa431… Patch: https://github.com/kamailio/kamailio/commit/81d8e4cfbb991f046ea2123c9dfa431… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index 5111ad70b4..02e11c77bd 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -310,8 +310,12 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) return ; parseerror: - LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p,status, (int)(p-buffer), ZSW(p)); + if(p<end) { + LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", + *p, status, (int)(p-buffer), ZSW(p)); + } else { + LM_ERR("unexpected end of buffer - status %d\n", status); + } return ; }

1 0

git:5.5:aaaed98b: kazoo: docbook - fixed 'Document root element "chapter", must match DOCTYPE root "book".'
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.5 Commit: aaaed98b5a35bebfc198082109c0a51baf2aac75 URL: https://github.com/kamailio/kamailio/commit/aaaed98b5a35bebfc198082109c0a51… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T08:41:06+02:00 kazoo: docbook - fixed 'Document root element "chapter", must match DOCTYPE root "book".' (cherry picked from commit 60867418d596bf64126941ab258dae013b2649b3) --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aaaed98b5a35bebfc198082109c0a51… Patch: https://github.com/kamailio/kamailio/commit/aaaed98b5a35bebfc198082109c0a51… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index 84d716bf75..fbd5d7a5d7 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [

1 0

git:5.5:42df8f89: kazoo: docbook files space formating
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.5 Commit: 42df8f8921cb0ec23e9dba7a964b9cb5060f1a63 URL: https://github.com/kamailio/kamailio/commit/42df8f8921cb0ec23e9dba7a964b9cb… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T08:41:18+02:00 kazoo: docbook files space formating for formating used oXygen XML Editor 13.2 (cherry picked from commit e4d5138e7873e811d36b99195a04ea8284ea8af6) --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/42df8f8921cb0ec23e9dba7a964b9cb… Patch: https://github.com/kamailio/kamailio/commit/42df8f8921cb0ec23e9dba7a964b9cb…

1 0

git:5.5:7e6cc68e: kazoo: fixed json body in example
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.5 Commit: 7e6cc68ee6ba80513c3e2138ad9ba408d6fe29a4 URL: https://github.com/kamailio/kamailio/commit/7e6cc68ee6ba80513c3e2138ad9ba40… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T08:40:45+02:00 kazoo: fixed json body in example (cherry picked from commit 38ba61170abdfeb189f7b05d6daf19f15378fab9) --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7e6cc68ee6ba80513c3e2138ad9ba40… Patch: https://github.com/kamailio/kamailio/commit/7e6cc68ee6ba80513c3e2138ad9ba40… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index 6b236ed50a..ef3b41890b 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -624,7 +624,7 @@ modparam("kazoo", "pua_mode", 0) <title><function>kazoo_publish</function> usage</title> <programlisting format="linespecific"> ... -$var(amqp_payload_request) = "{'Event-Category' : 'directory', 'Event-Name' : 'reg_success', 'Contact' : '" + $var(fs_contact) + "', 'Call-ID' : '" + $ci + "', 'Realm' : '" + $fd +"', 'Username' : '" + $fU + "', 'From-User' : '" + $fU + "', 'From-Host' : '" + $fd + "', 'To-User' : '" + $tU +"', 'To-Host' : '" + $td + "', 'User-Agent' : '" + $ua +"' ," + $var(register_contants)+ " }"; +$var(amqp_payload_request) = $_s({"Event-Category" : "directory", "Event-Name" : "reg_success", "Contact" : "$(ct{s.escape.common}{s.replace,\','}{s.replace,$$,})", "Call-ID" : "$ci", "Realm" : "$fd", "Username" : "$fU", "From-User" : "$fU", "From-Host" : "$fd", "To-User" : "$tU", "To-Host" : "$td", "User-Agent" : "$(ua{s.escape.common}{s.replace,\','}{s.replace,$$,})" }); $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $fU; kazoo_publish("callmgr", $var(amqp_routing_key), $var(amqp_payload_request)); ...

1 0

git:5.5:238ad651: kazoo: docbook - fixed 'Attribute "xmlns:xi" must be declared for element type'
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.5 Commit: 238ad651d6bcef82f6396b850b439d132380a1c2 URL: https://github.com/kamailio/kamailio/commit/238ad651d6bcef82f6396b850b439d1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T08:40:56+02:00 kazoo: docbook - fixed 'Attribute "xmlns:xi" must be declared for element type' (cherry picked from commit ab3397cb609ac5d9a9b5e215ff5e7f48e35c6c2a) --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/238ad651d6bcef82f6396b850b439d1… Patch: https://github.com/kamailio/kamailio/commit/238ad651d6bcef82f6396b850b439d1… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index ef3b41890b..84d716bf75 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -6,6 +6,9 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; +<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > +%xinclude; + ]>

1 0

git:5.5:ecfcab9a: core: parser - additioal check for content lenght spanning next line
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.5 Commit: ecfcab9af6f3927c9dfe170826f1cbae5d28a447 URL: https://github.com/kamailio/kamailio/commit/ecfcab9af6f3927c9dfe170826f1cba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T08:39:47+02:00 core: parser - additioal check for content lenght spanning next line (cherry picked from commit bf6bd11a9b969c02a106f94ebf40cefbe8028456) --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/ecfcab9af6f3927c9dfe170826f1cba… Patch: https://github.com/kamailio/kamailio/commit/ecfcab9af6f3927c9dfe170826f1cba… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index cda4b8177d..aff70f8660 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -224,8 +224,8 @@ char* parse_content_length(char* const buffer, const char* const end, goto error; } /* search the begining of the number */ - while ( p<end && (*p==' ' || *p=='\t' || - (*p=='\n' && (*(p+1)==' '||*(p+1)=='\t')) )) + while ( p<end && (*p==' ' || *p=='\t' + || (*p=='\n' && p+1<end && (*(p+1)==' ' || *(p+1)=='\t')) ) ) p++; if (p==end) goto error;

1 0

git:5.5:8a6c44d2: core: parse identityinfo - log message on end of buffer
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.5 Commit: 8a6c44d2f0504f81b2ef1d97732499b5f721b4a7 URL: https://github.com/kamailio/kamailio/commit/8a6c44d2f0504f81b2ef1d97732499b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T08:39:56+02:00 core: parse identityinfo - log message on end of buffer (cherry picked from commit 1e212088091183aac8fcd418656beea523950870) --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/8a6c44d2f0504f81b2ef1d97732499b… Patch: https://github.com/kamailio/kamailio/commit/8a6c44d2f0504f81b2ef1d97732499b… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index da613e798f..e58bcd26ff 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -311,8 +311,12 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) return ; parseerror: - LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p,status, (int)(p-buffer), ZSW(p)); + if(p<end) { + LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", + *p, status, (int)(p-buffer), ZSW(p)); + } else { + LM_ERR("unexpected end of buffer - status %d\n", status); + } return ; }

1 0

Releasing Kamailio v.5.4.7
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Hello, I am planning to release a new version from branch 5.4, respectively 5.4.7, sometime next week, likely on Wednesday, Sep 22, 2021. If anyone is aware of issues not yet reported to bug tracker or missing backports, report them in order to try to get the fixes in this release. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 1

git:master:c349530a: modules: readme files regenerated - kazoo ... [skip ci]
by Kamailio Dev 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: c349530a1419c23bd4fb02c619788dadcae23f70 URL: https://github.com/kamailio/kamailio/commit/c349530a1419c23bd4fb02c619788da… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-21T21:01:12+02:00 modules: readme files regenerated - kazoo ... [skip ci] --- Modified: src/modules/kazoo/README Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/c349530a1419c23bd4fb02c619788da… Patch: https://github.com/kamailio/kamailio/commit/c349530a1419c23bd4fb02c619788da… --- diff --git a/src/modules/kazoo/README b/src/modules/kazoo/README index ab9206a243..7497dd20e8 100644 --- a/src/modules/kazoo/README +++ b/src/modules/kazoo/README @@ -443,9 +443,9 @@ modparam("kazoo", "amqp_connection", "kazoo://guest:guest@otherhost:5672") handles control to the next sub-loop. ... while(true) // main loop - while(ACK or timeout) // acknowledge from worker process - while(SEND or timeout) // anything to send ? - while(CONSUME or timeout) // any data on consumed exchanges ? +while(ACK or timeout) // acknowledge from worker process +while(SEND or timeout) // anything to send ? +while(CONSUME or timeout) // any data on consumed exchanges ? ... 4.2.1. amqp_consumer_loop_count(int) @@ -652,11 +652,11 @@ modparam("kazoo", "pua_mode", 0) Example 1.22. kazoo_publish usage ... -$var(amqp_payload_request) = "{'Event-Category' : 'directory', 'Event-Name' : 'r -eg_success', 'Contact' : '" + $var(fs_contact) + "', 'Call-ID' : '" + $ci + "', -'Realm' : '" + $fd +"', 'Username' : '" + $fU + "', 'From-User' : '" + $fU + "', - 'From-Host' : '" + $fd + "', 'To-User' : '" + $tU +"', 'To-Host' : '" + $td + " -', 'User-Agent' : '" + $ua +"' ," + $var(register_contants)+ " }"; +$var(amqp_payload_request) = $_s({"Event-Category" : "directory", "Event-Name" : + "reg_success", "Contact" : "$(ct{s.escape.common}{s.replace,\','}{s.replace,$$, +})", "Call-ID" : "$ci", "Realm" : "$fd", "Username" : "$fU", "From-User" : "$fU" +, "From-Host" : "$fd", "To-User" : "$tU", "To-Host" : "$td", "User-Agent" : "$(u +a{s.escape.common}{s.replace,\','}{s.replace,$$,})" }); $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $fU; kazoo_publish("callmgr", $var(amqp_routing_key), $var(amqp_payload_request)); ... diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 94ab08ab3c..7643dfee4f 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -725,15 +725,20 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") Defines the name of XAVP class to store runtime module config values. The values are stored as inner XAVPs, like $xavp(class=>attribute). Valid inner XAVP names: - * expires - the number of maximum contacts to be stored for the - current registration AoR. It overwrites the 'max_contacts' module - parameter value. - * q - the expires value, to overwrite the value from SIP headers. + * match_callid - filter contacts by callid. Used in registered(). + * match_contact - filter contacts by contact. Used in registered(). + * match_received - filter contacts by received. Used in registered(). + * rlf_bflags - filter contacts by branch flags. Used in lookup(). + * q - q value of contact (integer 0-1000). It overrides q value given + in contact header and default_q parameter. Used in save(). + * expires - the expires value, to overwrite the value from SIP + headers. Used in save(). * max_contacts - the number of maximum contacts to be stored for the current registration AoR. It overwrites the 'max_contacts' module - parameter value. + parameter value. Used in save(). * socket - the string representing the socket on which the register - request was received, as alternative to using the sock_hdr. + request was received, as alternative to using the sock_hdr. Used in + save(). For example. if this parameter is set to 'reg', then the number of maximum contacts can be set in $xavp(reg=>max_contacts). @@ -1120,7 +1125,7 @@ lookup_branches("location"); * uri (optional) - SIP URI to do be used instead of Request/To-URI. It can be a dynamic string with pseudo-variables. * match_option (optional) - flag parameter to restrict contact - search. use reg_xavp_cfg to set the values to compare to. + search. use xavp_cfg to set the values to compare to. flag values is as follows: + 1 - match_callid + 2 - match_received

1 0

[kamailio/kamailio] mod kazoo: wrong kazoo_publish example (#2627)
by sergey-safarov 21 Sep '21

21 Sep '21

### Description Example 1.21. kazoo_publish usage contains string ``` $var(amqp_payload_request) = "{'Event-Category' : 'directory', 'Event-Name' : 'reg_success', 'Contact' : '" + $var(fs_contact) + "', 'Call-ID' : '" + $ci + "', 'Realm' : '" + $fd +"', 'Username' : '" + $fU + "', 'From-User' : '" + $fU + "', 'From-Host' : '" + $fd + "', 'To-User' : '" + $tU +"', 'To-Host' : '" + $td + "', 'User-Agent' : '" + $ua +"' ," + $var(register_contants)+ " }"; ``` This example did not work because the string generates broken JSON: 1. here present value ` $var(register_contants)` but key is not present 2. JSON key and value must be started and terminated by `"` symbol (not by `'`) -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2627

2 6

[kamailio/kamailio] Gh2627 (#2855)
by sergey-safarov 21 Sep '21

21 Sep '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 - [x] Tested changes locally - [x] Related to issue #2627 #### Description Fixed json example and space formating You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2855 -- Commit Summary -- * kazoo: fixed json body in example * kazoo: docbook - fixed 'Attribute "xmlns:xi" must be declared for element type' * kazoo: docbook - fixed 'Document root element "chapter", must match DOCTYPE root "book".' * kazoo: docbook files space formating -- File Changes -- M src/modules/kazoo/doc/kazoo_admin.xml (1259) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2855.patch https://github.com/kamailio/kamailio/pull/2855.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2855

3 3

git:master:e4d5138e: kazoo: docbook files space formating
by Daniel-Constantin Mierla 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: e4d5138e7873e811d36b99195a04ea8284ea8af6 URL: https://github.com/kamailio/kamailio/commit/e4d5138e7873e811d36b99195a04ea8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-21T20:56:55+02:00 kazoo: docbook files space formating for formating used oXygen XML Editor 13.2 --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e4d5138e7873e811d36b99195a04ea8… Patch: https://github.com/kamailio/kamailio/commit/e4d5138e7873e811d36b99195a04ea8…

1 0

git:master:38ba6117: kazoo: fixed json body in example
by Daniel-Constantin Mierla 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: 38ba61170abdfeb189f7b05d6daf19f15378fab9 URL: https://github.com/kamailio/kamailio/commit/38ba61170abdfeb189f7b05d6daf19f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-21T20:56:55+02:00 kazoo: fixed json body in example --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/38ba61170abdfeb189f7b05d6daf19f… Patch: https://github.com/kamailio/kamailio/commit/38ba61170abdfeb189f7b05d6daf19f… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index 6b236ed50a..ef3b41890b 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -624,7 +624,7 @@ modparam("kazoo", "pua_mode", 0) <title><function>kazoo_publish</function> usage</title> <programlisting format="linespecific"> ... -$var(amqp_payload_request) = "{'Event-Category' : 'directory', 'Event-Name' : 'reg_success', 'Contact' : '" + $var(fs_contact) + "', 'Call-ID' : '" + $ci + "', 'Realm' : '" + $fd +"', 'Username' : '" + $fU + "', 'From-User' : '" + $fU + "', 'From-Host' : '" + $fd + "', 'To-User' : '" + $tU +"', 'To-Host' : '" + $td + "', 'User-Agent' : '" + $ua +"' ," + $var(register_contants)+ " }"; +$var(amqp_payload_request) = $_s({"Event-Category" : "directory", "Event-Name" : "reg_success", "Contact" : "$(ct{s.escape.common}{s.replace,\','}{s.replace,$$,})", "Call-ID" : "$ci", "Realm" : "$fd", "Username" : "$fU", "From-User" : "$fU", "From-Host" : "$fd", "To-User" : "$tU", "To-Host" : "$td", "User-Agent" : "$(ua{s.escape.common}{s.replace,\','}{s.replace,$$,})" }); $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $fU; kazoo_publish("callmgr", $var(amqp_routing_key), $var(amqp_payload_request)); ...

1 0

git:master:ab3397cb: kazoo: docbook - fixed 'Attribute "xmlns:xi" must be declared for element type'
by Daniel-Constantin Mierla 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: ab3397cb609ac5d9a9b5e215ff5e7f48e35c6c2a URL: https://github.com/kamailio/kamailio/commit/ab3397cb609ac5d9a9b5e215ff5e7f4… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-21T20:56:55+02:00 kazoo: docbook - fixed 'Attribute "xmlns:xi" must be declared for element type' --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ab3397cb609ac5d9a9b5e215ff5e7f4… Patch: https://github.com/kamailio/kamailio/commit/ab3397cb609ac5d9a9b5e215ff5e7f4… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index ef3b41890b..84d716bf75 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -6,6 +6,9 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; +<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > +%xinclude; + ]>

1 0

git:master:60867418: kazoo: docbook - fixed 'Document root element "chapter", must match DOCTYPE root "book".'
by Daniel-Constantin Mierla 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: 60867418d596bf64126941ab258dae013b2649b3 URL: https://github.com/kamailio/kamailio/commit/60867418d596bf64126941ab258dae0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-21T20:56:55+02:00 kazoo: docbook - fixed 'Document root element "chapter", must match DOCTYPE root "book".' --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/60867418d596bf64126941ab258dae0… Patch: https://github.com/kamailio/kamailio/commit/60867418d596bf64126941ab258dae0… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index 84d716bf75..fbd5d7a5d7 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [

1 0

[kamailio/kamailio] registrar: docs for xavp_cfg (#2860)
by Bastian Triller 21 Sep '21

21 Sep '21

* fix docs for expires/q attributes * add all available attributes and note in which function they are used   #### 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 - [ ] 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/2860 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2860/commits/13fc6f45ac5c8d01e6c9…">registrar: docs for xavp_cfg</a> -- File Changes -- M src/modules/registrar/doc/registrar_admin.xml (40) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2860.patch https://github.com/kamailio/kamailio/pull/2860.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2860

2 2

git:master:fe4b180d: registrar: docs for xavp_cfg
by Daniel-Constantin Mierla 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: fe4b180d3d2c42beec8299938f7935b0c67ef4d2 URL: https://github.com/kamailio/kamailio/commit/fe4b180d3d2c42beec8299938f7935b… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-21T20:55:40+02:00 registrar: docs for xavp_cfg * fix docs for expires/q attributes * add all available attributes and note in which function they are used --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fe4b180d3d2c42beec8299938f7935b… Patch: https://github.com/kamailio/kamailio/commit/fe4b180d3d2c42beec8299938f7935b… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 09d41843dd..50ba66f38f 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -745,15 +745,41 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") <itemizedlist> <listitem> <para> - <emphasis>expires</emphasis> - the number of maximum - contacts to be stored for the current registration AoR. It - overwrites the 'max_contacts' module parameter value. + <emphasis>match_callid</emphasis> - filter contacts by callid. + Used in registered(). + </para> + </listitem> + <listitem> + <para> + <emphasis>match_contact</emphasis> - filter contacts by contact. + Used in registered(). + </para> + </listitem> + <listitem> + <para> + <emphasis>match_received</emphasis> - filter contacts by received. + Used in registered(). </para> </listitem> <listitem> <para> - <emphasis>q</emphasis> - the expires value, to overwrite the + <emphasis>rlf_bflags</emphasis> - filter contacts by branch flags. + Used in lookup(). + </para> + </listitem> + <listitem> + <para> + <emphasis>q</emphasis> - q value of contact + (integer 0-1000). It overrides q value given in + contact header and default_q parameter. + Used in save(). + </para> + </listitem> + <listitem> + <para> + <emphasis>expires</emphasis> - the expires value, to overwrite the value from SIP headers. + Used in save(). </para> </listitem> <listitem> @@ -761,6 +787,7 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") <emphasis>max_contacts</emphasis> - the number of maximum contacts to be stored for the current registration AoR. It overwrites the 'max_contacts' module parameter value. + Used in save(). </para> </listitem> <listitem> @@ -768,6 +795,7 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") <emphasis>socket</emphasis> - the string representing the socket on which the register request was received, as alternative to using the sock_hdr. + Used in save(). </para> </listitem> </itemizedlist> @@ -1117,7 +1145,7 @@ end are returned. </para> </listitem> - </itemizedlist> + </itemizedlist> <para> <emphasis> Default value is NULL (disabled). @@ -1451,7 +1479,7 @@ lookup_branches("location"); <listitem> <para> <emphasis>match_option</emphasis> (optional) - flag parameter to restrict - contact search. use reg_xavp_cfg to set the values to compare to. + contact search. use xavp_cfg to set the values to compare to. </para> <para>flag values is as follows:</para> <itemizedlist>

1 0

git:master:22f8dca3: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: 22f8dca3ff941addf69148f237c1127e271b00e1 URL: https://github.com/kamailio/kamailio/commit/22f8dca3ff941addf69148f237c1127… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-21T16:01:16+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/22f8dca3ff941addf69148f237c1127… Patch: https://github.com/kamailio/kamailio/commit/22f8dca3ff941addf69148f237c1127… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index d10e25fb3e..319e654c50 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -37,6 +37,8 @@ Daniel-Constantin Mierla 4.5. pos_headers_end() 4.6. pos_body_start() 4.7. pos_body_end() + 4.8. pos_find_str(idx, val) + 4.9. pos_findi_str(idx, val) List of Examples @@ -48,6 +50,8 @@ Daniel-Constantin Mierla 1.6. pos_headers_end() usage 1.7. pos_body_start() usage 1.8. pos_body_end() usage + 1.9. pos_find_str() usage + 1.10. pos_findi_str() usage Chapter 1. Admin Guide @@ -72,6 +76,8 @@ Chapter 1. Admin Guide 4.5. pos_headers_end() 4.6. pos_body_start() 4.7. pos_body_end() + 4.8. pos_find_str(idx, val) + 4.9. pos_findi_str(idx, val) 1. Overview @@ -124,6 +130,8 @@ modparam("posops", "idx0", -200) 4.5. pos_headers_end() 4.6. pos_body_start() 4.7. pos_body_end() + 4.8. pos_find_str(idx, val) + 4.9. pos_findi_str(idx, val) 4.1. pos_append(idx, val) @@ -221,3 +229,38 @@ $var(pos) = pos_body_start(); ... $var(pos) = pos_body_end(); ... + +4.8. pos_find_str(idx, val) + + Return the position of the val in message buffer starting at idx. In + case of not finding it or error, the return code is negative. If val is + at index 0, it returns the value specified by modparam idx0. + + The idx can be an integer value or a variable holding an integer. + + The val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.9. pos_find_str() usage +... +$var(idx) = pos_find_str("100", "kamailio"); +... + +4.9. pos_findi_str(idx, val) + + Return the position of the val (matching case insensitive) in message + buffer starting at idx. In case of not finding it or error, the return + code is negative. If val is at index 0, it returns the value specified + by modparam idx0. + + The idx can be an integer value or a variable holding an integer. + + The val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.10. pos_findi_str() usage +... +$var(idx) = pos_findi_str("100", "kamailio"); +...

1 0

git:master:e39f77e9: posops: functions to get the position of a string in message buffer
by Daniel-Constantin Mierla 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: e39f77e9c685cf64df6cf6ac255cb0c786c415b6 URL: https://github.com/kamailio/kamailio/commit/e39f77e9c685cf64df6cf6ac255cb0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-21T15:51:07+02:00 posops: functions to get the position of a string in message buffer --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e39f77e9c685cf64df6cf6ac255cb0c… Patch: https://github.com/kamailio/kamailio/commit/e39f77e9c685cf64df6cf6ac255cb0c…

1 0

git:master:23a2bc69: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: 23a2bc69464d622d700a53bd860ac0dd60ae3747 URL: https://github.com/kamailio/kamailio/commit/23a2bc69464d622d700a53bd860ac0d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-21T10:31:29+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/23a2bc69464d622d700a53bd860ac0d… Patch: https://github.com/kamailio/kamailio/commit/23a2bc69464d622d700a53bd860ac0d…

1 0

git:master:771ce943: posops: added idx0 mod param
by Daniel-Constantin Mierla 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: 771ce9436adb250a398e1fd337e712c0d5c67745 URL: https://github.com/kamailio/kamailio/commit/771ce9436adb250a398e1fd337e712c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-21T10:23:53+02:00 posops: added idx0 mod param - set the value to return by function when position is at index 0 - default -255 --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/771ce9436adb250a398e1fd337e712c… Patch: https://github.com/kamailio/kamailio/commit/771ce9436adb250a398e1fd337e712c… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index 9e532d7bf3..4628b0cb29 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -54,6 +54,31 @@ </section> </section> + <section> + <title>Parameters</title> + <section id="posops.p.idx0"> + <title><varname>idx0</varname> (int)</title> + <para> + The value to return by functions seeking a position when the index + is 0 (note: returning 0 is stopping the execution of configuration + file like 'exit', but for KEMI usage it is ok). + </para> + <para> + <emphasis> + Default value is -255. + </emphasis> + </para> + <example> + <title>Set <varname>idx0</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("posops", "idx0", -200) +... +</programlisting> + </example> + </section> + </section> + <section> <title>Functions</title> <section id="posops.f.pos_append"> diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index fc62679afd..3a8746a2a5 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -51,6 +51,8 @@ typedef struct posops_data { int idx; } posops_data_t; +static int posops_idx0 = -255; + static int pv_posops_get_pos(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_posops_parse_pos_name(pv_spec_t *sp, str *in); @@ -87,6 +89,7 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ + {"idx0", PARAM_INT, &posops_idx0}, {0, 0, 0} }; @@ -309,7 +312,7 @@ static int ki_posops_pos_headers_start(sip_msg_t* msg) } _posops_data.idx = msg->first_line.len; - _posops_data.ret = (_posops_data.idx==0)?-255:_posops_data.idx; + _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; return _posops_data.ret; } @@ -334,7 +337,7 @@ static int ki_posops_pos_headers_end(sip_msg_t* msg) } _posops_data.idx = msg->unparsed - msg->buf; - _posops_data.ret = (_posops_data.idx==0)?-255:_posops_data.idx; + _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; return _posops_data.ret; } @@ -367,7 +370,7 @@ static int ki_posops_pos_body_start(sip_msg_t* msg) } _posops_data.idx = body - msg->buf; - _posops_data.ret = (_posops_data.idx==0)?-255:_posops_data.idx; + _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; return _posops_data.ret; } @@ -397,7 +400,7 @@ static int ki_posops_pos_body_end(sip_msg_t* msg) } _posops_data.idx = msg->len; - _posops_data.ret = (_posops_data.idx==0)?-255:_posops_data.idx; + _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; return _posops_data.ret; }

1 0

git:master:10b014b5: lcr: small white-space (related to GH #2859)
by Henning Westerholt 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 10b014b505080a918a8443ff83029a0155364661 URL: https://github.com/kamailio/kamailio/commit/10b014b505080a918a8443ff83029a0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-20T18:14:35Z lcr: small white-space (related to GH #2859) --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/10b014b505080a918a8443ff83029a0… Patch: https://github.com/kamailio/kamailio/commit/10b014b505080a918a8443ff83029a0… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 23b5bce0dc..93c5181600 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -3034,8 +3034,7 @@ static int do_from_gw(struct sip_msg *_m, unsigned int lcr_id, } /* Store tag and flags and return result */ - if((res != NULL) - && ((transport == PROTO_NONE) || (res->transport_code == transport))) { + if((res != NULL) && ((transport == PROTO_NONE) || (res->transport_code == transport))) { LM_DBG("request came from gw\n"); if(tag_avp_param) { val.s.s = res->tag;

1 0

[kamailio/kamailio] lcr: improve binary search to support a match including src port (#2859)
by zenichev 20 Sep '21

20 Sep '21

#### Pre-Submission Checklist - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Improve binary search in the lcr module and add a possibility to do a matching not only based on an IP address of a GW, but also using a source port. When a possibility to use 'src_port' parameter in from_gw() and from_any_gw() was introduced here: 14e6fc80b3d2389567c73c4a2196bf8e6d92d8d2 the bsearch() remained untouched, and hence the matching (iteration through existing GWs) is now done only based on an IP address. This leads to the issue, when there are more than one GW with the same IP address in gws table, and from_gw() and from_any_gw() functions are used with the 'src_port' parameter, it can happen that a wrong GW is picked out by bsearch() from gws table (lcr_gw) and a check by from_gw() and from_any_gw() returns False. Hence the matching based on IP address and source port is required for bsearch(), when from_gw() and from_any_gw() functions are used with the 'src_port' parameter. This means backwards compatibility is still present (when one uses functions without 'src_port'). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2859 -- Commit Summary -- * lcr: improve binary search to support a match including src port -- File Changes -- M src/modules/lcr/lcr_mod.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2859.patch https://github.com/kamailio/kamailio/pull/2859.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2859

3 7

git:master:7a3a5443: lcr: remove excessive conditional check in do_from_gw()
by Henning Westerholt 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 7a3a54433bbbfdb2521d4f8981c5b72423299bb1 URL: https://github.com/kamailio/kamailio/commit/7a3a54433bbbfdb2521d4f8981c5b72… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-20T20:09:58+02:00 lcr: remove excessive conditional check in do_from_gw() After an update of the bsearch(), which now supports matching not only by the IP address, but also using the 'src_port', there is no need to check, if the source port of a request matched the one from the 'lcr_gw' ('res' pointer will be NULL anyway, if ports don't match). Nor do we need to check if it's zero. --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7a3a54433bbbfdb2521d4f8981c5b72… Patch: https://github.com/kamailio/kamailio/commit/7a3a54433bbbfdb2521d4f8981c5b72… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 8c5b05d1df..23b5bce0dc 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -3035,8 +3035,7 @@ static int do_from_gw(struct sip_msg *_m, unsigned int lcr_id, /* Store tag and flags and return result */ if((res != NULL) - && ((transport == PROTO_NONE) || (res->transport_code == transport)) - && ((src_port == 0) || (res->port == src_port))) { + && ((transport == PROTO_NONE) || (res->transport_code == transport))) { LM_DBG("request came from gw\n"); if(tag_avp_param) { val.s.s = res->tag;

1 0

git:master:e82819e6: lcr: improve binary search to support a match including src port
by Henning Westerholt 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: e82819e6613dd64ca5c887759eab18cd38d20373 URL: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-20T20:09:58+02:00 lcr: improve binary search to support a match including src port Improve binary search in the lcr module and add a possibility to do a matching not only based on an IP address of a GW, but also using a source port. When a possibility to use 'src_port' parameter in from_gw() and from_any_gw() was introduced here: 14e6fc80b3d2389567c73c4a2196bf8e6d92d8d2 the bsearch() remained untouched, and hence the matching (iteration through existing GWs) is now done only based on an IP address. This leads to the issue, when there are more than one GW with the same IP address in gws table, and from_gw() and from_any_gw() functions are used with the 'src_port' parameter, it can happen that a wrong GW is picked out by bsearch() from gws table (lcr_gw) and a check by from_gw() and from_any_gw() returns False. Hence the matching based on IP address and source port is required for bsearch(), when from_gw() and from_any_gw() functions are used with the 'src_port' parameter. This means backwards compatibility is still present (when one uses functions without 'src_port'). --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… Patch: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 21f05a4730..8c5b05d1df 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -921,6 +921,30 @@ static int comp_gws(const void *_g1, const void *_g2) return memcmp(g1->ip_addr.u.addr, g2->ip_addr.u.addr, g1->ip_addr.len); } +/* + * Compare gateways based on their IP address and port + */ +static int comp_gws_include_port(const void *_g1, const void *_g2) +{ + struct gw_info *g1 = (struct gw_info *)_g1; + struct gw_info *g2 = (struct gw_info *)_g2; + + /* first address family comparison */ + if(g1->ip_addr.af < g2->ip_addr.af) + return -1; + if(g1->ip_addr.af > g2->ip_addr.af) + return 1; + if(g1->ip_addr.len < g2->ip_addr.len) + return -1; + if(g1->ip_addr.len > g2->ip_addr.len) + return 1; + + /* secondly ports comparison */ + if(g1->port != g2->port) + return -1; + + return memcmp(g1->ip_addr.u.addr, g2->ip_addr.u.addr, g1->ip_addr.len); +} /* * Insert gw info into index i or gws table @@ -2997,10 +3021,17 @@ static int do_from_gw(struct sip_msg *_m, unsigned int lcr_id, return -1; } - /* Search for gw ip address */ gw.ip_addr = *src_addr; - res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], - sizeof(struct gw_info), comp_gws); + if (src_port != 0) { + /* Search for gw based on its ip address and port */ + gw.port = src_port; + res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], + sizeof(struct gw_info), comp_gws_include_port); + } else { + /* Search for gw based on its ip address */ + res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], + sizeof(struct gw_info), comp_gws); + } /* Store tag and flags and return result */ if((res != NULL)

1 0

git:master:a9ef78b7: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: a9ef78b7f43616f2ceaa26df97eff68eb5348846 URL: https://github.com/kamailio/kamailio/commit/a9ef78b7f43616f2ceaa26df97eff68… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-20T07:31:16+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/a9ef78b7f43616f2ceaa26df97eff68… Patch: https://github.com/kamailio/kamailio/commit/a9ef78b7f43616f2ceaa26df97eff68… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index 9c861862e0..bf003d5a6e 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2021 http://www.asipto.com + Copyright Â© 2021 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -29,12 +29,20 @@ Daniel-Constantin Mierla 3.1. pos_append(idx, val) 3.2. pos_insert(idx, val) 3.3. pos_rm(idx, len) + 3.4. pos_headers_start() + 3.5. pos_headers_end() + 3.6. pos_body_start() + 3.7. pos_body_end() List of Examples 1.1. pos_append() usage 1.2. pos_insert() usage 1.3. pos_rm() usage + 1.4. pos_headers_start() usage + 1.5. pos_headers_end() usage + 1.6. pos_body_start() usage + 1.7. pos_body_end() usage Chapter 1. Admin Guide @@ -51,6 +59,10 @@ Chapter 1. Admin Guide 3.1. pos_append(idx, val) 3.2. pos_insert(idx, val) 3.3. pos_rm(idx, len) + 3.4. pos_headers_start() + 3.5. pos_headers_end() + 3.6. pos_body_start() + 3.7. pos_body_end() 1. Overview @@ -82,8 +94,12 @@ Chapter 1. Admin Guide 3.1. pos_append(idx, val) 3.2. pos_insert(idx, val) 3.3. pos_rm(idx, len) + 3.4. pos_headers_start() + 3.5. pos_headers_end() + 3.6. pos_body_start() + 3.7. pos_body_end() -3.1. pos_append(idx, val) +3.1. pos_append(idx, val) Append the value val after the position idx in the SIP message buffer. @@ -100,7 +116,7 @@ Chapter 1. Admin Guide pos_append("100", "kamailio-$si"); ... -3.2. pos_insert(idx, val) +3.2. pos_insert(idx, val) Insert the value val at the position idx in the SIP message buffer. @@ -117,7 +133,7 @@ pos_append("100", "kamailio-$si"); pos_insert("100", "kamailio-$si"); ... -3.3. pos_rm(idx, len) +3.3. pos_rm(idx, len) Remove len characters starting at the position idx in the SIP message buffer. @@ -135,3 +151,47 @@ pos_insert("100", "kamailio-$si"); ... pos_insert("100", "10"); ... + +3.4. pos_headers_start() + + Return the position in the message buffer where headers start. + + This function can be used from ANY_ROUTE. + + Example 1.4. pos_headers_start() usage +... +$var(pos) = pos_headers_start(); +... + +3.5. pos_headers_end() + + Return the position in the message buffer where headers end. + + This function can be used from ANY_ROUTE. + + Example 1.5. pos_headers_end() usage +... +$var(pos) = pos_headers_end(); +... + +3.6. pos_body_start() + + Return the position in the message buffer where body starts. + + This function can be used from ANY_ROUTE. + + Example 1.6. pos_body_start() usage +... +$var(pos) = pos_body_start(); +... + +3.7. pos_body_end() + + Return the position in the message buffer where body ends. + + This function can be used from ANY_ROUTE. + + Example 1.7. pos_body_end() usage +... +$var(pos) = pos_body_end(); +...

1 0

git:master:1e212088: core: parse identityinfo - log message on end of buffer
by Daniel-Constantin Mierla 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 1e212088091183aac8fcd418656beea523950870 URL: https://github.com/kamailio/kamailio/commit/1e212088091183aac8fcd418656beea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-20T07:22:57+02:00 core: parse identityinfo - log message on end of buffer --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/1e212088091183aac8fcd418656beea… Patch: https://github.com/kamailio/kamailio/commit/1e212088091183aac8fcd418656beea… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index da613e798f..e58bcd26ff 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -311,8 +311,12 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) return ; parseerror: - LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p,status, (int)(p-buffer), ZSW(p)); + if(p<end) { + LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", + *p, status, (int)(p-buffer), ZSW(p)); + } else { + LM_ERR("unexpected end of buffer - status %d\n", status); + } return ; }

1 0

git:master:bf6bd11a: core: parser - additioal check for content lenght spanning next line
by Daniel-Constantin Mierla 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: bf6bd11a9b969c02a106f94ebf40cefbe8028456 URL: https://github.com/kamailio/kamailio/commit/bf6bd11a9b969c02a106f94ebf40cef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-20T07:17:27+02:00 core: parser - additioal check for content lenght spanning next line --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/bf6bd11a9b969c02a106f94ebf40cef… Patch: https://github.com/kamailio/kamailio/commit/bf6bd11a9b969c02a106f94ebf40cef… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index cda4b8177d..aff70f8660 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -224,8 +224,8 @@ char* parse_content_length(char* const buffer, const char* const end, goto error; } /* search the begining of the number */ - while ( p<end && (*p==' ' || *p=='\t' || - (*p=='\n' && (*(p+1)==' '||*(p+1)=='\t')) )) + while ( p<end && (*p==' ' || *p=='\t' + || (*p=='\n' && p+1<end && (*(p+1)==' ' || *(p+1)=='\t')) ) ) p++; if (p==end) goto error;

1 0

git:master:07f48321: posops: added functions to get where the headers and body start or end
by Daniel-Constantin Mierla 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 07f48321e98e7e9f0b6f354823a11a63e3c49c05 URL: https://github.com/kamailio/kamailio/commit/07f48321e98e7e9f0b6f354823a11a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T12:58:28+02:00 posops: added functions to get where the headers and body start or end --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/07f48321e98e7e9f0b6f354823a11a6… Patch: https://github.com/kamailio/kamailio/commit/07f48321e98e7e9f0b6f354823a11a6…

1 0

git:master:5fcdbfb2: posops: added $pos(key) variable
by Daniel-Constantin Mierla 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 5fcdbfb277feb6c26becbc9398cf7e86b42e3e07 URL: https://github.com/kamailio/kamailio/commit/5fcdbfb277feb6c26becbc9398cf7e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-19T09:24:39+02:00 posops: added $pos(key) variable - get attributes related to posops --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5fcdbfb277feb6c26becbc9398cf7e8… Patch: https://github.com/kamailio/kamailio/commit/5fcdbfb277feb6c26becbc9398cf7e8…

1 0

[kamailio/kamailio] xhttp_prom: added prom_counter_dec function (#2858)
by sergey-safarov 17 Sep '21

17 Sep '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I use dialog module and want to export current active calls with custom labels. I need to decrement the counter value when a call is terminated. `prom_counter_dec` add this functionality. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2858 -- Commit Summary -- * xhttp_prom: introduced prom_counter_update * xhttp_prom: replaced prom_counter_inc by prom_counter_update * xhttp_prom: added prom_counter_dec function * xhttp_prom: added rpc_prom_counter_dec * xhttp_prom: counter_dec published via KEMI interface * xhttp_prom: docbook - fixed 'Document root element "chapter", must match DOCTYPE root "book".' * xhttp_prom: docubook ulink elementdo not alloed inside listitem element * xhttp_prom: docbook para element not allowed inside another para element * xhttp_prom: docbook files space formating * xhttp_prom: added prom_counter_dec docbook description -- File Changes -- M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (1151) M src/modules/xhttp_prom/prom_metric.c (29) M src/modules/xhttp_prom/prom_metric.h (4) M src/modules/xhttp_prom/xhttp_prom.c (324) M src/modules/xhttp_prom/xhttp_prom.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2858.patch https://github.com/kamailio/kamailio/pull/2858.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2858

2 3

git:5.4:baed0ff2: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 17 Sep '21

17 Sep '21

Module: kamailio Branch: 5.4 Commit: baed0ff2c8b396e7d062e59aed856605c50e8d96 URL: https://github.com/kamailio/kamailio/commit/baed0ff2c8b396e7d062e59aed85660… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-17T09:31:50+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/baed0ff2c8b396e7d062e59aed85660… Patch: https://github.com/kamailio/kamailio/commit/baed0ff2c8b396e7d062e59aed85660… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index a0e1f48d8d..5951c70f4c 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -543,17 +543,17 @@ Revoking a certificate and using a CRL require the certificate file and list of CA certificates per a regular TLS configuration. -AWS CloudHSM Example +Thales Luna Example -------------------- ... -# Example for AWS CloudHSM (SafeNet Luna) +# Example for Thales Luna modparam("tls", "engine", "gem") -modparam("tls", "engine_config", "/usr/local/etc/kamailio/luna.conf") -modparam("tls", "engine_algorithms", "ALL) +modparam("tls", "engine_config", "/usr/local/etc/kamailio/thales.cnf") +modparam("tls", "engine_algorithms", "EC") ... -/usr/local/etc/kamailio/luna.cnf is a OpenSSL config format file used to +/usr/local/etc/kamailio/thales.cnf is a OpenSSL config format file used to bootstrap the engine, e.g., pass the PIN. ... @@ -564,11 +564,12 @@ kamailio = openssl_init engines = engine_section [ engine_section ] -# gem is the name of the SafeNet Luna OpenSSL engine +# gem is the name of the Thales Luna OpenSSL engine gem = gem_section [ gem_section ] -# from SafeNet documentation +# from Thales documentation +dynamic_path = /usr/lib64/engines-1.1/gem.so ENGINE_INIT = 0:20:21:password=1234-ABCD-5678-EFGH ...

1 0

git: new commits in branch 5.4
by Daniel-Constantin Mierla 17 Sep '21

17 Sep '21

- URL: https://github.com/kamailio/kamailio/commit/69819531b532fdec7956c0c28e1ea1a… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-09-17T09:02:59+02:00 core: enables compilation with debug symbols by default for other architectures - enables compilation with debug symbols by default for other architectures in core - pull request GH #2811 - closes GH #2789 (cherry picked from commit ed46adad82e7b6569eb42704c5460263d2af75f7) (cherry picked from commit ba8a06d2988e41b09947d3ae3386a13e3d8415b9) - URL: https://github.com/kamailio/kamailio/commit/e9272d8d67b9f8f9e04ad511ae01457… Author: FredWH <wh720(a)139.com> Date: 2021-09-17T09:03:24+02:00 db_redis: fix broken pipe issue, if redis server with timeout setting. - issue #2764 (cherry picked from commit 7cec977f8e12bbeb0309d903e02461d1ccbf41a8) (cherry picked from commit 48eb41654859e6130c82c46400b529f2af9ce908) - URL: https://github.com/kamailio/kamailio/commit/e5785361cad74949bde08386b857c13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:04:04+02:00 core: parser sdp - shorten debug message with sdp line - was printing the rest of the body, print now max 20 chars (cherry picked from commit 4191a8193025499df64f13d59f5716563e573161) (cherry picked from commit ede5a8399662903c2aa081b7010603398a598e94) - URL: https://github.com/kamailio/kamailio/commit/7fd662c98aa14d9b2fb730cfce0f639… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:04:31+02:00 sdpops: refactored sdp_remove_str_codec_id_attrs() - line oriented matching of codec addributes - support to remove a=rtcp-fb per codec, GH #2755 (cherry picked from commit 1a15a18eacd5764e9ba6240acbe37e645368f825) (cherry picked from commit 96f24caed768b1b382b166eea835e555eac5e933) - URL: https://github.com/kamailio/kamailio/commit/fa2c7c16881b25bb99a33f69b67bda9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:04:44+02:00 misc/tools/protoshoot: removed svn id and history (cherry picked from commit e3875c01adf576f179374a926e69e99c0094e5b4) (cherry picked from commit 105b15422f611ba1dcc59be30f7f4d474b294d03) - URL: https://github.com/kamailio/kamailio/commit/984af7311243de4ea5358236d43346e… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2021-09-17T09:05:12+02:00 tm: restore xavps & flags after rebuilding message (cherry picked from commit 7ee642c58991e594f38247ab0751fadd07ce758c) (cherry picked from commit ad5f0f522f43a69e0f7f930cac5aefc3f21607df) - URL: https://github.com/kamailio/kamailio/commit/0f0fd6f7d9997bceafb3a2034a15cab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:05:28+02:00 core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes - set the values of IP4_MAX_STR_SIZE and IP6_MAX_STR_SIZE based on them, if defined, or to 15 and 45 - cope with IPv6 with IPv4 tunneling representation (RFC 4291 section 2.2) - cover the requirements of using inet_ntop() - GH #2823 (cherry picked from commit 22a72f3a7725d56f00e22bdc52d44bd53da7c091) (cherry picked from commit 680d98caccc0216f43c2b5de83935dbc4853ab9d) - URL: https://github.com/kamailio/kamailio/commit/4ce1fc01f916a0ee45aff75a18de67f… Author: Alan Evans <alan(a)kageds.com> Date: 2021-09-17T09:05:44+02:00 kazoo : fix routing of reply events success events should be routed to onreply_route[] failure events should be routed to failure_route[] (cherry picked from commit fb2eee3e175040fef5e76cbed11430976f62df32) (cherry picked from commit d8ff1845c34a7f9d8e6911ae3d2055b122eb3b79) - URL: https://github.com/kamailio/kamailio/commit/f619ef65ce925b7273fc253feb9ca66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:06:01+02:00 drouting: added dr_ prefix to internal time recurrence functions - avoids symbol conflicts with the core tmrec.c - GH #2828 (cherry picked from commit 33ea38f35f9911a26a757dbfa22065eb80a9a24a) (cherry picked from commit b49f23af03d5e2f0364610739e7ef6e07cfd54a5) - URL: https://github.com/kamailio/kamailio/commit/9825c3da237394fb2b856e41a593b8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:06:13+02:00 cplc: use cpl_ prefix for internal time recurrence functions - avoid global symbol conflicts with core tmrec.c - GH #2827 (cherry picked from commit 431544864c97d1848db1c0c42a03251a214f04cd) (cherry picked from commit 7e3e0a81bf458bd90bc1454c81bf21d64ed9212c) - URL: https://github.com/kamailio/kamailio/commit/b0a7811ef60d8fee47db4535cdc84c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:06:51+02:00 core: check message rcv and snd proto for diff realms lump conditions - in addition to receive socket and send socket protos, which may be the same in cases of tcp/tls+ws/wss using same ports (cherry picked from commit 871f8113612148a49e69218e70ed7f475fb665db) (cherry picked from commit 52978a0873eb068be31ca0688e64c88e4872efac) - URL: https://github.com/kamailio/kamailio/commit/565b43d1d0572a8b68188cacf5b8248… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:07:16+02:00 core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps - besides comparing the protos of rcv and snd sockets (cherry picked from commit 31377b160df563a222bec5a1bf92590635429240) (cherry picked from commit de84b32eb42e19f8626947da1c567eea2d0869fb) - URL: https://github.com/kamailio/kamailio/commit/a564c8d2e88b58948f2e1ea01008ec8… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-09-17T09:08:22+02:00 tls: fix OpenSSL engine in child processes tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839 (cherry picked from commit 238ef139bfbe145fb93e5c4b0730de58040d2265) (cherry picked from commit ad5af6d3acd648e6bd57b923083cc26d3a3d0f57) - URL: https://github.com/kamailio/kamailio/commit/f3d7a0f52152adf2b3a0da8b44b6154… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2021-09-17T09:08:41+02:00 ndb_redis: fix SIGSEGV in redisc_check_auth - Added the check for NULL pointer. When TCP session to redis reset, redisCommand function can return NULL pointer. (cherry picked from commit c32a0be89cc92a0649277774d1e7aebf349b8b49) (cherry picked from commit 5dbf99eb03aba76905aa926a55aedd3caa0fcd05) - URL: https://github.com/kamailio/kamailio/commit/c5a3dc8e58b4653ad488a373b5760bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:08:52+02:00 dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW (cherry picked from commit b86d2490f3b96c532cbe07259786757b3ab9fc02) (cherry picked from commit 0c9d7e3378a4e3ffb1e6a7e48f89b7649aaa6fb2) - URL: https://github.com/kamailio/kamailio/commit/6061def6d5550c9686f1b76d4d09400… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:09:05+02:00 sca: call unsafe find entry function to avoid infinite recursion (cherry picked from commit bd92fb59cce183008956ff060911cc14d3dfb160) (cherry picked from commit b6380374f310a26c8a36f807d97ff0f415204be4) - URL: https://github.com/kamailio/kamailio/commit/0f9141a4ac722e1c33fbd597ef85c92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:09:20+02:00 tm: skip body operation on empty string for uac building (cherry picked from commit 34b61d3f1d6b5a0d4425f8edfa69d707cfa058b7) (cherry picked from commit d96e3527c20791cb2291aa91685d5bc85606eb56) - URL: https://github.com/kamailio/kamailio/commit/7e325b0a8cc6a80cd9173f07ac1e9c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:09:34+02:00 presence: skip body operations on empty string (cherry picked from commit c849070371740c01f9f13a889c610de9132349f3) (cherry picked from commit b0125b66116468b1e5d0dd2ee4eb0eebb4e7ecb4) - URL: https://github.com/kamailio/kamailio/commit/bbd5a5ce5b2269e6e29f63a8cd73838… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:09:47+02:00 usrloc: set tcp connection id to -1 for records added via rpc - cope properly with the handle_lost_tcp modparam (cherry picked from commit a0a97119bef7671f33734399dc9de4562abae39c) (cherry picked from commit 1685ebd5917e763c347b6d4201b19b72e2ee274e) - URL: https://github.com/kamailio/kamailio/commit/0ea368063362c090485dddaacf03a6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:10:04+02:00 core: print char code on error in parse_addr_spec() (cherry picked from commit 031fd46980b34a570385f49f168b13af43d84b87) (cherry picked from commit 86c5d807ceb896dcc554bf8f1b7fb93c68e69a73) - URL: https://github.com/kamailio/kamailio/commit/28251b9233b5011b36423717c054093… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:10:18+02:00 core: parse content length - consider multi line header format - safety checks for log message when not parsing the message buffer (cherry picked from commit baed515e8aed8e5b505ff716eb57d0c60e582632) (cherry picked from commit c19e43e7bfa7d88b49312f1e83c3aae0756e4ae5) - URL: https://github.com/kamailio/kamailio/commit/99dd461fb14c2eb3803d7708c229bb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:10:39+02:00 core: parser - free local unused param structure (cherry picked from commit 116ef94420bf6ed9e0ae3bc08a612d8d0c4aa0a7) (cherry picked from commit 479a6669da3bd03a9bd54ea4612192ee0b31f86a) - URL: https://github.com/kamailio/kamailio/commit/61d80860ead2adf93ffecb1318048bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:10:51+02:00 core: parser - ensure content lenght value does not exceed max int (cherry picked from commit f769011743feccde0fbca8531ab4e1b3563bf155) (cherry picked from commit cd4c6ef6022fa6b4453c9e2feb091d3dd7776311) - URL: https://github.com/kamailio/kamailio/commit/307f429ec4c1512018540cf58885b2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:11:02+02:00 core: catch empty string on parsing params (cherry picked from commit 76e6033ff14fec0f2db0b387803b4c5815a91163) (cherry picked from commit d40de01737781f12cb2383a2891c8590cfb7deba) - URL: https://github.com/kamailio/kamailio/commit/f0d7b3a3d6c2aa27e47c87ec58b31c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:11:38+02:00 core: parser contact - link structure once finishing current one (cherry picked from commit d6c52a6afdd38cc05a67a25e55e387ad77a9ddf4) (cherry picked from commit 9ed8820aaf307a756f1f08ccff4459884f62b9a8) - URL: https://github.com/kamailio/kamailio/commit/6120013b0821e9420254b083d6eb4f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:11:50+02:00 core: parser contact - proper update of length in skip_name() - stop walking name also for unquoted ;, being special char - small typo (cherry picked from commit 20db418f1e35f31d7a90d7cabbd22ae989b7266c) (cherry picked from commit a0d7837c934df7f4c2223ca7f90f7c439628caf4) - URL: https://github.com/kamailio/kamailio/commit/a7143e95b407d53714ed0113e243032… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:12:03+02:00 core: log unexpected char in parse_param2() (cherry picked from commit a2511df29adc83544f047cbbdba7a8ba88272930) (cherry picked from commit c6bfa8d8ee14ea27158f09f3b0a04015a1252e1a) - URL: https://github.com/kamailio/kamailio/commit/4f438e01d4e6c6042026e9c5f673e1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:12:14+02:00 core: parser - free unlinked local param structure in parse_to_param() (cherry picked from commit f624e1701088a94465a06f36a2ef27804b16ec0e) (cherry picked from commit 04c7d84874bf60dabede57adb1fc64ebe2260420) - URL: https://github.com/kamailio/kamailio/commit/d94bed817ffd389b5e528c124e2a841… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:12:27+02:00 core: parse_to_param() check for end of data on escape or start of value (cherry picked from commit 17a2eec2a8e47939782c1352ddb0fa4d3e73f9d8) (cherry picked from commit 92083402b2768b0ab81072feefd94bf754730e7f) - URL: https://github.com/kamailio/kamailio/commit/816f7b42b8527a2edc621143d2f1fae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:12:49+02:00 core: parse content - group operation to avoid overflow (cherry picked from commit 685817088ff9c72c055e72091fa6f923b824c206) (cherry picked from commit 796e2b203bbe09c6eb30321c579651d96c9b5de5) - URL: https://github.com/kamailio/kamailio/commit/0daa378326ea967bda8e302ac183463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:13:03+02:00 core: parse via - safe check for end of buffer - just in case it is needed to be used for non-zero-terminated strings (cherry picked from commit 1d3fde1205440296c1d6a54feee5a9d637055bee) (cherry picked from commit 5a73c4b2363a533f8a9ed67aff3413223815c52c) - URL: https://github.com/kamailio/kamailio/commit/0616c676ca0e0e6e013ce26a53e951b… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-09-17T09:13:16+02:00 kazoo: fixed crash when json body is NULL fixes GH #2794 (cherry picked from commit d8955fc350b48d0c4ca359d03cb9954a48998658) (cherry picked from commit abbf1fde2efd02f24c806a5be296e4648060b0af) - URL: https://github.com/kamailio/kamailio/commit/d8ef550a4e7181f7fce1a4982c5da10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:13:27+02:00 core: free params list at end on error state inside parse_addr_spec (cherry picked from commit f2b133e24e29f9f0ce7ba568a5d4564c7b0f8f31) (cherry picked from commit b44879a17af848c3acb5524fe1058854c59c95fd) - URL: https://github.com/kamailio/kamailio/commit/09370e77e42a287246df46728c85a8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:13:40+02:00 dispatcher: init attrs value when param not given to rpc add - GH #2854 (cherry picked from commit 7894fb470e707622b077d565763c9cfb7c654da5) (cherry picked from commit 55312a08806027850840cf5b1f69ec7469965730) - URL: https://github.com/kamailio/kamailio/commit/730167bf4e26ba44bf69275730efbf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:14:01+02:00 core: parser - print what is left in buffer if no EoH in get_body() (cherry picked from commit 63ecb827631189d27da6a85d41149985d95fc479) (cherry picked from commit 4578fb676177e16324c2241820cf5f8042503a37) - URL: https://github.com/kamailio/kamailio/commit/a5340f49d21cb4dede9c84fe099561d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:14:23+02:00 sqlops: return 1 on success for kemi sql_xquery() - GH #2856 (cherry picked from commit 32bf3eb2b27fbefe991a4aabc829f21ecc4e8829) (cherry picked from commit c1f5595eaf0b1f98cb5dcc00ab68c0e57bc4b053)

1 0

git:master:6208d8a0: core: receive - check for required headers before routing blocks
by Daniel-Constantin Mierla 17 Sep '21

17 Sep '21

Module: kamailio Branch: master Commit: 6208d8a0e31fa03ca24bc2fd63093607d235dbbd URL: https://github.com/kamailio/kamailio/commit/6208d8a0e31fa03ca24bc2fd6309360… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T08:22:09+02:00 core: receive - check for required headers before routing blocks --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/6208d8a0e31fa03ca24bc2fd6309360… Patch: https://github.com/kamailio/kamailio/commit/6208d8a0e31fa03ca24bc2fd6309360… --- diff --git a/src/core/receive.c b/src/core/receive.c index f3b31fefbc..b3e6aee8b8 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -421,9 +421,13 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) if(msg->first_line.type == SIP_REQUEST) { ruri_mark_new(); /* ruri is usable for forking (not consumed yet) */ if(!IS_SIP(msg)) { + LM_DBG("handling non-sip request message\n"); if((ret = nonsip_msg_run_hooks(msg)) != NONSIP_MSG_ACCEPT) { - if(unlikely(ret == NONSIP_MSG_ERROR)) + if(unlikely(ret == NONSIP_MSG_ERROR)) { + LM_DBG("failed handling non-sip request message\n"); goto error03; + } + LM_DBG("finished handling non-sip request message\n"); goto end; /* drop the message */ } } @@ -435,6 +439,14 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) STATS_BAD_MSG(); goto error02; } + if(unlikely((msg->callid == 0) || (msg->cseq == 0) || (msg->from == 0) + || (msg->to == 0))) { + /* no required headers -- send back error ? */ + LOG(cfg_get(core, core_cfg, sip_parser_log), + "required headers not found in request\n"); + STATS_BAD_MSG(); + goto error02; + } /* check if necessary to add receive?->moved to forward_req */ /* check for the alias stuff */ #ifdef USE_TCP @@ -526,6 +538,14 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) STATS_BAD_RPL(); goto error02; } + if(unlikely((msg->callid == 0) || (msg->cseq == 0) || (msg->from == 0) + || (msg->to == 0))) { + /* no required headers -- send back error ? */ + LOG(cfg_get(core, core_cfg, sip_parser_log), + "required headers not found in reply\n"); + STATS_BAD_RPL(); + goto error02; + } if(exectime) { gettimeofday(&tvb, NULL);

1 0

[kamailio/kamailio] How to get $fU and $tU from MSRP module? (#2857)
by w415384914 17 Sep '21

17 Sep '21

Hello! I want to get $fU and $tU from event_route[msrp:frame-in] in order to filter out MSRP messages sent by a specific sender and received by a specific receiver, I know I can get message content from $msrp(buf), the message content is like this: > MSRP 7a57f552155926c0 SEND > To-Path: msrp://172.18.0.14:6060/9d8da4a34dc2102959e7;tcp msrp://172.18.0.12:5060/msrp-6142fc2b-84-1;tcp msrp://172.18.0.2:34862/2a67b54ae0750b7d82aa;tcp > From-Path: msrp://172.18.0.14:6060/c71ae3675e114d08216b;tcp msrp://172.18.0.12:5060/msrp-6142fc2b-83-1;tcp msrp://172.18.0.2:34858/8baea7c52ba8755322fd;tcp > Byte-Range: 1-197/197 > Failure-Report: yes > Success-Report: yes > Message-ID: c792c94039b8a969 > Content-Type: message/cpim > > From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> > To: <sip:bob@ims.mnc001.mcc001.3gppnetwork.org> > DateTime: 2021-09-16T09:23:49.339805+00:00 > > MIME-Version: 1.0 > Content-Type: text/plain > > hello > -------7a57f552155926c0$ I want to get alice and bob from the content below： > From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> > To: <sip:bob@ims.mnc001.mcc001.3gppnetwork.org> > DateTime: 2021-09-16T09:23:49.339805+00:00 someone can suggest some method. In other route like request_route we can use $fU and $tU to access them. Regrads HANG LI -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2857

2 2

git:master:698417d9: modules: readme files regenerated - slack ... [skip ci]
by Kamailio Dev 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 698417d9704413fa8e58b1ee53e728efe1c02f34 URL: https://github.com/kamailio/kamailio/commit/698417d9704413fa8e58b1ee53e728e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-16T14:01:17+02:00 modules: readme files regenerated - slack ... [skip ci] --- Modified: src/modules/slack/README --- Diff: https://github.com/kamailio/kamailio/commit/698417d9704413fa8e58b1ee53e728e… Patch: https://github.com/kamailio/kamailio/commit/698417d9704413fa8e58b1ee53e728e… --- diff --git a/src/modules/slack/README b/src/modules/slack/README index 58203e80fb..22ede72ebc 100644 --- a/src/modules/slack/README +++ b/src/modules/slack/README @@ -4,7 +4,7 @@ Arsen Semenov <arsperger(a)gmail.com> - Copyright © 2021 arsperger.com + Copyright Â© 2021 arsperger.com __________________________________________________________________ Table of Contents @@ -22,7 +22,7 @@ Arsen Semenov 3.1. slack url (str) 3.2. channel (str) 3.3. username (str) - 3.4. icon_emogi (str) + 3.4. icon_emoji (str) 4. Functions @@ -33,7 +33,7 @@ Arsen Semenov 1.1. Set slack webhook URL parameter 1.2. Set channel parameter 1.3. Set username parameter - 1.4. Set icon_emogi parameter + 1.4. Set icon_emoji parameter 1.5. slack_send usage Chapter 1. Admin Guide @@ -51,7 +51,7 @@ Chapter 1. Admin Guide 3.1. slack url (str) 3.2. channel (str) 3.3. username (str) - 3.4. icon_emogi (str) + 3.4. icon_emoji (str) 4. Functions @@ -62,7 +62,7 @@ Chapter 1. Admin Guide This module provides integration with Slack over webhooks. Slack integration (https://api.slack.com/messaging/webhooks) - It relays on libcurl. library (https://curl.se/libcurl). + It relays on libcurl through http_client module. 2. Dependencies @@ -72,7 +72,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules The following modules must be loaded before this module: - * none. + * HTTP_CLIENT - the http_client module should be loaded first. 2.2. External Libraries or Applications @@ -85,7 +85,7 @@ Chapter 1. Admin Guide 3.1. slack url (str) 3.2. channel (str) 3.3. username (str) - 3.4. icon_emogi (str) + 3.4. icon_emoji (str) 3.1. slack url (str) @@ -121,16 +121,16 @@ modparam("slack", "channel", "#kamailio") modparam("slack", "username", "webhookbot") ... -3.4. icon_emogi (str) +3.4. icon_emoji (str) specify an emoji (using colon shortcodes, eg. :white_check_mark:) to use as the profile photo alongside the message. Default value is :ghost: - Example 1.4. Set icon_emogi parameter + Example 1.4. Set icon_emoji parameter ... -modparam("slack", "icon_emogi", ":ghost:") +modparam("slack", "icon_emoji", ":ghost:") ... 4. Functions

1 0

git:master:996bc9cc: slack: update readme docs [skip ci]
by Arsen Semenov 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 996bc9ccecdb2a5a41fb006306eefe3b384c6812 URL: https://github.com/kamailio/kamailio/commit/996bc9ccecdb2a5a41fb006306eefe3… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Arsen Semenov <arsperger(a)gmail.com> Date: 2021-09-16T16:56:58+05:00 slack: update readme docs [skip ci] --- Modified: src/modules/slack/doc/slack_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/996bc9ccecdb2a5a41fb006306eefe3… Patch: https://github.com/kamailio/kamailio/commit/996bc9ccecdb2a5a41fb006306eefe3… --- diff --git a/src/modules/slack/doc/slack_admin.xml b/src/modules/slack/doc/slack_admin.xml index fa8e6cf6b6..f7b1f4071c 100644 --- a/src/modules/slack/doc/slack_admin.xml +++ b/src/modules/slack/doc/slack_admin.xml @@ -20,7 +20,7 @@ Slack integration (https://api.slack.com/messaging/webhooks) </para> <para> - It relays on libcurl. library (https://curl.se/libcurl). + It relays on libcurl through http_client module. </para> </section> @@ -29,15 +29,14 @@ <section> <title>&kamailio; Modules</title> <para> - The following modules must be loaded before this module: + The following modules must be loaded before this module: <itemizedlist> - <listitem> - <para> - <emphasis>none</emphasis>. - </para> - </listitem> + <listitem><para> + HTTP_CLIENT - the http_client module should be + loaded first. + </para></listitem> </itemizedlist> - </para> + </para> </section> <section> <title>External Libraries or Applications</title> @@ -47,7 +46,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libcurl</emphasis> + <emphasis>&libcurl;</emphasis> </para> </listitem> </itemizedlist>

1 0

git: new commits in branch 5.5
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

- URL: https://github.com/kamailio/kamailio/commit/86c5d807ceb896dcc554bf8f1b7fb93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:04:54+02:00 core: print char code on error in parse_addr_spec() (cherry picked from commit 031fd46980b34a570385f49f168b13af43d84b87) - URL: https://github.com/kamailio/kamailio/commit/e50f95cda2190f29cc572ebc90b4d0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:05:04+02:00 app_ruby: utils/app_ruby_ctl - increade api skeleton functions to 1536 (cherry picked from commit cfb5c453caaee341dc4ee1d9f2cdc5b1c3c87eea) - URL: https://github.com/kamailio/kamailio/commit/44c9608c1d1c82439e76dda861362b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:05:14+02:00 app_ruby: regenerated api skeleton functions (cherry picked from commit 8b128b7dd544e3e30d615da39e84cec91588249a) - URL: https://github.com/kamailio/kamailio/commit/c19e43e7bfa7d88b49312f1e83c3aae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:06:38+02:00 core: parse content length - consider multi line header format - safety checks for log message when not parsing the message buffer (cherry picked from commit baed515e8aed8e5b505ff716eb57d0c60e582632) - URL: https://github.com/kamailio/kamailio/commit/479a6669da3bd03a9bd54ea4612192e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:07:01+02:00 core: parser - free local unused param structure (cherry picked from commit 116ef94420bf6ed9e0ae3bc08a612d8d0c4aa0a7) - URL: https://github.com/kamailio/kamailio/commit/cd4c6ef6022fa6b4453c9e2feb091d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:07:11+02:00 core: parser - ensure content lenght value does not exceed max int (cherry picked from commit f769011743feccde0fbca8531ab4e1b3563bf155) - URL: https://github.com/kamailio/kamailio/commit/d40de01737781f12cb2383a2891c859… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:07:27+02:00 core: catch empty string on parsing params (cherry picked from commit 76e6033ff14fec0f2db0b387803b4c5815a91163) - URL: https://github.com/kamailio/kamailio/commit/62e8b4571f746819f460ae83b95e95e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:07:56+02:00 core: relocate parse_contact_hader() to parser folder (cherry picked from commit d2dbe98e072f59138b9974ab8f147bcfef5f983e) - URL: https://github.com/kamailio/kamailio/commit/9ed8820aaf307a756f1f08ccff44598… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:08:05+02:00 core: parser contact - link structure once finishing current one (cherry picked from commit d6c52a6afdd38cc05a67a25e55e387ad77a9ddf4) - URL: https://github.com/kamailio/kamailio/commit/a0d7837c934df7f4c2223ca7f90f7c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:08:35+02:00 core: parser contact - proper update of length in skip_name() - stop walking name also for unquoted ;, being special char - small typo (cherry picked from commit 20db418f1e35f31d7a90d7cabbd22ae989b7266c) - URL: https://github.com/kamailio/kamailio/commit/c6bfa8d8ee14ea27158f09f3b0a0401… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:08:46+02:00 core: log unexpected char in parse_param2() (cherry picked from commit a2511df29adc83544f047cbbdba7a8ba88272930) - URL: https://github.com/kamailio/kamailio/commit/04c7d84874bf60dabede57adb1fc64e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:09:43+02:00 core: parser - free unlinked local param structure in parse_to_param() (cherry picked from commit f624e1701088a94465a06f36a2ef27804b16ec0e) - URL: https://github.com/kamailio/kamailio/commit/92083402b2768b0ab81072feefd94bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:10:00+02:00 core: parse_to_param() check for end of data on escape or start of value (cherry picked from commit 17a2eec2a8e47939782c1352ddb0fa4d3e73f9d8) - URL: https://github.com/kamailio/kamailio/commit/796e2b203bbe09c6eb30321c579651d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:12:05+02:00 core: parse content - group operation to avoid overflow (cherry picked from commit 685817088ff9c72c055e72091fa6f923b824c206) - URL: https://github.com/kamailio/kamailio/commit/5a73c4b2363a533f8a9ed67aff34132… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:12:17+02:00 core: parse via - safe check for end of buffer - just in case it is needed to be used for non-zero-terminated strings (cherry picked from commit 1d3fde1205440296c1d6a54feee5a9d637055bee) - URL: https://github.com/kamailio/kamailio/commit/abbf1fde2efd02f24c806a5be296e46… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-09-16T13:12:57+02:00 kazoo: fixed crash when json body is NULL fixes GH #2794 (cherry picked from commit d8955fc350b48d0c4ca359d03cb9954a48998658) - URL: https://github.com/kamailio/kamailio/commit/b44879a17af848c3acb5524fe105885… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:13:08+02:00 core: free params list at end on error state inside parse_addr_spec (cherry picked from commit f2b133e24e29f9f0ce7ba568a5d4564c7b0f8f31) - URL: https://github.com/kamailio/kamailio/commit/55312a08806027850840cf5b1f69ec7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:13:20+02:00 dispatcher: init attrs value when param not given to rpc add - GH #2854 (cherry picked from commit 7894fb470e707622b077d565763c9cfb7c654da5) - URL: https://github.com/kamailio/kamailio/commit/4578fb676177e16324c2241820cf5f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:13:39+02:00 core: parser - print what is left in buffer if no EoH in get_body() (cherry picked from commit 63ecb827631189d27da6a85d41149985d95fc479) - URL: https://github.com/kamailio/kamailio/commit/c1f5595eaf0b1f98cb5dcc00ab68c0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:13:53+02:00 sqlops: return 1 on success for kemi sql_xquery() - GH #2856 (cherry picked from commit 32bf3eb2b27fbefe991a4aabc829f21ecc4e8829)

1 0

[kamailio/kamailio] KSR.sqlops.sql_xquery() return 0 when successful, but 1 expected (#2856)
by hance2010 16 Sep '21

16 Sep '21

### Description  ### Troubleshooting ``` # kamailio.cfg sql = "select * from subscriber"; sql_xquery("ca", sql, "ra"); xinfo("returncode = $rc"); /* 1 */ # kamailio.lua sql = "select * from subscriber" rc = KSR.sqlops.sql_xquery("ca", sql, "ra") KSR.info("returncode = " .. rc .. "\n") -- 0, but 1 expected ``` #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.5.1 ``` * **Operating System**:  ``` debian10 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2856

2 2

git:master:32bf3eb2: sqlops: return 1 on success for kemi sql_xquery()
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 32bf3eb2b27fbefe991a4aabc829f21ecc4e8829 URL: https://github.com/kamailio/kamailio/commit/32bf3eb2b27fbefe991a4aabc829f21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:00:20+02:00 sqlops: return 1 on success for kemi sql_xquery() - GH #2856 --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/32bf3eb2b27fbefe991a4aabc829f21… Patch: https://github.com/kamailio/kamailio/commit/32bf3eb2b27fbefe991a4aabc829f21… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index d67f30ccef..63c035ca89 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -954,7 +954,7 @@ int sqlops_do_xquery(sip_msg_t *msg, str *scon, str *squery, str *xavp) if(sql_exec_xquery(msg, con, squery, xavp)<0) goto error; - return 0; + return 1; error: return -1; }

1 0

git:master:b8d3971a: slack: reuse http_client api
by Arsen Semenov 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: b8d3971ab7d2d5d913f629b142dded6322a82172 URL: https://github.com/kamailio/kamailio/commit/b8d3971ab7d2d5d913f629b142dded6… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Arsen Semenov <arsperger(a)gmail.com> Date: 2021-09-16T15:42:24+05:00 slack: reuse http_client api --- Modified: src/modules/slack/Makefile Modified: src/modules/slack/slack.c Modified: src/modules/slack/slack.h --- Diff: https://github.com/kamailio/kamailio/commit/b8d3971ab7d2d5d913f629b142dded6… Patch: https://github.com/kamailio/kamailio/commit/b8d3971ab7d2d5d913f629b142dded6…

1 0

[kamailio/kamailio] `rpc dispatcher.add group address flags` not work (#2854)
by hance2010 16 Sep '21

16 Sep '21

### Description  kamcmd dispatcher add 1 sip:1.2.3.4 # work kamcmd dispatcher add 1 sip:1.2.3.4 8 maxload=20 # work but, kamcmd dispatcher add 1 sip:1.2.3.4 8 # not work ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` kamailio 5.5.2 ``` (paste your output here) ``` * **Operating System**: Debian10  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2854

2 4

git:master:63ecb827: core: parser - print what is left in buffer if no EoH in get_body()
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 63ecb827631189d27da6a85d41149985d95fc479 URL: https://github.com/kamailio/kamailio/commit/63ecb827631189d27da6a85d4114998… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T11:03:52+02:00 core: parser - print what is left in buffer if no EoH in get_body() --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/63ecb827631189d27da6a85d4114998… Patch: https://github.com/kamailio/kamailio/commit/63ecb827631189d27da6a85d4114998… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 795c96a350..5b7fab524d 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1356,8 +1356,10 @@ char* get_body(sip_msg_t* const msg) (*(msg->unparsed)=='\n' || *(msg->unparsed)=='\r' ) ) { offset = 1; } else { - LM_ERR("failed to locate end of headers (%p %p - %d %d [%s])\n", - msg->buf, msg->unparsed, msg->len, len, msg->unparsed); + LM_ERR("failed to locate end of headers (%p %p - %d %d [%.*s])\n", + msg->buf, msg->unparsed, msg->len, len, + (len<msg->len)?(msg->len-len):0, + (len<msg->len)?msg->unparsed:""); return 0; }

1 0

git:master:489eb674: misctest: sync with fuzz msg code
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 489eb6742997f8e4f2dc56c894af6b8ed5ef4d33 URL: https://github.com/kamailio/kamailio/commit/489eb6742997f8e4f2dc56c894af6b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T11:00:56+02:00 misctest: sync with fuzz msg code --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/489eb6742997f8e4f2dc56c894af6b8… Patch: https://github.com/kamailio/kamailio/commit/489eb6742997f8e4f2dc56c894af6b8… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index 68f70718fc..0867c1ae46 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -39,10 +39,14 @@ #include "../../core/parser/parse_uri.c" #include "../../core/parser/parse_hname2.h" #include "../../core/parser/contact/parse_contact.h" +#include "../../core/parser/parse_to.h" +#include "../../core/parser/parse_from.h" #include "../../core/parser/parse_refer_to.h" #include "../../core/parser/parse_ppi_pai.h" #include "../../core/parser/parse_privacy.h" #include "../../core/parser/parse_diversion.h" +#include "../../core/parser/parse_identityinfo.h" +#include "../../core/parser/parse_disposition.h" MODULE_VERSION @@ -325,22 +329,38 @@ static int misctest_message_init(void) goto cleanup; } + parse_headers(&tmsg, HDR_EOH_F, 0); + parse_sdp(&tmsg); - parse_headers(&tmsg, HDR_TO_F, 0); + parse_from_header(&tmsg); + + parse_from_uri(&tmsg); + + parse_to_header(&tmsg); + + parse_to_uri(&tmsg); parse_contact_header(&tmsg); parse_refer_to_header(&tmsg); - parse_to_header(&tmsg); - parse_pai_header(&tmsg); parse_diversion_header(&tmsg); parse_privacy(&tmsg); + parse_content_disposition(&tmsg); + + parse_identityinfo_header(&tmsg); + + str uri; + get_src_uri(&tmsg, 0, &uri); + + str ssock; + get_src_address_socket(&tmsg, &ssock); + cleanup: free_sip_msg(&tmsg);

1 0

git:master:7894fb47: dispatcher: init attrs value when param not given to rpc add
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 7894fb470e707622b077d565763c9cfb7c654da5 URL: https://github.com/kamailio/kamailio/commit/7894fb470e707622b077d565763c9cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T08:37:55+02:00 dispatcher: init attrs value when param not given to rpc add - GH #2854 --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/7894fb470e707622b077d565763c9cf… Patch: https://github.com/kamailio/kamailio/commit/7894fb470e707622b077d565763c9cf… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 679acbe2aa..4ed98919b7 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1854,7 +1854,7 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) { int group, flags, nparams; str dest; - str attrs; + str attrs = STR_NULL; flags = 0; @@ -1862,7 +1862,7 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) if(nparams < 2) { rpc->fault(ctx, 500, "Invalid Parameters"); return; - } else if (nparams < 3) { + } else if (nparams <= 3) { attrs.s = 0; attrs.len = 0; }

1 0

git:master:f2b133e2: core: free params list at end on error state inside parse_addr_spec
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: f2b133e24e29f9f0ce7ba568a5d4564c7b0f8f31 URL: https://github.com/kamailio/kamailio/commit/f2b133e24e29f9f0ce7ba568a5d4564… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T08:08:18+02:00 core: free params list at end on error state inside parse_addr_spec --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/f2b133e24e29f9f0ce7ba568a5d4564… Patch: https://github.com/kamailio/kamailio/commit/f2b133e24e29f9f0ce7ba568a5d4564… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 99138dcaf4..1ff5a16908 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -896,6 +896,9 @@ char *parse_addr_spec(char *const buffer, const char *const end, status); goto error; } + if(to_b->error == PARSE_ERROR) { + free_to_params(to_b); + } return tmp; error:

1 0

[kamailio/kamailio] kazoo application may send zero string to kamailio this trigers crash (#2794)
by sergey-safarov 15 Sep '21

15 Sep '21

### Description I can see Kamailio cush then kazoo sends zero string as payload. Crush happens Kamailio start. #### Debugging Data ``` (gdb) bt full #0 strlen () at ../sysdeps/aarch64/strlen.S:94 No locals. #1 0x0000ffff98237274 in json_tokener_parse_ex (tok=0x1fe5a930, str=0x0, len=-1) at json_tokener.c:259 obj = 0x0 c = 1 '\001' oldlocale = 0xffffffffffffffff newloc = <optimized out> #2 0x0000ffff982b7c34 in kz_json_parse (str=0x0) at kz_json.c:285 tok = 0x1fe5a930 obj = 0x0 __func__ = "kz_json_parse" #3 0x0000ffff982a4550 in kz_amqp_consumer_event (Evt=0xffff9ce07a60) at kz_amqp.c:2427 json_obj = 0x0 #4 0x0000ffff982b1450 in kz_amqp_consumer_worker_cb (fd=16, event=2, arg=0xffffc5e8b350) at kz_amqp.c:3277 cmd = 0x0 Evt = 0xffff9ce07a60 __func__ = "kz_amqp_consumer_worker_cb" #5 0x0000ffff98193628 in event_process_active_single_queue () from /lib64/libevent-2.1.so.6 No symbol table info available. #6 0x0000ffff98193ee8 in event_base_loop () from /lib64/libevent-2.1.so.6 No symbol table info available. #7 0x0000ffff982b1878 in kz_amqp_consumer_worker_proc (cmd_pipe=16) at kz_amqp.c:3292 pipe_ev = {ev_evcallback = {evcb_active_next = {tqe_next = 0x0, tqe_prev = 0x1fb68f40}, evcb_flags = 130, evcb_pri = 0 '\000', evcb_closure = 2 '\002', evcb_cb_union = {evcb_callback = 0xffff982b080c <kz_amqp_consumer_worker_cb>, evcb_selfcb = 0xffff982b080c <kz_amqp_consumer_worker_cb>, evcb_evfinalize = 0xffff982b080c <kz_amqp_consumer_worker_cb>, evcb_cbfinalize = 0xffff982b080c <kz_amqp_consumer_worker_cb>}, evcb_arg = 0xffffc5e8b350}, ev_timeout_pos = {ev_next_with_common_timeout = {tqe_next = 0xffffffffffff, tqe_prev = 0xffffc5e8b5c0}, min_heap_idx = -1}, ev_fd = 16, ev_base = 0x1fe4e360, ev_ = {ev_io = {ev_io_next = {le_next = 0x0, le_prev = 0x1fdd0ec0}, ev_timeout = {tv_sec = 0, tv_usec = 0}}, ev_signal = {ev_signal_next = {le_next = 0x0, le_prev = 0x1fdd0ec0}, ev_ncalls = 0, ev_pncalls = 0x0}}, ev_events = 18, ev_res = 2, ev_timeout = {tv_sec = 281473255792648, tv_usec = 0}} #8 0x0000ffff98279a94 in mod_child_init (rank=0) at kazoo.c:412 pid = 0 i = 2 g = 0xffff9e491868 s = 0x8e2210 __func__ = "mod_child_init" #9 0x00000000005c93a8 in init_mod_child (m=0xffff9defe638, rank=0) at core/sr_module.c:864 __func__ = "init_mod_child" #10 0x00000000005c8f5c in init_mod_child (m=0xffff9df16b30, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #11 0x00000000005c8f5c in init_mod_child (m=0xffff9df9fde0, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #12 0x00000000005c8f5c in init_mod_child (m=0xffff9dfa03a0, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #13 0x00000000005c8f5c in init_mod_child (m=0xffff9dfa2750, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #14 0x00000000005c8f5c in init_mod_child (m=0xffff9dfa4e70, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #15 0x00000000005c8f5c in init_mod_child (m=0xffff9e09c900, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #16 0x00000000005c8f5c in init_mod_child (m=0xffff9e09df60, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #17 0x00000000005c8f5c in init_mod_child (m=0xffff9e09e608, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #18 0x00000000005c8f5c in init_mod_child (m=0xffff9e09e978, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #19 0x00000000005c8f5c in init_mod_child (m=0xffff9e09ece8, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #20 0x00000000005c8f5c in init_mod_child (m=0xffff9e3577a8, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #21 0x00000000005c8f5c in init_mod_child (m=0xffff9e358888, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #22 0x00000000005c8f5c in init_mod_child (m=0xffff9e391358, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #23 0x00000000005c8f5c in init_mod_child (m=0xffff9e45dc90, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #24 0x00000000005c8f5c in init_mod_child (m=0xffff9e483c60, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #25 0x00000000005c8f5c in init_mod_child (m=0xffff9e484190, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #26 0x00000000005c8f5c in init_mod_child (m=0xffff9e484e38, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #27 0x00000000005c8f5c in init_mod_child (m=0xffff9e4868c8, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #28 0x00000000005c8f5c in init_mod_child (m=0xffff9e4c1fb8, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #29 0x00000000005c8f5c in init_mod_child (m=0xffff9e51d880, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #30 0x00000000005c8f5c in init_mod_child (m=0xffff9e54c6c0, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #31 0x00000000005c8f5c in init_mod_child (m=0xffff9e5b3130, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #32 0x00000000005c9d8c in init_child (rank=0) at core/sr_module.c:909 ret = -974598928 type = 0x8e4180 "PROC_MAIN" __func__ = "init_child" #33 0x0000000000431f70 in main_loop () at main.c:1849 i = 8 pid = 174778 si = 0x0 si_desc = "udp receiver child=7 sock=[2600:1f1c:6d5:aa02::c6]:5080\000\230\352\356\235\377\377\000\000\360\315\350\305\377\377\000\000\340\004S\236\377\377\000\000\020\316\350\305\377\377\000\000 \316\350\305\377\377\000\000 \316\350\305\377\377\000\000\360\315\350\305\377\377\000\000\320\377\377\377\200\377\377\377\000\355w\200t\232'\376" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #34 0x000000000043de90 in main (argc=11, argv=0xffffc5e8d3c8) at main.c:3053 cfg_stream = 0x1fae02d0 c = -1 r = 0 tmp = 0xffffc5e8fee1 "" tmp_len = 65535 port = 1 proto = 0 ahost = 0x0 aport = 0 options = 0x8ae128 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 2101103603 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xffff9f660da8 <__libc_start_main+168> "" st = {st_dev = 25, st_ino = 18714, st_mode = 16832, st_nlink = 2, st_uid = 991, st_gid = 986, st_rdev = 0, __pad1 = 0, st_size = 60, st_blksize = 65536, __pad2 = 0, st_blocks = 0, st_atim = {tv_sec = 1624850771, tv_nsec = 439999983}, st_mtim = {tv_sec = 1625171374, tv_nsec = 987883153}, st_ctim = {tv_sec = 1625171374, tv_nsec = 987883153}, __glibc_reserved = {0, 0}} tbuf = "\000\000\000\000\000\000\000\000\000\000\230\237\377\377\000\000\000\000\000\000\000\000\000\000\330\375\233\237\377\377", '\000' <repeats 58 times>, "x\376\233\237\377\377\000\000h\376\233\237\377\377\000\000\b\376\233\237\377\377\000\000(\376\233\237\377\377\000\000\070\376\233\237\377\377\000\000\250\376\233\237\377\377\000\000\270\376\233\237\377\377\000\000\310\376\233\237\377\377\000\000H\376\233\237\377\377\000\000X\376\233\237\377\377", '\000' <repeats 18 times>, "\330\375\233\237\377\377", '\000' <repeats 42 times>... option_index = 12 long_options = {{name = 0x8b04e8 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x8ab520 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x8b04f0 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x8b04f8 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x8b0500 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x8b0510 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x8b0520 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x8b0530 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x8b0540 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x8b0550 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x8b0560 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x8b0568 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x8b0578 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` Variables vlaues ``` (gdb) f 2 #2 0x0000ffff982b7c34 in kz_json_parse (str=0x0) at kz_json.c:285 285 obj = json_tokener_parse_ex(tok, str, -1); (gdb) p obj $3 = (struct json_object *) 0x0 (gdb) p *obj Cannot access memory at address 0x0 (gdb) f 3 #3 0x0000ffff982a4550 in kz_amqp_consumer_event (Evt=0xffff9ce07a60) at kz_amqp.c:2427 2427 json_obj = kz_json_parse(Evt->payload); (gdb) p *Evt $4 = {payload = 0x0, delivery_tag = 1819, channel = 6, event_key = 0x0, event_subkey = 0x0, message_id = 0xffff9cfdd600, routing_key = 0x0, cmd = 0x0} (gdb) p Evt->payload $5 = 0x0 (gdb) p *Evt->payload Cannot access memory at address 0x0 ``` ### Possible Solutions Check empty string zero inside `kz_json_parse` function and NULL if received empty string. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@bcf-e-0 ~]# kamailio -v version: kamailio 5.6.0-dev0 (aarch64/linux) f03900 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT-NOSMP, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: f03900 compiled on 17:17:36 Jun 26 2021 with gcc 8.4.1 ``` Here is master branch with my customization * **Operating System**: ``` [root@bcf-e-0 ~]# uname -a Linux bcf-e-0.la.cal911.net 4.18.0-305.3.1.el8.aarch64 #1 SMP Tue Jun 1 16:22:50 UTC 2021 aarch64 aarch64 aarch64 GNU/Linux [root@bcf-e-0 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2794

2 4

git:master:d8955fc3: kazoo: fixed crash when json body is NULL
by Sergey Safarov 15 Sep '21

15 Sep '21

Module: kamailio Branch: master Commit: d8955fc350b48d0c4ca359d03cb9954a48998658 URL: https://github.com/kamailio/kamailio/commit/d8955fc350b48d0c4ca359d03cb9954… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-09-15T16:14:13+03:00 kazoo: fixed crash when json body is NULL fixes GH #2794 --- Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/d8955fc350b48d0c4ca359d03cb9954… Patch: https://github.com/kamailio/kamailio/commit/d8955fc350b48d0c4ca359d03cb9954… --- diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 5ab8f68c79..0e5f2e8b10 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -276,6 +276,11 @@ struct json_object* kz_json_parse(const char *str) struct json_tokener* tok; struct json_object* obj; + if (str == NULL || str[0] == 0) { + LM_ERR("Error parsing json: empty string\n"); + return NULL; + } + tok = json_tokener_new(); if (!tok) { LM_ERR("Error parsing json: could not allocate tokener\n");

1 0

git:master:f485a1b2: posops: new module with functions working with the position in message buffer
by Daniel-Constantin Mierla 15 Sep '21

15 Sep '21

Module: kamailio Branch: master Commit: f485a1b2d4aacce80dc819c0a987c192c0a0cc97 URL: https://github.com/kamailio/kamailio/commit/f485a1b2d4aacce80dc819c0a987c19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-15T14:54:59+02:00 posops: new module with functions working with the position in message buffer - add/remove content at a specific position in the sip message buffer --- Added: src/modules/posops/Makefile Added: src/modules/posops/README Added: src/modules/posops/doc/Makefile Added: src/modules/posops/doc/posops.xml Added: src/modules/posops/doc/posops_admin.xml Added: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f485a1b2d4aacce80dc819c0a987c19… Patch: https://github.com/kamailio/kamailio/commit/f485a1b2d4aacce80dc819c0a987c19…

1 0

[kamailio/kamailio] Random segfault or general protection crash on siptrace.so module (#2718)
by Joshua Riffle 15 Sep '21

15 Sep '21

### Description After upgrading from Kamailio 5.2.x, a high volume Kamailio 5.4.4 instance randomly crashes with either a general protection or segfault error message in `siptrace.so` during use of `sip_trace` function from one of its child processes (which cascades to the parent crashing). This appears to occur once about every 36 hours on average, but has not yet appeared to correspond with any particular event. We are continuing to collect debug information and will be populating this ticket as more information becomes available. However, this issue has been observed. Sip trace function is applied in this example snippet: ``` # ------- siptrace -------- modparam("siptrace", "hep_mode_on", 1) modparam("siptrace", "hep_version", 3) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "trace_flag", 22) modparam("siptrace", "trace_on", 1) request_route { #.... if ( is_method("INVITE") && !has_totag() ) { # Only start sip_trace on initial INVITE sip_trace("HEP_URL","$ci-MY_IP","d"); } setflag(22); #... } ``` ### Troubleshooting We attempted packet collection with Homer v5 and Homer v7 and changed between HEP protocol v2 and v3. #### Reproduction We have not determined a means of reproducing this issue without simply letting the server run until a crash occurs. There are four almost identical servers all experiencing the same random crashing but not at the same time. #### Debugging Data Our next troubleshooting case will be to simply comment out the `sip_trace` function, but this effectively disables the `siptrace` module completely rather than addressing an underlying problem. Core dumps are still in-progress for retrieval. Debug logs should also be more readily available soon. There will be delays since these are high volume production servers.  #### Log Messages All of them have randomly crashed with the following example log entry. Regardless of troubleshooting tactics to date: ``` kernel: traps: kamailio[7579] general protection ip:7fb1a64e2dbf sp:7ffc60f04180 error:0 in siptrace.so[7fb1a64b8000+4e000] systemd: kamailio.service: main process exited, code=exited, status=1/FAILURE systemd: Unit kamailio.service entered failed state. systemd: kamailio.service failed. ``` #### SIP Traffic To date, there is no corresponding SIP Traffic with the crash. ### Possible Solutions To date, only disabling the `siptrace` module seems to be the solution. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.4 (x86_64/linux) e16352 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES 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: e16352 compiled on 15:56:46 Feb 15 2021 with gcc 4.8.5 ``` * **Operating System**:  ``` Linux <hostname> 3.10.0-957.27.2.el7.x86_64 #1 SMP Mon Jul 29 17:46:05 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2718

5 19

git:master:1d9a9726: misc/fuzz: deeper parsing for From/To
by Daniel-Constantin Mierla 15 Sep '21

15 Sep '21

Module: kamailio Branch: master Commit: 1d9a972692a44210884137c5d941909022ce6183 URL: https://github.com/kamailio/kamailio/commit/1d9a972692a44210884137c5d941909… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-15T11:01:45+02:00 misc/fuzz: deeper parsing for From/To --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1d9a972692a44210884137c5d941909… Patch: https://github.com/kamailio/kamailio/commit/1d9a972692a44210884137c5d941909… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index 8de9175549..1c813fd715 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -2,6 +2,8 @@ #include "../parser/parse_uri.c" #include "../parser/parse_hname2.h" #include "../parser/contact/parse_contact.h" +#include "../parser/parse_from.h" +#include "../parser/parse_to.h" #include "../parser/parse_refer_to.h" #include "../parser/parse_ppi_pai.h" #include "../parser/parse_privacy.h" @@ -19,22 +21,29 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { sip_msg_t orig_inv = { }; orig_inv.buf = (char*)data; orig_inv.len = size; + if (parse_msg(orig_inv.buf, orig_inv.len, &orig_inv) < 0) { goto cleanup; } - + + parse_headers(&orig_inv, HDR_EOH_F, 0); + parse_sdp(&orig_inv); - parse_headers(&orig_inv, HDR_TO_F, 0); + parse_from_header(&orig_inv); + + parse_from_uri(&orig_inv); + + parse_to_header(&orig_inv); + + parse_to_uri(&orig_inv); parse_contact_header(&orig_inv); parse_refer_to_header(&orig_inv); - parse_to_header(&orig_inv); - parse_pai_header(&orig_inv); - + parse_diversion_header(&orig_inv); parse_privacy(&orig_inv);

1 0

[kamailio/kamailio] db_redis: add support for native redis cluster (#1997)
by George Diamantopoulos 15 Sep '21

15 Sep '21

The db_redis module seems to only support connecting with a single redis instance. It is not evident from the documentation if it implements support for native redis cluster by honouring 'MOVED' replies. ndb_redis seems to have support for native redis clusters, and supports both automatic (see allow_dynamic_nodes parameter of ndb_redis) and manual configuration of redis nodes. Since both modules are based on the hiredis library, is it safe to assume this support could be easily implemented, with some code sharing between the two modules perhaps? If db_redis supports clusters with automatic configuration only (by processing MOVED replies), perhaps the module's documentation should be updated to reflect that. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1997

4 4

[kamailio/kamailio] JSON CEE structured logging (#2797)
by Daniel Pocock 15 Sep '21

15 Sep '21

### Description Kamailio recently added JSON logging support, described on these two pages: https://www.kamailio.org/w/2020/04/structured-json-logging/ https://www.kamailio.org/wiki/cookbooks/devel/core#log_engine_cli_parameter Structured logging is particularly useful when: 1. there are multiple applications involved in a call (e.g. Kamailio, Kurento, coTurn, Apache) 2. all the applications create JSON logs using identical field names I recently made contributions to reSIProcate, GStreamer and Kurento to support the JSON CEE field names. It would be very easy to replicate in Kamailio. https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/847 https://github.com/Kurento/kurento-media-server/pull/17 https://github.com/resiprocate/resiprocate/commit/d1df9aeb956be79253560fe36… Notice that ```rsyslog``` can receive legacy Syslog events from VoIP hardware, Cisco and Polycom phones and it can convert them to JSON CEE and push them into the document store where they will meet the records from Kamailio. This is another case where it is really useful if all the JSON from different applications is using CEE. Here are the JSON CEE field names: https://cee.mitre.org/language/1.0-beta1/core-profile.html ### Expected behavior Extend the config setting so that people can request CEE on the command line. #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2797

2 3

git:master:cbca34c6: sipt: use helper function to check for valid ISUP/ACM/CPG
by Henning Westerholt 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: cbca34c67bec1ba8581a6f7d2de83a71f1fefcd3 URL: https://github.com/kamailio/kamailio/commit/cbca34c67bec1ba8581a6f7d2de83a7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-14T15:39:57Z sipt: use helper function to check for valid ISUP/ACM/CPG --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/cbca34c67bec1ba8581a6f7d2de83a7… Patch: https://github.com/kamailio/kamailio/commit/cbca34c67bec1ba8581a6f7d2de83a7… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index e0324e3f8a..b5e596d077 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -264,6 +264,25 @@ static inline int sipt_check_IAM(struct sip_msg *msg, str *body) return 1; } +static inline int sipt_check_ACM_CPG(struct sip_msg *msg, str *body) +{ + body->s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP, &body->len); + + if(body->s == NULL) + { + LM_INFO("No ISUP Message Found"); + return -1; + } + + if((body->s[0] != ISUP_ACM) && (body->s[0] != ISUP_CPG)) + { + LM_DBG("message not an ACM or CPG\n"); + return -1; + } + return 1; +} + + static int sipt_get_hop_counter(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str body; @@ -353,17 +372,9 @@ static int sipt_get_calling_party(struct sip_msg *msg, pv_param_t *param, pv_val static int sipt_get_redirection_info(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str body; - body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP,&body.len); - - if(body.s == NULL) - { - LM_INFO("No ISUP Message Found"); - return -1; - } - - if((body.s[0] != ISUP_ACM) && (body.s[0] != ISUP_CPG)) + if(sipt_check_ACM_CPG(msg, &body) != 1) { - LM_DBG("message not an ACM or CPG\n"); + LM_INFO("could not check ACM or CPG\n"); return -1; } @@ -374,17 +385,9 @@ static int sipt_get_redirection_info(struct sip_msg *msg, pv_param_t *param, pv_ static int sipt_get_redirection_number_nai(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str body; - body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP,&body.len); - - if(body.s == NULL) - { - LM_INFO("No ISUP Message Found"); - return -1; - } - - if((body.s[0] != ISUP_ACM) && (body.s[0] != ISUP_CPG)) + if(sipt_check_ACM_CPG(msg, &body) != 1) { - LM_DBG("message not an ACM or CPG\n"); + LM_INFO("could not check ACM or CPG\n"); return -1; } @@ -396,18 +399,10 @@ static int sipt_get_redirection_number(struct sip_msg *msg, pv_param_t *param, p { static char sb_s_buf[26]; str body; - body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP,&body.len); - memset(sb_s_buf, 0, 26); - if(body.s == NULL) + if(sipt_check_ACM_CPG(msg, &body) != 1) { - LM_INFO("No ISUP Message Found"); - return -1; - } - - if((body.s[0] != ISUP_ACM) && (body.s[0] != ISUP_CPG)) - { - LM_DBG("message not an ACM or CPG\n"); + LM_INFO("could not check ACM or CPG\n"); return -1; }

1 0

git:master:0cc471e0: sipt: use helper function to check for valid ISUP/IAM
by Henning Westerholt 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: 0cc471e0c12c33044a0be6b41cbf63ee12a5d5c1 URL: https://github.com/kamailio/kamailio/commit/0cc471e0c12c33044a0be6b41cbf63e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-14T15:32:50Z sipt: use helper function to check for valid ISUP/IAM --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/0cc471e0c12c33044a0be6b41cbf63e… Patch: https://github.com/kamailio/kamailio/commit/0cc471e0c12c33044a0be6b41cbf63e…

1 0

[kamailio/kamailio] Kamailio was not accepting TLS connections (#2796)
by aatif218 14 Sep '21

14 Sep '21

we are getting the following errors in Kamailio logs **kamailio.log** Jun 29 08:08:14 fep-1 /usr/local/fep-kamailio/sbin/kamailio[14111]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7f524f7862d0, fd 30406 Jun 29 08:08:14 fep-1 /usr/local/fep-kamailio/sbin/kamailio[14111]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7f525a6c5f90, fd 30407 Jun 29 08:08:14 fep-1 /usr/local/fep-kamailio/sbin/kamailio[14111]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7f52449e0978, fd 30415 Jun 29 08:06:27 fep-1 /usr/local/fep-kamailio/sbin/kamailio[14111]: CRITICAL: <core> [core/io_wait.h:596]: io_watch_del(): invalid fd 30355, not in [0, 4607) Jun 29 08:06:27 fep-1 /usr/local/fep-kamailio/sbin/kamailio[14111]: CRITICAL: <core> [core/io_wait.h:596]: io_watch_del(): invalid fd 30356, not in [0, 4607) Jun 29 08:06:27 fep-1 /usr/local/fep-kamailio/sbin/kamailio[14111]: CRITICAL: <core> [core/io_wait.h:596]: io_watch_del(): invalid fd 30358, not in [0, 4607) **Description** On checking this issue we found that Kamailio was not accepting TLS connections. We were getting an error which is mentioned above. We double-checked TLS and TCP connections and they were normal. We have 5000+ TLS connections and the max connection limit is 30,000. So we were not exceeding the TLS connection limit. We also verified open_files_limits. It is around 1 million which is more than enough. **Kamailio Version** - output of kamailio -v version: kamailio 5.4.2 (x86_64/linux) f8885c flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES 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: f8885c **Operating System:** NAME="CentOS Linux" VERSION="7 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="7" PRETTY_NAME="CentOS Linux 7 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:7" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-7" CENTOS_MANTISBT_PROJECT_VERSION="7" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="7" -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2796

2 10

[kamailio/kamailio] kamailio log socket error (#2806)
by nihaomatmat 14 Sep '21

14 Sep '21

I have some problems。the kamailio version is 5.3.0. My linux version is centos 7. the kamailio log: ERROR: <core> [core/tcp_main.c:3508]: send_fd_queue_run(): send_fd failed on socket 63 , queue entry 1, retries 90, connection 0x7ff46e6b1b60, tcp socket 218, errno=11 (Resource temporarily unavailable) ERROR: {1 12529 MESSAGE 359bf0410a7e471c950623e3f7a3b17b} <core> [core/kemi.c:94]: sr_kemi_core_err(): 202->408 CRITICAL: <core> [core/tcp_main.c:4218]: send2child(): tcp child 6, socket 65: queue full, 291 requests queued (total handled 10665748) This problem does not happen every time。When the number of user registrations increases significantly, errors will appear。I tried to set the parameter tcp_children is adjusted to 8, it will not appear frequently, but when the number of user registrations increases to about 5000, errors will still appear. My kamailio.cfg global parameters are set as follows：tls_max_connections=65536,tcp_max_connections=65536,open_max_files=65536。 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2806

3 5

[kamailio/kamailio] misc: fuzz: extend msg parsing fuzzer (#2851)
by DavidKorczynski 14 Sep '21

14 Sep '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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  Extends the msg parsing fuzzer to reach some of the parsing routines we currently miss. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2851 -- Commit Summary -- * misc: fuzz: extend msg parsing fuzzer -- File Changes -- M misc/fuzz/fuzz_parse_msg.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2851.patch https://github.com/kamailio/kamailio/pull/2851.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2851

2 2

git:master:ef457eea: misc: fuzz: extend msg parsing fuzzer
by Daniel-Constantin Mierla 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: ef457eea6f4eff1f52829db5ab88e08b74b8da86 URL: https://github.com/kamailio/kamailio/commit/ef457eea6f4eff1f52829db5ab88e08… Author: David Korczynski <david(a)adalogics.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-14T10:11:18+02:00 misc: fuzz: extend msg parsing fuzzer --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/ef457eea6f4eff1f52829db5ab88e08… Patch: https://github.com/kamailio/kamailio/commit/ef457eea6f4eff1f52829db5ab88e08… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index ef656abd3a..8de9175549 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -6,6 +6,8 @@ #include "../parser/parse_ppi_pai.h" #include "../parser/parse_privacy.h" #include "../parser/parse_diversion.h" +#include "../parser/parse_identityinfo.h" +#include "../parser/parse_disposition.h" int LLVMFuzzerInitialize(int *argc, char ***argv) { ksr_hname_init_index(); @@ -37,6 +39,16 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { parse_privacy(&orig_inv); + parse_content_disposition(&orig_inv); + + parse_identityinfo_header(&orig_inv); + + str uri; + get_src_uri(&orig_inv, 0, &uri); + + str ssock; + get_src_address_socket(&orig_inv, &ssock); + cleanup: free_sip_msg(&orig_inv);

1 0

[kamailio/kamailio] ims_charging: fix charging reply route with kemi (#2836)
by Riccardo-78 14 Sep '21

14 Sep '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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  This patch fixes route callback for ccr responses when using kemi as configuration engine. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2836 -- Commit Summary -- * ims_charging: fix charging reply route with kemi -- File Changes -- M src/modules/ims_charging/ims_charging_mod.c (30) M src/modules/ims_charging/ims_ro.c (35) M src/modules/ims_charging/ims_ro.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2836.patch https://github.com/kamailio/kamailio/pull/2836.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2836

2 2

git:master:cfaea077: ims_charging: fix charging reply route with kemi
by Daniel-Constantin Mierla 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: cfaea0776be0027f4a7dab996a9f0f0e6271c421 URL: https://github.com/kamailio/kamailio/commit/cfaea0776be0027f4a7dab996a9f0f0… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-14T10:10:49+02:00 ims_charging: fix charging reply route with kemi --- Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ims_ro.h --- Diff: https://github.com/kamailio/kamailio/commit/cfaea0776be0027f4a7dab996a9f0f0… Patch: https://github.com/kamailio/kamailio/commit/cfaea0776be0027f4a7dab996a9f0f0…

1 0

git:master:a1afff1d: lib/srdb1: schema - create index on tcp connection for location
by Daniel-Constantin Mierla 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: a1afff1d50c426b0aa9fe358425110a64e838159 URL: https://github.com/kamailio/kamailio/commit/a1afff1d50c426b0aa9fe358425110a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-14T09:14:40+02:00 lib/srdb1: schema - create index on tcp connection for location --- Modified: src/lib/srdb1/schema/location.xml --- Diff: https://github.com/kamailio/kamailio/commit/a1afff1d50c426b0aa9fe358425110a… Patch: https://github.com/kamailio/kamailio/commit/a1afff1d50c426b0aa9fe358425110a… --- diff --git a/src/lib/srdb1/schema/location.xml b/src/lib/srdb1/schema/location.xml index 7ca7d29af4..55ebb6f83c 100644 --- a/src/lib/srdb1/schema/location.xml +++ b/src/lib/srdb1/schema/location.xml @@ -236,6 +236,10 @@ <name>expires_idx</name> <colref linkend="expires"/> </index> + <index> + <name>tcpcon_idx</name> + <colref linkend="connection_id"/> + </index> <index> <name>connection_idx</name> <colref linkend="server_id"/>

1 0

git:master:d024975f: kamctl: regenerated db schema files
by Daniel-Constantin Mierla 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: d024975fa855461a758cdf8276e2406bbda95d0a URL: https://github.com/kamailio/kamailio/commit/d024975fa855461a758cdf8276e2406… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-14T09:14:40+02:00 kamctl: regenerated db schema files --- Modified: utils/kamctl/db_sqlite/usrloc-create.sql Modified: utils/kamctl/mysql/usrloc-create.sql Modified: utils/kamctl/oracle/usrloc-create.sql Modified: utils/kamctl/postgres/usrloc-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/d024975fa855461a758cdf8276e2406… Patch: https://github.com/kamailio/kamailio/commit/d024975fa855461a758cdf8276e2406… --- diff --git a/utils/kamctl/db_sqlite/usrloc-create.sql b/utils/kamctl/db_sqlite/usrloc-create.sql index 676574f037..e23cc5d8d0 100644 --- a/utils/kamctl/db_sqlite/usrloc-create.sql +++ b/utils/kamctl/db_sqlite/usrloc-create.sql @@ -27,6 +27,7 @@ CREATE TABLE location ( CREATE INDEX location_account_contact_idx ON location (username, domain, contact); CREATE INDEX location_expires_idx ON location (expires); +CREATE INDEX location_tcpcon_idx ON location (connection_id); CREATE INDEX location_connection_idx ON location (server_id, connection_id); INSERT INTO version (table_name, table_version) values ('location','9'); diff --git a/utils/kamctl/mysql/usrloc-create.sql b/utils/kamctl/mysql/usrloc-create.sql index 024123b949..73f8cf111f 100644 --- a/utils/kamctl/mysql/usrloc-create.sql +++ b/utils/kamctl/mysql/usrloc-create.sql @@ -27,6 +27,7 @@ CREATE TABLE `location` ( CREATE INDEX account_contact_idx ON location (`username`, `domain`, `contact`); CREATE INDEX expires_idx ON location (`expires`); +CREATE INDEX tcpcon_idx ON location (`connection_id`); CREATE INDEX connection_idx ON location (`server_id`, `connection_id`); INSERT INTO version (table_name, table_version) values ('location','9'); diff --git a/utils/kamctl/oracle/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 0cf6d822f1..7cd93c1105 100644 --- a/utils/kamctl/oracle/usrloc-create.sql +++ b/utils/kamctl/oracle/usrloc-create.sql @@ -35,6 +35,7 @@ BEGIN map2users('location'); END; / CREATE INDEX location_account_contact_idx ON location (username, domain, contact); CREATE INDEX location_expires_idx ON location (expires); +CREATE INDEX location_tcpcon_idx ON location (connection_id); CREATE INDEX location_connection_idx ON location (server_id, connection_id); INSERT INTO version (table_name, table_version) values ('location','9'); diff --git a/utils/kamctl/postgres/usrloc-create.sql b/utils/kamctl/postgres/usrloc-create.sql index b9e9c90583..55d22e8857 100644 --- a/utils/kamctl/postgres/usrloc-create.sql +++ b/utils/kamctl/postgres/usrloc-create.sql @@ -27,6 +27,7 @@ CREATE TABLE location ( CREATE INDEX location_account_contact_idx ON location (username, domain, contact); CREATE INDEX location_expires_idx ON location (expires); +CREATE INDEX location_tcpcon_idx ON location (connection_id); CREATE INDEX location_connection_idx ON location (server_id, connection_id); INSERT INTO version (table_name, table_version) values ('location','9');

1 0

git:master:a74977e4: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: a74977e42a39b93a4127766b86fc26fc367e9fe6 URL: https://github.com/kamailio/kamailio/commit/a74977e42a39b93a4127766b86fc26f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-14T08:46:23+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/a74977e42a39b93a4127766b86fc26f… Patch: https://github.com/kamailio/kamailio/commit/a74977e42a39b93a4127766b86fc26f…

1 0

git:master:68581708: core: parse content - group operation to avoid overflow
by Daniel-Constantin Mierla 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: 685817088ff9c72c055e72091fa6f923b824c206 URL: https://github.com/kamailio/kamailio/commit/685817088ff9c72c055e72091fa6f92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-14T08:03:47+02:00 core: parse content - group operation to avoid overflow --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/685817088ff9c72c055e72091fa6f92… Patch: https://github.com/kamailio/kamailio/commit/685817088ff9c72c055e72091fa6f92… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index ee56e09b7a..cda4b8177d 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -237,7 +237,7 @@ char* parse_content_length(char* const buffer, const char* const end, LM_ERR("content lenght value is too large\n"); goto error; } - number = number*10 + (*p)-'0'; + number = number*10 + ((*p) - '0'); size ++; p++; }

1 0

git:master:1d3fde12: core: parse via - safe check for end of buffer
by Daniel-Constantin Mierla 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: 1d3fde1205440296c1d6a54feee5a9d637055bee URL: https://github.com/kamailio/kamailio/commit/1d3fde1205440296c1d6a54feee5a9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-14T08:05:05+02:00 core: parse via - safe check for end of buffer - just in case it is needed to be used for non-zero-terminated strings --- Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/1d3fde1205440296c1d6a54feee5a9d… Patch: https://github.com/kamailio/kamailio/commit/1d3fde1205440296c1d6a54feee5a9d… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 78bd304f32..100af6d6bf 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -940,7 +940,7 @@ static /*inline*/ char *parse_via_param(char *const p, const char *const end, find_value: tmp++; - for(; *tmp; tmp++) { + for(; tmp<end && *tmp; tmp++) { switch(*tmp) { case ' ': case '\t': @@ -2064,7 +2064,7 @@ char *parse_via( tmp++; c_nest = 0; /*state should always be F_HOST here*/; - for(; *tmp; tmp++) { + for(; tmp<end && *tmp; tmp++) { switch(*tmp) { case ' ': case '\t':

1 0

git:master:ad0f9a69: dispatcher: docs for ds_is_active()
by Daniel-Constantin Mierla 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: ad0f9a692e9e56195844e77ee8e6ebe0ca1f0bd2 URL: https://github.com/kamailio/kamailio/commit/ad0f9a692e9e56195844e77ee8e6ebe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-13T10:25:46+02:00 dispatcher: docs for ds_is_active() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ad0f9a692e9e56195844e77ee8e6ebe… Patch: https://github.com/kamailio/kamailio/commit/ad0f9a692e9e56195844e77ee8e6ebe… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 0ac1a430e6..7507773e13 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1732,6 +1732,46 @@ if(ds_is_from_list("10", "3", "sip:127.0.0.1:5080")) { ... } ... +</programlisting> + </example> + </section> + <section id="dispatcher.f.ds_is_active"> + <title> + <function moreinfo="none">ds_is_active(groupid [, uri])</function> + </title> + <para> + This function returns true, if there is an active URI in the destination + group; otherwise false. If the uri parameter is provided, then the + corresponding destination has to be active. + </para> + <para>Description of parameters:</para> + <itemizedlist> + <listitem> + <para><emphasis>groupid</emphasis> - the group id. The parameter + can be an integer or a variable holding an integer value. + </para> + </listitem> + <listitem> + <para><emphasis>uri</emphasis> (optional) - the URI of the destination. + if parameter is empty or missing, the any destination is matched. + </para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>ds_is_active</function> usage</title> + <programlisting format="linespecific"> +... +if(ds_is_active("10")) { + ... +} +if(ds_is_active("10", "sip:127.0.0.1:5080")) { + ... +} +... </programlisting> </example> </section>

1 0

git:master:afcd0bc7: misctest: 0-padding for hex print
by Daniel-Constantin Mierla 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: afcd0bc7d231cb290ec54549016a8706f12f4210 URL: https://github.com/kamailio/kamailio/commit/afcd0bc7d231cb290ec54549016a870… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-13T10:37:33+02:00 misctest: 0-padding for hex print --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/afcd0bc7d231cb290ec54549016a870… Patch: https://github.com/kamailio/kamailio/commit/afcd0bc7d231cb290ec54549016a870… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index 2a263432d1..68f70718fc 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -263,7 +263,7 @@ static int misctest_message_init(void) char tbuf[BUF_SIZE]; FILE *f; long fsize; - sip_msg_t tmsg = { }; + sip_msg_t tmsg = { }; if(misctest_message_data.s!=0 && misctest_message_data.len>0) { if(misctest_message_data.len>=BUF_SIZE-2) { @@ -387,7 +387,7 @@ int misctest_hexprint(void *data, size_t length, int linelen, int split) } if (lrem) { - sprintf(ptr, "%0.2x ", *((unsigned char *) inptr + pos)); + sprintf(ptr, "%02x ", *((unsigned char *) inptr + pos)); lrem--; } else { sprintf(ptr, " ");

1 0

git:master:d574a210: dispatcher: added ds_is_active(group [, uri])
by Daniel-Constantin Mierla 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: d574a2107aa38e14c45e398721f66c5a2487c793 URL: https://github.com/kamailio/kamailio/commit/d574a2107aa38e14c45e398721f66c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-13T10:25:46+02:00 dispatcher: added ds_is_active(group [, uri]) - check if any or a specific uri in a group is active --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/d574a2107aa38e14c45e398721f66c5… Patch: https://github.com/kamailio/kamailio/commit/d574a2107aa38e14c45e398721f66c5…

1 0

git:master:a34463c9: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 13 Sep '21

13 Sep '21

Module: kamailio Branch: master Commit: a34463c9f5fc5faade30d36f168b10105de98ac8 URL: https://github.com/kamailio/kamailio/commit/a34463c9f5fc5faade30d36f168b101… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-13T09:31:18+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/a34463c9f5fc5faade30d36f168b101… Patch: https://github.com/kamailio/kamailio/commit/a34463c9f5fc5faade30d36f168b101… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index a33e556545..94ab08ab3c 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -1009,6 +1009,8 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 AoR (user). + 0x08 - Do not apply expires_range or default_expires_range to this registration. + + 0x10 - prepare the headers for reply, used only if flag 0x02 + is set. The flags may be given in decimal or hexadecimal format. * uri (optional - flags param has to be set and can be 0 for default behavior) - SIP URI to do be used instead of To header URI. It can

1 0

git:master:3eb2608d: registrar: save() - new flag to prepare the headers for reply
by Daniel-Constantin Mierla 13 Sep '21

13 Sep '21

Module: kamailio Branch: master Commit: 3eb2608d9063ce00327ff54eecfd3a2ce74a379e URL: https://github.com/kamailio/kamailio/commit/3eb2608d9063ce00327ff54eecfd3a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-13T09:20:48+02:00 registrar: save() - new flag to prepare the headers for reply --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/registrar.h Modified: src/modules/registrar/reply.c Modified: src/modules/registrar/reply.h Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/3eb2608d9063ce00327ff54eecfd3a2… Patch: https://github.com/kamailio/kamailio/commit/3eb2608d9063ce00327ff54eecfd3a2…

1 0

git:master:eb204c0f: slack: free send_data in case of error
by Daniel-Constantin Mierla 13 Sep '21

13 Sep '21

Module: kamailio Branch: master Commit: eb204c0f99247e7ee5356201a8d0d46e5808ddad URL: https://github.com/kamailio/kamailio/commit/eb204c0f99247e7ee5356201a8d0d46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-13T08:06:26+02:00 slack: free send_data in case of error - removed unnecessary if conditions --- Modified: src/modules/slack/slack.c --- Diff: https://github.com/kamailio/kamailio/commit/eb204c0f99247e7ee5356201a8d0d46… Patch: https://github.com/kamailio/kamailio/commit/eb204c0f99247e7ee5356201a8d0d46… --- diff --git a/src/modules/slack/slack.c b/src/modules/slack/slack.c index 7a046d387a..30ab96bed4 100644 --- a/src/modules/slack/slack.c +++ b/src/modules/slack/slack.c @@ -128,6 +128,7 @@ static int _curl_send(const char* uri, str *post_data) if((curl_handle=curl_easy_init())==NULL) { LM_ERR("Unable to init cURL library\n"); curl_global_cleanup(); + pkg_free(send_data); return -1; } @@ -139,18 +140,14 @@ static int _curl_send(const char* uri, str *post_data) LM_ERR("slack request send error: %s\n", curl_easy_strerror(res)); curl_easy_cleanup(curl_handle); curl_global_cleanup(); - if(send_data) { - pkg_free(send_data); - } + pkg_free(send_data); return -1; } LM_INFO("slack request sent [%d]\n", datasz); curl_easy_cleanup(curl_handle); curl_global_cleanup(); - if (send_data) { - pkg_free(send_data); - } + pkg_free(send_data); return 0; }

1 0

git:master:65e0b1a3: misctest: close file if buffer size is not enough
by Daniel-Constantin Mierla 13 Sep '21

13 Sep '21

Module: kamailio Branch: master Commit: 65e0b1a3248a1ee183864b17f719b9fd8cb9e64b URL: https://github.com/kamailio/kamailio/commit/65e0b1a3248a1ee183864b17f719b9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-13T08:09:38+02:00 misctest: close file if buffer size is not enough --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/65e0b1a3248a1ee183864b17f719b9f… Patch: https://github.com/kamailio/kamailio/commit/65e0b1a3248a1ee183864b17f719b9f… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index 2b304c6b5d..2a263432d1 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -294,6 +294,7 @@ static int misctest_message_init(void) if(fsize>=BUF_SIZE-2) { LM_ERR("the file data is too big\n"); + fclose(f); return -1; }

1 0

SIGSEGV on DMQ
by Sergio Carvalho 11 Sep '21

11 Sep '21

Hi everyone, I'm trying to use the DMQ module to share the user location info across our Kamailio's cluster. But when I start the service under docker I get a segmentation fault violation. After analysing the core dump with the *LLDB* I get (if you want I can share the core dump with you using Google Drive): > (lldb) bt > * thread #1, name = 'kamailio', stop reason = signal SIGSEGV > * frame #0: 0x000000000071c63c kamailio`get_hdr_field(buf="", end="", > hdr=0x0000000000000000) at msg_parser.c:144:5 > frame #1: 0x0000000000575b02 > kamailio`resolve_select(s=0x00007ffd470c6da0) at select.c:384:3 > frame #2: 0x00007fbbd7637fb9 > frame #3: 0x00000000005ad785 > kamailio`clen_builder(msg=0x00007fbbd7f6e008, clen_len=0x0000000000000000, > diff=0, body_only=0) at msg_translator.c:451:3 > frame #4: 0x0000000000439aa7 > kamailio`_dns_hash_find(name=0x00007fbbd7f6e498, type=32765, > h=0x0000000000000000, err=0x0000000000000000) at dns_cache.c:551:4 > frame #5: 0x0000000000440cb2 > kamailio`dns_cache_do_request(name=0x0000000000000000, type=0) at > dns_cache.c:1767:3 > frame #6: 0x000000000043f8f6 > kamailio`dns_cache_mk_rd_entry(name=0x0000000000000000, type=0, > rd_lst=0x0000000000000000) at dns_cache.c:1226:7 > frame #7: 0x000000000046501e > kamailio`print_action(t=0x0000000000000000) at route_struct.c:467:4 > frame #8: 0x0000000000471f2f > kamailio`xavp_print_list_content(head=0x00007ffd470c31a0, level=32699) at > xavp.c:584:2 > frame #9: 0x0000000000462047 > kamailio`print_action(t=0x0000000000000000) at route_struct.c:392:4 > frame #10: 0x0000000000471f2f > kamailio`xavp_print_list_content(head=0x00007ffd470c31a0, level=32699) at > xavp.c:584:2 > frame #11: 0x00000000004654dc > kamailio`print_action(t=0x0000000000000000) at route_struct.c:470:4 > frame #12: 0x0000000000471f2f > kamailio`xavp_print_list_content(head=0x00007ffd470c31a0, level=32699) at > xavp.c:584:2 > frame #13: 0x0000000000465532 > kamailio`print_action(t=0x0000000003863810) at route_struct.c:470:4 > frame #14: 0x0000000000471f2f > kamailio`xavp_print_list_content(head=0x00007ffd470c31a0, level=32699) at > xavp.c:584:2 > frame #15: 0x0000000000462047 > kamailio`print_action(t=0x00000000006da9d3) at route_struct.c:392:4 > frame #16: 0x0000000000471f2f > kamailio`xavp_print_list_content(head=0x00007ffd470c31a0, level=32699) at > xavp.c:584:2 > frame #17: 0x0000000000472680 > kamailio`xavp_get_list_key_names(xavp=0x00007ffd470c6da0) at xavp.c:622:3 > frame #18: 0x00007fbbb357da54 > frame #19: 0x00007fbbb3580370 > frame #20: 0x00007fbbb358317b > frame #21: 0x00007fbbb3583147 > frame #22: 0x00007fbbb3585e8d > frame #23: 0x00007fbbaec3ef23 > frame #24: 0x00007fbbaec3d5da > frame #25: 0x00007fbbaec4e158 > frame #26: 0x00007fbbaec4aadd > frame #27: 0x00007fbbaec53f05 > frame #28: 0x0000000000541563 > kamailio`handle_tcp_child(tcp_c=0x00000004b4481868, fd_i=136) at > tcp_main.c:3477:1 > frame #29: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x0000000000000000, fd_i=32699) at > tcp_main.c:3470:5 > frame #30: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00000000470c6da0, fd_i=0) at > tcp_main.c:3470:5 > frame #31: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00000000b4481868, fd_i=1863578990) at > tcp_main.c:3470:5 > frame #32: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00000000b4481868, fd_i=1863578990) at > tcp_main.c:3470:5 > frame #33: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007fbbb4481868, fd_i=1863578990) at > tcp_main.c:3470:5 > frame #34: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007ffd470c64d0, fd_i=32699) at > tcp_main.c:3470:5 > frame #35: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007ffd470c658c, fd_i=32765) at > tcp_main.c:3470:5 > frame #36: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00000000b4481868, fd_i=1863578990) at > tcp_main.c:3470:5 > frame #37: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007fbbb4481868, fd_i=1863578990) at > tcp_main.c:3470:5 > frame #38: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007fbbd8059e38, fd_i=32699) at > tcp_main.c:3470:5 > frame #39: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007ffd470c6770, fd_i=32765) at > tcp_main.c:3470:5 > frame #40: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x0000000000000000, fd_i=32765) at > tcp_main.c:3470:5 > frame #41: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007fbbb5179a80, fd_i=0) at > tcp_main.c:3470:5 > frame #42: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00000065dbb52b93, fd_i=32765) at > tcp_main.c:3470:5 > frame #43: 0x00000000005418fa > kamailio`handle_ser_child(p=0x00000065dbb52b93, fd_i=32765) at > tcp_main.c:3513:3 > frame #44: 0x0000000000425d6e kamailio`main_loop at main.c:1620:4 > frame #45: 0x000000000042c6af kamailio`main(argc=13, > argv=0x00007ffd470c6da8) at main.c:2568:3 > Using *GDB* I get the following info: > #22 0x00007efcca978e8d in request () from /usr/lib64/kamailio/modules/tm.so > ---Type <return> to continue, or q <return> to quit--- > No symbol table info available. > #23 0x00007efcc6031f23 in dmq_send_message (peer=0x7efccc5545c0, > body=0x7efcef106ef8, node=0x7efccc5ded10, resp_cback=0x7efcc625d370 > <notification_callback>, max_forwards=2, > content_type=0x7efcc625d360 <notification_content_type>) at > dmq_funcs.c:251 > uac_r = {method = 0x7efcc625d3b0 <dmq_request_method>, headers = > 0x7ffe13cb34b0, body = 0x7efcef106ef8, ssock = 0x7efcc625da20 > <dmq_server_socket>, dialog = 0x7efccc5e0918, > cb_flags = 1024, cb = 0x7efcc602eb7b <dmq_tm_callback>, cbp = > 0x7efccc5def58, callid = 0x0} > str_hdr = {s = 0x7efcef1004e8 "Max-Forwards: 2\r\nContent-Type: > text/plain\r\n", len = 43} > from = {s = 0x7efcef107248 "sip:notification_peer@10.12.4.238:5090", > len = 38} > to = {s = 0x7efcef11d100 "sip:notification_peer@10.12.4.170:5090", > len = 38} > cb_param = 0x7efccc5def58 > result = 0 > len = 43 > __FUNCTION__ = "dmq_send_message" > #24 0x00007efcc60305da in bcast_dmq_message1 (peer=0x7efccc5545c0, > body=0x7efcef106ef8, except=0x0, resp_cback=0x7efcc625d370 > <notification_callback>, max_forwards=2, > content_type=0x7efcc625d360 <notification_content_type>, > incl_inactive=1) at dmq_funcs.c:170 > node = 0x7efccc5ded10 > __FUNCTION__ = "bcast_dmq_message1" > #25 0x00007efcc6041158 in request_nodelist (node=0x7efccc5deac8, > forward=2) at notification_peer.c:573 > body = 0x7efcef106ef8 > ret = 0 > __FUNCTION__ = "request_nodelist" > #26 0x00007efcc603dadd in add_server_and_notify (paddr=0x7efcc625da30 > <dmq_notification_address>) at notification_peer.c:340 > puri_data = "sip:10.12.5.29:5090\000\376\177\000\000\250I+\002\000\000\000\000\230L+\002\000\000\000\000\260;\313\023\376\177\000\000\250c+\002\000\000\000\000`;\313\023\376\177", > '\000' <repeats 17 times>, > "\200`?\313\023\376\177\000\000\325\222\255\307\374~\000\000\024=\313\023\376\177\000\000\030=\313\023\376\177\000\000\034=\313\023\376\177\000\000\260:\313\023\376\177\000\000*\000\000\000\000\000\000\000]s\f\000\000\000\000\000\001\000\000\000\000\000\000\000\244\201\000\000\204\352", > '\000' <repeats 19 times>, > "\340\f\000\000\000\000\000\000\020\000\000\000\000\000\000p\006\000\000\000\000\000\000"... > puri_list = {0x7ffe13cb3950 "sip:10.12.5.29:5090", 0x7ffe13cb3a50 > "sip:10.12.4.170:5090", 0x7ffe13cb3b50 "x\321-\002", 0x7ffe13cb3c50 "", > 0x7ffe13cb3d50 " @\313\023\376\177", > 0x7ffe13cb3e50 "", 0x7ffe13cb3f50 "", 0x7ffe13cb4050 "", > 0x7ffe13cb4150 "2\247h", 0x7ffe13cb4250 "pB\313\023\376\177", > 0x7ffe13cb4350 "\200S\237\312\374~", > 0x7ffe13cb4450 "8\341\006\357\374~", 0x7ffe13cb4550 > "\320E\313\023\376\177", 0x7ffe13cb4650 "\210*,\002", 0x7ffe13cb4750 > "\330N\313\023\376\177", 0x7ffe13cb4850 "", > 0x7ffe13cb4950 "", 0x7ffe13cb4a50 "\200J\313\023\376\177", > 0x7ffe13cb4b50 "\035\362\067\037\003", 0x7ffe13cb4c50 > "\320L\313\023\376\177", 0x7ffe13cb4d50 "\177", 0x7ffe13cb4e50 "n", > 0x7ffe13cb4f50 "1\325\\\002", 0x7ffe13cb5050 > "\260P\313\023\376\177", 0x7ffe13cb5150 "", 0x7ffe13cb5250 > "\320\343\270\307\374~", 0x7ffe13cb5350 "", 0x7ffe13cb5450 "xV,\002", > 0x7ffe13cb5550 "2\247h", 0x7ffe13cb5650 "\320\235\005\306\374~"} > pfirst = 0x7efccc5deac8 > pnode = 0x7efccc5ded10 > host_cnt = 2 > index = 2 > puri = {{user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, > host = {s = 0x7efceefdde8c " > kamailio-kazoo.svc.cpaas.eu-west-1.aws.prv.talkdeskstg.com:5090", len = > 58}, port = { > s = 0x7efceefddec7 "5090", len = 4}, params = {s = 0x0, len > = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, > port_no = 5090, proto = 0, type = SIP_URI_T, > flags = (unknown: 0), transport = {s = 0x0, len = 0}, ttl = {s > = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = > 0}, method = {s = 0x0, len = 0}, lr = { > s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, > len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, > user_param_val = {s = 0x0, len = 0}, > maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = > 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = > 0x0, len = 0}}} > pstr = {{s = 0x7ffe13cb3a50 "sip:10.12.4.170:5090", len = 20}} > __FUNCTION__ = "add_server_and_notify" > #27 0x00007efcc6046f05 in child_init (rank=0) at dmq.c:302 > i = 4 > newpid = 160 > ---Type <return> to continue, or q <return> to quit--- > __FUNCTION__ = "child_init" > #28 0x0000000000541563 in init_mod_child () > No symbol table info available. > #29 0x0000000000541223 in init_mod_child () > No symbol table info available. > #30 0x0000000000541223 in init_mod_child () > No symbol table info available. > #31 0x0000000000541223 in init_mod_child () > No symbol table info available. > #32 0x0000000000541223 in init_mod_child () > No symbol table info available. > #33 0x0000000000541223 in init_mod_child () > No symbol table info available. > #34 0x0000000000541223 in init_mod_child () > No symbol table info available. > #35 0x0000000000541223 in init_mod_child () > No symbol table info available. > #36 0x0000000000541223 in init_mod_child () > No symbol table info available. > #37 0x0000000000541223 in init_mod_child () > No symbol table info available. > #38 0x0000000000541223 in init_mod_child () > No symbol table info available. > #39 0x0000000000541223 in init_mod_child () > No symbol table info available. > #40 0x0000000000541223 in init_mod_child () > No symbol table info available. > #41 0x0000000000541223 in init_mod_child () > No symbol table info available. > #42 0x0000000000541223 in init_mod_child () > No symbol table info available. > #43 0x00000000005418fa in init_child () > No symbol table info available. > #44 0x0000000000425d6e in main_loop () > No symbol table info available. > #45 0x000000000042c6af in main () > No symbol table info available. > DMQ module parameters are: > #!ifdef DMQ_ROLE > loadmodule "dmq.so" > loadmodule "dmq_usrloc.so" > > # ---- dmq params ---- > modparam("dmq", "server_address", "sip:DMQ_SERVER_ADDRESS") > modparam("dmq", "notification_address", "sip:DMQ_NOTIFY_ADDRESS") > modparam("dmq", "ping_interval", 5) > modparam("dmq", "multi_notify", 1) > modparam("dmq", "num_workers", 4) > modparam("dmq", "worker_usleep", 0) > modparam("dmq_usrloc", "enable", 1) > #!endif > Kamailio version and flags are: > version: kamailio 5.2.5 (x86_64/linux) > flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, > DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, > Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, > FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, > USE_DST_BLACKLIST, HAVE_RESOLV_RES > ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, > BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB > poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. > id: unknown > compiled on 01:14:59 Nov 19 2019 with gcc 7.3.1 > Do you have any idea what might be causing this *SEGV*? Best regards, Sergio Carvalho

2 1

[kamailio/kamailio] tcp_reuse_port: ACK cannot be delievered to WebRTC client (#2849)
by sergey-safarov 11 Sep '21

11 Sep '21

### Description I have working Kamailio config for WebRTC clients. I now want to use `tcp_reuse_port` feature and this feature breaks WebRTC clients. #### Log Messages ``` 106(106803) DEBUG: {1 41089865 ACK d50c83b4-124a-11ec-a038-835ce78b460e} <core> [core/forward.c:578]: forward_request(): orig. len=865, new_len=741, proto=5 106(106803) DEBUG: {1 41089865 ACK d50c83b4-124a-11ec-a038-835ce78b460e} <core> [core/forward.h:169]: msg_send_buffer(): sending to: 109.121.188.190:56424, force_socket=4, send_sock=0xffffa40ffa98 106(106803) WARNING: {1 41089865 ACK d50c83b4-124a-11ec-a038-835ce78b460e} <core> [core/forward.h:203]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found 106(106803) ERROR: {1 41089865 ACK d50c83b4-124a-11ec-a038-835ce78b460e} sl [sl_funcs.c:418]: sl_reply_error(): stateless error reply used: Unfortunately error on sending to next hop occurred (477/SL) ``` More logs at the attached `ack.log` file. [ask.log](https://github.com/kamailio/kamailio/files/7144893/ask.log) ### Additional Information * **Kamailio Version** - output of `kamailio -v` used master branch with small customization, base commit c503d2bd31a580138a67f1d4a265ccde5791d271 * **Operating System**: aarch64 ``` [root@tmp kamailio]# cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2849

2 5

Bullseye builds
by George Diamantopoulos 10 Sep '21

10 Sep '21

Hello all, Debian 11 "Bullseye" is to be released this Saturday. Do you expect to have binaries available for it on deb.kamailio.org anytime soon following the release? Thanks! BR, George

2 4

git:master:7d41d020: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 7d41d02028d095bd7e52047665db4f53ae606cc3 URL: https://github.com/kamailio/kamailio/commit/7d41d02028d095bd7e52047665db4f5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-10T13:31:16+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/7d41d02028d095bd7e52047665db4f5… Patch: https://github.com/kamailio/kamailio/commit/7d41d02028d095bd7e52047665db4f5… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index e3876fa7c0..a33e556545 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -935,6 +935,9 @@ end with branch flags matching at least one set inside xavp specified by xavp_cfg parameter with inner name rlf_bflags - e.g., $xavp(reg=>rlf_bflags). + * 2 - apply the active tcp connection filter - return only contact + records that have the associated TCP/TLS/WSS connection active. UDP + and SCTP contacts are not filtered, all are returned. Default value is NULL (disabled).

1 0

git:master:622f02d0: registrar: implemented lookup filter mode 2
by Daniel-Constantin Mierla 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 622f02d0f817c5b6c70783cc98745cf06a986f84 URL: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-10T13:20:12+02:00 registrar: implemented lookup filter mode 2 - use only contacts that have associated TCP/TLS/WSS connection active --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf… Patch: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index e310636f01..cafd8bbcf3 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1109,6 +1109,14 @@ end rlf_bflags - e.g., $xavp(reg=>rlf_bflags). </para> </listitem> + <listitem> + <para> + <emphasis>2</emphasis> - apply the active tcp connection filter + - return only contact records that have the associated TCP/TLS/WSS + connection active. UDP and SCTP contacts are not filtered, all + are returned. + </para> + </listitem> </itemizedlist> <para> <emphasis> diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 81f9b7afd9..b58fbd6f7d 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -45,6 +45,8 @@ #include "lookup.h" #include "config.h" +#define REG_LOOKUP_FILTER_BFLAG (1<<0) +#define REG_LOOKUP_FILTER_TCPCON (1<<1) extern int reg_lookup_filter_mode; @@ -60,12 +62,13 @@ static void reg_lookup_filter_init(void) str filter_bflags = str_init("rlf_bflags"); sr_xavp_t *vavp = NULL; - if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) { + if(reg_lookup_filter_mode==0) { return; } memset(&_reg_lookup_filter, 0, sizeof(reg_lookup_filter_t)); - if((reg_lookup_filter_mode & 1) + if((reg_lookup_filter_mode & REG_LOOKUP_FILTER_BFLAG) + && (reg_xavp_cfg.s != NULL && reg_xavp_cfg.len > 0) && (vavp = xavp_get_child_with_ival(&reg_xavp_cfg, &filter_bflags)) != NULL) { if(vavp->val.v.i != 0) { @@ -73,24 +76,45 @@ static void reg_lookup_filter_init(void) _reg_lookup_filter.factive = 1; } } + + if(reg_lookup_filter_mode & REG_LOOKUP_FILTER_TCPCON) { + _reg_lookup_filter.factive = 1; + } return; } static int reg_lookup_filter_match(ucontact_t* ptr) { - if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) { - return 1; - } - if(_reg_lookup_filter.factive==0) { + tcp_connection_t *con = NULL; + + if(reg_lookup_filter_mode==0 || _reg_lookup_filter.factive==0) { return 1; } - if(_reg_lookup_filter.bflags!=0) { + + if((reg_lookup_filter_mode & REG_LOOKUP_FILTER_BFLAG) + && _reg_lookup_filter.bflags!=0) { if((_reg_lookup_filter.bflags & ptr->cflags)==0) { return 0; } } - return 1; + if(reg_lookup_filter_mode & REG_LOOKUP_FILTER_TCPCON) { + if(ptr->tcpconn_id > 0) { + con = tcpconn_get(ptr->tcpconn_id, 0, 0, 0, 0); + if (unlikely(con == NULL)) { + LM_DBG("connection id %d does not exist\n", ptr->tcpconn_id); + return 0; + } + if (con->state != S_CONN_OK) { + LM_DBG("connection id %d not in state ok\n", ptr->tcpconn_id); + tcpconn_put(con); + return 0; + } + tcpconn_put(con); + } + } + + return 1; } static int has_to_tag(struct sip_msg* msg) @@ -485,7 +509,9 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) if (!cfg_get(registrar, registrar_cfg, append_branches)) goto done; for( ; ptr ; ptr = ptr->next ) { - if ((VALID_CONTACT(ptr, act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts)) && allowed_method(_m, ptr) + if ((VALID_CONTACT(ptr, act_time) + || cfg_get(registrar,registrar_cfg,use_expired_contacts)) + && allowed_method(_m, ptr) && reg_lookup_filter_match(ptr)) { path_dst.len = 0; if(ptr->path.s && ptr->path.len) { @@ -500,7 +526,8 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) continue; } if (check_self(&(path_uri.host), 0, 0)) { - /* first hop in path vector is local - check for additional hops and if present, point to next one */ + /* first hop in path vector is local + * - check for additional hops and if present, point to next one */ if (path_str.len > (path_dst.len + 3)) { path_str.s = path_str.s + path_dst.len + 3; path_str.len = path_str.len - path_dst.len - 3;

1 0

git:master:bfc545f3: modules: readme files regenerated - sipt ... [skip ci]
by Kamailio Dev 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: bfc545f35193290a441c430a0de2eb05cd7d749b URL: https://github.com/kamailio/kamailio/commit/bfc545f35193290a441c430a0de2eb0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-10T12:16:25+02:00 modules: readme files regenerated - sipt ... [skip ci] --- Modified: src/modules/sipt/README --- Diff: https://github.com/kamailio/kamailio/commit/bfc545f35193290a441c430a0de2eb0… Patch: https://github.com/kamailio/kamailio/commit/bfc545f35193290a441c430a0de2eb0…

1 0

git:master:42db40db: rollback sipt_get_redirection_info
by Henning Westerholt 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 42db40db857c103404aaf3080ea2461e6d57618a URL: https://github.com/kamailio/kamailio/commit/42db40db857c103404aaf3080ea2461… Author: Mikhail Kalashnikov <mikhail.kalashnikov(a)sifox.ru> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-10T12:06:01+02:00 rollback sipt_get_redirection_info --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/42db40db857c103404aaf3080ea2461… Patch: https://github.com/kamailio/kamailio/commit/42db40db857c103404aaf3080ea2461… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index 39b6a04199..533e114699 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -371,9 +371,9 @@ static int sipt_get_redirection_info(struct sip_msg *msg, pv_param_t *param, pv_ return -1; } - if((body.s[0] != ISUP_ACM) && (body.s[0] != ISUP_CPG) && (body.s[0] != ISUP_IAM)) + if((body.s[0] != ISUP_ACM) && (body.s[0] != ISUP_CPG)) { - LM_DBG("message not an ACM or CPG or IAM\n"); + LM_DBG("message not an ACM or CPG\n"); return -1; }

1 0

git:master:8f2b2bbf: sipt: added one function and 8 pseudo-variables
by Henning Westerholt 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 8f2b2bbfa43e87841dc90cf4113c9e41f09b9b97 URL: https://github.com/kamailio/kamailio/commit/8f2b2bbfa43e87841dc90cf4113c9e4… Author: Mikhail Kalashnikov <mikhail.kalashnikov(a)sifox.ru> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-10T12:06:01+02:00 sipt: added one function and 8 pseudo-variables - sipt_has_isup_body() - $sipt(redirection_information.reason) - $sipt(redirection_information.original_reason) - $sipt(redirecting_number.nai) - $sipt(redirecting_number) - $sipt(original_called_number.nai) - $sipt(original_called_number) - $sipt(generic_number.nai) - $sipt(generic_number) --- Modified: src/modules/sipt/doc/sipt_admin.xml Modified: src/modules/sipt/sipt.c Modified: src/modules/sipt/ss7.h Modified: src/modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/8f2b2bbfa43e87841dc90cf4113c9e4… Patch: https://github.com/kamailio/kamailio/commit/8f2b2bbfa43e87841dc90cf4113c9e4…

1 0

git:master:c311fb78: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: c311fb78976fd7ba97e9ec1e3b8c4176ebeccc0f URL: https://github.com/kamailio/kamailio/commit/c311fb78976fd7ba97e9ec1e3b8c417… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-10T11:16:30+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/c311fb78976fd7ba97e9ec1e3b8c417… Patch: https://github.com/kamailio/kamailio/commit/c311fb78976fd7ba97e9ec1e3b8c417… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index bcabbe4db2..d180968e95 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -98,6 +98,7 @@ Carsten Bock 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) 3.58. load_rank (int) + 3.59. db_clean_tcp (int) 4. RPC Commands @@ -203,6 +204,7 @@ Carsten Bock 1.56. ka_loglevel parameter usage 1.57. ka_logmsg parameter usage 1.58. load_rank parameter usage + 1.59. db_clean_tcp parameter usage Chapter 1. Admin Guide @@ -277,6 +279,7 @@ Chapter 1. Admin Guide 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) 3.58. load_rank (int) + 3.59. db_clean_tcp (int) 4. RPC Commands @@ -414,6 +417,7 @@ Chapter 1. Admin Guide 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) 3.58. load_rank (int) + 3.59. db_clean_tcp (int) 3.1. nat_bflag (int) @@ -1231,6 +1235,22 @@ modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") modparam("usrloc", "load_rank", 1) ... +3.59. db_clean_tcp (int) + + If set to 1, when Kamailio starts it removes the contacts with + transport TCP, TLS or WSS, no longer loading them. Useful when end + points do not listen for incoming connections on contact address, which + is quite common (end point use only tcp client connections). On + restart, connections are lost, therefore the corresponding contact + records become useless. + + Default value is “0” (do not clean tcp contacts). + + Example 1.59. db_clean_tcp parameter usage +... +modparam("usrloc", "db_clean_tcp", 1) +... + 4. RPC Commands 4.1. ul.dump

1 0

git:master:18b7337a: usrloc: added db_clean_tcp parameter
by Daniel-Constantin Mierla 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 18b7337ad4b868a84d4cb70abb37a3d4ba16a428 URL: https://github.com/kamailio/kamailio/commit/18b7337ad4b868a84d4cb70abb37a3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-10T11:12:01+02:00 usrloc: added db_clean_tcp parameter - if set, tcp contacts are deleted before loading location table at start time - it is very common that end points use only tcp client connections, on restart those connections are lost and corresponding contacts are useless --- Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/18b7337ad4b868a84d4cb70abb37a3d… Patch: https://github.com/kamailio/kamailio/commit/18b7337ad4b868a84d4cb70abb37a3d… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 25124abcc1..66dae44913 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1517,6 +1517,29 @@ modparam("usrloc", "load_rank", 1) </example> </section> + <section id="usrloc.p.db_clean_tcp"> + <title><varname>db_clean_tcp</varname> (int)</title> + <para> + If set to 1, when &kamailio; starts it removes the contacts with + transport TCP, TLS or WSS, no longer loading them. Useful when + end points do not listen for incoming connections on contact address, + which is quite common (end point use only tcp client connections). + On restart, connections are lost, therefore the corresponding + contact records become useless. + </para> + <para> + Default value is <quote>0</quote> (do not clean tcp contacts). + </para> + <example> + <title><varname>db_clean_tcp</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "db_clean_tcp", 1) +... + </programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 204ddfd29f..4025cc549e 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -45,6 +45,7 @@ #include "urecord.h" extern int ul_rm_expired_delay; +extern int ul_db_clean_tcp; #ifdef STATISTICS static char *build_stat_name( str* domain, char *var_name) @@ -372,6 +373,52 @@ static inline ucontact_info_t* dbrow2info(db_val_t *vals, str *contact, int rcon return &ci; } +/*! + * \brief Delete all location records with tcp connection + * + * \param _c database connection + * \param _d loaded domain + * \return 0 on success, -1 on failure + */ +int uldb_delete_tcp_records(db1_con_t* _c, udomain_t* _d) +{ + db_key_t keys[2]; + db_op_t ops[2]; + db_val_t vals[2]; + int nr_keys = 0; + + LM_DBG("delete location tcp records\n"); + + keys[nr_keys] = &ul_con_id_col;; + ops[nr_keys] = OP_GT; + vals[nr_keys].type = DB1_INT; + vals[nr_keys].nul = 0; + vals[nr_keys].val.int_val = 0; + nr_keys++; + + if (ul_db_srvid != 0) { + keys[nr_keys] = &ul_srv_id_col; + ops[nr_keys] = OP_EQ; + vals[nr_keys].type = DB1_INT; + vals[nr_keys].nul = 0; + vals[nr_keys].val.int_val = server_id; + nr_keys++; + } + + if (ul_dbf.use_table(_c, _d->name) < 0) { + LM_ERR("sql use_table failed\n"); + return -1; + } + + + if (ul_dbf.delete(_c, keys, ops, vals, nr_keys) < 0) { + LM_ERR("deleting from database failed\n"); + return -1; + } + + return 0; +} + /*! * \brief Load all records from a udomain @@ -400,6 +447,10 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) urecord_t* r; ucontact_t* c; + if(ul_db_clean_tcp!=0) { + uldb_delete_tcp_records(_c, _d); + } + columns[0] = &ul_user_col; columns[1] = &ul_contact_col; columns[2] = &ul_expires_col; diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 733c16a3ff..5668586733 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -176,6 +176,7 @@ int ul_desc_time_order = 0; /*!< By default do not enable timestamp ordering int ul_handle_lost_tcp = 0; /*!< By default do not remove contacts before expiration time */ int ul_close_expired_tcp = 0; /*!< By default do not close TCP connections for expired contacts */ int ul_skip_remote_socket = 0; /*!< By default do not skip remote socket */ +int ul_db_clean_tcp = 0; /*!< Clean TCP/TLS/WSS contacts in DB before loading records */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 10; @@ -263,6 +264,7 @@ static param_export_t params[] = { {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg}, {"load_rank", PARAM_INT, &ul_load_rank}, + {"db_clean_tcp", PARAM_INT, &ul_db_clean_tcp}, {0, 0, 0} };

1 0

git:master:608118de: modules: readme files regenerated - snmpstats ... [skip ci]
by Kamailio Dev 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 608118deffa70cf12f4c3de29e18a0cfb1ff934c URL: https://github.com/kamailio/kamailio/commit/608118deffa70cf12f4c3de29e18a0c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-09T21:46:13+02:00 modules: readme files regenerated - snmpstats ... [skip ci] --- Modified: src/modules/snmpstats/README --- Diff: https://github.com/kamailio/kamailio/commit/608118deffa70cf12f4c3de29e18a0c… Patch: https://github.com/kamailio/kamailio/commit/608118deffa70cf12f4c3de29e18a0c… --- diff --git a/src/modules/snmpstats/README b/src/modules/snmpstats/README index 5308308e36..155003e027 100644 --- a/src/modules/snmpstats/README +++ b/src/modules/snmpstats/README @@ -44,7 +44,8 @@ Olle E. Johansson 4.5. dlg_major_threshold (Integer) 4.6. snmpgetPath (String) 4.7. snmpCommunity (String) - 4.8. export_registrar (int) + 4.8. snmpVersion (String) + 4.9. export_registrar (int) 5. Functions 6. Installation and Running @@ -69,7 +70,8 @@ Olle E. Johansson 1.5. Setting the dlg_major_threshold parameter 1.6. Setting the snmpgetPath parameter 1.7. Setting the snmpCommunity parameter - 1.8. Setting the export_registrar parameter + 1.8. Setting the snmpVersion parameter + 1.9. Setting the export_registrar parameter Chapter 1. Admin Guide @@ -100,7 +102,8 @@ Chapter 1. Admin Guide 4.5. dlg_major_threshold (Integer) 4.6. snmpgetPath (String) 4.7. snmpCommunity (String) - 4.8. export_registrar (int) + 4.8. snmpVersion (String) + 4.9. export_registrar (int) 5. Functions 6. Installation and Running @@ -309,7 +312,8 @@ Chapter 1. Admin Guide 4.5. dlg_major_threshold (Integer) 4.6. snmpgetPath (String) 4.7. snmpCommunity (String) - 4.8. export_registrar (int) + 4.8. snmpVersion (String) + 4.9. export_registrar (int) 4.1. sipEntityType (String) @@ -426,7 +430,21 @@ modparam("snmpstats", "snmpgetPath", "/my/custom/path/") modparam("snmpstats", "snmpCommunity", "customCommunityString") ... -4.8. export_registrar (int) +4.8. snmpVersion (String) + + The SNMPStats module provides the kamailioSIPServiceStartTime scalar. + This scalar requires the SNMPStats module to perform a snmpget query to + the master agent. You can use this parameter to set specific SNMP + version. + + Default value is “3”. + + Example 1.8. Setting the snmpVersion parameter +... +modparam("snmpstats", "snmpVersion", "2c") +... + +4.9. export_registrar (int) The SNMPStats module will export registrar (usrloc) records if this parameter is set to 1. This will result in more memory usage and bigger @@ -440,7 +458,7 @@ modparam("snmpstats", "snmpCommunity", "customCommunityString") Default value is “0” (don't export). - Example 1.8. Setting the export_registrar parameter + Example 1.9. Setting the export_registrar parameter ... modparam("snmpstats", "export_registrar", 1) ...

1 0

[kamailio/kamailio] snmpstats: add parameter to specify SNMP version (#2846)
by Marat 09 Sep '21

09 Sep '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2846 -- Commit Summary -- * snmpstats: add parameter to specify SNMP version -- File Changes -- M src/modules/snmpstats/doc/snmpstats_admin.xml (26) M src/modules/snmpstats/snmpstats.c (30) M src/modules/snmpstats/snmpstats_globals.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2846.patch https://github.com/kamailio/kamailio/pull/2846.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2846

2 3

git:master:9f3b344a: snmpstats: add parameter to specify SNMP version
by Henning Westerholt 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 9f3b344a737f2bf8628be1126e4aa6145963b9bc URL: https://github.com/kamailio/kamailio/commit/9f3b344a737f2bf8628be1126e4aa61… Author: Marat Gareev <maratkin94(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-09T21:42:56+02:00 snmpstats: add parameter to specify SNMP version --- Modified: src/modules/snmpstats/doc/snmpstats_admin.xml Modified: src/modules/snmpstats/snmpstats.c Modified: src/modules/snmpstats/snmpstats_globals.h --- Diff: https://github.com/kamailio/kamailio/commit/9f3b344a737f2bf8628be1126e4aa61… Patch: https://github.com/kamailio/kamailio/commit/9f3b344a737f2bf8628be1126e4aa61… --- diff --git a/src/modules/snmpstats/doc/snmpstats_admin.xml b/src/modules/snmpstats/doc/snmpstats_admin.xml index a6a4f1e3b4..870a8630a0 100644 --- a/src/modules/snmpstats/doc/snmpstats_admin.xml +++ b/src/modules/snmpstats/doc/snmpstats_admin.xml @@ -439,6 +439,32 @@ modparam("snmpstats", "snmpCommunity", "customCommunityString") </example> </section> + <section id ="snmpstats.p.snmpVersion"> + <title><varname>snmpVersion</varname> (String)</title> + + <para> + The SNMPStats module provides the kamailioSIPServiceStartTime scalar. + This scalar requires the SNMPStats module to perform a snmpget query + to the master agent. You can use this parameter to set specific + SNMP version. + </para> + + <para> + <emphasis> + Default value is <quote>3</quote>. + </emphasis> + </para> + + <example> + <title>Setting the <varname>snmpVersion</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("snmpstats", "snmpVersion", "2c") +... + </programlisting> + </example> + </section> + <section id ="snmpstats.p.export_registrar"> <title><varname>export_registrar</varname> (int)</title> diff --git a/src/modules/snmpstats/snmpstats.c b/src/modules/snmpstats/snmpstats.c index a9d8b1fc88..4fae5dad09 100644 --- a/src/modules/snmpstats/snmpstats.c +++ b/src/modules/snmpstats/snmpstats.c @@ -145,6 +145,8 @@ static param_export_t mod_params[] = { (void *)set_snmpget_path}, {"snmpCommunity", PARAM_STRING | USE_FUNC_PARAM, (void *)set_snmp_community}, + {"snmpVersion", PARAM_STRING | USE_FUNC_PARAM, + (void *)set_snmp_version}, {"export_registrar", INT_PARAM, &snmp_export_registrar}, {0, 0, 0} }; @@ -178,10 +180,11 @@ volatile pid_t sysUpTime_pid; * for a full description. */ static int spawn_sysUpTime_child(); -/*! Storage for the "snmpgetPath" and "snmpCommunity" kamailio.cfg parameters. +/*! Storage for the "snmpgetPath", "snmpCommunity" and "snmpVersion" kamailio.cfg parameters. * The parameters are used to define what happens with the sysUpTime child. */ char *snmpget_path = NULL; char *snmp_community = NULL; +char *snmp_version = NULL; /*! * This module replaces the default SIGCHLD handler with our own, as explained @@ -462,6 +465,7 @@ static int spawn_sysUpTime_child(void) char *full_path_to_snmpget = NULL; char *snmp_community_string = "public"; + char *snmp_version_string = "3"; /* Set up a new SIGCHLD handler. The handler will be responsible for * ignoring SIGCHLDs generated by our sysUpTime child process. Every @@ -509,8 +513,16 @@ static int spawn_sysUpTime_child(void) snmp_community_string); } - char *args[] = {"-Ov", "-c", snmp_community_string, "localhost", - SYSUPTIME_OID, (char *)0}; + if(snmp_version != NULL) { + snmp_version_string = snmp_version; + } else { + LM_INFO("A snmpVersion parameter was not provided." + " Defaulting to %s\n", + snmp_version_string); + } + + char *args[] = {"snmpget", "-v", snmp_version_string, "-Ov", "-c", + snmp_community_string, "localhost", SYSUPTIME_OID, (char *)0}; /* Make sure we have a path to snmpget, so we can retrieve the * sysUpTime. */ @@ -586,3 +598,15 @@ int set_snmp_community(modparam_t type, void *val) return 0; } + +/* Handles setting of the snmp version. */ +int set_snmp_version(modparam_t type, void *val) +{ + if(!stringHandlerSanityCheck(type, val, "snmpVersion")) { + return -1; + } + + snmp_version = (char *)val; + + return 0; +} diff --git a/src/modules/snmpstats/snmpstats_globals.h b/src/modules/snmpstats/snmpstats_globals.h index f40e65d42b..3a01e7ef70 100644 --- a/src/modules/snmpstats/snmpstats_globals.h +++ b/src/modules/snmpstats/snmpstats_globals.h @@ -159,4 +159,7 @@ int set_snmpget_path(modparam_t type, void *val); /*! Handles setting of the snmp community string. */ int set_snmp_community(modparam_t type, void *val); +/*! Handles setting of the snmp version. */ +int set_snmp_version(modparam_t type, void *val); + #endif \ No newline at end of file

1 0

[kamailio/kamailio] core: logging: JSON: CEE: add the @cee prefix in Syslog messages (#2848)
by Daniel Pocock 09 Sep '21

09 Sep '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The JSON CEE output from ```stderr``` is OK When the messages are sent through Syslog, they need this extra prefix ```@cee:``` before the JSON string Tested with ```rsyslog-omelasticsearch``` and [OpenSearch Dashboard (replacement for Kibana)](https://opensearch.org/) ``` module(load="mmjsonparse") # we handle LOG_LOCAL5 only, use the same setting in the application config local5.* :mmjsonparse: template(name="isJSON" type="list") { property(name="$!all-json") } module(load="omelasticsearch") local5.* action(type="omelasticsearch" template="isJSON" server="some-server" serverport="9200" searchIndex="log" searchType="_doc/" uid="admin" pwd="admin") ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2848 -- Commit Summary -- * core: logging: JSON: CEE: add the @cee prefix in Syslog messages -- File Changes -- M src/core/dprint.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2848.patch https://github.com/kamailio/kamailio/pull/2848.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2848

2 3

git:master:73e4dfea: core: logging: JSON: CEE: add the @cee prefix in Syslog messages
by Henning Westerholt 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 73e4dfea9b7b21625d029e38f45a07beb2942aff URL: https://github.com/kamailio/kamailio/commit/73e4dfea9b7b21625d029e38f45a07b… Author: Daniel Pocock <daniel(a)pocock.pro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-09T21:33:56+02:00 core: logging: JSON: CEE: add the @cee prefix in Syslog messages --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/73e4dfea9b7b21625d029e38f45a07b… Patch: https://github.com/kamailio/kamailio/commit/73e4dfea9b7b21625d029e38f45a07b… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 4a6dac31ca..1a809710ae 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -652,6 +652,10 @@ static void ksr_slog_json_str_escape(str *s_in, str *s_out, int *emode) "\"file\":{\"name\":\"%s\",\"line\":%d},\"native\":{\"function\":\"%s\"},\"msg\":\"%s\"," \ "\"pname\":\"%s\",\"appname\":\"%s\",\"hostname\":\"%s\"}%s" +#define KSR_SLOG_SYSLOG_JSON_CEEFMT "@cee: " KSR_SLOG_JSON_CEEFMT + +#define KSR_SLOG_STDERR_JSON_CEEFMT KSR_SLOG_JSON_CEEFMT + void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) { va_list arglist; @@ -718,7 +722,7 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) strftime (iso8601buf, ISO8601_BUF_SIZE, "%FT%T", &_tm); if (unlikely(log_stderr)) { if (unlikely(log_cee)) { - fprintf(stderr, KSR_SLOG_JSON_CEEFMT, + fprintf(stderr, KSR_SLOG_STDERR_JSON_CEEFMT, iso8601buf, _tp.tv_nsec, my_pid(), #ifdef HAVE_PTHREAD (uintmax_t)pthread_self(), @@ -739,7 +743,7 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) } } else { if (unlikely(log_cee)) { - _km_log_func(kld->v_facility, KSR_SLOG_JSON_CEEFMT, + _km_log_func(kld->v_facility, KSR_SLOG_SYSLOG_JSON_CEEFMT, iso8601buf, _tp.tv_nsec, my_pid(), #ifdef HAVE_PTHREAD pthread_self(),

1 0

git:master:8cd0a5ab: misctest: info debug about input data
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 8cd0a5ab8683c7a598499e6b1bbe1fc6a489f531 URL: https://github.com/kamailio/kamailio/commit/8cd0a5ab8683c7a598499e6b1bbe1fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T14:59:21+02:00 misctest: info debug about input data --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8cd0a5ab8683c7a598499e6b1bbe1fc… Patch: https://github.com/kamailio/kamailio/commit/8cd0a5ab8683c7a598499e6b1bbe1fc… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index c8fe64a56c..2b304c6b5d 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -312,37 +312,38 @@ static int misctest_message_init(void) return -1; } - tmsg.buf = tbuf; + tmsg.buf = tbuf; - LM_INFO("using data: [[%.*s]] (%d)\n", tmsg.len, tmsg.buf, tmsg.len); + LM_INFO("data - start: %p - end: %p - len: %d\n", tmsg.buf, + tmsg.buf + tmsg.len, tmsg.len); + LM_INFO("data - content: [[%.*s]]\n", tmsg.len, tmsg.buf); misctest_hexprint(tmsg.buf, tmsg.len, 20, 10); - if (parse_msg(tmsg.buf, tmsg.len, &tmsg) < 0) { - goto cleanup; - } + if (parse_msg(tmsg.buf, tmsg.len, &tmsg) < 0) { + goto cleanup; + } - parse_sdp(&tmsg); + parse_sdp(&tmsg); - parse_headers(&tmsg, HDR_TO_F, 0); + parse_headers(&tmsg, HDR_TO_F, 0); - parse_contact_header(&tmsg); + parse_contact_header(&tmsg); - parse_refer_to_header(&tmsg); + parse_refer_to_header(&tmsg); - parse_to_header(&tmsg); + parse_to_header(&tmsg); - parse_pai_header(&tmsg); + parse_pai_header(&tmsg); - parse_diversion_header(&tmsg); + parse_diversion_header(&tmsg); - parse_privacy(&tmsg); + parse_privacy(&tmsg); cleanup: - free_sip_msg(&tmsg); - - return 0; + free_sip_msg(&tmsg); + return 0; } /**

1 0

git:5.5:1685ebd5: usrloc: set tcp connection id to -1 for records added via rpc
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: 5.5 Commit: 1685ebd5917e763c347b6d4201b19b72e2ee274e URL: https://github.com/kamailio/kamailio/commit/1685ebd5917e763c347b6d4201b19b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T13:33:46+02:00 usrloc: set tcp connection id to -1 for records added via rpc - cope properly with the handle_lost_tcp modparam (cherry picked from commit a0a97119bef7671f33734399dc9de4562abae39c) --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/1685ebd5917e763c347b6d4201b19b7… Patch: https://github.com/kamailio/kamailio/commit/1685ebd5917e763c347b6d4201b19b7… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index d45a8e2783..6565b07d5c 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -678,6 +678,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } ci.ruid = _ul_sruid.uid; ci.server_id = server_id; + ci.tcpconn_id = -1; lock_udomain(dom, &aor);

1 0

git:5.5:b0125b66: presence: skip body operations on empty string
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: 5.5 Commit: b0125b66116468b1e5d0dd2ee4eb0eebb4e7ecb4 URL: https://github.com/kamailio/kamailio/commit/b0125b66116468b1e5d0dd2ee4eb0ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:33:35+02:00 presence: skip body operations on empty string (cherry picked from commit c849070371740c01f9f13a889c610de9132349f3) --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/b0125b66116468b1e5d0dd2ee4eb0ee… Patch: https://github.com/kamailio/kamailio/commit/b0125b66116468b1e5d0dd2ee4eb0ee… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 87ed58cff4..cf52c21c22 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1700,7 +1700,8 @@ int send_notify_request( } /* build extra headers */ - if(build_str_hdr(subs, notify_body ? 1 : 0, &str_hdr) < 0) { + if(build_str_hdr(subs, (notify_body && notify_body->len>0) ? 1 : 0, + &str_hdr) < 0) { LM_ERR("while building headers\n"); goto error; } diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 8dd7c99fe8..83a88f1aa1 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -303,6 +303,9 @@ int pres_dmq_handle_msg( } else if(strcmp(it->string, "body") == 0) { p_body.s = it->valuestring; p_body.len = strlen(it->valuestring); + if(p_body.len==0) { + p_body.s = NULL; + } } else { LM_ERR("unrecognized field in json object\n"); goto invalid; diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index bc17bf1074..a7629a4e92 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -737,6 +737,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, result_cols[rez_ruid_col = n_result_cols++] = &str_ruid_col; if(new_t) { + /* new_t!=0 */ LM_DBG("new presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); @@ -888,6 +889,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, *sent_reply = 1; goto send_notify; } else { + /* new_t==0 */ LM_DBG("updating existing presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); @@ -1206,7 +1208,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, update_vals[n_update_cols].val.int_val = presentity->priority; n_update_cols++; - if(body && body->s) { + if(body && body->s && body->len>0) { update_keys[n_update_cols] = &str_body_col; update_vals[n_update_cols].type = DB1_BLOB; update_vals[n_update_cols].nul = 0; @@ -1748,7 +1750,7 @@ static int ps_cache_update_presentity(sip_msg_t *msg, presentity_t *presentity, ptc.expires = presentity->expires + (int)time(NULL); ptc.received_time = presentity->received_time; ptc.priority = presentity->priority; - if(body && body->s) { + if(body && body->s && body->len>0) { ptc.body = *body; } if(presentity->sender) {

1 0

git:5.5:0c9d7e33: dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: 5.5 Commit: 0c9d7e3378a4e3ffb1e6a7e48f89b7649aaa6fb2 URL: https://github.com/kamailio/kamailio/commit/0c9d7e3378a4e3ffb1e6a7e48f89b76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:32:45+02:00 dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW (cherry picked from commit b86d2490f3b96c532cbe07259786757b3ab9fc02) --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/0c9d7e3378a4e3ffb1e6a7e48f89b76… Patch: https://github.com/kamailio/kamailio/commit/0c9d7e3378a4e3ffb1e6a7e48f89b76… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7e5b00425b..243bb9bd9f 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2706,7 +2706,7 @@ static void rpc_dlg_set_state(rpc_t *rpc,void *c){ dlg->init_ts = (unsigned int)(time(0)); dlg->end_ts = (unsigned int)(time(0)); } - dlg->dflags |= DLG_FLAG_NEW; + dlg->dflags |= DLG_FLAG_CHANGED; dlg_unref(dlg, unref);

1 0

git:5.5:b6380374: sca: call unsafe find entry function to avoid infinite recursion
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: 5.5 Commit: b6380374f310a26c8a36f807d97ff0f415204be4 URL: https://github.com/kamailio/kamailio/commit/b6380374f310a26c8a36f807d97ff0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:32:58+02:00 sca: call unsafe find entry function to avoid infinite recursion (cherry picked from commit bd92fb59cce183008956ff060911cc14d3dfb160) --- Modified: src/modules/sca/sca_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/b6380374f310a26c8a36f807d97ff0f… Patch: https://github.com/kamailio/kamailio/commit/b6380374f310a26c8a36f807d97ff0f… --- diff --git a/src/modules/sca/sca_hash.c b/src/modules/sca/sca_hash.c index 3e96bc2be5..690e9a39e5 100644 --- a/src/modules/sca/sca_hash.c +++ b/src/modules/sca/sca_hash.c @@ -205,7 +205,7 @@ sca_hash_entry *sca_hash_table_slot_kv_find_entry(sca_hash_slot *slot, str *key) sca_hash_entry *e; lock_get(&slot->lock); - e = sca_hash_table_slot_kv_find_entry(slot, key); + e = sca_hash_table_slot_kv_find_entry_unsafe(slot, key); lock_release(&slot->lock); return (e);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev