sr-dev

sr-dev@lists.kamailio.org

7 participants
45206 discussions

git:master:616aa146: drouting: update to new keepalive interface, using custom pinging interval per destination
by Nacho Garcia Segovia 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 616aa146f919b8a42101a323c611a6a525b19236 URL: https://github.com/kamailio/kamailio/commit/616aa146f919b8a42101a323c611a6a… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-06T23:13:27+02:00 drouting: update to new keepalive interface, using custom pinging interval per destination - Changes required because of dependencies from module keepalive. --- Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/616aa146f919b8a42101a323c611a6a… Patch: https://github.com/kamailio/kamailio/commit/616aa146f919b8a42101a323c611a6a… --- diff --git a/src/modules/drouting/drouting.c b/src/modules/drouting/drouting.c index e16f5ae804..4fd0786ffe 100644 --- a/src/modules/drouting/drouting.c +++ b/src/modules/drouting/drouting.c @@ -223,7 +223,7 @@ static int dr_update_keepalive(pgw_t *addrs) for(cur = addrs; cur != NULL; cur = cur->next) { LM_DBG("uri: %.*s\n", cur->ip.len, cur->ip.s); keepalive_api.add_destination( - &cur->ip, &owner, 0, dr_keepalive_statechanged, cur); + &cur->ip, &owner, 0, 0, dr_keepalive_statechanged, cur); } return 0;

1 0

git:master:4cebb16b: keepalive: custom pinging interval per destination
by Nacho Garcia Segovia 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 4cebb16b536c35ec74ecbdf595c5c6dbafe5afa1 URL: https://github.com/kamailio/kamailio/commit/4cebb16b536c35ec74ecbdf595c5c6d… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-06T23:10:40+02:00 keepalive: custom pinging interval per destination - This functionality it's just available when using api.h bindings. For exported functions current value ka_ping_interval is used. - Modified add_destination function to provide this new parameter. - Now we have one timer per destination, instead of multiple, so we don't need to iterate over all destinations. Timers are cleaned when destinations are removed. --- Modified: src/modules/keepalive/api.h Modified: src/modules/keepalive/doc/keepalive.xml Modified: src/modules/keepalive/doc/keepalive_devel.xml Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4cebb16b536c35ec74ecbdf595c5c6d… Patch: https://github.com/kamailio/kamailio/commit/4cebb16b536c35ec74ecbdf595c5c6d…

1 0

git:5.3:f977da4c: kamctl: regenerated db schema for secfilter
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: f977da4c7058a62919557eba3f6edcd5faa61cda URL: https://github.com/kamailio/kamailio/commit/f977da4c7058a62919557eba3f6edcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:21:12+02:00 kamctl: regenerated db schema for secfilter (cherry picked from commit 59c49af039f468466b0d853a4ceab8fe7f566215) --- Modified: utils/kamctl/db_berkeley/kamailio/secfilter Modified: utils/kamctl/db_sqlite/secfilter-create.sql Modified: utils/kamctl/mongodb/kamailio/secfilter.json Modified: utils/kamctl/mysql/secfilter-create.sql Modified: utils/kamctl/oracle/secfilter-create.sql Modified: utils/kamctl/postgres/secfilter-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/f977da4c7058a62919557eba3f6edcd… Patch: https://github.com/kamailio/kamailio/commit/f977da4c7058a62919557eba3f6edcd… --- diff --git a/utils/kamctl/db_berkeley/kamailio/secfilter b/utils/kamctl/db_berkeley/kamailio/secfilter index 38fbb9a05e..b264e5b0a3 100644 --- a/utils/kamctl/db_berkeley/kamailio/secfilter +++ b/utils/kamctl/db_berkeley/kamailio/secfilter @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|'' +NIL|0|0|'' diff --git a/utils/kamctl/db_sqlite/secfilter-create.sql b/utils/kamctl/db_sqlite/secfilter-create.sql index 476ea46de4..44e1f4e4c2 100644 --- a/utils/kamctl/db_sqlite/secfilter-create.sql +++ b/utils/kamctl/db_sqlite/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id INTEGER PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/mongodb/kamailio/secfilter.json b/utils/kamctl/mongodb/kamailio/secfilter.json index 1f7baf47fc..7c433e929d 100644 --- a/utils/kamctl/mongodb/kamailio/secfilter.json +++ b/utils/kamctl/mongodb/kamailio/secfilter.json @@ -9,12 +9,12 @@ }, "action": { "type": "int", - "default": "", + "default": 0, "null": false }, "type": { "type": "int", - "default": "", + "default": 0, "null": false }, "data": { diff --git a/utils/kamctl/mysql/secfilter-create.sql b/utils/kamctl/mysql/secfilter-create.sql index 18a67c79b6..9b35b8d570 100644 --- a/utils/kamctl/mysql/secfilter-create.sql +++ b/utils/kamctl/mysql/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE `secfilter` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - `action` SMALLINT DEFAULT '' NOT NULL, - `type` SMALLINT DEFAULT '' NOT NULL, + `action` SMALLINT DEFAULT 0 NOT NULL, + `type` SMALLINT DEFAULT 0 NOT NULL, `data` VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/oracle/secfilter-create.sql b/utils/kamctl/oracle/secfilter-create.sql index 684d1c44cf..d980915525 100644 --- a/utils/kamctl/oracle/secfilter-create.sql +++ b/utils/kamctl/oracle/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id NUMBER(10) PRIMARY KEY, - action NUMBER(5) DEFAULT '', - type NUMBER(5) DEFAULT '', + action NUMBER(5) DEFAULT 0 NOT NULL, + type NUMBER(5) DEFAULT 0 NOT NULL, data VARCHAR2(64) DEFAULT '' ); diff --git a/utils/kamctl/postgres/secfilter-create.sql b/utils/kamctl/postgres/secfilter-create.sql index 71badd4ece..ce048396fa 100644 --- a/utils/kamctl/postgres/secfilter-create.sql +++ b/utils/kamctl/postgres/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id SERIAL PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL );

1 0

git:5.3:221175ff: srdb1: default value set to 0 for number types
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: 221175ff31bfead160ef9f3bc8ac613a107f98cf URL: https://github.com/kamailio/kamailio/commit/221175ff31bfead160ef9f3bc8ac613… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:21:02+02:00 srdb1: default value set to 0 for number types (cherry picked from commit b0f1486f8a656922aac02020c9e3141639f2ecb9) --- Modified: src/lib/srdb1/schema/secfilter.xml --- Diff: https://github.com/kamailio/kamailio/commit/221175ff31bfead160ef9f3bc8ac613… Patch: https://github.com/kamailio/kamailio/commit/221175ff31bfead160ef9f3bc8ac613… --- diff --git a/src/lib/srdb1/schema/secfilter.xml b/src/lib/srdb1/schema/secfilter.xml index 4edab34e6c..0b3cbc8878 100644 --- a/src/lib/srdb1/schema/secfilter.xml +++ b/src/lib/srdb1/schema/secfilter.xml @@ -37,14 +37,14 @@ <column id="action"> <name>action</name> <type>short</type> - <default/> + <default>0</default> <description>Action to do (0=blacklisted data, 1=whitelisted data, 2=blacklisted destination).</description> </column> <column id="type"> <name>type</name> <type>short</type> - <default/> + <default>0</default> <description>Type of data (0=user-agent, 1=country, 2=domain, 3=IP address, 4=user).</description> </column>

1 0

git:5.3:ac1b7f30: pua: use file name specific include guard
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: ac1b7f30b4cdc6d48d77f19421822300bcaa34be URL: https://github.com/kamailio/kamailio/commit/ac1b7f30b4cdc6d48d77f1942182230… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:20:53+02:00 pua: use file name specific include guard (cherry picked from commit 076649793bfdbdc4f03f96961f23997c87ce4268) --- Modified: src/modules/pua/hash.h Modified: src/modules/pua/pua.h --- Diff: https://github.com/kamailio/kamailio/commit/ac1b7f30b4cdc6d48d77f1942182230… Patch: https://github.com/kamailio/kamailio/commit/ac1b7f30b4cdc6d48d77f1942182230… --- diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index cc73d3e761..454e4bb853 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/modules/pua/pua.h b/src/modules/pua/pua.h index 57cc379ebe..908f5b0cb3 100644 --- a/src/modules/pua/pua.h +++ b/src/modules/pua/pua.h @@ -15,13 +15,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PUBLISH_H -#define PUBLISH_H +#ifndef _PUA_H_ +#define _PUA_H_ #include "../../core/str.h" #include "../../lib/srdb1/db.h"

1 0

git:master:59c49af0: kamctl: regenerated db schema for secfilter
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 59c49af039f468466b0d853a4ceab8fe7f566215 URL: https://github.com/kamailio/kamailio/commit/59c49af039f468466b0d853a4ceab8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:19:36+02:00 kamctl: regenerated db schema for secfilter --- Modified: utils/kamctl/db_berkeley/kamailio/secfilter Modified: utils/kamctl/db_sqlite/secfilter-create.sql Modified: utils/kamctl/mongodb/kamailio/secfilter.json Modified: utils/kamctl/mysql/secfilter-create.sql Modified: utils/kamctl/oracle/secfilter-create.sql Modified: utils/kamctl/postgres/secfilter-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/59c49af039f468466b0d853a4ceab8f… Patch: https://github.com/kamailio/kamailio/commit/59c49af039f468466b0d853a4ceab8f… --- diff --git a/utils/kamctl/db_berkeley/kamailio/secfilter b/utils/kamctl/db_berkeley/kamailio/secfilter index 38fbb9a05e..b264e5b0a3 100644 --- a/utils/kamctl/db_berkeley/kamailio/secfilter +++ b/utils/kamctl/db_berkeley/kamailio/secfilter @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|'' +NIL|0|0|'' diff --git a/utils/kamctl/db_sqlite/secfilter-create.sql b/utils/kamctl/db_sqlite/secfilter-create.sql index 476ea46de4..44e1f4e4c2 100644 --- a/utils/kamctl/db_sqlite/secfilter-create.sql +++ b/utils/kamctl/db_sqlite/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id INTEGER PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/mongodb/kamailio/secfilter.json b/utils/kamctl/mongodb/kamailio/secfilter.json index 1f7baf47fc..7c433e929d 100644 --- a/utils/kamctl/mongodb/kamailio/secfilter.json +++ b/utils/kamctl/mongodb/kamailio/secfilter.json @@ -9,12 +9,12 @@ }, "action": { "type": "int", - "default": "", + "default": 0, "null": false }, "type": { "type": "int", - "default": "", + "default": 0, "null": false }, "data": { diff --git a/utils/kamctl/mysql/secfilter-create.sql b/utils/kamctl/mysql/secfilter-create.sql index 18a67c79b6..9b35b8d570 100644 --- a/utils/kamctl/mysql/secfilter-create.sql +++ b/utils/kamctl/mysql/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE `secfilter` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - `action` SMALLINT DEFAULT '' NOT NULL, - `type` SMALLINT DEFAULT '' NOT NULL, + `action` SMALLINT DEFAULT 0 NOT NULL, + `type` SMALLINT DEFAULT 0 NOT NULL, `data` VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/oracle/secfilter-create.sql b/utils/kamctl/oracle/secfilter-create.sql index 684d1c44cf..d980915525 100644 --- a/utils/kamctl/oracle/secfilter-create.sql +++ b/utils/kamctl/oracle/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id NUMBER(10) PRIMARY KEY, - action NUMBER(5) DEFAULT '', - type NUMBER(5) DEFAULT '', + action NUMBER(5) DEFAULT 0 NOT NULL, + type NUMBER(5) DEFAULT 0 NOT NULL, data VARCHAR2(64) DEFAULT '' ); diff --git a/utils/kamctl/postgres/secfilter-create.sql b/utils/kamctl/postgres/secfilter-create.sql index 71badd4ece..ce048396fa 100644 --- a/utils/kamctl/postgres/secfilter-create.sql +++ b/utils/kamctl/postgres/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id SERIAL PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL );

1 0

git:master:b0f1486f: srdb1: default value set to 0 for number types
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: master Commit: b0f1486f8a656922aac02020c9e3141639f2ecb9 URL: https://github.com/kamailio/kamailio/commit/b0f1486f8a656922aac02020c9e3141… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:19:05+02:00 srdb1: default value set to 0 for number types --- Modified: src/lib/srdb1/schema/secfilter.xml --- Diff: https://github.com/kamailio/kamailio/commit/b0f1486f8a656922aac02020c9e3141… Patch: https://github.com/kamailio/kamailio/commit/b0f1486f8a656922aac02020c9e3141… --- diff --git a/src/lib/srdb1/schema/secfilter.xml b/src/lib/srdb1/schema/secfilter.xml index 4edab34e6c..0b3cbc8878 100644 --- a/src/lib/srdb1/schema/secfilter.xml +++ b/src/lib/srdb1/schema/secfilter.xml @@ -37,14 +37,14 @@ <column id="action"> <name>action</name> <type>short</type> - <default/> + <default>0</default> <description>Action to do (0=blacklisted data, 1=whitelisted data, 2=blacklisted destination).</description> </column> <column id="type"> <name>type</name> <type>short</type> - <default/> + <default>0</default> <description>Type of data (0=user-agent, 1=country, 2=domain, 3=IP address, 4=user).</description> </column>

1 0

ICMP port-unreachable for UDP INVITEs
by James Browne 06 May '20

06 May '20

I've searched, but I cannot find anything recent about this. My kamailio 5.0.8 proxy sends an INVITE downstream over UDP and gets an ICMP port-unreachable response from the UAS. Apparently ignoring this, it re-transmits the INVITEs and eventually times out and sends to the next host (from the SRV lookup). According to RFC 3261 (https://tools.ietf.org/html/rfc3261#section-8.1.3.1), If a fatal transport error is reported by the transport layer (generally, due to fatal ICMP errors in UDP or connection failures in TCP), the condition MUST be treated as a 503 (Service Unavailable) status code. Does kamailio support handling ICMP responses to INVITEs (and therefore either failing over immediately, or sending 503 upstream immediately)? I don't know for sure the "correct" behavior because the RFC3261 is so old and because ICMP responses are limited in size and therefore can't guarantee to uniquely identify the transactions that caused them.

2 2

git:master:07664979: pua: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: master Commit: 076649793bfdbdc4f03f96961f23997c87ce4268 URL: https://github.com/kamailio/kamailio/commit/076649793bfdbdc4f03f96961f23997… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T17:15:36+02:00 pua: use file name specific include guard --- Modified: src/modules/pua/hash.h Modified: src/modules/pua/pua.h --- Diff: https://github.com/kamailio/kamailio/commit/076649793bfdbdc4f03f96961f23997… Patch: https://github.com/kamailio/kamailio/commit/076649793bfdbdc4f03f96961f23997… --- diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index cc73d3e761..454e4bb853 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/modules/pua/pua.h b/src/modules/pua/pua.h index 57cc379ebe..908f5b0cb3 100644 --- a/src/modules/pua/pua.h +++ b/src/modules/pua/pua.h @@ -15,13 +15,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PUBLISH_H -#define PUBLISH_H +#ifndef _PUA_H_ +#define _PUA_H_ #include "../../core/str.h" #include "../../lib/srdb1/db.h"

1 0

git:master:14645b55: pv: use localtime_r() for a safer multi-thread usage
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: master Commit: 14645b550cf9500e6a6e4a7d2ed8749e9aa174dc URL: https://github.com/kamailio/kamailio/commit/14645b550cf9500e6a6e4a7d2ed8749… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T17:03:45+02:00 pv: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/14645b550cf9500e6a6e4a7d2ed8749… Patch: https://github.com/kamailio/kamailio/commit/14645b550cf9500e6a6e4a7d2ed8749… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 826fa9c2ef..d07e55e719 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -195,6 +195,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t v, w; time_t t; uint32_t sz1, sz2; + struct tm tmv; if(val==NULL || val->flags&PV_VAL_NULL) return -1; @@ -1045,8 +1046,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, memcpy(s, st.s, st.len); s[st.len] = '\0'; t = val->ri; - val->rs.len = strftime(_tr_buffer, TR_BUFFER_SIZE-1, s, - localtime(&t)); + localtime_r(&t, &tmv); + val->rs.len = strftime(_tr_buffer, TR_BUFFER_SIZE-1, s, &tmv); pkg_free(s); val->flags = PV_VAL_STR; val->rs.s = _tr_buffer;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev