sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
306 discussions

git:master:ef457eea: misc: fuzz: extend msg parsing fuzzer

by Daniel-Constantin Mierla

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

3 years, 3 months

[kamailio/kamailio] ims_charging: fix charging reply route with kemi (#2836)

by Riccardo-78

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

3 years, 3 months

git:master:cfaea077: ims_charging: fix charging reply route with kemi

by Daniel-Constantin Mierla

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

3 years, 3 months

git:master:d024975f: kamctl: regenerated db schema files

by Daniel-Constantin Mierla

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

3 years, 3 months

git:master:a1afff1d: lib/srdb1: schema - create index on tcp connection for location

by Daniel-Constantin Mierla

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

3 years, 3 months

git:master:a74977e4: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

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

3 years, 3 months

git:master:1d3fde12: core: parse via - safe check for end of buffer

by Daniel-Constantin Mierla

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

3 years, 3 months

git:master:68581708: core: parse content - group operation to avoid overflow

by Daniel-Constantin Mierla

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

3 years, 3 months

git:master:afcd0bc7: misctest: 0-padding for hex print

by Daniel-Constantin Mierla

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

3 years, 3 months

git:master:ad0f9a69: dispatcher: docs for ds_is_active()

by Daniel-Constantin Mierla

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

3 years, 3 months

← Newer
1
...
18
19
20
21
22
23
24
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2021