- sr-dev - kamailio.org

event_route names with underscore before the semicolon
by Luca Nardin 18 Dec '23

18 Dec '23

Hello, In the kamailio core cookbook (https://www.kamailio.org/wiki/cookbooks/5.5.x/core#event_route) I read that the name of an event_route should be like this: event_route[groupid:eventid] Where: groupid - should be the name of the module that triggers the event eventid - some meaningful short text describing the event Some modules of kamailio have underscores in the name, for example: http_async_client Years ago a fix have been committed in order to allow underscores in the second part of the name, after the semicolon: https://github.com/kamailio/kamailio/commit/5806703c1ff72243457ff55758f41c3… But it seems that an underscore is still not allowed in the first part of the name: https://github.com/kamailio/kamailio/blob/master/src/core/cfg.lex EVENT_RT_NAME [a-zA-Z][0-9a-zA-Z-]*(":"[a-zA-Z][0-9a-zA-Z_-]*)+ So I wonder if this is a bug in the code or a mistake in the cookbook. Thanks, Luca

1 1

Info: Next Kamailio World Conference - April 18-19, 2024, Berlin, Germany
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Hello, a short announcement to inform that the dates for next Kamailio World Conference have been set to April 18-19, 2024, the event to take place again in Berlin, Germany. It will be a different venue than the past editions, that one not being available. A pre-conference day is considered on April 17, 2024, but it is not yet known in what form and where. The conference is scheduled a bit earlier than the usual in the year because Germany hosts the Euro 2024 football championship during June-July 2024, making May very busy and harder to find adequate conferencing space in Berlin. The website and more details will be published soon. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training -- asipto.com

1 0

git:master:2f43510b: pv: removed unnecessary condition
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: 2f43510be37c157f800389dfb432b6c52d7435a7 URL: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:31:34+01:00 pv: removed unnecessary condition --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… Patch: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 7eb50ee9a2b..84c3a0c703f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1439,7 +1439,7 @@ int tr_eval_string( get_cfg_crt_line()); return -1; } - if(n == 0 || m >= val->rs.len) { + if(m >= val->rs.len) { if(val->rs.len > TR_BUFFER_SIZE - 2) { LM_ERR("value too large: %d\n", val->rs.len); return -1;

1 0

git:master:ca2a9479: pv: typo in transformation log message
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: ca2a9479adf720e67bf50c9d2795cc8937e223dc URL: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:22:25+01:00 pv: typo in transformation log message --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… Patch: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 3c51be15f74..7eb50ee9a2b 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1406,7 +1406,7 @@ int tr_eval_string( case TR_S_FMTLINES: case TR_S_FMTLINET: if(tp == NULL || tp->next == NULL) { - LM_ERR("substr invalid parameters (cfg line: %d)\n", + LM_ERR("fmtline invalid parameters (cfg line: %d)\n", get_cfg_crt_line()); return -1; }

1 0

git:master:f128db2b: tm: use coherent type int for tm route blocks indexes
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: f128db2b85a525ff82c28faffbeec3203f9560c3 URL: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:16:08+01:00 tm: use coherent type int for tm route blocks indexes --- Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_reply.h --- Diff: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… Patch: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… --- diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 8481ccde29e..d95cb7d717c 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -225,13 +225,11 @@ typedef struct ua_client */ struct retr_buf *local_ack; /* the route to take if no final positive reply arrived */ - unsigned short on_failure; + int on_failure; /* the route to take for all failure replies */ - unsigned short on_branch_failure; + int on_branch_failure; /* the onreply_route to be processed if registered to do so */ - unsigned short on_reply; - /* unused - keep the structure aligned to 32b */ - unsigned short on_unused; + int on_reply; } tm_ua_client_t; @@ -429,18 +427,18 @@ typedef struct cell /* nr of replied branch; 0..sr_dst_max_branches=branch value, * -1 no reply, -2 local reply */ - short relayed_reply_branch; + int relayed_reply_branch; /* the route to take if no final positive reply arrived */ - unsigned short on_failure; + int on_failure; /* the route to take for all failure replies */ - unsigned short on_branch_failure; + int on_branch_failure; /* the onreply_route to be processed if registered to do so */ - unsigned short on_reply; + int on_reply; /* The route to take for each downstream branch separately */ - unsigned short on_branch; + int on_branch; /* branch route backup for late branch add (t_append_branch) */ - unsigned short on_branch_delayed; + int on_branch_delayed; /* place holder for MD5checksum, MD5_LEN bytes are extra alloc'ed */ char md5[0]; diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index e9b9df434a5..c5a58bba8ab 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -224,17 +224,17 @@ void t_on_reply(unsigned int go_to) } -unsigned int get_on_failure() +int get_on_failure() { return goto_on_failure; } -unsigned int get_on_branch_failure() +int get_on_branch_failure() { return goto_on_branch_failure; } -unsigned int get_on_reply() +int get_on_reply() { return goto_on_reply; } diff --git a/src/modules/tm/t_reply.h b/src/modules/tm/t_reply.h index 709b70454ed..18ce47f457c 100644 --- a/src/modules/tm/t_reply.h +++ b/src/modules/tm/t_reply.h @@ -199,11 +199,11 @@ void on_failure_reply( replies arrive */ void t_on_failure(unsigned int go_to); -unsigned int get_on_failure(void); +int get_on_failure(void); void t_on_branch_failure(unsigned int go_to); -unsigned int get_on_branch_failure(void); +int get_on_branch_failure(void); void t_on_reply(unsigned int go_to); -unsigned int get_on_reply(void); +int get_on_reply(void); int t_retransmit_reply(struct cell *t);

1 0

git:master:678b1a68: core: srjson - init vars and check scanned values
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: 678b1a68de86d9539adeaf0262d9735b8d435077 URL: https://github.com/kamailio/kamailio/commit/678b1a68de86d9539adeaf0262d9735… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:04:10+01:00 core: srjson - init vars and check scanned values --- Modified: src/core/utils/srjson.c --- Diff: https://github.com/kamailio/kamailio/commit/678b1a68de86d9539adeaf0262d9735… Patch: https://github.com/kamailio/kamailio/commit/678b1a68de86d9539adeaf0262d9735… --- diff --git a/src/core/utils/srjson.c b/src/core/utils/srjson.c index 5960932f545..f339230232a 100644 --- a/src/core/utils/srjson.c +++ b/src/core/utils/srjson.c @@ -272,7 +272,10 @@ static const char *parse_string( *ptr2++ = '\t'; break; case 'u': /* transcode utf16 to utf8. */ - sscanf(ptr + 1, "%4x", &uc); + uc = 0; + if(sscanf(ptr + 1, "%4x", &uc) < 1) { + break; + } ptr += 4; /* get the unicode char. */ if((uc >= 0xDC00 && uc <= 0xDFFF) || uc == 0) @@ -283,8 +286,11 @@ static const char *parse_string( { if(ptr[1] != '\\' || ptr[2] != 'u') break; + uc2 = 0; //missing second - half of surrogate. - sscanf(ptr + 3, "%4x", &uc2); + if(sscanf(ptr + 3, "%4x", &uc2) < 1) { + break; + } ptr += 6; if(uc2 < 0xDC00 || uc2 > 0xDFFF) break;

1 0

git:master:586ddc6e: presence_xml: check for number of read values
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: 586ddc6ed3a2b757ad55fb9eb859945b279c415c URL: https://github.com/kamailio/kamailio/commit/586ddc6ed3a2b757ad55fb9eb859945… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T11:18:21+01:00 presence_xml: check for number of read values --- Modified: src/modules/presence_xml/pidf.c --- Diff: https://github.com/kamailio/kamailio/commit/586ddc6ed3a2b757ad55fb9eb859945… Patch: https://github.com/kamailio/kamailio/commit/586ddc6ed3a2b757ad55fb9eb859945… --- diff --git a/src/modules/presence_xml/pidf.c b/src/modules/presence_xml/pidf.c index 09d11438a0a..b9c85c65466 100644 --- a/src/modules/presence_xml/pidf.c +++ b/src/modules/presence_xml/pidf.c @@ -181,7 +181,7 @@ time_t xml_parse_dateTime(char *xml_time_str) p++; - if(sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2) < 0) { + if(sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2) < 4) { printf("error: failed to parse time\n"); return 0; }

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev