- sr-dev - kamailio.org

[kamailio/kamailio] OpenSSL depreacation warning (Issue #3502)
by sergey-safarov 06 Nov '23

06 Nov '23

**crypto_uuid.c** ``` CC (gcc) [M crypto.so] api.o CC (gcc) [M crypto.so] crypto_aes.o CC (gcc) [M crypto.so] crypto_evcb.o CC (gcc) [M crypto.so] crypto_mod.o CC (gcc) [M crypto.so] crypto_uuid.o crypto_uuid.c: In function 'crypto_generate_callid': crypto_uuid.c:184:9: warning: 'SHA1_Init' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 184 | SHA1_Init(&crypto_ctx); | ^~~~~~~~~ In file included from crypto_uuid.c:37: /usr/include/openssl/sha.h:49:27: note: declared here 49 | OSSL_DEPRECATEDIN_3_0 int SHA1_Init(SHA_CTX *c); | ^~~~~~~~~ crypto_uuid.c:185:9: warning: 'SHA1_Update' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 185 | SHA1_Update(&crypto_ctx, crypto_callid_seed, SEED_LEN); | ^~~~~~~~~~~ In file included from crypto_uuid.c:37: /usr/include/openssl/sha.h:50:27: note: declared here 50 | OSSL_DEPRECATEDIN_3_0 int SHA1_Update(SHA_CTX *c, const void *data, size_t len); | ^~~~~~~~~~~ crypto_uuid.c:186:9: warning: 'SHA1_Update' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 186 | SHA1_Update(&crypto_ctx, crypto_callid_counter, CTR_LEN); | ^~~~~~~~~~~ In file included from crypto_uuid.c:37: /usr/include/openssl/sha.h:50:27: note: declared here 50 | OSSL_DEPRECATEDIN_3_0 int SHA1_Update(SHA_CTX *c, const void *data, size_t len); | ^~~~~~~~~~~ crypto_uuid.c:187:9: warning: 'SHA1_Final' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 187 | SHA1_Final(crypto_buf, &crypto_ctx); | ^~~~~~~~~~ In file included from crypto_uuid.c:37: /usr/include/openssl/sha.h:51:27: note: declared here 51 | OSSL_DEPRECATEDIN_3_0 int SHA1_Final(unsigned char *md, SHA_CTX *c); | ^~~~~~~~~~ LD (gcc) [M crypto.so] crypto.so CC (gcc) [M tls.so] tls_bio.o ``` **auth_crypt.c** ``` CC (gcc) [M tls.so] tls_verify.o LD (gcc) [M tls.so] tls.so CC (gcc) [M auth_identity.so] auth_crypt.o auth_crypt.c: In function 'rsa_sha1_enc': auth_crypt.c:214:9: warning: 'RSA_sign' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 214 | if(RSA_sign(NID_sha1, sstrcrypted, sizeof sstrcrypted, | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:356:27: note: declared here 356 | OSSL_DEPRECATEDIN_3_0 int RSA_sign(int type, const unsigned char *m, | ^~~~~~~~ auth_crypt.c: In function 'rsa_sha1_dec': auth_crypt.c:258:9: warning: 'EVP_PKEY_get1_RSA' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 258 | hpubkey = EVP_PKEY_get1_RSA(pkey); | ^~~~~~~ In file included from /usr/include/openssl/pem.h:22, from auth_crypt.c:33: /usr/include/openssl/evp.h:1359:16: note: declared here 1359 | struct rsa_st *EVP_PKEY_get1_RSA(EVP_PKEY *pkey); | ^~~~~~~~~~~~~~~~~ auth_crypt.c:266:9: warning: 'RSA_verify' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 266 | if(RSA_verify(NID_sha1, (unsigned char *)ssha, sshasize, | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:359:27: note: declared here 359 | OSSL_DEPRECATEDIN_3_0 int RSA_verify(int type, const unsigned char *m, | ^~~~~~~~~~ auth_crypt.c:273:17: warning: 'RSA_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 273 | RSA_free(hpubkey); | ^~~~~~~~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:301:28: note: declared here 301 | OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r); | ^~~~~~~~ auth_crypt.c:298:9: warning: 'RSA_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 298 | RSA_free(hpubkey); | ^~~~~~~~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:301:28: note: declared here 301 | OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r); | ^~~~~~~~ CC (gcc) [M auth_identity.so] auth_dynstr.o CC (gcc) [M auth_identity.so] auth_hdrs.o ``` **auth_identity.c** ``` CC (gcc) [M auth_identity.so] auth_http.o CC (gcc) [M auth_identity.so] auth_identity.o auth_identity.c: In function 'mod_init': auth_identity.c:414:9: warning: 'PEM_read_RSAPrivateKey' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 414 | glb_hmyprivkey = PEM_read_RSAPrivateKey(hpemfile, NULL, NULL, NULL); | ^~~~~~~~~~~~~~ In file included from auth_identity.c:43: /usr/include/openssl/pem.h:447:1: note: declared here 447 | DECLARE_PEM_rw_cb_attr(OSSL_DEPRECATEDIN_3_0, RSAPrivateKey, RSA) | ^~~~~~~~~~~~~~~~~~~~~~ auth_identity.c:425:9: warning: 'RSA_size' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 425 | if(initdynstr(&glb_encedmsg, RSA_size(glb_hmyprivkey))) | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_identity.c:43: /usr/include/openssl/rsa.h:212:27: note: declared here 212 | OSSL_DEPRECATEDIN_3_0 int RSA_size(const RSA *rsa); | ^~~~~~~~ auth_identity.c:429:9: warning: 'RSA_size' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 429 | if(initdynstr(&glb_b64encedmsg, (RSA_size(glb_hmyprivkey) / 3 + 1) * 4)) | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_identity.c:43: /usr/include/openssl/rsa.h:212:27: note: declared here 212 | OSSL_DEPRECATEDIN_3_0 int RSA_size(const RSA *rsa); | ^~~~~~~~ CC (gcc) [M auth_identity.so] auth_tables.o LD (gcc) [M auth_identity.so] auth_identity.so ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3502 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3502(a)github.com>

3 4

[kamailio/kamailio] Sequential fork with different Call-Ids (Issue #3630)
by vbatistela 06 Nov '23

06 Nov '23

I have a scenario on wich requires sequential fork (up to 30 possible destinations) with different Call-ID for each leg. I am using topoh module enabled, but it always puts the same Call-ID. I think a possible solution would be to modify the callid prefix parameter of topoh module. Instead of storing a string, it could store the name of a variable that could then have its content changed within the script. So within the "branch_route" I could modify this variable by putting $tU ( To URI Username of the outgoing Invite). In this case the new Call-ID generated by topoh module would be a function of the "To URI Username" that is different for each leg. Is this proposal technically feasible or is there a different solution for this scenario? Additional information: kamailio Version - output of kamailio -v version: kamailio 5.7.1 (x86_64/linux) 4238e4 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 4238e4 compiled on 13:26:58 Jun 28 2023 with gcc 8.5.0 Operating System: CentOS Linux 8 CPE OS Name: cpe:/o:centos:centos:8 Kernel: Linux 4.18.0-348.7.1.el8_5.x86_64 Architecture: x86-64 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3630 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3630(a)github.com>

2 2

[kamailio/kamailio] kamcmd: don't clash with ENV NAME or ctl.so module (PR #3628)
by Christian Marangi 06 Nov '23

06 Nov '23

NAME variable might be set to the current HOSTNAME in some shell and also clash with the value set by the module calling MOD_INSTALL_UTILS by passing a NAME variable. With commit 1774cee62098 ("kamcmd: allow defining the name of the application from command line") this resulted in the kamcmd bin being renamed to all kind of name from hostname to ctl.so. Fix this by checking the variable to a more safe name that is not already defined in shell by default and also that doesn't clash with module variables, use UTIL_NAME as an alternative to NAME. UTIL_NAME now needs to be used to create kamcmd with custom name. Fixes: 1774cee62098 ("kamcmd: allow defining the name of the application from command line")   #### 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/3628 -- Commit Summary -- * kamcmd: don't clash with ENV NAME or ctl.so module -- File Changes -- M utils/kamcmd/Makefile (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3628.patch https://github.com/kamailio/kamailio/pull/3628.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3628 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3628(a)github.com>

2 2

git:master:b141f267: kamcmd: Makefile - use CUSTOM_NAME for specifying custom binary name
by Daniel-Constantin Mierla 06 Nov '23

06 Nov '23

Module: kamailio Branch: master Commit: b141f267ce1fe1068de1541d8bd5b5dc53c1d6d9 URL: https://github.com/kamailio/kamailio/commit/b141f267ce1fe1068de1541d8bd5b5d… Author: Christian Marangi <ansuelsmth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T16:13:55+01:00 kamcmd: Makefile - use CUSTOM_NAME for specifying custom binary name - previous use of NAME can clash with environment variable NAME that could be set by OS or by Kamailio modules installation - GH #3628 --- Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b141f267ce1fe1068de1541d8bd5b5d… Patch: https://github.com/kamailio/kamailio/commit/b141f267ce1fe1068de1541d8bd5b5d… --- diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index 1fd923d8554..c8298a8662c 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -8,10 +8,15 @@ include $(COREPATH)/Makefile.targets auto_gen= RELEASE=1.5 UTIL_SRC_NAME=kamcmd +# Pass CUSTOM_NAME to overwrite the kamcmd/sercmd bin name +ifeq ($(CUSTOM_NAME),) ifeq ($(FLAVOUR),ser) - NAME?=sercmd + NAME=sercmd else - NAME?=kamcmd + NAME=kamcmd +endif +else + NAME=$(CUSTOM_NAME) endif readline_localpath=$(LOCALBASE)/include/readline/readline.h

1 0

git:master:511964bd: topos: handle NOTIFY during call setup
by Daniel-Constantin Mierla 06 Nov '23

06 Nov '23

Module: kamailio Branch: master Commit: 511964bd91d0fb0099dab14a69296d21d37abffa URL: https://github.com/kamailio/kamailio/commit/511964bd91d0fb0099dab14a69296d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T14:20:53+01:00 topos: handle NOTIFY during call setup - GH #3627 --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/511964bd91d0fb0099dab14a69296d2… Patch: https://github.com/kamailio/kamailio/commit/511964bd91d0fb0099dab14a69296d2… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index c2dd3e70b7d..740f87b067f 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -910,7 +910,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) goto error; } metid = get_cseq(msg)->method_id; - if((metid & (METHOD_BYE | METHOD_INFO | METHOD_PRACK | METHOD_UPDATE)) + if((metid + & (METHOD_BYE | METHOD_INFO | METHOD_PRACK | METHOD_UPDATE + | METHOD_NOTIFY)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ if(metid & (METHOD_BYE | METHOD_UPDATE)) { diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 70c003c944c..63951386622 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1130,9 +1130,7 @@ int tps_db_load_branch( db_val_t db_vals[5]; db_key_t db_cols[TPS_NR_KEYS]; db1_res_t *db_res = NULL; - str sinv = str_init("INVITE"); - str ssub = str_init("SUBSCRIBE"); - int bInviteDlg = 1; + str sMethodDlg = str_init("INVITE"); int nr_keys; int nr_cols; int n; @@ -1144,10 +1142,13 @@ int tps_db_load_branch( nr_keys = 0; nr_cols = 0; - if((get_cseq(msg)->method_id == METHOD_SUBSCRIBE) - || ((get_cseq(msg)->method_id == METHOD_NOTIFY) - && (msg->event && msg->event->len > 0))) { - bInviteDlg = 0; + if(get_cseq(msg)->method_id == METHOD_SUBSCRIBE) { + sMethodDlg.s = "SUBSCRIBE"; + sMethodDlg.len = 9; + } else if(get_cseq(msg)->method_id == METHOD_NOTIFY) { + /* NOTIFY can be also sent during call setup - ignore dialog method */ + sMethodDlg.s = ""; + sMethodDlg.len = 0; } if(mode == 0) { @@ -1178,12 +1179,14 @@ int tps_db_load_branch( } nr_keys++; - db_keys[nr_keys] = &tt_col_s_method; - db_ops[nr_keys] = OP_EQ; - db_vals[nr_keys].type = DB1_STR; - db_vals[nr_keys].nul = 0; - db_vals[nr_keys].val.str_val = bInviteDlg ? sinv : ssub; - nr_keys++; + if(sMethodDlg.len > 0) { + db_keys[nr_keys] = &tt_col_s_method; + db_ops[nr_keys] = OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; + db_vals[nr_keys].val.str_val = sMethodDlg; + nr_keys++; + } if(md->a_uuid.len > 0) { if(md->a_uuid.s[0] == 'a') {

1 0

git:master:184417a1: tm: reformat exported structures more human friendly
by Daniel-Constantin Mierla 06 Nov '23

06 Nov '23

Module: kamailio Branch: master Commit: 184417a1089397baf47ed91a096660f1a421276c URL: https://github.com/kamailio/kamailio/commit/184417a1089397baf47ed91a096660f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T13:46:46+01:00 tm: reformat exported structures more human friendly --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/184417a1089397baf47ed91a096660f… Patch: https://github.com/kamailio/kamailio/commit/184417a1089397baf47ed91a096660f…

1 0

[kamailio/kamailio] ims_charging: Implemented restore of Ro sessions from database (PR #3622)
by mtryfoss 06 Nov '23

06 Nov '23

- realtime and shutdown mode support - removed duplicate entry in doc about "ro_auth_expiry" - RO_TABLE_VERSION constant did not match inserted value in db schema   #### 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 Fixed the module so it also use information written to database to restore Ro sessions on startup/restart. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3622 -- Commit Summary -- * ims_charging: Implemented restore of Ro sessions from database -- File Changes -- M src/modules/ims_charging/dialog.c (6) M src/modules/ims_charging/doc/ims_charging_admin.xml (21) M src/modules/ims_charging/ims_charging_mod.c (15) M src/modules/ims_charging/ims_ro.c (2) M src/modules/ims_charging/ro_db_handler.c (444) M src/modules/ims_charging/ro_db_handler.h (11) M src/modules/ims_charging/ro_timer.c (2) M utils/kamctl/mysql/ims_charging-create.sql (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3622.patch https://github.com/kamailio/kamailio/pull/3622.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3622 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3622(a)github.com>

2 2

git:master:becebaa8: ims_charging: Implemented restore of Ro sessions from database
by Daniel-Constantin Mierla 06 Nov '23

06 Nov '23

Module: kamailio Branch: master Commit: becebaa826597eba250c1c90fdfa2ffaa90f1712 URL: https://github.com/kamailio/kamailio/commit/becebaa826597eba250c1c90fdfa2ff… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T13:31:44+01:00 ims_charging: Implemented restore of Ro sessions from database - realtime and shutdown mode support - removed duplicate entry in doc about "ro_auth_expiry" --- Modified: src/modules/ims_charging/dialog.c Modified: src/modules/ims_charging/doc/ims_charging_admin.xml Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_db_handler.c Modified: src/modules/ims_charging/ro_db_handler.h Modified: src/modules/ims_charging/ro_timer.c Modified: utils/kamctl/mysql/ims_charging-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/becebaa826597eba250c1c90fdfa2ff… Patch: https://github.com/kamailio/kamailio/commit/becebaa826597eba250c1c90fdfa2ff…

1 0

git:master:70ecd99e: tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension
by Daniel-Constantin Mierla 06 Nov '23

06 Nov '23

Module: kamailio Branch: master Commit: 70ecd99e3d8069d0f89444a5b893f61dd1edd1b3 URL: https://github.com/kamailio/kamailio/commit/70ecd99e3d8069d0f89444a5b893f61… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T13:29:09+01:00 tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/70ecd99e3d8069d0f89444a5b893f61… Patch: https://github.com/kamailio/kamailio/commit/70ecd99e3d8069d0f89444a5b893f61… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 997d1a5bb78..e0048f0604c 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -645,6 +645,7 @@ int t_cancel_suspend(unsigned int hash_index, unsigned int label) /* The transaction does not need to be locked because this * function is either executed from the original route block * or from failure route which already locks */ + t->flags &= ~T_ASYNC_SUSPENDED; reset_kr(); /* the blind UAC of t_suspend has set kr */

1 0

[kamailio/kamailio] tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension (PR #3629)
by mtryfoss 06 Nov '23

06 Nov '23

#### 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 I've been testing the ims_charging module which relies on a diameter request and async reply. If there's no available diameter server, Ro_CCR() calls t_cancel_suspend() to cancel suspension of the transaction and return an error. Based on my understanding, it should now be possible to continue script logic as if the transaction was not suspended at all. In our case we want the call to go through anyway, as a fallback. The INVITE is being sent to the destination, but all replies are filtered since the suspended flag is still set. Tested this change locally, and it's now working according to our needs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3629 -- Commit Summary -- * tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension -- File Changes -- M src/modules/tm/t_suspend.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3629.patch https://github.com/kamailio/kamailio/pull/3629.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3629 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3629(a)github.com>

2 3

git:master:4cec039c: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 05 Nov '23

05 Nov '23

Module: kamailio Branch: master Commit: 4cec039ce1b7fa2d1980f8f30dd7bb1012e3c9cb URL: https://github.com/kamailio/kamailio/commit/4cec039ce1b7fa2d1980f8f30dd7bb1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-05T22:02:26+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/4cec039ce1b7fa2d1980f8f30dd7bb1… Patch: https://github.com/kamailio/kamailio/commit/4cec039ce1b7fa2d1980f8f30dd7bb1… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 216533fbfb6..41dced573d2 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -2101,6 +2101,9 @@ if (t_newtran()) { * code - Reply code number. * reason_phrase - Reason string. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + ONREPLY_ROUTE. + Example 1.63. t_reply usage ... t_reply("404", "Not found"); @@ -2111,7 +2114,8 @@ t_reply("404", "Not found"); Sends a stateful reply based in internal error code, similar to sl_send_error() from sl module. - This function can be used from REQUEST_ROUTE. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + ONREPLY_ROUTE. Example 1.64. t_reply_error usage ...

1 0

git:master:9bbf86a8: tm: docs updated for t_reply_error()
by Daniel-Constantin Mierla 05 Nov '23

05 Nov '23

Module: kamailio Branch: master Commit: 9bbf86a8a7e598a67254e2907dcc430af98f5689 URL: https://github.com/kamailio/kamailio/commit/9bbf86a8a7e598a67254e2907dcc430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-05T21:48:43+01:00 tm: docs updated for t_reply_error() --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/9bbf86a8a7e598a67254e2907dcc430… Patch: https://github.com/kamailio/kamailio/commit/9bbf86a8a7e598a67254e2907dcc430… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index 7bcc3a43ccf..539e4f0dafb 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -359,6 +359,9 @@ if (t_newtran()) { </para> </listitem> </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE. + </para> <example> <title><function>t_reply</function> usage</title> <programlisting> @@ -378,7 +381,7 @@ t_reply("404", "Not found"); sl_send_error() from sl module. </para> <para> - This function can be used from REQUEST_ROUTE. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE. </para> <example> <title><function>t_reply_error</function> usage</title>

1 0

git:master:c8695084: tm: enable t_reply_error() in same routing blocks like t_reply()
by Daniel-Constantin Mierla 05 Nov '23

05 Nov '23

Module: kamailio Branch: master Commit: c86950841dfc0ca18ad1956efd1dc374a4eb064b URL: https://github.com/kamailio/kamailio/commit/c86950841dfc0ca18ad1956efd1dc37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-04T16:42:46+01:00 tm: enable t_reply_error() in same routing blocks like t_reply() --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/c86950841dfc0ca18ad1956efd1dc37… Patch: https://github.com/kamailio/kamailio/commit/c86950841dfc0ca18ad1956efd1dc37… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index ec83abedaae..cb34dd4a036 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -256,7 +256,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE}, {"t_reply", w_t_reply, 2, fixup_t_reply, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"t_reply_error", w_t_reply_error, 0, 0, 0, REQUEST_ROUTE}, + {"t_reply_error", w_t_reply_error, 0, 0, 0, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"t_send_reply", w_t_send_reply, 2, fixup_t_reply, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"t_retransmit_reply", w_t_retransmit_reply, 0, 0, 0, REQUEST_ROUTE},

1 0

git:master:0def9a07: db_redis: wrapp field version_code.s with ZSW() to be safer when it is not set
by Daniel-Constantin Mierla 03 Nov '23

03 Nov '23

Module: kamailio Branch: master Commit: 0def9a071343c963ab3a497540534d8ea3b8eebc URL: https://github.com/kamailio/kamailio/commit/0def9a071343c963ab3a497540534d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T11:40:29+01:00 db_redis: wrapp field version_code.s with ZSW() to be safer when it is not set --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/0def9a071343c963ab3a497540534d8… Patch: https://github.com/kamailio/kamailio/commit/0def9a071343c963ab3a497540534d8… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index ff41aa45282..84c0c3a9459 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -22,6 +22,8 @@ #include <stdlib.h> #include <time.h> +#include "../../core/ut.h" + #include "db_redis_mod.h" #include "redis_connection.h" #include "redis_dbase.h" @@ -360,7 +362,7 @@ static int db_redis_find_query_key(redis_key_t *key, const str *table_name, goto err; } snprintf(key_name->s, len, "%.*s%.*s:%.*s::%.*s", - table->version_code.len, table->version_code.s, + table->version_code.len, ZSW(table->version_code.s), table_name->len, table_name->s, type_name->len, type_name->s, val.len, val.s); key_name->len = len - 1; // subtract the term 0 char @@ -456,7 +458,7 @@ static int db_redis_find_query_key(redis_key_t *key, const str *table_name, goto err; } snprintf(key_name->s, len, "%.*s%.*s:%.*s", table->version_code.len, - table->version_code.s, table_name->len, table_name->s, + ZSW(table->version_code.s), table_name->len, table_name->s, type_name->len, type_name->s); key_name->len = len - 1; } @@ -621,7 +623,7 @@ static int db_redis_build_type_keys(km_redis_con_t *con, const str *table_name, goto err; } sprintf(keyname.s, "%.*s%.*s::index::%.*s", - table->version_code.len, table->version_code.s, + table->version_code.len, ZSW(table->version_code.s), table_name->len, table_name->s, type->type.len, type->type.s); if(db_redis_key_add_str(set_keys, &keyname) != 0) { @@ -787,7 +789,7 @@ static int db_redis_build_query_keys(km_redis_con_t *con, const str *table_name, goto err; } sprintf(ts_scan_table->s, "%.*s%.*s::index::%.*s", - table->version_code.len, table->version_code.s, + table->version_code.len, ZSW(table->version_code.s), table_name->len, table_name->s, type->type.len, type->type.s); } @@ -1094,7 +1096,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name, return -1; } int len = sprintf(match, "%.*s%.*s:entry::*", table->version_code.len, - table->version_code.s, table_name->len, table_name->s); + ZSW(table->version_code.s), table_name->len, table_name->s); str match_pattern = {match, len}; ret = db_redis_scan_query_keys_pattern(con, &match_pattern, ts_scan_table, _n, query_keys, query_keys_count, manual_keys,

1 0

git:master:e24df12d: db_redis: init allocated redis table structure
by Daniel-Constantin Mierla 03 Nov '23

03 Nov '23

Module: kamailio Branch: master Commit: e24df12d10d8b88582907481d161c6a2db5cf8f1 URL: https://github.com/kamailio/kamailio/commit/e24df12d10d8b88582907481d161c6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T11:00:34+01:00 db_redis: init allocated redis table structure --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/e24df12d10d8b88582907481d161c6a… Patch: https://github.com/kamailio/kamailio/commit/e24df12d10d8b88582907481d161c6a… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index 33b097a9674..10dd7d57960 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -433,8 +433,7 @@ static struct str_hash_entry *db_redis_create_table(str *table) pkg_free(e); return NULL; } - t->entry_keys = NULL; - t->types = NULL; + memset(t, 0, sizeof(redis_table_t)); if(str_hash_alloc(&t->columns, REDIS_HT_SIZE) != 0) { LM_ERR("Failed to allocate memory for table schema hashtable\n");

1 0

git:master:d4995bf2: modules: readme files regenerated - sl ... [skip ci]
by Kamailio Dev 03 Nov '23

03 Nov '23

Module: kamailio Branch: master Commit: d4995bf2791bd1048ac8a7f32e51ae6949562ce3 URL: https://github.com/kamailio/kamailio/commit/d4995bf2791bd1048ac8a7f32e51ae6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-03T09:17:27+01:00 modules: readme files regenerated - sl ... [skip ci] --- Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/d4995bf2791bd1048ac8a7f32e51ae6… Patch: https://github.com/kamailio/kamailio/commit/d4995bf2791bd1048ac8a7f32e51ae6… --- diff --git a/src/modules/sl/README b/src/modules/sl/README index 615e7a531bb..6433a1d7ebe 100644 --- a/src/modules/sl/README +++ b/src/modules/sl/README @@ -32,6 +32,7 @@ Daniel-Constantin Mierla 3.3. send_reply_mode(code, reason, mode) 3.4. sl_reply_error() 3.5. sl_forward_reply([ code, [ reason ] ]) + 3.6. send_reply_error() 4. Statistics @@ -78,6 +79,7 @@ Daniel-Constantin Mierla 1.9. send_reply_mode usage 1.10. sl_reply_error usage 1.11. send_reply usage + 1.12. send_reply_error usage Chapter 1. Admin Guide @@ -100,6 +102,7 @@ Chapter 1. Admin Guide 3.3. send_reply_mode(code, reason, mode) 3.4. sl_reply_error() 3.5. sl_forward_reply([ code, [ reason ] ]) + 3.6. send_reply_error() 4. Statistics @@ -252,6 +255,7 @@ modparam("sl", "event_callback_lres_sent", "ksr_event_sl_local_response") 3.3. send_reply_mode(code, reason, mode) 3.4. sl_reply_error() 3.5. sl_forward_reply([ code, [ reason ] ]) + 3.6. send_reply_error() 3.1. sl_send_reply(code, reason) @@ -350,6 +354,20 @@ if(status=="408") sl_forward_reply("404", "Not found"); ... +3.6. send_reply_error() + + For the current request, the internal error code reply is sent back + stateful or stateless, depending of the TM module: if a transaction + exists for the current request, then the reply is sent statefully, + otherwise stateless. + + It can be used from REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. + + Example 1.12. send_reply_error usage +... +send_reply_error(); +... + 4. Statistics 4.1. 1xx_replies

1 0

git:master:cb529523: sl: docs for send_reply_error()
by Daniel-Constantin Mierla 03 Nov '23

03 Nov '23

Module: kamailio Branch: master Commit: cb5295234a1b106473c3fdb9ff25c23bfc9fbcd1 URL: https://github.com/kamailio/kamailio/commit/cb5295234a1b106473c3fdb9ff25c23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T09:06:38+01:00 sl: docs for send_reply_error() --- Modified: src/modules/sl/doc/sl_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/cb5295234a1b106473c3fdb9ff25c23… Patch: https://github.com/kamailio/kamailio/commit/cb5295234a1b106473c3fdb9ff25c23… --- diff --git a/src/modules/sl/doc/sl_functions.xml b/src/modules/sl/doc/sl_functions.xml index 11ef4706755..8f2715b7a00 100644 --- a/src/modules/sl/doc/sl_functions.xml +++ b/src/modules/sl/doc/sl_functions.xml @@ -130,7 +130,7 @@ send_reply_mode("403", "Invalid user - $fU", "3"); </title> <para> Sends back an error reply describing the nature of the last - internal error. Usually this function should be used after a + internal error. Usually this function should be used after a script function that returned an error code. </para> <example> @@ -174,6 +174,29 @@ sl_reply_error(); if(status=="408") sl_forward_reply("404", "Not found"); ... +</programlisting> + </example> + </section> + + <section id="sl.f.send_reply_error"> + <title> + <function moreinfo="none">send_reply_error()</function> + </title> + <para> + For the current request, the internal error code reply is sent back + stateful or stateless, depending of the <acronym>TM</acronym> module: + if a transaction exists for the current request, then the reply is sent + statefully, otherwise stateless. + </para> + <para> + It can be used from REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. + </para> + <example> + <title><function>send_reply_error</function> usage</title> + <programlisting format="linespecific"> +... +send_reply_error(); +... </programlisting> </example> </section>

1 0

git:master:130dc00c: sl: added send_reply_error()
by Daniel-Constantin Mierla 03 Nov '23

03 Nov '23

Module: kamailio Branch: master Commit: 130dc00c1700839248a044f8ae6d4a9e9c97d301 URL: https://github.com/kamailio/kamailio/commit/130dc00c1700839248a044f8ae6d4a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T09:00:14+01:00 sl: added send_reply_error() - wrapper around t_reply_error() and sl_reply_error() --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/130dc00c1700839248a044f8ae6d4a9… Patch: https://github.com/kamailio/kamailio/commit/130dc00c1700839248a044f8ae6d4a9… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 0ee22efcc0a..2a8f49fe78c 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -73,6 +73,7 @@ static int w_sl_send_reply(struct sip_msg *msg, char *str1, char *str2); static int w_send_reply(struct sip_msg *msg, char *str1, char *str2); static int w_send_reply_mode( struct sip_msg *msg, char *str1, char *str2, char *str3); +static int w_send_reply_error(sip_msg_t *msg, char *str1, char *str2); static int w_sl_reply_error(struct sip_msg *msg, char *str1, char *str2); static int w_sl_forward_reply0(sip_msg_t *msg, char *str1, char *str2); static int w_sl_forward_reply1(sip_msg_t *msg, char *str1, char *str2); @@ -102,6 +103,8 @@ static cmd_export_t cmds[] = { {"send_reply_mode", (cmd_function)w_send_reply_mode, 3, fixup_sl_reply_mode, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, + {"send_reply_error", w_send_reply_error, 0, 0, 0, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"sl_reply_error", w_sl_reply_error, 0, 0, 0, REQUEST_ROUTE}, {"sl_forward_reply", w_sl_forward_reply0, 0, 0, 0, ONREPLY_ROUTE}, {"sl_forward_reply", w_sl_forward_reply1, 1, fixup_spve_all, 0, @@ -326,6 +329,29 @@ static int w_send_reply(struct sip_msg *msg, char *p1, char *p2) return send_reply(msg, code, &reason); } +/** + * + */ +static int ki_send_reply_error(sip_msg_t *msg) +{ + int ret; + if(sl_bind_tm != 0 && tmb.t_reply_error != NULL) { + ret = tmb.t_reply_error(msg); + if(ret > 0) { + return ret; + } + } + return sl_reply_error(msg); +} + +/** + * + */ +static int w_send_reply_error(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_send_reply_error(msg); +} + /** * @brief send stateful reply if transaction was created * @@ -672,6 +698,11 @@ static sr_kemi_t sl_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sl"), str_init("send_reply_error"), + SR_KEMIP_INT, ki_send_reply_error, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sl"), str_init("sl_forward_reply"), SR_KEMIP_INT, w_sl_forward_reply, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:20979227: tm: exposed t_reply_error() to intermodule API
by Daniel-Constantin Mierla 03 Nov '23

03 Nov '23

Module: kamailio Branch: master Commit: 2097922746d12d332ce923193af9c624429b7f96 URL: https://github.com/kamailio/kamailio/commit/2097922746d12d332ce923193af9c62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T08:41:08+01:00 tm: exposed t_reply_error() to intermodule API --- Modified: src/modules/tm/t_reply.h Modified: src/modules/tm/tm.c Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/2097922746d12d332ce923193af9c62… Patch: https://github.com/kamailio/kamailio/commit/2097922746d12d332ce923193af9c62… --- diff --git a/src/modules/tm/t_reply.h b/src/modules/tm/t_reply.h index 38fe67f5cd5..709b70454ed 100644 --- a/src/modules/tm/t_reply.h +++ b/src/modules/tm/t_reply.h @@ -178,6 +178,8 @@ int t_reply_str(struct cell *t, struct sip_msg *, unsigned int, str *); int t_reply_unsafe(struct cell *t, struct sip_msg *, unsigned int, char *); int t_reply_str_unsafe(struct cell *t, struct sip_msg *, unsigned int, str *); +int ki_t_reply_error(sip_msg_t *msg); + enum rps relay_reply(struct cell *t, struct sip_msg *p_msg, int branch, unsigned int msg_status, struct cancel_info *cancel_data, diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index bf30639a248..ec83abedaae 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1596,7 +1596,7 @@ int w_t_reply_wrp(struct sip_msg *msg, unsigned int code, char *txt) /** * kemi function to send reply based on internal error code */ -static int ki_t_reply_error(sip_msg_t *msg) +int ki_t_reply_error(sip_msg_t *msg) { char err_buffer[128]; str reason; diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index dced3edbeef..7149873515e 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -143,6 +143,7 @@ int load_tm(struct tm_binds *tmb) tmb->set_fr = t_set_fr; tmb->t_release_transaction = t_release_transaction; tmb->t_uas_request_clean_parsed = t_uas_request_clean_parsed; + tmb->t_reply_error = ki_t_reply_error; return 1; } diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index f13c04cde6f..bf41eb789ef 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -43,6 +43,9 @@ /* export not usable from scripts */ #define NO_SCRIPT -1 +typedef void (*t_on_route_f)(unsigned int); +typedef int (*t_no_param_f)(struct sip_msg *); + struct tm_binds { register_tmcb_f register_tmcb; @@ -127,6 +130,7 @@ struct tm_binds tset_fr_f set_fr; trelease_t t_release_transaction; t_uas_request_clean_parsed_f t_uas_request_clean_parsed; + t_no_param_f t_reply_error; }; typedef struct tm_binds tm_api_t; @@ -165,9 +169,6 @@ static inline int tm_load_api(tm_api_t *tmb) * eXtra API - not common used in other modules */ -typedef void (*t_on_route_f)(unsigned int); -typedef int (*t_no_param_f)(struct sip_msg *); - int t_check_trans(struct sip_msg *msg); int t_is_canceled(struct sip_msg *msg);

1 0

git:master:21eeb977: core: add transport parameter for ws/wss advertised proto
by Daniel-Constantin Mierla 02 Nov '23

02 Nov '23

Module: kamailio Branch: master Commit: 21eeb977c882dec4540703b2d8b4ff5131e6c446 URL: https://github.com/kamailio/kamailio/commit/21eeb977c882dec4540703b2d8b4ff5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-02T14:01:58+01:00 core: add transport parameter for ws/wss advertised proto --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/21eeb977c882dec4540703b2d8b4ff5… Patch: https://github.com/kamailio/kamailio/commit/21eeb977c882dec4540703b2d8b4ff5… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f5f7be8c9f9..9bb142efea8 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1094,6 +1094,9 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, break; \ case PROTO_WS: \ case PROTO_WSS: \ + memcpy(new_buf + offset, TRANSPORT_PARAM, \ + TRANSPORT_PARAM_LEN); \ + offset += TRANSPORT_PARAM_LEN; \ memcpy(new_buf + offset, "ws", 2); \ offset += 2; \ break; \ @@ -1217,6 +1220,9 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, break; \ case PROTO_WS: \ case PROTO_WSS: \ + memcpy(new_buf + offset, TRANSPORT_PARAM, \ + TRANSPORT_PARAM_LEN); \ + offset += TRANSPORT_PARAM_LEN; \ memcpy(new_buf + offset, "ws", 2); \ offset += 2; \ break; \

1 0

[kamailio/kamailio] wrong code for new mod param of pdt module (Issue #3626)
by doktorsip 02 Nov '23

02 Nov '23

### Description This new code in pdttree.c is not correct for this new pdt mode, it just print's a debug log instead of error. The return value should be 0 instead of 1 in case _pdt_mode is 1 otherwise it will still not start. <code> if(_pdt_mode & 1) { LM_DBG("prefix already allocated [%.*s/[%.*s] - ignoring\n", sp->len, sp->s, sd->len, sd->s); return -1; } else { LM_ERR("prefix already allocated [%.*s/[%.*s]\n", sp->len, sp->s, sd->len, sd->s); return -1; } </code> ### Troubleshooting #### Reproduction #### Debugging Data #### Log Messages #### SIP Traffic ### Possible Solutions ### Additional Information * **Operating System**: -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3626 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3626(a)github.com>

2 2

git:master:ef5e889d: pdt: return 0 when add_to_tree() detect duplicated prefix with pdt mode 1
by Daniel-Constantin Mierla 02 Nov '23

02 Nov '23

Module: kamailio Branch: master Commit: ef5e889dce3e2ff077b300f183b6d3262aeab9f8 URL: https://github.com/kamailio/kamailio/commit/ef5e889dce3e2ff077b300f183b6d32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-02T13:17:17+01:00 pdt: return 0 when add_to_tree() detect duplicated prefix with pdt mode 1 - GH #3626 --- Modified: src/modules/pdt/pdtree.c --- Diff: https://github.com/kamailio/kamailio/commit/ef5e889dce3e2ff077b300f183b6d32… Patch: https://github.com/kamailio/kamailio/commit/ef5e889dce3e2ff077b300f183b6d32… --- diff --git a/src/modules/pdt/pdtree.c b/src/modules/pdt/pdtree.c index b211ca6611d..5e60fe216e9 100644 --- a/src/modules/pdt/pdtree.c +++ b/src/modules/pdt/pdtree.c @@ -121,7 +121,7 @@ int add_to_tree(pdt_tree_t *pt, str *sp, str *sd) if(_pdt_mode & 1) { LM_DBG("prefix already allocated [%.*s/[%.*s] - ignoring\n", sp->len, sp->s, sd->len, sd->s); - return -1; + return 0; } else { LM_ERR("prefix already allocated [%.*s/[%.*s]\n", sp->len, sp->s, sd->len, sd->s);

1 0

git:master:d9189306: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 02 Nov '23

02 Nov '23

Module: kamailio Branch: master Commit: d9189306f38e8f79c16e3a9ea38a2fe90fc82fb7 URL: https://github.com/kamailio/kamailio/commit/d9189306f38e8f79c16e3a9ea38a2fe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-02T13:16:27+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/d9189306f38e8f79c16e3a9ea38a2fe… Patch: https://github.com/kamailio/kamailio/commit/d9189306f38e8f79c16e3a9ea38a2fe… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index e10556dad09..6ffe4cab0cd 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -266,6 +266,13 @@ Chapter 1. Admin Guide 3.20. config_file (string) 3.21. netinterface (string) + The parameters are loaded in order. That can lead to unexpected + behavior: If httpcon is set at first, the default values for all other + parameters are used, and not the values that might be set after + httpcon. For example, if setting verify_peer=0 or verify_host=0 after + httpcon, the certificates are checked and self-signed certificates are + rejected nevertheless. + 3.1. httpredirect (int) If set to 1, enabled, http_client will follow HTTP 302 Redirects. If

1 0

[kamailio/kamailio] cdp: Fix for undefined symbols when using older/unsupported OpenSSL (PR #3616)
by mtryfoss 02 Nov '23

02 Nov '23

This was originaly fixed in #3601, but that did not handle the change in #3612 very well.   #### 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 Fix for undefined symbols when using older/unsupported OpenSSL. This was originaly fixed in #3601, but that did not handle the change in #3612 very well. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3616 -- Commit Summary -- * cdp: Fix for undefined symbols when using older/unsupported OpenSSL -- File Changes -- M src/modules/cdp/receiver.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3616.patch https://github.com/kamailio/kamailio/pull/3616.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3616 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3616(a)github.com>

3 7

git:master:ba72724f: cdp: Fix for undefined symbols when using older/unsupported OpenSSL
by Daniel-Constantin Mierla 02 Nov '23

02 Nov '23

Module: kamailio Branch: master Commit: ba72724fd1c3547feccb56ae68bd8bed11a3d19a URL: https://github.com/kamailio/kamailio/commit/ba72724fd1c3547feccb56ae68bd8be… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-02T13:10:44+01:00 cdp: Fix for undefined symbols when using older/unsupported OpenSSL This was originaly fixed in #3601, but that did not handle the change in #3612 very well. --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/ba72724fd1c3547feccb56ae68bd8be… Patch: https://github.com/kamailio/kamailio/commit/ba72724fd1c3547feccb56ae68bd8be… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 223d14dd403..17200cf8143 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -533,6 +533,7 @@ void receiver_process(peer *p) static inline int do_read(serviced_peer_t *sp, char *dst, int n) { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int cnt, ssl_err; char *err_str; @@ -547,6 +548,11 @@ static inline int do_read(serviced_peer_t *sp, char *dst, int n) } else { cnt = recv(sp->tcp_socket, dst, n, 0); } +#else + int cnt; + + cnt = recv(sp->tcp_socket, dst, n, 0); +#endif return cnt; } @@ -684,6 +690,7 @@ static inline int do_receive(serviced_peer_t *sp) static int do_write(serviced_peer_t *sp, const void *buf, int num) { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int cnt, ssl_err; char *err_str; @@ -698,6 +705,11 @@ static int do_write(serviced_peer_t *sp, const void *buf, int num) } else { cnt = write(sp->tcp_socket, buf, num); } +#else + int cnt; + + cnt = write(sp->tcp_socket, buf, num); +#endif return cnt; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev