sr-dev

sr-dev@lists.kamailio.org

8 participants
45484 discussions

git:master:7653124c: schema: allow null value for active_watchers user-agent column
by lazedo 11 Feb '18

11 Feb '18

Module: kamailio Branch: master Commit: 7653124c2d3615e4f6229f12b699063f65b7afea URL: https://github.com/kamailio/kamailio/commit/7653124c2d3615e4f6229f12b699063… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2018-02-09T11:28:05Z schema: allow null value for active_watchers user-agent column some UAs not sending Userg-Agent header on SUBSCRIBE --- Modified: src/lib/srdb1/schema/pr_active_watchers.xml Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/dbtext/kamailio/active_watchers Modified: utils/kamctl/mongodb/kamailio/active_watchers.json Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/7653124c2d3615e4f6229f12b699063… Patch: https://github.com/kamailio/kamailio/commit/7653124c2d3615e4f6229f12b699063… --- diff --git a/src/lib/srdb1/schema/pr_active_watchers.xml b/src/lib/srdb1/schema/pr_active_watchers.xml index 8e4fd0604d..3d53eaf46d 100644 --- a/src/lib/srdb1/schema/pr_active_watchers.xml +++ b/src/lib/srdb1/schema/pr_active_watchers.xml @@ -220,6 +220,7 @@ <type>string</type> <size>&hf_len;</size> <default/> + <null/> <description>User-Agent header field contains information about the UAC originating the request.</description> </column> diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index 637ff14b62..df121b96d5 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -46,7 +46,7 @@ CREATE TABLE active_watchers ( updated INTEGER NOT NULL, updated_winfo INTEGER NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, - user_agent VARCHAR(255) DEFAULT '' NOT NULL, + user_agent VARCHAR(255) DEFAULT '', CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); diff --git a/utils/kamctl/dbtext/kamailio/active_watchers b/utils/kamctl/dbtext/kamailio/active_watchers index 19719b72d5..04e96b39bc 100644 --- a/utils/kamctl/dbtext/kamailio/active_watchers +++ b/utils/kamctl/dbtext/kamailio/active_watchers @@ -1 +1 @@ -id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string,null) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string) +id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string,null) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string,null) diff --git a/utils/kamctl/mongodb/kamailio/active_watchers.json b/utils/kamctl/mongodb/kamailio/active_watchers.json index 123692d988..5dc8df8256 100644 --- a/utils/kamctl/mongodb/kamailio/active_watchers.json +++ b/utils/kamctl/mongodb/kamailio/active_watchers.json @@ -135,7 +135,7 @@ "user_agent": { "type": "string", "default": "", - "null": false + "null": true } ] } \ No newline at end of file diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 9e7e71c138..d5fcc72770 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -46,7 +46,7 @@ CREATE TABLE `active_watchers` ( `updated` INT(11) NOT NULL, `updated_winfo` INT(11) NOT NULL, `flags` INT(11) DEFAULT 0 NOT NULL, - `user_agent` VARCHAR(255) DEFAULT '' NOT NULL, + `user_agent` VARCHAR(255) DEFAULT '', CONSTRAINT active_watchers_idx UNIQUE (`callid`, `to_tag`, `from_tag`) ); diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 2259c260a8..943aac0bd6 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -46,7 +46,7 @@ CREATE TABLE active_watchers ( updated INTEGER NOT NULL, updated_winfo INTEGER NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, - user_agent VARCHAR(255) DEFAULT '' NOT NULL, + user_agent VARCHAR(255) DEFAULT '', CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) );

1 0

git:master:4654f8b4: presence: set user agent db field to empty string if no value is found
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: master Commit: 4654f8b4f341a6c9f8cf4daafc7d618871c95e1b URL: https://github.com/kamailio/kamailio/commit/4654f8b4f341a6c9f8cf4daafc7d618… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T09:37:05+01:00 presence: set user agent db field to empty string if no value is found --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/4654f8b4f341a6c9f8cf4daafc7d618… Patch: https://github.com/kamailio/kamailio/commit/4654f8b4f341a6c9f8cf4daafc7d618… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 3c6e4458d4..4c74ac7980 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -191,6 +191,7 @@ int insert_subs_db(subs_t* s, int type) contact_col, local_contact_col, version_col,socket_info_col,reason_col, watcher_user_col, watcher_domain_col, updated_col, updated_winfo_col, user_agent_col, flags_col; + str sval_empty = str_init(""); if(pa_dbf.use_table(pa_db, &active_watchers_table)< 0) { @@ -353,7 +354,8 @@ int insert_subs_db(subs_t* s, int type) query_vals[updated_col].val.int_val = s->updated; query_vals[updated_winfo_col].val.int_val = s->updated_winfo; query_vals[flags_col].val.int_val = s->flags; - query_vals[user_agent_col].val.str_val= s->user_agent; + query_vals[user_agent_col].val.str_val= + (s->user_agent.s && s->user_agent.len>0)?s->user_agent:sval_empty; if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0) {

1 0

git:master:8f9ddbf4: rr: removed unused variable after spliting code into a function
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: master Commit: 8f9ddbf43eb19c05efbb8a109b8151c023cc736a URL: https://github.com/kamailio/kamailio/commit/8f9ddbf43eb19c05efbb8a109b8151c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T09:27:38+01:00 rr: removed unused variable after spliting code into a function --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/8f9ddbf43eb19c05efbb8a109b8151c… Patch: https://github.com/kamailio/kamailio/commit/8f9ddbf43eb19c05efbb8a109b8151c… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index f5164cd39b..6e9e888a2b 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -784,7 +784,6 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) int res; int status = RR_DRIVEN; str uri; - struct socket_info *si; int uri_is_myself; int use_ob = 0; str rparams;

1 0

Errored: kamailio/kamailio#5519 (master - e1d8008)
by Travis CI 11 Feb '18

11 Feb '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5519 Status: Errored Duration: 10 minutes and 34 seconds Commit: e1d8008 (master) Author: Daniel-Constantin Mierla Message: tmx: allocate space to store ending 0 for branch value - reported by Alfred Farrugia and Sandro Gauci View the changeset: https://github.com/kamailio/kamailio/compare/00330db3864d...e1d8008a09d9 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/340060372?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:4.4:be854087: tmx: allocate space to store ending 0 for branch value
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: 4.4 Commit: be85408733333f20792de7f1144f987cf9f5b666 URL: https://github.com/kamailio/kamailio/commit/be85408733333f20792de7f1144f987… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T08:17:50+01:00 tmx: allocate space to store ending 0 for branch value - reported by Alfred Farrugia and Sandro Gauci (cherry picked from commit e1d8008a09d9390ebaf698abe8909e10dfec4097) (cherry picked from commit 7d783adc7de603972966f50106471c06a6be2fac) --- Modified: modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/be85408733333f20792de7f1144f987… Patch: https://github.com/kamailio/kamailio/commit/be85408733333f20792de7f1144f987… --- diff --git a/modules/tmx/tmx_pretran.c b/modules/tmx/tmx_pretran.c index 00f571bb4a..b92f28befb 100644 --- a/modules/tmx/tmx_pretran.c +++ b/modules/tmx/tmx_pretran.c @@ -260,7 +260,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(likely(vbr!=NULL)) { svbranch = vbr->value; trim(&svbranch); - dsize += svbranch.len; + dsize += svbranch.len + 1; } if(dsize<256) dsize = 256;

1 0

git:5.1:5cd6530e: tmx: allocate space to store ending 0 for branch value
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: 5.1 Commit: 5cd6530e68ef311a59acbec180588a498f2a32dc URL: https://github.com/kamailio/kamailio/commit/5cd6530e68ef311a59acbec180588a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T08:15:12+01:00 tmx: allocate space to store ending 0 for branch value - reported by Alfred Farrugia and Sandro Gauci (cherry picked from commit e1d8008a09d9390ebaf698abe8909e10dfec4097) --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/5cd6530e68ef311a59acbec180588a4… Patch: https://github.com/kamailio/kamailio/commit/5cd6530e68ef311a59acbec180588a4… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 494bdffe3e..67c4f7f4af 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -260,7 +260,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(likely(vbr!=NULL)) { svbranch = vbr->value; trim(&svbranch); - dsize += svbranch.len; + dsize += svbranch.len + 1; } if(dsize<256) dsize = 256;

1 0

git:5.0:7d783adc: tmx: allocate space to store ending 0 for branch value
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: 5.0 Commit: 7d783adc7de603972966f50106471c06a6be2fac URL: https://github.com/kamailio/kamailio/commit/7d783adc7de603972966f50106471c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T08:10:49+01:00 tmx: allocate space to store ending 0 for branch value - reported by Alfred Farrugia and Sandro Gauci (cherry picked from commit e1d8008a09d9390ebaf698abe8909e10dfec4097) --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/7d783adc7de603972966f50106471c0… Patch: https://github.com/kamailio/kamailio/commit/7d783adc7de603972966f50106471c0… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 494bdffe3e..67c4f7f4af 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -260,7 +260,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(likely(vbr!=NULL)) { svbranch = vbr->value; trim(&svbranch); - dsize += svbranch.len; + dsize += svbranch.len + 1; } if(dsize<256) dsize = 256;

1 0

git:master:e1d8008a: tmx: allocate space to store ending 0 for branch value
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: master Commit: e1d8008a09d9390ebaf698abe8909e10dfec4097 URL: https://github.com/kamailio/kamailio/commit/e1d8008a09d9390ebaf698abe8909e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-10T22:05:42+01:00 tmx: allocate space to store ending 0 for branch value - reported by Alfred Farrugia and Sandro Gauci --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/e1d8008a09d9390ebaf698abe8909e1… Patch: https://github.com/kamailio/kamailio/commit/e1d8008a09d9390ebaf698abe8909e1… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 494bdffe3e..67c4f7f4af 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -260,7 +260,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(likely(vbr!=NULL)) { svbranch = vbr->value; trim(&svbranch); - dsize += svbranch.len; + dsize += svbranch.len + 1; } if(dsize<256) dsize = 256;

1 0

git:5.0:5a67316c: kazoo: verify timer
by Luis Azedo 09 Feb '18

09 Feb '18

Module: kamailio Branch: 5.0 Commit: 5a67316c102649e42f92256c18eb00c97d254f3a URL: https://github.com/kamailio/kamailio/commit/5a67316c102649e42f92256c18eb00c… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-02-09T23:21:29Z kazoo: verify timer (cherry picked from commit 00330db3864dbc7df20c76f413beb73a6d60189c) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/5a67316c102649e42f92256c18eb00c… Patch: https://github.com/kamailio/kamailio/commit/5a67316c102649e42f92256c18eb00c… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 0dbf96158c..e04bdd3179 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2659,10 +2659,10 @@ void kz_amqp_reconnect_cb(int fd, short event, void *arg) kz_amqp_timer_destroy(&connection->reconnect); -// if (connection->state == KZ_AMQP_CONNECTION_OPEN) { -// LM_WARN("trying to connect an already connected server.\n"); -// return; -// } + if (connection->state == KZ_AMQP_CONNECTION_OPEN) { + LM_WARN("trying to connect an already connected server.\n"); + return; + } kz_amqp_connect(connection); } @@ -3223,6 +3223,8 @@ int kz_amqp_consumer_worker_proc(int cmd_pipe) void kz_amqp_timer_destroy(kz_amqp_timer_ptr* pTimer) { + if(!pTimer) + return; kz_amqp_timer_ptr timer = *pTimer; if (timer->ev != NULL) { event_del(timer->ev); @@ -3316,7 +3318,6 @@ void kz_amqp_heartbeat_proc(int fd, short event, void *arg) LM_DBG("sending heartbeat to zone : %s , connection id : %d\n", connection->server->zone->zone, connection->server->id); if (connection->state != KZ_AMQP_CONNECTION_OPEN) { kz_amqp_timer_destroy(&connection->heartbeat); - kz_amqp_handle_server_failure(connection); return; } heartbeat.channel = 0;

1 0

git:5.1:358f63a7: kazoo: verify timer
by Luis Azedo 09 Feb '18

09 Feb '18

Module: kamailio Branch: 5.1 Commit: 358f63a7a452923a28f7d5ea682c4dc9cde10d25 URL: https://github.com/kamailio/kamailio/commit/358f63a7a452923a28f7d5ea682c4dc… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-02-09T23:20:58Z kazoo: verify timer (cherry picked from commit 00330db3864dbc7df20c76f413beb73a6d60189c) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/358f63a7a452923a28f7d5ea682c4dc… Patch: https://github.com/kamailio/kamailio/commit/358f63a7a452923a28f7d5ea682c4dc… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 5bc327be1d..affaad4eda 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2659,10 +2659,10 @@ void kz_amqp_reconnect_cb(int fd, short event, void *arg) kz_amqp_timer_destroy(&connection->reconnect); -// if (connection->state == KZ_AMQP_CONNECTION_OPEN) { -// LM_WARN("trying to connect an already connected server.\n"); -// return; -// } + if (connection->state == KZ_AMQP_CONNECTION_OPEN) { + LM_WARN("trying to connect an already connected server.\n"); + return; + } kz_amqp_connect(connection); } @@ -3235,6 +3235,8 @@ int kz_amqp_consumer_worker_proc(int cmd_pipe) void kz_amqp_timer_destroy(kz_amqp_timer_ptr* pTimer) { + if(!pTimer) + return; kz_amqp_timer_ptr timer = *pTimer; if (timer->ev != NULL) { event_del(timer->ev); @@ -3328,7 +3330,6 @@ void kz_amqp_heartbeat_proc(int fd, short event, void *arg) LM_DBG("sending heartbeat to zone : %s , connection id : %d\n", connection->server->zone->zone, connection->server->id); if (connection->state != KZ_AMQP_CONNECTION_OPEN) { kz_amqp_timer_destroy(&connection->heartbeat); - kz_amqp_handle_server_failure(connection); return; } heartbeat.channel = 0;

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