- 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

git:master:9cd07110: presence_dialoginfo: check return for sscanf()
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 9cd07110ed59058de27c077574e4a740df068485 URL: https://github.com/kamailio/kamailio/commit/9cd07110ed59058de27c077574e4a74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T11:41:23+01:00 presence_dialoginfo: check return for sscanf() --- Modified: src/modules/presence_dialoginfo/pidf.c --- Diff: https://github.com/kamailio/kamailio/commit/9cd07110ed59058de27c077574e4a74… Patch: https://github.com/kamailio/kamailio/commit/9cd07110ed59058de27c077574e4a74… --- diff --git a/src/modules/presence_dialoginfo/pidf.c b/src/modules/presence_dialoginfo/pidf.c index 95852379455..382045eab83 100644 --- a/src/modules/presence_dialoginfo/pidf.c +++ b/src/modules/presence_dialoginfo/pidf.c @@ -141,6 +141,7 @@ time_t xml_parse_dateTime(char *xml_time_str) char h1, h2, m1, m2; int sign = 1; signed int timezone_diff = 0; + int rv = 0; p = strptime(xml_time_str, "%F", &tm); if(p == NULL) { @@ -178,7 +179,8 @@ time_t xml_parse_dateTime(char *xml_time_str) p++; - if(sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2) < 0) { + rv = sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2); + if(rv == EOF || rv < 4) { printf("error: failed to parse time\n"); return 0; }

1 0

[kamailio/kamailio] utils: Prefer `printf` over `echo -e`. (PR #3671)
by Sean Bright 12 Dec '23

12 Dec '23

On Ubuntu, `/bin/sh` defaults to `dash` whose built-in `echo` command does not support the `-e` flag. `printf`, on the other hand, supports backslash escapes by default so we use that instead. In passing, also clean up some messy ANSI escape codes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3671 -- Commit Summary -- * utils: Prefer `printf` over `echo -e`. -- File Changes -- M pkg/kamailio/obs/kamailio.init (2) M utils/kamctl/kamctl (2) M utils/kamctl/kamctl.base (10) M utils/kamctl/kamdbctl (6) M utils/kamctl/kamdbctl.base (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3671.patch https://github.com/kamailio/kamailio/pull/3671.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3671 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3671(a)github.com>

2 3

git:master:8d3d53f5: utils: Prefer `printf` over `echo -e`.
by Victor Seva 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 8d3d53f5f698da1357c3475ae136677099b2f702 URL: https://github.com/kamailio/kamailio/commit/8d3d53f5f698da1357c3475ae136677… Author: Sean Bright <sean(a)seanbright.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-12T10:38:06+01:00 utils: Prefer `printf` over `echo -e`. On Ubuntu, `/bin/sh` defaults to `dash` whose built-in `echo` command does not support the `-e` flag. `printf`, on the other hand, supports backslash escapes by default so we use that instead. In passing, also clean up some messy ANSI escape codes. --- Modified: pkg/kamailio/obs/kamailio.init Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base Modified: utils/kamctl/kamdbctl Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/8d3d53f5f698da1357c3475ae136677… Patch: https://github.com/kamailio/kamailio/commit/8d3d53f5f698da1357c3475ae136677…

1 0

[kamailio/kamailio] github: [skip ci]: bump actions/stale from 8 to 9 (PR #3672)
by dependabot[bot] 11 Dec '23

11 Dec '23

Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/stale/releases">actions/stale… releases</a>.</em></p> <blockquote> <h2>v9.0.0</h2> <h2>Breaking Changes</h2> <ol> <li>Action is now stateful: If the action ends because of <a href="https://github.com/actions/stale#operations-per-run">ope… then the next run will start from the first unprocessed issue skipping the issues processed during the previous run(s). The state is reset when all the issues are processed. This should be considered for scheduling workflow runs.</li> <li>Version 9 of this action updated the runtime to Node.js 20. All scripts are now run with Node.js 20 instead of Node.js 16 and are affected by any breaking changes between Node.js 16 and 20.</li> </ol> <h2>What Else Changed</h2> <ol> <li>Performance optimization that removes unnecessary API calls by <a href="https://github.com/dsame"><code>@dsame</code&g… <a href="https://redirect.github.com/actions/stale/pull/1033/">#1… fixes <a href="https://redirect.github.com/actions/stale/issues/792">#7… <li>Logs displaying current github API rate limit by <a href="https://github.com/dsame"><code>@dsame</code&g… <a href="https://redirect.github.com/actions/stale/pull/1032">#10… addresses <a href="https://redirect.github.com/actions/stale/issues/1029">#… </ol> <p>For more information, please read the <a href="https://github.com/actions/stale#readme">action documentation</a> and its <a href="https://github.com/actions/stale#statefulness">section about statefulness</a></p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/jmeridth"><code>@jmeridth</… made their first contribution in <a href="https://redirect.github.com/actions/stale/pull/984">acti… <li><a href="https://github.com/nikolai-laevskii"><code>@nikol… made their first contribution in <a href="https://redirect.github.com/actions/stale/pull/1020">act… <li><a href="https://github.com/dusan-trickovic"><code>@dusan-… made their first contribution in <a href="https://redirect.github.com/actions/stale/pull/1056">act… <li><a href="https://github.com/aparnajyothi-y"><code>@aparnaj… made their first contribution in <a href="https://redirect.github.com/actions/stale/pull/1110">act… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/stale/compare/v8...v9.0.0">ht… </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/actions/stale/blob/main/CHANGELOG.md"&gt… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h1>[7.0.0]</h1> <p>:warning: Breaking change :warning:</p> <ul> <li>Allow daysBeforeStale options to be float by <a href="https://github.com/irega"><code>@irega</code&g… in <a href="https://redirect.github.com/actions/stale/pull/841">acti… <li>Use cache in check-dist.yml by <a href="https://github.com/jongwooo"><code>@jongwooo</… in <a href="https://redirect.github.com/actions/stale/pull/876">acti… <li>fix print outputs step in existing workflows by <a href="https://github.com/irega"><code>@irega</code&g… in <a href="https://redirect.github.com/actions/stale/pull/859">acti… <li>Update issue and PR templates, add/delete workflow files by <a href="https://github.com/IvanZosimov"><code>@IvanZosimo… in <a href="https://redirect.github.com/actions/stale/pull/880">acti… <li>Update how stale handles exempt items by <a href="https://github.com/johnsudol"><code>@johnsudol&lt… in <a href="https://redirect.github.com/actions/stale/pull/874">acti… </ul> <h1>[6.0.1]</h1> <p>Update <code>@actions/core</code> to v1.10.0 (<a href="https://redirect.github.com/actions/stale/pull/839">#839… <h1>[6.0.0]</h1> <p>:warning: Breaking change :warning:</p> <p>Issues/PRs default <code>close-issue-reason</code> is now <code>not_planned</code>(<a href="https://redirect.github.com/actions/stale/issues/789">#7… <h1>[5.1.0]</h1> <p><a href="https://redirect.github.com/actions/stale/issues/696">Do… process stale issues right after they're marked stale</a> [Add close-issue-reason option]<a href="https://redirect.github.com/actions/stale/pull/764">#764… href="https://redirect.github.com/actions/stale/pull/772">#772… Various dependabot/dependency updates</p> <h2><a href="https://github.com/actions/stale/compare/v3.0.19...v4.1.0"&… (2021-07-14)</h2> <h2>Features</h2> <ul> <li><a href="https://github.com/actions/stale/commit/9912fa74d1c01b5d6187793d… to exempt draft PRs</a></li> </ul> <h2><a href="https://github.com/actions/stale/compare/v3.0.19...v4.0.0"&… (2021-07-14)</h2> <h3>Features</h3> <ul> <li><strong>options:</strong> simplify config by removing skip stale message options (<a href="https://redirect.github.com/actions/stale/issues/457">#4…) (<a href="https://github.com/actions/stale/commit/6ec637d238067ab8cc96c928…);6ec637d</a>), closes <a href="https://redirect.github.com/actions/stale/issues/405">#4… <a href="https://redirect.github.com/actions/stale/issues/455">#4… <li><strong>output:</strong> print output parameters (<a href="https://redirect.github.com/actions/stale/issues/458">#4…) (<a href="https://github.com/actions/stale/commit/3e6d35b685f0b2fa1a69be89… </ul> <h3>Bug Fixes</h3> <ul> <li><strong>dry-run:</strong> forbid mutations in dry-run (<a href="https://redirect.github.com/actions/stale/issues/500">#5…) (<a href="https://github.com/actions/stale/commit/f1017f33dd159ea513663751…);f1017f3</a>), closes <a href="https://redirect.github.com/actions/stale/issues/499">#4… <li><strong>logs:</strong> coloured logs (<a href="https://redirect.github.com/actions/stale/issues/465">#4…) (<a href="https://github.com/actions/stale/commit/5fbbfba142860ea6512549e9… <li><strong>operations:</strong> fail fast the current batch to respect the operations limit (<a href="https://redirect.github.com/actions/stale/issues/474">#4…) (<a href="https://github.com/actions/stale/commit/5f6f311ca6aa75babadfc7ba…);5f6f311</a>), closes <a href="https://redirect.github.com/actions/stale/issues/466">#4… <li><strong>label comparison</strong>: make label comparison case insensitive <a href="https://redirect.github.com/actions/stale/pull/517">#517…;>#517</a>, closes <a href="https://redirect.github.com/actions/stale/pull/516">#516… <li><strong>filtering comments by actor could have strange behavior</strong>: &quot;stale&quot; comments are now detected based on if the message is the stale message not <em>who</em> made the comment(<a href="https://redirect.github.com/actions/stale/pull/519">#519…)>#519</a>), fixes <a href="https://redirect.github.com/actions/stale/pull/441">#441…;>#441</a>, <a href="https://redirect.github.com/actions/stale/pull/509">#509…;>#509</a>, <a href="https://redirect.github.com/actions/stale/pull/518">#518… </ul> <h3>Breaking Changes</h3>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/stale/commit/28ca1036281a5e5922ead518… Upgrade Node to v20 (<a href="https://redirect.github.com/actions/stale/issues/1110">#… <li><a href="https://github.com/actions/stale/commit/b69b346013879cedbf50c69f… build(deps-dev): bump <code>@types/node</code> from 18.16.18 to 20.5.1 (<a href="https://redirect.github.com/actions/stale/issues/1079">#… <li><a href="https://github.com/actions/stale/commit/88a6f4f6cbe6984b66da80d3… build(deps-dev): bump typescript from 5.1.3 to 5.2.2 (<a href="https://redirect.github.com/actions/stale/issues/1083">#… <li><a href="https://github.com/actions/stale/commit/796531a7b39835671cd9f436… Merge pull request <a href="https://redirect.github.com/actions/stale/issues/1080">#… from akv-platform/fix-delete-cache</li> <li><a href="https://github.com/actions/stale/commit/8986f6218b4935e254d5b844… Don not try to delete cache if it does not exists</li> <li><a href="https://github.com/actions/stale/commit/cab99b362baa5afbbd8c7c78… fix typo proceeded/processed</li> <li><a href="https://github.com/actions/stale/commit/184e7afe930f6b5c7ce52c4b… Merge pull request <a href="https://redirect.github.com/actions/stale/issues/1064">#… from actions/dependabot/npm_and_yarn/typescript-esli...</li> <li><a href="https://github.com/actions/stale/commit/523885cf3c115dcdcbed573c… chore: update eslint-plugin, parser and eslint-plugin-jest</li> <li><a href="https://github.com/actions/stale/commit/2487a1dc2b501176ca975d2d… build(deps-dev): bump <code>@typescript-eslint/eslint-plugin</code></li> <li><a href="https://github.com/actions/stale/commit/60c722ee97faafece819a7c4… Merge pull request <a href="https://redirect.github.com/actions/stale/issues/1063">#… from actions/dependabot/npm_and_yarn/jest-29.6.2</li> <li>Additional commits viewable in <a href="https://github.com/actions/stale/compare/v8...v9">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3672 -- Commit Summary -- * github: [skip ci]: bump actions/stale from 8 to 9 -- File Changes -- M .github/workflows/issue_management.yml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3672.patch https://github.com/kamailio/kamailio/pull/3672.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3672 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3672(a)github.com>

2 1

git:master:14e763fd: github: [skip ci]: bump actions/stale from 8 to 9
by Victor Seva 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 14e763fd15a846d4377214521cac06113ba6888d URL: https://github.com/kamailio/kamailio/commit/14e763fd15a846d4377214521cac061… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-12T00:24:42+01:00 github: [skip ci]: bump actions/stale from 8 to 9 Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v8...v9) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/issue_management.yml --- Diff: https://github.com/kamailio/kamailio/commit/14e763fd15a846d4377214521cac061… Patch: https://github.com/kamailio/kamailio/commit/14e763fd15a846d4377214521cac061… --- diff --git a/.github/workflows/issue_management.yml b/.github/workflows/issue_management.yml index 0d0b2ef9aa5..ce4d061d033 100644 --- a/.github/workflows/issue_management.yml +++ b/.github/workflows/issue_management.yml @@ -11,7 +11,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: stale-issue-message: 'This issue is stale because it has been open 6 weeks with no activity. Remove stale label or comment or this will be closed in 2 weeks.' stale-pr-message: 'This PR is stale because it has been open 6 weeks with no activity. Remove stale label or comment or this will be closed in 2 weeks.'

1 0

git:master:ee2ad77a: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: ee2ad77aa71326d355e299625ebbd31f67f8ed20 URL: https://github.com/kamailio/kamailio/commit/ee2ad77aa71326d355e299625ebbd31… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-12-11T17:17:05+01:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/ee2ad77aa71326d355e299625ebbd31… Patch: https://github.com/kamailio/kamailio/commit/ee2ad77aa71326d355e299625ebbd31… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index b1be2506b26..d4aa520a5ea 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -354,7 +354,7 @@ modparam("jsonrpcs", "dgram_timeout", 2000) Example 1.14. Set tcp_socket parameter ... -modparam("jsonrpcs", "tcp_socket", "udp:1.2.3.4:5042") +modparam("jsonrpcs", "tcp_socket", "tcp:1.2.3.4:5042") ... 5. Functions

1 0

git:master:af49deac: jsonrpcs: doc - fix example for tcp_socket parameter
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: af49deacad22b9f2d6502649002d51ad2423f005 URL: https://github.com/kamailio/kamailio/commit/af49deacad22b9f2d6502649002d51a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T17:08:08+01:00 jsonrpcs: doc - fix example for tcp_socket parameter --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/af49deacad22b9f2d6502649002d51a… Patch: https://github.com/kamailio/kamailio/commit/af49deacad22b9f2d6502649002d51a… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index 0e39676edd7..ab8aee4fcd0 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -413,7 +413,7 @@ modparam("jsonrpcs", "dgram_timeout", 2000) <title>Set <varname>tcp_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("jsonrpcs", "tcp_socket", "udp:1.2.3.4:5042") +modparam("jsonrpcs", "tcp_socket", "tcp:1.2.3.4:5042") ... </programlisting> </example> @@ -638,4 +638,3 @@ rm /tmp/kamailio_jsonrpc_reply_fifo </section> </chapter> -

1 0

git:master:7eb96925: siptrace: check sscan() return value
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 7eb96925c4bb4664cce589050dff3e1c8b98b6f0 URL: https://github.com/kamailio/kamailio/commit/7eb96925c4bb4664cce589050dff3e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T15:51:01+01:00 siptrace: check sscan() return value --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/7eb96925c4bb4664cce589050dff3e1… Patch: https://github.com/kamailio/kamailio/commit/7eb96925c4bb4664cce589050dff3e1… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index bac4ad04779..d8a5f974bb3 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -158,7 +158,8 @@ int sip_trace_xheaders_read(struct _siptrace_data *sto) char *searchend = NULL; char *eoh = NULL; char *xheaders = NULL; - long long unsigned int tv_sec, tv_usec; + long long unsigned int tv_sec = 0, tv_usec = 0; + int rv = 0; if(trace_xheaders_read == 0) { return 0; @@ -202,16 +203,17 @@ int sip_trace_xheaders_read(struct _siptrace_data *sto) } // Parse the x-headers: scanf() - if(sscanf(xheaders, - "\r\n" - "X-Siptrace-Fromip: %50s\r\n" - "X-Siptrace-Toip: %50s\r\n" - "X-Siptrace-Time: %llu %llu\r\n" - "X-Siptrace-Method: %50s\r\n" - "X-Siptrace-Dir: %3s", - sto->fromip.s, sto->toip.s, &tv_sec, &tv_usec, sto->method.s, - sto->dir) - == EOF) { + rv = sscanf(xheaders, + "\r\n" + "X-Siptrace-Fromip: %50s\r\n" + "X-Siptrace-Toip: %50s\r\n" + "X-Siptrace-Time: %llu %llu\r\n" + "X-Siptrace-Method: %50s\r\n" + "X-Siptrace-Dir: %3s", + sto->fromip.s, sto->toip.s, &tv_sec, &tv_usec, sto->method.s, + sto->dir); + + if(rv == EOF || rv < 6) { LM_ERR("malformed x-headers\n"); goto erroraftermalloc; }

1 0

git:master:1b7ea63d: core: main - check limit for values of -m and -M
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 1b7ea63df655246b5b6ca123d9ed25d1764d9402 URL: https://github.com/kamailio/kamailio/commit/1b7ea63df655246b5b6ca123d9ed25d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T15:37:26+01:00 core: main - check limit for values of -m and -M --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1b7ea63df655246b5b6ca123d9ed25d… Patch: https://github.com/kamailio/kamailio/commit/1b7ea63df655246b5b6ca123d9ed25d… --- diff --git a/src/main.c b/src/main.c index db694381421..3aa79b73d91 100644 --- a/src/main.c +++ b/src/main.c @@ -2094,6 +2094,7 @@ int main(int argc, char **argv) struct name_lst *n_lst; char *p; struct stat st = {0}; + long l1 = 0; #define KSR_TBUF_SIZE 512 char tbuf[KSR_TBUF_SIZE]; @@ -2181,12 +2182,20 @@ int main(int argc, char **argv) fprintf(stderr, "bad private mem size\n"); goto error; } - pkg_mem_size = strtol(optarg, &tmp, 10) * 1024 * 1024; + l1 = strtol(optarg, &tmp, 10); if(tmp && (*tmp)) { fprintf(stderr, "bad private mem size number: -M %s\n", optarg); goto error; - }; + } + /* safety check for upper limit of 1TB */ + if(l1 <= 0 || l1 > 1024L * 1024) { + fprintf(stderr, + "our of limits private mem size number: -M %s\n", + optarg); + goto error; + } + pkg_mem_size = 1024UL * 1024 * l1; break; case 'x': sr_memmng_shm = optarg; @@ -2315,11 +2324,18 @@ int main(int argc, char **argv) fprintf(stderr, "bad shared mem size\n"); goto error; } - shm_mem_size = strtol(optarg, &tmp, 10) * 1024 * 1024; + l1 = strtol(optarg, &tmp, 10); if(tmp && (*tmp)) { fprintf(stderr, "bad shmem size number: -m %s\n", optarg); goto error; - }; + } + /* safety check for upper limit of 16TB */ + if(l1 <= 0 || l1 > 16L * 1024 * 1024) { + fprintf(stderr, "our of limits shmem size number: -m %s\n", + optarg); + goto error; + } + shm_mem_size = 1024UL * 1024 * l1; LM_INFO("shared memory: %ld bytes\n", shm_mem_size); break; case 'd':

1 0

git:master:75a7d0d8: core: route struct - use helper macro to get action address
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 75a7d0d8b1340d292aba9b589263619f5a6e11c1 URL: https://github.com/kamailio/kamailio/commit/75a7d0d8b1340d292aba9b589263619… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T14:19:04+01:00 core: route struct - use helper macro to get action address --- Modified: src/core/route_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/75a7d0d8b1340d292aba9b589263619… Patch: https://github.com/kamailio/kamailio/commit/75a7d0d8b1340d292aba9b589263619… --- diff --git a/src/core/route_struct.c b/src/core/route_struct.c index 654e588beb3..fa43b498e75 100644 --- a/src/core/route_struct.c +++ b/src/core/route_struct.c @@ -561,11 +561,12 @@ void print_actions(struct action *a) */ struct action *get_action_from_param(void **param, int param_no) { - struct action *ac, ac2; - action_u_t *au, au2; + cfg_action_t *ac; + action_u_t *au; /* param points to au->u.string, get pointer to au */ - au = (void *)((char *)param - ((char *)&au2.u.string - (char *)&au2)); + au = ksr_container_of(param, action_u_t, u.string); au = au - 1 - param_no; - ac = (void *)((char *)au - ((char *)&ac2.val - (char *)&ac2)); + /* au points to ac->val, get pointer to ac */ + ac = ksr_container_of(au, cfg_action_t, val); return ac; }

1 0

git:master:9c336764: core: cast to variable type action_u_t*
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 9c336764f567c873e25792efd813be1806d215d3 URL: https://github.com/kamailio/kamailio/commit/9c336764f567c873e25792efd813be1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T13:01:18+01:00 core: cast to variable type action_u_t* --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/9c336764f567c873e25792efd813be1… Patch: https://github.com/kamailio/kamailio/commit/9c336764f567c873e25792efd813be1… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 9660afce320..d67e7e44af3 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -1092,7 +1092,7 @@ action_u_t *fixup_get_param( { action_u_t *a; /* cur_param points to a->u.string, get pointer to a */ - a = (void *)((char *)cur_param - offsetof(action_u_t, u.string)); + a = (action_u_t *)((char *)cur_param - offsetof(action_u_t, u.string)); return a + required_param_no - cur_param_no; } @@ -1114,7 +1114,7 @@ int fixup_get_param_count(void **cur_param, int cur_param_no) action_param_type *fixup_get_param_ptype(void **param) { action_u_t *a; - a = (void *)((char *)param - offsetof(action_u_t, u.string)); + a = (action_u_t *)((char *)param - offsetof(action_u_t, u.string)); return &a->type; }

1 0

git:master:6aa967eb: debugger: updated dbg_fixup_get_action() to use helper macro for structure address
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 6aa967eb82fa9092f0a32101e44798e4d66fc708 URL: https://github.com/kamailio/kamailio/commit/6aa967eb82fa9092f0a32101e44798e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T12:54:25+01:00 debugger: updated dbg_fixup_get_action() to use helper macro for structure address --- Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6aa967eb82fa9092f0a32101e44798e… Patch: https://github.com/kamailio/kamailio/commit/6aa967eb82fa9092f0a32101e44798e… --- diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index 3b3b7922dd2..b6248644d65 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -320,12 +320,13 @@ static int w_dbg_dump(struct sip_msg *msg, char *mask, char *level) */ static struct action *dbg_fixup_get_action(void **param, int param_no) { - struct action *ac, ac2; - action_u_t *au, au2; + cfg_action_t *ac; + action_u_t *au; /* param points to au->u.string, get pointer to au */ - au = (void *)((char *)param - ((char *)&au2.u.string - (char *)&au2)); + au = ksr_container_of(param, action_u_t, u.string); au = au - 1 - param_no; - ac = (void *)((char *)au - ((char *)&ac2.val - (char *)&ac2)); + /* au points to ac->val, get pointer to ac */ + ac = ksr_container_of(au, cfg_action_t, val); return ac; }

1 0

git:master:1b81cbc9: tm: use helper macro to get structure address from member
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 1b81cbc9f79354aae604e33ac978dece95c0326c URL: https://github.com/kamailio/kamailio/commit/1b81cbc9f79354aae604e33ac978dec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T12:25:56+01:00 tm: use helper macro to get structure address from member --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/1b81cbc9f79354aae604e33ac978dec… Patch: https://github.com/kamailio/kamailio/commit/1b81cbc9f79354aae604e33ac978dec… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index a2ebb434ccb..c0cbade59d6 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -486,8 +486,8 @@ ticks_t retr_buf_handler(ticks_t ticks, struct timer_ln *tl, void *p) unsigned long crt_retr_interval_ms; struct cell *t; - rbuf = (struct retr_buf *)((void *)tl - - (void *)(&((struct retr_buf *)0)->timer)); + rbuf = ksr_container_of(tl, struct retr_buf, timer); + membar_depends(); /* to be on the safe side */ t = rbuf->my_T;

1 0

git:master:ad2e976d: core: helper macro to get enclosing struture from a member address
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: ad2e976d9200bd68c88e4a78edc0d250ba4045ba URL: https://github.com/kamailio/kamailio/commit/ad2e976d9200bd68c88e4a78edc0d25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T11:31:56+01:00 core: helper macro to get enclosing struture from a member address --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/ad2e976d9200bd68c88e4a78edc0d25… Patch: https://github.com/kamailio/kamailio/commit/ad2e976d9200bd68c88e4a78edc0d25… --- diff --git a/src/core/ut.h b/src/core/ut.h index 8e2e4f0d8f0..ff8d964e559 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -33,6 +33,7 @@ #include <limits.h> #include <time.h> #include <unistd.h> +#include <stddef.h> #include <ctype.h> #include <string.h> #include <strings.h> @@ -143,6 +144,8 @@ #define is_in_str(p, in) (p < in->s + in->len && *p) +#define ksr_container_of(ptr, type, member) \ + ((type *)((char *)(ptr)-offsetof(type, member))) /* links a value to a msgid */ struct msgid_var

1 0

git:master:9db18bc4: dialog: check first the size
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 9db18bc48bff0d230e66973a45c8e72e1b7744e8 URL: https://github.com/kamailio/kamailio/commit/9db18bc48bff0d230e66973a45c8e72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T10:07:39+01:00 dialog: check first the size --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/9db18bc48bff0d230e66973a45c8e72… Patch: https://github.com/kamailio/kamailio/commit/9db18bc48bff0d230e66973a45c8e72… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 10df9e90c3e..db5f61c4e05 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -667,8 +667,8 @@ int pv_set_dlg_ctx( break; case 4: if(val && val->flags & PV_VAL_STR) { - if(val->rs.s[val->rs.len] == '\0' - && val->rs.len < DLG_TOROUTE_SIZE) { + if(val->rs.len < DLG_TOROUTE_SIZE + && val->rs.s[val->rs.len] == '\0') { _dlg_ctx.to_route = route_lookup(&main_rt, val->rs.s); strcpy(_dlg_ctx.to_route_name, val->rs.s); } else {

1 0

git:master:e614575d: sca: check return for snprintf()
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: e614575d53f5e3b7d3a4796a445728f862e60916 URL: https://github.com/kamailio/kamailio/commit/e614575d53f5e3b7d3a4796a445728f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T09:53:48+01:00 sca: check return for snprintf() --- Modified: src/modules/sca/sca_call_info.c --- Diff: https://github.com/kamailio/kamailio/commit/e614575d53f5e3b7d3a4796a445728f… Patch: https://github.com/kamailio/kamailio/commit/e614575d53f5e3b7d3a4796a445728f… --- diff --git a/src/modules/sca/sca_call_info.c b/src/modules/sca/sca_call_info.c index a1af143c017..2694239cb9f 100644 --- a/src/modules/sca/sca_call_info.c +++ b/src/modules/sca/sca_call_info.c @@ -112,6 +112,7 @@ static int sca_call_info_header_append_appearances( str state_str; int slot_idx; int len = -1; + int l1 = -1; int usedlen = -1; slot_idx = @@ -153,9 +154,14 @@ static int sca_call_info_header_append_appearances( sca_appearance_state_to_str(app->state, &state_str); // state_str.s is a nul-terminated string literal - len += snprintf(hdrbuf + len, maxlen - len, + l1 = snprintf(hdrbuf + len, maxlen - len, ">;appearance-index=%d;appearance-state=%s", app->index, state_str.s); + if(l1 < 0 || l1 >= maxlen - len) { + LM_ERR("failed to print the header\n"); + return -1; + } + len += l1; if(!SCA_STR_EMPTY(&app->uri)) { hdrbuf[len] = ';';

1 0

[kamailio/kamailio] Add support for Linux kernel anyIP feature (Issue #3394)
by mohsen 09 Dec '23

09 Dec '23

Hi I have a kimailio box that receives messages from one interface and send it from another interface and I use dispatcher module successfully. Now I assigned an I range to Linux loopback interface through Linux kernel anyip feature. And I can ping the range. ip -4 route add local 192.168.0.0/24 dev lo I want to send messages from source of the ip in this range but kamailio cant do this in the right way. I added this two directives to kamailio.cfg: mhomed=yes ip_free_bind = 1 and when I want to use an ip from the list I use $fs=”udp:192.168.0.120:5060”; With no luck If I use force_send_socket(udp:192.168.0.120:5060); kamailio returns an error bad force_send_socket argument: 192.168.0.120:5060 (kamailio doesn't listen on it) and if I add listen directive for one ip like: listen=udp:192.168.0.120:5060 everything works fine but I want to be able to use any ip from list not just one ip. Thanks. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3394 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3394(a)github.com>

6 10

Jenkins build is still unstable: kamailio57-nightly-binaries » amd64,stretch #39
by kamailio＠sipwise.com 09 Dec '23

09 Dec '23

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

1 0

git:5.7:8674b333: core: parse privacy recompute lenght of rest to parse
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: 5.7 Commit: 8674b333300d5829bff9cb4993886bcf7bea249b URL: https://github.com/kamailio/kamailio/commit/8674b333300d5829bff9cb4993886bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T22:12:01+01:00 core: parse privacy recompute lenght of rest to parse (cherry picked from commit 804ee651b45498727196886c97cb55d20b254c4a) --- Modified: src/core/parser/parse_privacy.c --- Diff: https://github.com/kamailio/kamailio/commit/8674b333300d5829bff9cb4993886bc… Patch: https://github.com/kamailio/kamailio/commit/8674b333300d5829bff9cb4993886bc… --- diff --git a/src/core/parser/parse_privacy.c b/src/core/parser/parse_privacy.c index 64431468675..89423c1dffa 100644 --- a/src/core/parser/parse_privacy.c +++ b/src/core/parser/parse_privacy.c @@ -178,14 +178,13 @@ int parse_privacy(struct sip_msg *msg) values = 0; p = next.s; - len = next.len; - beyond = p + len; + beyond = next.s + next.len; while(p < beyond) { + len = beyond - p; if((val_len = parse_priv_value(p, len, &value)) != 0) { values |= value; p = p + val_len; - len = len - val_len; } else { LM_ERR("invalid privacy value\n"); return -1;

1 0

git:master:804ee651: core: parse privacy recompute lenght of rest to parse
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 804ee651b45498727196886c97cb55d20b254c4a URL: https://github.com/kamailio/kamailio/commit/804ee651b45498727196886c97cb55d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T22:10:36+01:00 core: parse privacy recompute lenght of rest to parse --- Modified: src/core/parser/parse_privacy.c --- Diff: https://github.com/kamailio/kamailio/commit/804ee651b45498727196886c97cb55d… Patch: https://github.com/kamailio/kamailio/commit/804ee651b45498727196886c97cb55d… --- diff --git a/src/core/parser/parse_privacy.c b/src/core/parser/parse_privacy.c index 64431468675..89423c1dffa 100644 --- a/src/core/parser/parse_privacy.c +++ b/src/core/parser/parse_privacy.c @@ -178,14 +178,13 @@ int parse_privacy(struct sip_msg *msg) values = 0; p = next.s; - len = next.len; - beyond = p + len; + beyond = next.s + next.len; while(p < beyond) { + len = beyond - p; if((val_len = parse_priv_value(p, len, &value)) != 0) { values |= value; p = p + val_len; - len = len - val_len; } else { LM_ERR("invalid privacy value\n"); return -1;

1 0

[kamailio/kamailio] siptrace: add haproxy protocol support (Issue #3665)
by sergey-safarov 08 Dec '23

08 Dec '23

When used `tcp_accept_haproxy=yes` and inbound connection from load-balancer received via IPv6 protocol and client real IPv4 then i can see error in the kamailio log ``` 28(723055) ERROR: {1 27 REGISTER 4fkReTbLC-} siptrace [siptrace_hep.c:94]: trace_send_hep3_duplicate(): interworking detected ? ``` Looks like requried add haproxy protocol support into siptrace module -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3665 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3665(a)github.com>

2 2

[kamailio/kamailio] Redefine Advertised socket URI when used haproxy protocol (Issue #3667)
by sergey-safarov 08 Dec '23

08 Dec '23

### Description When used haproxy protocol then from client perspetive TCP connection established to loadbalancer IP address. Real Kamailio listener may be IPv6 and expected to see `$RAut` value with IP of load balancer IP. Really I can see for first message from the client ``` sip:2600::6:45060;transport=tcp ``` For second message ``` Advertised socket URI: sip:[2600::6]:5060 ``` For first case missed `[]` in the IP and expected to see loadbalancer IPv4 because client use IPv4 to establish connection to Kamailio. ### Expected behavior Used loadbalancerserver IP from haproxy protocol for `$RAut` value and for `Record-Route` headers generation. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3667 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3667(a)github.com>

2 2

git:master:5d97afef: core: xavp - info long when skipping serializing a field
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 5d97afefd2a8f53072a36b6eb8927c180fb984c9 URL: https://github.com/kamailio/kamailio/commit/5d97afefd2a8f53072a36b6eb8927c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T16:23:03+01:00 core: xavp - info long when skipping serializing a field --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/5d97afefd2a8f53072a36b6eb8927c1… Patch: https://github.com/kamailio/kamailio/commit/5d97afefd2a8f53072a36b6eb8927c1… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 58f3a567611..128ea631013 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1184,7 +1184,8 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) } break; default: - LM_DBG("skipping value type: %d\n", avp->val.type); + LM_INFO("skipping field [%.*s] value type: %d\n", avp->name.len, + avp->name.s, avp->val.type); ostr.len = 0; } if(ostr.len > 0) { @@ -1678,7 +1679,8 @@ int xavu_serialize_fields(str *rname, char *obuf, int olen) } break; default: - LM_DBG("skipping value type: %d\n", avu->val.type); + LM_INFO("skipping field [%.*s] value type: %d\n", avu->name.len, + avu->name.s, avu->val.type); ostr.len = 0; } if(ostr.len > 0) { @@ -2652,7 +2654,8 @@ int xavi_serialize_fields(str *rname, char *obuf, int olen) } break; default: - LM_DBG("skipping value type: %d\n", avi->val.type); + LM_INFO("skipping field [%.*s] value type: %d\n", avi->name.len, + avi->name.s, avi->val.type); ostr.len = 0; } if(ostr.len > 0) {

1 0

[kamailio/kamailio] TOPOS callid masking (Issue #3606)
by Dennis 08 Dec '23

08 Dec '23

### Description PKG memory errors when configured mask_callid in TOPOS. ### Troubleshooting The poblem in detail desribed in mailing lists: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg19997.html ### Possible Solutions Right way to configure topos for callid masking is: modparam("topoh", "use_mode", 1) modparam("topos", "mask_callid", 1) modparam("topoh", "mask_callid", 1) We need to set mask_callid module parameter for topoh also. There is not a word about this in the documentation, so docs correction needed. ### Additional Information * **Kamailio Version** - 5.7.X -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3606 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3606(a)github.com>

3 5

[kamailio/kamailio] pv: Add support to $hfl $hflc for Diversion header (PR #3651)
by Xenofon Karamanos 08 Dec '23

08 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, ...) - [ ] 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) - [x] 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 This PR adds support for $hfl(Diversion)[] and $hflc(Diversion). This parse_diversion.c was inspired by [parse_pai_ppi.c](https://github.com/kamailio/kamailio/blob/master/src/core/…. I am not sure if it's breaking the existing implementation and usage. Any feedback and review is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3651 -- Commit Summary -- * parser: Extend diversion for multiple bodies * pv: Add hfl and hflc support for Diversion header -- File Changes -- M src/core/parser/parse_diversion.c (152) M src/core/parser/parse_diversion.h (11) M src/modules/pv/pv_core.c (71) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3651.patch https://github.com/kamailio/kamailio/pull/3651.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3651 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3651(a)github.com>

3 10

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev