- sr-dev - kamailio.org

Jenkins build is back to stable : kamailio57-nightly-binaries » amd64,stretch #41
by kamailio＠sipwise.com 17 Dec '23

17 Dec '23

See <https://kamailio.sipwise.com/job/kamailio57-nightly-binaries/architecture=a…>

1 0

git:5.7:bfc63986: pkg/kamailio/deb: override lintian error on stretch [skip ci]
by Victor Seva 16 Dec '23

16 Dec '23

Module: kamailio Branch: 5.7 Commit: bfc63986ae7239a64803b8f20f634522bc584948 URL: https://github.com/kamailio/kamailio/commit/bfc63986ae7239a64803b8f20f63452… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-16T20:30:10+01:00 pkg/kamailio/deb: override lintian error on stretch [skip ci] (cherry picked from commit aaeb54c8b630b4aac50df75ff430ad5baea6746c) --- Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jammy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/bfc63986ae7239a64803b8f20f63452… Patch: https://github.com/kamailio/kamailio/commit/bfc63986ae7239a64803b8f20f63452…

1 0

[kamailio/kamailio] max_branches settings are not effective (Issue #3678)
by QWERTY 16 Dec '23

16 Dec '23

![image](https://github.com/kamailio/kamailio/assets/88914706/c325af99-f556-497c-9bbb-47d6bfe61742) max_branches=30 Following this route, the branch value will be doubled，only 15 branches can be created -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3678 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3678(a)github.com>

2 3

[kamailio/kamailio] Kamailio TLS sni: unknown) (Issue #3675)
by faisalahmadkhan 15 Dec '23

15 Dec '23

I am using kamailio (5.6.5 (x86_64/linux)) i am trying to establish direct routing with MS-Teams getting this issue upon sending option packets. I tried with including server_name as well but not able to resolve the issue. may be some tech gurus can help me out. Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23837]: INFO: <script>: Sent out tm request: OPTIONS sip:sip.pstnhub.microsoft.com;transport=tls SIP/2.0 Via: SIP/2.0/TLS abcsbc.com:5061;branch=z9hG4bK7c5b.7ad63320000000000000000000000000.0 To: <sip:sip.pstnhub.microsoft.com;transport=tls> From: <sip:abcsbc.com>;tag=64ff6b492a7d9ab14de1f0b7c15c9c17-25003c71 CSeq: 10 OPTIONS Call-ID: 25555f22142f22f4-23837(a)0.0.0.0 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.6.5 (x86_64/linux)) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23837]: INFO: <script>: Sent out tm request: OPTIONS sip:sip2.pstnhub.microsoft.com;transport=tls SIP/2.0 Via: SIP/2.0/TLS abcsbc.com:5061;branch=z9hG4bK8c5b.b0cf0513000000000000000000000000.0 To: <sip:sip2.pstnhub.microsoft.com;transport=tls> From: <sip:abcsbc.com>;tag=64ff6b492a7d9ab14de1f0b7c15c9c17-8784af70 CSeq: 10 OPTIONS Call-ID: 25555f22142f22f5-23837(a)0.0.0.0 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.6.5 (x86_64/linux)) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23837]: INFO: <script>: Sent out tm request: OPTIONS sip:sip3.pstnhub.microsoft.com;transport=tls SIP/2.0 Via: SIP/2.0/TLS abcsbc.com:5061;branch=z9hG4bK5c5b.a165cf12000000000000000000000000.0 To: <sip:sip3.pstnhub.microsoft.com;transport=tls> From: <sip:abcsbc.com>;tag=64ff6b492a7d9ab14de1f0b7c15c9c17-60095adb CSeq: 10 OPTIONS Call-ID: 25555f22142f22f6-23837(a)0.0.0.0 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.6.5 (x86_64/linux)) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23855]: ERROR: tls [tls_server.c:1319]: tls_h_read_f(): protocol level error Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23855]: ERROR: tls [tls_util.h:49]: tls_err_ret(): TLS write:error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed (sni: unknown) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23855]: ERROR: tls [tls_server.c:1323]: tls_h_read_f(): src addr: 52.114.132.46:5061 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23855]: ERROR: tls [tls_server.c:1326]: tls_h_read_f(): dst addr: 172.31.19.8:0 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23855]: ERROR: <core> [core/tcp_read.c:1499]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f8f327181f0 r: 0x7f8f32718318 (-1) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23857]: ERROR: tls [tls_server.c:1319]: tls_h_read_f(): protocol level error Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23857]: ERROR: tls [tls_util.h:49]: tls_err_ret(): TLS write:error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed (sni: unknown) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23857]: ERROR: tls [tls_server.c:1323]: tls_h_read_f(): src addr: 52.114.32.169:5061 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23857]: ERROR: tls [tls_server.c:1326]: tls_h_read_f(): dst addr: 172.31.19.8:0 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23857]: ERROR: <core> [core/tcp_read.c:1499]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f8f32741588 r: 0x7f8f327416b0 (-1) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23865]: ERROR: tls [tls_server.c:1319]: tls_h_read_f(): protocol level error Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23865]: ERROR: tls [tls_util.h:49]: tls_err_ret(): TLS write:error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed (sni: unknown) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23865]: ERROR: tls [tls_server.c:1323]: tls_h_read_f(): src addr: 52.114.76.76:5061 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23865]: ERROR: tls [tls_server.c:1326]: tls_h_read_f(): dst addr: 172.31.19.8:0 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23865]: ERROR: <core> [core/tcp_read.c:1499]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f8f32726108 r: 0x7f8f32726230 (-1) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3675 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3675(a)github.com>

5 12

git:master:68940cc0: seas: use same type iterator to avoid risk of overflow
by Daniel-Constantin Mierla 15 Dec '23

15 Dec '23

Module: kamailio Branch: master Commit: 68940cc09c999621b1f9a765e190b3207728106e URL: https://github.com/kamailio/kamailio/commit/68940cc09c999621b1f9a765e190b32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-15T12:19:25+01:00 seas: use same type iterator to avoid risk of overflow --- Modified: src/modules/seas/encode_header.c --- Diff: https://github.com/kamailio/kamailio/commit/68940cc09c999621b1f9a765e190b32… Patch: https://github.com/kamailio/kamailio/commit/68940cc09c999621b1f9a765e190b32… --- diff --git a/src/modules/seas/encode_header.c b/src/modules/seas/encode_header.c index 055821d37d5..e59d422861c 100644 --- a/src/modules/seas/encode_header.c +++ b/src/modules/seas/encode_header.c @@ -366,6 +366,7 @@ int print_encoded_header(FILE *fd, char *msg, int msglen, { char *hdr_start_ptr; short int start_idx, i; + int j; memcpy(&start_idx, payload, 2); start_idx = ntohs(start_idx); @@ -378,9 +379,9 @@ int print_encoded_header(FILE *fd, char *msg, int msglen, hdr_start_ptr); fprintf(fd, "%sHEADER:[%.*s]\n", prefix, i - 2, hdr_start_ptr); fprintf(fd, "%sHEADER CODE=", prefix); - for(i = 0; i < len; i++) - fprintf(fd, "%s%d%s", i == 0 ? "[" : ":", payload[i], - i == len - 1 ? "]\n" : ""); + for(j = 0; j < len; j++) + fprintf(fd, "%s%d%s", j == 0 ? "[" : ":", payload[j], + j == len - 1 ? "]\n" : ""); if(len == 4) return 1; switch(type) {

1 0

git:master:2bebff2b: sms: rework truncating long messages
by Daniel-Constantin Mierla 15 Dec '23

15 Dec '23

Module: kamailio Branch: master Commit: 2bebff2b27acd8ffa9f9d22409c197b0f0bc168e URL: https://github.com/kamailio/kamailio/commit/2bebff2b27acd8ffa9f9d22409c197b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-15T11:17:11+01:00 sms: rework truncating long messages --- Modified: src/modules/sms/libsms_getsms.c --- Diff: https://github.com/kamailio/kamailio/commit/2bebff2b27acd8ffa9f9d22409c197b… Patch: https://github.com/kamailio/kamailio/commit/2bebff2b27acd8ffa9f9d22409c197b… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index 959d44f0333..0f6df6b7341 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -187,8 +187,10 @@ static int fetchsms(struct modem *mdm, int sim, char *pdu) return 0; /* Now we have the end of the PDU or ASCII string */ *end = 0; - if(strlen(beginning) < SMS_BUF_SIZE) { - strcpy(pdu, beginning); + clen = strlen(beginning); + if(clen < SMS_BUF_SIZE) { + memcpy(pdu, beginning, clen); + pdu[clen] = '\0'; } else { /* truncate */ memcpy(pdu, beginning, SMS_BUF_SIZE - 1);

1 0

git:master:431b80a1: sms: define size for buffers and check the length on copy
by Daniel-Constantin Mierla 14 Dec '23

14 Dec '23

Module: kamailio Branch: master Commit: 431b80a1b8313d7457d4bf5fa1770f9465820d39 URL: https://github.com/kamailio/kamailio/commit/431b80a1b8313d7457d4bf5fa1770f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-14T19:52:23+01:00 sms: define size for buffers and check the length on copy --- Modified: src/modules/sms/libsms_getsms.c --- Diff: https://github.com/kamailio/kamailio/commit/431b80a1b8313d7457d4bf5fa1770f9… Patch: https://github.com/kamailio/kamailio/commit/431b80a1b8313d7457d4bf5fa1770f9… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index e4ff2296707..959d44f0333 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -26,6 +26,7 @@ mailto:s.frings@mail.isis.de #include "libsms_sms.h" #include "sms_funcs.h" +#define SMS_BUF_SIZE 512 #define set_date(_date, _Pointer) \ { \ @@ -131,7 +132,7 @@ static int pdu2binary(char *pdu, char *binary) static int fetchsms(struct modem *mdm, int sim, char *pdu) { char command[16]; - char answer[512]; + char answer[SMS_BUF_SIZE]; char *position; char *beginning; char *end; @@ -186,7 +187,13 @@ static int fetchsms(struct modem *mdm, int sim, char *pdu) return 0; /* Now we have the end of the PDU or ASCII string */ *end = 0; - strcpy(pdu, beginning); + if(strlen(beginning) < SMS_BUF_SIZE) { + strcpy(pdu, beginning); + } else { + /* truncate */ + memcpy(pdu, beginning, SMS_BUF_SIZE - 1); + pdu[SMS_BUF_SIZE - 1] = '\0'; + } return sim; } @@ -480,7 +487,7 @@ static inline int decode_pdu( int getsms(struct incame_sms *sms, struct modem *mdm, int sim) { - char pdu[512]; + char pdu[SMS_BUF_SIZE]; int found; int ret;

1 0

git:master:a78aeebd: smsops: check returned value
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: a78aeebd66ec63810987555d5bb492fec1979fc8 URL: https://github.com/kamailio/kamailio/commit/a78aeebd66ec63810987555d5bb492f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:52:40+01:00 smsops: check returned value --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/a78aeebd66ec63810987555d5bb492f… Patch: https://github.com/kamailio/kamailio/commit/a78aeebd66ec63810987555d5bb492f… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index c8ccc2df4e1..703092542b0 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -1249,6 +1249,10 @@ int pv_sms_body(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) // Check for UDH concat = GetConcatShortMsg8bitRefIE(rp_send_data); + if(concat == NULL) { + LM_ERR("message building failure\n"); + return -1; + } if(concat->max_num_sm && concat->seq) { sms_body.s[sms_body.len++] = 5; // always 5 for TP_UDH_IE_CONCAT_SM_8BIT_REF

1 0

git:master:49b3b90c: app_python3: check allocated pointer
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 49b3b90cd229b7c4da06b61cdfd782450d383cc9 URL: https://github.com/kamailio/kamailio/commit/49b3b90cd229b7c4da06b61cdfd7824… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:23:23+01:00 app_python3: check allocated pointer --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/49b3b90cd229b7c4da06b61cdfd7824… Patch: https://github.com/kamailio/kamailio/commit/49b3b90cd229b7c4da06b61cdfd7824… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 2d271b2e271..718d8ecedaf 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -567,6 +567,12 @@ static PyObject *init_KSR(void) emods[k].kexp[0].mname.s); PyModuleDef *mmodule = malloc(sizeof(PyModuleDef)); + if(mmodule == NULL) { + LM_ERR("failed to allocate system memory\n"); + free(_sr_KSRMethods); + _sr_KSRMethods = NULL; + return NULL; + } memset(mmodule, 0, sizeof(PyModuleDef)); mmodule->m_name = strndup(mname, 127); mmodule->m_methods = _sr_crt_KSRMethods;

1 0

git:master:077651fa: core: check if conversion could not be done
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 077651fa3bfd50e0f654c907f3783b1421497bd5 URL: https://github.com/kamailio/kamailio/commit/077651fa3bfd50e0f654c907f3783b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:15:28+01:00 core: check if conversion could not be done --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/077651fa3bfd50e0f654c907f3783b1… Patch: https://github.com/kamailio/kamailio/commit/077651fa3bfd50e0f654c907f3783b1… --- diff --git a/src/core/route.c b/src/core/route.c index a03330b6c04..69443e37b37 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -1559,6 +1559,11 @@ inline static int comp_rve(int op, struct rval_expr *rve, int rtype, if(unlikely(rv)) { /* no int => str */ rv1 = rval_convert(h, msg, RV_STR, rv, &c1); + if(rv1 == NULL) { + LM_ERR("failure converting expression\n"); + i = 0; /* false */ + goto int_expr; + } i = comp_str(op, &rv1->v.s, rtype, r, msg, h); rval_destroy(rv1); rval_destroy(rv);

1 0

git:master:5d641f56: registrar: check returned branch pointer
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 5d641f56fc1bc342d9be008ecd96959e114fef66 URL: https://github.com/kamailio/kamailio/commit/5d641f56fc1bc342d9be008ecd96959… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:08:56+01:00 registrar: check returned branch pointer --- Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/5d641f56fc1bc342d9be008ecd96959… Patch: https://github.com/kamailio/kamailio/commit/5d641f56fc1bc342d9be008ecd96959… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index fec1efe2e90..c0d1404a9e5 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -703,8 +703,9 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) for(i = 0; i < nr_branches_start; i++) { crt = get_sip_branch(i); /* it has to be a clean branch to do lookup for it */ - if(crt->len <= 0 || crt->dst_uri_len > 0 || crt->path_len > 0 - || crt->force_send_socket != NULL || crt->flags != 0) + if(crt == NULL || crt->len <= 0 || crt->dst_uri_len > 0 + || crt->path_len > 0 || crt->force_send_socket != NULL + || crt->flags != 0) continue; /* set the new uri from branch and lookup */ new_uri.s = crt->uri;

1 0

git:master:1191ab4e: tm: check get_t() result for consistency
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 1191ab4e5e03b35714ec1ad9d9bf2dd9665c71fd URL: https://github.com/kamailio/kamailio/commit/1191ab4e5e03b35714ec1ad9d9bf2dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:02:01+01:00 tm: check get_t() result for consistency --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/1191ab4e5e03b35714ec1ad9d9bf2dd… Patch: https://github.com/kamailio/kamailio/commit/1191ab4e5e03b35714ec1ad9d9bf2dd… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 67b954b03c8..b2866a685cc 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2565,6 +2565,10 @@ int t_check_trans(struct sip_msg *msg) return 1; case 1: /* found */ t = get_t(); + if(t == NULL || t == T_UNDEFINED) { + LM_WARN("unexpected transaction value\n"); + return -1; + } if(msg->REQ_METHOD == METHOD_ACK) { /* ack to neg. reply or ack to local trans. * => process it and end the script */

1 0

git:master:4e2edcb0: sipcapture: signed iterator to cover negative condition
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 4e2edcb0acdac56a9c5946525e427cdd44d0289e URL: https://github.com/kamailio/kamailio/commit/4e2edcb0acdac56a9c5946525e427cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T11:38:48+01:00 sipcapture: signed iterator to cover negative condition --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/4e2edcb0acdac56a9c5946525e427cd… Patch: https://github.com/kamailio/kamailio/commit/4e2edcb0acdac56a9c5946525e427cd… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 8958e39d9f0..d39ee1fa7c4 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -483,7 +483,7 @@ int parse_table_names(str table_name, str **table_names) char *p = NULL; unsigned int no_tables; char *table_name_cpy; - unsigned int i; + int i; /*parse and save table names*/ no_tables = 1;

1 0

git:master:cae0f9a1: ratelimit: reorder for safer storage size
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: cae0f9a1302a79d748155401117e934a5a8e272f URL: https://github.com/kamailio/kamailio/commit/cae0f9a1302a79d748155401117e934… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T11:24:24+01:00 ratelimit: reorder for safer storage size --- Modified: src/modules/ratelimit/rl_statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/cae0f9a1302a79d748155401117e934… Patch: https://github.com/kamailio/kamailio/commit/cae0f9a1302a79d748155401117e934… --- diff --git a/src/modules/ratelimit/rl_statistics.c b/src/modules/ratelimit/rl_statistics.c index 237c7acd9a2..4e00dbeda38 100644 --- a/src/modules/ratelimit/rl_statistics.c +++ b/src/modules/ratelimit/rl_statistics.c @@ -182,7 +182,7 @@ int get_socket_list_from_proto_and_family( return 0; } - *ipList = pkg_malloc(numberOfSockets * (num_ip_octets + 1) * sizeof(int)); + *ipList = pkg_malloc(sizeof(int) * numberOfSockets * (num_ip_octets + 1)); /* We couldn't allocate memory for the IP List. So all we can do is * fail. */

1 0

[kamailio/kamailio] tm: Update doc for t_check_trans() (PR #3673)
by Stefan Mititelu 13 Dec '23

13 Dec '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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I was looking in code at how t_check_trans() works and updated doc. Please let me know if I understood correctly how it behaves for non-acks and non-cancel, when transaction is found. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3673 -- Commit Summary -- * tm: Update doc for t_check_trans() -- File Changes -- M src/modules/tm/doc/functions.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3673.patch https://github.com/kamailio/kamailio/pull/3673.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3673 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3673(a)github.com>

2 5

Jenkins build is still unstable: kamailiodev-nightly-binaries » amd64,stretch #2548
by kamailio＠sipwise.com 13 Dec '23

13 Dec '23

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 2

git:master:aaeb54c8: pkg/kamailio/deb: override lintian error on stretch [skip ci]
by Victor Seva 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: aaeb54c8b630b4aac50df75ff430ad5baea6746c URL: https://github.com/kamailio/kamailio/commit/aaeb54c8b630b4aac50df75ff430ad5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-12T15:38:33+01:00 pkg/kamailio/deb: override lintian error on stretch [skip ci] --- Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jammy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/aaeb54c8b630b4aac50df75ff430ad5… Patch: https://github.com/kamailio/kamailio/commit/aaeb54c8b630b4aac50df75ff430ad5…

1 0

git:5.7:75aecd3f: pv: remove extra len increment for some uri transformations
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: 5.7 Commit: 75aecd3f2e10509d5ed71cc5e89ae6f5c3bd0fea URL: https://github.com/kamailio/kamailio/commit/75aecd3f2e10509d5ed71cc5e89ae6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T13:10:29+01:00 pv: remove extra len increment for some uri transformations (cherry picked from commit 3fe9a279abecf6f367ce9fd2d4b085c41c87ad77) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/75aecd3f2e10509d5ed71cc5e89ae6f… Patch: https://github.com/kamailio/kamailio/commit/75aecd3f2e10509d5ed71cc5e89ae6f… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 5204c8fa22c..67c43d83b46 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1595,7 +1595,6 @@ int tr_eval_uri( sv.len++; memcpy(_tr_buffer, sv.s, sv.len); sv.s = _tr_buffer; - sv.len++; if((_tr_parsed_uri.user.len > 0) && (subtype != TR_URI_DURI)) { memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, _tr_parsed_uri.user.len);

1 0

git:master:3fe9a279: pv: remove extra len increment for some uri transformations
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 3fe9a279abecf6f367ce9fd2d4b085c41c87ad77 URL: https://github.com/kamailio/kamailio/commit/3fe9a279abecf6f367ce9fd2d4b085c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T13:09:54+01:00 pv: remove extra len increment for some uri transformations --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/3fe9a279abecf6f367ce9fd2d4b085c… Patch: https://github.com/kamailio/kamailio/commit/3fe9a279abecf6f367ce9fd2d4b085c… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 2c60cc7e656..3c51be15f74 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1595,7 +1595,6 @@ int tr_eval_uri( sv.len++; memcpy(_tr_buffer, sv.s, sv.len); sv.s = _tr_buffer; - sv.len++; if((_tr_parsed_uri.user.len > 0) && (subtype != TR_URI_DURI)) { memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, _tr_parsed_uri.user.len);

1 0

[kamailio/kamailio] `xavp_params_implode()` drops data from BIGINT datatype (Issue #3663)
by Ben Kaufman 12 Dec '23

12 Dec '23

### Description I came across the following while trying to serialize SQL data to xavp (`sql_xquery()`) and then serializing the result to htable using `xavp_params_implode()`. One of the data columns has a type of `BIGINT`. The resulting string had neither the key nor value. I recognize that Kamailio does not currently have support for 64 bit integers and that adding support for it is probably not a trivial matter. My request here is really that if the value is going to be dropped it would be good if `pv` would omit a warning. #### Reproduction MySQL table: ```sql CREATE TABLE dids ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, did varchar(11) NOT NULL, route_id BIGINT NOT NULL, failure_route_id INT NOT NULL, description VARCHAR(255) ); ``` With data like this: ```sql INSERT INTO dids ( did, route_id, failure_route_id, description ) VALUES ( '15555551000', 101, 1006, 'Alice' ); ``` And the following Kamailio code: ``` $var(query) = "SELECT * " + "FROM dids " + "WHERE did = " + $(rU{sql.val.str}); sql_xquery("db", "$var(query)", "did_data"); xavp_params_implode("did_data", "$sht(did=>$rU)"); xinfo("Serialized query result: [$sht(did=>$rU)]\n"); ``` The following log line results - the `route_id` is missing all together: ``` 1(7) INFO: <script>: Serialized query result: [id=1;did=15555551000;failure_route_id=1006;description=Alice;] ``` ### Possible Solutions It's worth noting that the value is usable out of the XAVP. `$xavp(did=>route_id)` is retrievable, and the problem seems to be only when running `xavp_params_implode()`. In a perfect world, the key and value would be retained and put into the serialized data, however I'm not sure of the complexity of this (what if the the value exceeds a 32 bit int?, etc). With that said, my only real request would be that if a value is dropped that a warning is omitted with a rough explanation of the reason ("omitting _keyName_ unknown_ data type", etc). ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.7.3 ``` * **Operating System**: Alpine 3.18 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3663 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3663(a)github.com>

2 3

git:master:185e7f64: kazoo: fixed rabbitmq-c deprecation warning
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 185e7f64668cf4e8de3fa83d482e02e90b4fd3e5 URL: https://github.com/kamailio/kamailio/commit/185e7f64668cf4e8de3fa83d482e02e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T12:50:18+01:00 kazoo: fixed rabbitmq-c deprecation warning --- Modified: src/modules/kazoo/Makefile Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/185e7f64668cf4e8de3fa83d482e02e… Patch: https://github.com/kamailio/kamailio/commit/185e7f64668cf4e8de3fa83d482e02e… --- diff --git a/src/modules/kazoo/Makefile b/src/modules/kazoo/Makefile index b7b1e1615cd..c0c7e9d3d22 100644 --- a/src/modules/kazoo/Makefile +++ b/src/modules/kazoo/Makefile @@ -11,6 +11,10 @@ ifeq ($(BUILDER),) JSONC=$(shell ls $(SYSBASE)/include/lib/libjson*.so $(LOCALBASE)/lib/libjson*.so 2>/dev/null | grep json-c) else JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c) + + ifeq ($(shell pkg-config --atleast-version=0.13.0 librabbitmq; echo $$?),0) + DEFS += -DRABBITMQ_DEPRECATION + endif endif ifneq ($(JSONC),) diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index a5cb429270a..ed696116514 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -29,10 +29,19 @@ #include <stdio.h> #include <stdlib.h> #include <stdint.h> + +#if RABBITMQ_DEPRECATION +#include <rabbitmq-c/amqp.h> +#include <rabbitmq-c/framing.h> +#include <rabbitmq-c/tcp_socket.h> +#include <rabbitmq-c/ssl_socket.h> +#else #include <amqp.h> #include <amqp_framing.h> #include <amqp_tcp_socket.h> #include <amqp_ssl_socket.h> +#endif + #include <json.h> #include <uuid/uuid.h> #include "../../core/mem/mem.h" diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index 6cfddbed8ac..faca990f166 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -32,7 +32,12 @@ #include <fcntl.h> #include <event.h> #include <sys/timerfd.h> + +#if RABBITMQ_DEPRECATION +#include <rabbitmq-c/amqp.h> +#else #include <amqp.h> +#endif #include "../../core/sr_module.h" #include "../../core/str.h"

1 0

git:master:1b589c20: rabbitmq: fixed rabbitmq-c deprecation warning
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 1b589c2070973ace082205dc0985363570c5b7f6 URL: https://github.com/kamailio/kamailio/commit/1b589c2070973ace082205dc0985363… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T12:50:18+01:00 rabbitmq: fixed rabbitmq-c deprecation warning --- Modified: src/modules/rabbitmq/Makefile Modified: src/modules/rabbitmq/rabbitmq.c Modified: src/modules/rabbitmq/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/1b589c2070973ace082205dc0985363… Patch: https://github.com/kamailio/kamailio/commit/1b589c2070973ace082205dc0985363… --- diff --git a/src/modules/rabbitmq/Makefile b/src/modules/rabbitmq/Makefile index 72633cc9c29..09023aaf827 100644 --- a/src/modules/rabbitmq/Makefile +++ b/src/modules/rabbitmq/Makefile @@ -10,6 +10,10 @@ RMQ_BUILDER=$(shell \ if pkg-config --exists librabbitmq && pkg-config --exists uuid; then \ echo 'pkg-config librabbitmq uuid'; \ fi) + + ifeq ($(shell pkg-config --atleast-version=0.13.0 librabbitmq; echo $$?),0) + DEFS += -DRABBITMQ_DEPRECATION + endif endif ifneq ($(RMQ_BUILDER),) diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index b426ffb9d0b..8547bacac79 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -51,10 +51,18 @@ #include <uuid/uuid.h> #include <stdint.h> + +#if RABBITMQ_DEPRECATION +#include <rabbitmq-c/tcp_socket.h> +#include <rabbitmq-c/amqp.h> +#include <rabbitmq-c/framing.h> +#include <rabbitmq-c/ssl_socket.h> +#else #include <amqp_tcp_socket.h> #include <amqp_ssl_socket.h> #include <amqp.h> #include <amqp_framing.h> +#endif #include <assert.h> diff --git a/src/modules/rabbitmq/utils.c b/src/modules/rabbitmq/utils.c index 6edbc22ea1d..e40492a3cc8 100644 --- a/src/modules/rabbitmq/utils.c +++ b/src/modules/rabbitmq/utils.c @@ -44,8 +44,14 @@ #include <ctype.h> #include <stdint.h> + +#if RABBITMQ_DEPRECATION +#include <rabbitmq-c/amqp.h> +#include <rabbitmq-c/framing.h> +#else #include <amqp.h> #include <amqp_framing.h> +#endif #include "utils.h"

1 0

[kamailio/kamailio] fixed rabbitmq-c deprecation warning (PR #3670)
by sergey-safarov 12 Dec '23

12 Dec '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 - [x] Related to issue #3464 #### Description fixed rabbitmq-c deprecation warning You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3670 -- Commit Summary -- * rabbitmq: fixed rabbitmq-c deprecation warning * kazoo: fixed rabbitmq-c deprecation warning -- File Changes -- M src/modules/kazoo/Makefile (4) M src/modules/kazoo/kz_amqp.c (9) M src/modules/kazoo/kz_amqp.h (5) M src/modules/rabbitmq/Makefile (4) M src/modules/rabbitmq/rabbitmq.c (7) M src/modules/rabbitmq/utils.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3670.patch https://github.com/kamailio/kamailio/pull/3670.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3670 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3670(a)github.com>

2 5

git:master:071f3f8f: ratelimit: init variables and check return of fscanf()
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 071f3f8fd1ffd85d872f6048db4750bbf6441cf3 URL: https://github.com/kamailio/kamailio/commit/071f3f8fd1ffd85d872f6048db4750b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T12:33:10+01:00 ratelimit: init variables and check return of fscanf() --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/071f3f8fd1ffd85d872f6048db4750b… Patch: https://github.com/kamailio/kamailio/commit/071f3f8fd1ffd85d872f6048db4750b… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 3ac8e7dacea..d993bbd6e98 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -331,11 +331,13 @@ int get_num_cpus() /* not using /proc/loadavg because it only works when our_timer_interval == theirs */ static int get_cpuload(double *load) { - static long long o_user, o_nice, o_sys, o_idle, o_iow, o_irq, o_sirq, o_stl; - long long n_user, n_nice, n_sys, n_idle, n_iow, n_irq, n_sirq, n_stl; + static long long o_user = 0, o_nice = 0, o_sys = 0, o_idle = 0, o_iow = 0, + o_irq = 0, o_sirq = 0, o_stl = 0; + long long n_user = 0, n_nice = 0, n_sys = 0, n_idle = 0, n_iow = 0, + n_irq = 0, n_sirq = 0, n_stl = 0; static int first_time = 1; FILE *f = fopen("/proc/stat", "r"); - double vload; + double vload = 0.0; static int errormsg = 0; if(!f) { @@ -348,7 +350,7 @@ static int get_cpuload(double *load) } if(fscanf(f, "cpu %lld%lld%lld%lld%lld%lld%lld%lld", &n_user, &n_nice, &n_sys, &n_idle, &n_iow, &n_irq, &n_sirq, &n_stl) - < 0) { + < 8) { LM_ERR("could not parse load information\n"); fclose(f); return -1;

1 0

git:master:ecf5ce88: nat_traversal: init variables read from string
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: ecf5ce88a2de9a2f28b87e1f9a0303e59870c1f7 URL: https://github.com/kamailio/kamailio/commit/ecf5ce88a2de9a2f28b87e1f9a0303e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T11:41:23+01:00 nat_traversal: init variables read from string --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/ecf5ce88a2de9a2f28b87e1f9a0303e… Patch: https://github.com/kamailio/kamailio/commit/ecf5ce88a2de9a2f28b87e1f9a0303e… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index b433cf234e4..4a27945a3e2 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1724,10 +1724,12 @@ static void restore_keepalive_state(void) res = fscanf(f, STATE_FILE_HEADER); // skip header while(true) { + ll_1 = 0; + ll_2 = 0; + uri[0] = '\0'; + socket[0] = '\0'; res = fscanf(f, "%63s %63s %" TIME_T_FMT " %" TIME_T_FMT, uri, socket, &ll_1, &ll_2); - rtime = ll_1; - stime = ll_2; if(res == EOF) { if(ferror(f)) LM_ERR("error while reading keepalive state file: %s\n", @@ -1738,6 +1740,8 @@ static void restore_keepalive_state(void) "entries.\n"); break; } else { + rtime = ll_1; + stime = ll_2; if(now > rtime && now > stime) continue; // expired entry

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev