sr-dev September 2020

sr-dev@lists.kamailio.org

12 participants
270 discussions

git:master:57ee97f5: core: skip abort() in free_lump() for LUMPFLAG_DUPED

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 57ee97f52dd90c86743b6fd6dd682285ef994e80 URL: https://github.com/kamailio/kamailio/commit/57ee97f52dd90c86743b6fd6dd68228… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T15:33:18+02:00 core: skip abort() in free_lump() for LUMPFLAG_DUPED - the LUMPFLAG_DUPED is set when duplicating lumps list for branch route execution, but some functions such as set_body() may want to clean them - report and minimal reproducing config by Henning Westerholt --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/57ee97f52dd90c86743b6fd6dd68228… Patch: https://github.com/kamailio/kamailio/commit/57ee97f52dd90c86743b6fd6dd68228… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 765dd5f988..a9a4880199 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -456,14 +456,17 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, } +/** + * free lump content + */ void free_lump(struct lump* lmp) { - if (lmp && (lmp->op==LUMP_ADD)){ - if (lmp->u.value){ - if (lmp->flags &(LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ + if (lmp && (lmp->op==LUMP_ADD)) { + if (lmp->u.value) { + if (lmp->flags & LUMPFLAG_SHMEM) { LM_CRIT("non free-able lump: %p flags=%x\n", lmp, lmp->flags); abort(); - }else{ + } else if(!(lmp->flags & LUMPFLAG_DUPED)) { pkg_free(lmp->u.value); lmp->u.value=0; lmp->len=0;

4 years, 3 months

git:master:b13431b6: core: more comments about data lump structure fields and options

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b13431b6fc7eec20096c5be46c8ce2e43931c45f URL: https://github.com/kamailio/kamailio/commit/b13431b6fc7eec20096c5be46c8ce2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T15:32:33+02:00 core: more comments about data lump structure fields and options --- Modified: src/core/lump_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/b13431b6fc7eec20096c5be46c8ce2e… Patch: https://github.com/kamailio/kamailio/commit/b13431b6fc7eec20096c5be46c8ce2e…

4 years, 3 months

[kamailio/kamailio] uac: contact_addr field added into db uacreg table (#2470)

by ovoshlook

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 #### Description Allows to pass unique address part into contact header for REGISTER requests for each uacreg entry If contact_addr wasn't passed into uacreg for a particular entry default reg_contact_addr will be used instead. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2470 -- Commit Summary -- * uacreg contact_addr added into db as configrable parameter for each entry * docs generated * formatting * Merge branch 'uacreg-contact_addr-field-in-db' of https://github.com/ovoshlook/kamailio into uacreg-contact_addr-field-in-db * reverted readme * formatting * formatting -- File Changes -- M src/modules/uac/doc/uac_admin.xml (11) M src/modules/uac/uac_reg.c (43) M src/modules/uac/uac_reg.h (2) M utils/kamctl/db_berkeley/kamailio/uacreg (4) M utils/kamctl/db_berkeley/kamailio/version (2) M utils/kamctl/db_redis/kamailio/uacreg (2) M utils/kamctl/db_sqlite/uac-create.sql (3) M utils/kamctl/dbtext/kamailio/uacreg (2) M utils/kamctl/mongodb/kamailio/uacreg.json (7) M utils/kamctl/mysql/uac-create.sql (3) M utils/kamctl/oracle/uac-create.sql (3) M utils/kamctl/postgres/uac-create.sql (3) M utils/kamctl/xhttp_pi/uac-mod (3) M utils/kamctl/xhttp_pi/uac-table (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2470.patch https://github.com/kamailio/kamailio/pull/2470.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/2470

4 years, 3 months

git:master:3c643c02: modules: readme files regenerated - uac ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3c643c023626e0de744c4960f2a7af4a401f6df0 URL: https://github.com/kamailio/kamailio/commit/3c643c023626e0de744c4960f2a7af4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-09T13:31:27+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/3c643c023626e0de744c4960f2a7af4… Patch: https://github.com/kamailio/kamailio/commit/3c643c023626e0de744c4960f2a7af4… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index a018d29a16..ae8376ab15 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -524,6 +524,9 @@ modparam("uac", "reg_db_table", "uacreg") username part of the Contact: URI will be the L_UUID field in the database. + A contact_addr value in the uacreg table will override the parameter + for this particular entry. + Example 1.17. Set reg_contact_addr parameter ... modparam("uac", "reg_contact_addr", "192.168.1.2:5080") @@ -1111,8 +1114,10 @@ event_route[uac:reply] { * flags * reg_delay * socket + * contact_addr - Use a dot (.) if no value should be set for auth_password or auth_ha1. + Use a dot (.) if no value should be set for auth_password, auth_ha1, or + contact_addr. Example 1.45. uac.reg_add usage ... @@ -1155,6 +1160,11 @@ event_route[uac:reply] { * reg_delay - delay initial registration with at least reg_delay seconds, e.g.,: 3 + * contact_addr - contact address to be used for this record instead + of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It + can be set to '.' (dot) to skip setting it and then + reg_contact_addr modparam is used. + * socket - Used socket for sending out registration requests, e.g.:, udp:192.168.0.125:5060

4 years, 3 months

git:master:177713c6: kamctl: regenerated db creation scripts for uacreg

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 177713c6e0fc51934779bd3e81e7a3278897d503 URL: https://github.com/kamailio/kamailio/commit/177713c6e0fc51934779bd3e81e7a32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:29:44+02:00 kamctl: regenerated db creation scripts for uacreg --- Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/mysql/uac-create.sql Modified: utils/kamctl/oracle/uac-create.sql Modified: utils/kamctl/postgres/uac-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/177713c6e0fc51934779bd3e81e7a32… Patch: https://github.com/kamailio/kamailio/commit/177713c6e0fc51934779bd3e81e7a32… --- diff --git a/utils/kamctl/db_sqlite/uac-create.sql b/utils/kamctl/db_sqlite/uac-create.sql index 764e623e02..6ff05276a5 100644 --- a/utils/kamctl/db_sqlite/uac-create.sql +++ b/utils/kamctl/db_sqlite/uac-create.sql @@ -13,7 +13,7 @@ CREATE TABLE uacreg ( expires INTEGER DEFAULT 0 NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, reg_delay INTEGER DEFAULT 0 NOT NULL, - contact_addr VARCHAR(128) DEFAULT '' NOT NULL, + contact_addr VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(128) DEFAULT '' NOT NULL, CONSTRAINT uacreg_l_uuid_idx UNIQUE (l_uuid) ); diff --git a/utils/kamctl/mysql/uac-create.sql b/utils/kamctl/mysql/uac-create.sql index b6c53f5dcf..a4560e6914 100644 --- a/utils/kamctl/mysql/uac-create.sql +++ b/utils/kamctl/mysql/uac-create.sql @@ -13,7 +13,7 @@ CREATE TABLE `uacreg` ( `expires` INT DEFAULT 0 NOT NULL, `flags` INT DEFAULT 0 NOT NULL, `reg_delay` INT DEFAULT 0 NOT NULL, - `contact_addr` VARCHAR(128) DEFAULT '' NOT NULL, + `contact_addr` VARCHAR(255) DEFAULT '' NOT NULL, `socket` VARCHAR(128) DEFAULT '' NOT NULL, CONSTRAINT l_uuid_idx UNIQUE (`l_uuid`) ); diff --git a/utils/kamctl/oracle/uac-create.sql b/utils/kamctl/oracle/uac-create.sql index fdad9316b1..88eb71c3e7 100644 --- a/utils/kamctl/oracle/uac-create.sql +++ b/utils/kamctl/oracle/uac-create.sql @@ -13,7 +13,7 @@ CREATE TABLE uacreg ( expires NUMBER(10) DEFAULT 0 NOT NULL, flags NUMBER(10) DEFAULT 0 NOT NULL, reg_delay NUMBER(10) DEFAULT 0 NOT NULL, - contact_addr VARCHAR2(128) DEFAULT '', + contact_addr VARCHAR2(255) DEFAULT '', socket VARCHAR2(128) DEFAULT '', CONSTRAINT uacreg_l_uuid_idx UNIQUE (l_uuid) ); diff --git a/utils/kamctl/postgres/uac-create.sql b/utils/kamctl/postgres/uac-create.sql index 4fcce80f0e..c24c3b8ecc 100644 --- a/utils/kamctl/postgres/uac-create.sql +++ b/utils/kamctl/postgres/uac-create.sql @@ -13,7 +13,7 @@ CREATE TABLE uacreg ( expires INTEGER DEFAULT 0 NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, reg_delay INTEGER DEFAULT 0 NOT NULL, - contact_addr VARCHAR(128) DEFAULT '' NOT NULL, + contact_addr VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(128) DEFAULT '' NOT NULL, CONSTRAINT uacreg_l_uuid_idx UNIQUE (l_uuid) );

4 years, 3 months

git:master:b98ff23b: lib/srdb1/schema/entities.xml: increased contact_addr_len entity to 255

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b98ff23bb7acab26a3442925ea563f64db97360c URL: https://github.com/kamailio/kamailio/commit/b98ff23bb7acab26a3442925ea563f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:28:32+02:00 lib/srdb1/schema/entities.xml: increased contact_addr_len entity to 255 - contact can have parameters that could end up being long (e.g., for ims cases) --- Modified: src/lib/srdb1/schema/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/b98ff23bb7acab26a3442925ea563f6… Patch: https://github.com/kamailio/kamailio/commit/b98ff23bb7acab26a3442925ea563f6… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 024851ec00..4ca1b6bfed 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -1,6 +1,6 @@ <!ENTITY user_len "64"> <!ENTITY domain_len "64"> -<!ENTITY contact_addr_len "128"> +<!ENTITY contact_addr_len "255"> <!ENTITY socket_len "128"> <!ENTITY from_tag_len "128"> <!ENTITY to_tag_len "128">

4 years, 3 months

git:master:89656680: uac: docs - updates for uacreg contact addr field

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 89656680c6ff3aae00bbffae03131a1e983198dd URL: https://github.com/kamailio/kamailio/commit/89656680c6ff3aae00bbffae03131a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:26:54+02:00 uac: docs - updates for uacreg contact addr field --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/89656680c6ff3aae00bbffae03131a1… Patch: https://github.com/kamailio/kamailio/commit/89656680c6ff3aae00bbffae03131a1… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 42645e891a..d43b8afa0c 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1359,12 +1359,13 @@ event_route[uac:reply] { <listitem><para>expires</para></listitem> <listitem><para>flags</para></listitem> <listitem><para>reg_delay</para></listitem> - <listitem><para>contact_addr</para></listitem> <listitem><para>socket</para></listitem> + <listitem><para>contact_addr</para></listitem> </itemizedlist> </para> <para> - Use a dot (.) if no value should be set for auth_password or auth_ha1. + Use a dot (.) if no value should be set for auth_password, auth_ha1, + or contact_addr. </para> <example> @@ -1463,8 +1464,9 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>contact_addr</emphasis> - Used contact address for sending out registration requests, - e.g.:, 192.168.0.125:5060 + <emphasis>contact_addr</emphasis> - contact address to be used for this record + instead of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It can + be set to '.' (dot) to skip setting it and then reg_contact_addr modparam is used. </para></listitem> </itemizedlist> <itemizedlist>

4 years, 3 months

git:master:e7275114: uac: allow empty contact addr in rpc add command for uacreg

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e72751147e0d6b5fd9ed32d23a7412d64fcb65eb URL: https://github.com/kamailio/kamailio/commit/e72751147e0d6b5fd9ed32d23a7412d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:20:44+02:00 uac: allow empty contact addr in rpc add command for uacreg - it has to be set to . - contact_addr parameter moved to be last, to be easier to just add to existing commands --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/e72751147e0d6b5fd9ed32d23a7412d… Patch: https://github.com/kamailio/kamailio/commit/e72751147e0d6b5fd9ed32d23a7412d… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index c636cc6cfa..379a544a7e 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -526,7 +526,7 @@ int reg_ht_add(reg_uac_t *reg) return -1; } - if (!reg->contact_addr.s || reg->contact_addr.len == 0) + if (!reg->contact_addr.s || reg->contact_addr.len == 0) { reg->contact_addr=reg_contact_addr; } @@ -553,7 +553,7 @@ int reg_ht_add(reg_uac_t *reg) memset(nr, 0, sizeof(reg_uac_t) + len); nr->expires = reg->expires; nr->flags = reg->flags; - if (reg->reg_delay) + if (reg->reg_delay) nr->reg_delay = reg->reg_delay; else if (reg_random_delay>0) nr->reg_delay = kam_rand() % reg_random_delay; @@ -594,9 +594,9 @@ int reg_ht_add(reg_uac_t *reg) } - /** - * - */ +/** + * + */ int reg_ht_rm(reg_uac_t *reg) { unsigned int slot1, slot2; @@ -2136,8 +2136,8 @@ static void rpc_uac_reg_add(rpc_t* rpc, void* ctx) &reg.expires, &reg.flags, &reg.reg_delay, - &reg.contact_addr, - &reg.socket + &reg.socket, + &reg.contact_addr )<1) { rpc->fault(ctx, 400, "Invalid Parameters"); @@ -2154,6 +2154,10 @@ static void rpc_uac_reg_add(rpc_t* rpc, void* ctx) reg.auth_ha1.len = 0; } + if(reg.contact_addr.len==1 && reg.contact_addr.s[0] == '.') { + reg.contact_addr = reg_contact_addr; + } + if(uac_reg_check_password(&reg) < 0) { rpc->fault(ctx, 500, "Failed to add record - invalid password or ha1"); return;

4 years, 3 months

git:master:2ddc45c1: kamctl: regenerated uacreg table creation scripts

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2ddc45c10ccb5790b064599ea1aa89ed83abab84 URL: https://github.com/kamailio/kamailio/commit/2ddc45c10ccb5790b064599ea1aa89e… Author: ovoshlook <ovoshlook(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:15:59+02:00 kamctl: regenerated uacreg table creation scripts --- Modified: utils/kamctl/db_berkeley/kamailio/uacreg Modified: utils/kamctl/db_redis/kamailio/uacreg Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/dbtext/kamailio/uacreg Modified: utils/kamctl/mongodb/kamailio/uacreg.json Modified: utils/kamctl/mysql/uac-create.sql Modified: utils/kamctl/oracle/uac-create.sql Modified: utils/kamctl/postgres/uac-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/uac-mod Modified: utils/kamctl/xhttp_pi/uac-table --- Diff: https://github.com/kamailio/kamailio/commit/2ddc45c10ccb5790b064599ea1aa89e… Patch: https://github.com/kamailio/kamailio/commit/2ddc45c10ccb5790b064599ea1aa89e…

4 years, 3 months

git:master:4ae04d52: lib/srdb1: added contact_addr column to uacreg table

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4ae04d52d0bd33ee44222f5b7efeca18f52d6413 URL: https://github.com/kamailio/kamailio/commit/4ae04d52d0bd33ee44222f5b7efeca1… Author: ovoshlook <ovoshlook(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:15:27+02:00 lib/srdb1: added contact_addr column to uacreg table --- Modified: src/lib/srdb1/schema/entities.xml Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ae04d52d0bd33ee44222f5b7efeca1… Patch: https://github.com/kamailio/kamailio/commit/4ae04d52d0bd33ee44222f5b7efeca1… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index acd7028967..024851ec00 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -1,5 +1,6 @@ <!ENTITY user_len "64"> <!ENTITY domain_len "64"> +<!ENTITY contact_addr_len "128"> <!ENTITY socket_len "128"> <!ENTITY from_tag_len "128"> <!ENTITY to_tag_len "128"> diff --git a/src/lib/srdb1/schema/uacreg.xml b/src/lib/srdb1/schema/uacreg.xml index bf967f2655..1da4d46f60 100644 --- a/src/lib/srdb1/schema/uacreg.xml +++ b/src/lib/srdb1/schema/uacreg.xml @@ -135,6 +135,14 @@ <description>Initial registration delay</description> </column> + <column id="contact_addr"> + <name>contact_addr</name> + <type>string</type> + <size>&contact_addr_len;</size> + <default/> + <description>Used contact_addr in contact header for sending out requests,if not passed reg_contact_addr will be used instead</description> + </column> + <column id="socket"> <name>socket</name> <type>string</type>

4 years, 3 months

← Newer
1
...
19
20
21
22
23
24
25
26
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2020