sr-dev November 2018

sr-dev@lists.kamailio.org

22 participants
298 discussions

[kamailio/kamailio] utils/kamctl: Adjusted avalue column in location_attrs tables… (#1723)
by sergey-safarov 19 Nov '18

19 Nov '18

… to store long values #### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 During usage i can see errors in logs related to long values cannot be saved in PostgreSQL. This PR is fix for PostgreSQL and other similar databases. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1723 -- Commit Summary -- * utils/kamctl: Adjusted avalue column in location_attrs tables to store long values -- File Changes -- M utils/kamctl/db_sqlite/usrloc-create.sql (2) M utils/kamctl/mysql/usrloc-create.sql (2) M utils/kamctl/oracle/usrloc-create.sql (2) M utils/kamctl/postgres/usrloc-create.sql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1723.patch https://github.com/kamailio/kamailio/pull/1723.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/1723

2 4

git:master:70f7a0e3: kamctl: regenerated sql creation scripts
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 70f7a0e39d039e5154bc7313b18d361cd4ef82f6 URL: https://github.com/kamailio/kamailio/commit/70f7a0e39d039e5154bc7313b18d361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:51:22+01:00 kamctl: regenerated sql creation scripts --- 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/70f7a0e39d039e5154bc7313b18d361… Patch: https://github.com/kamailio/kamailio/commit/70f7a0e39d039e5154bc7313b18d361… --- diff --git a/utils/kamctl/db_sqlite/usrloc-create.sql b/utils/kamctl/db_sqlite/usrloc-create.sql index c86c8f8f0b..676574f037 100644 --- a/utils/kamctl/db_sqlite/usrloc-create.sql +++ b/utils/kamctl/db_sqlite/usrloc-create.sql @@ -38,7 +38,7 @@ CREATE TABLE location_attrs ( domain VARCHAR(64) DEFAULT NULL, aname VARCHAR(64) DEFAULT '' NOT NULL, atype INTEGER DEFAULT 0 NOT NULL, - avalue VARCHAR(255) DEFAULT '' NOT NULL, + avalue VARCHAR(512) DEFAULT '' NOT NULL, last_modified TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:01' NOT NULL ); diff --git a/utils/kamctl/mysql/usrloc-create.sql b/utils/kamctl/mysql/usrloc-create.sql index a169ef878c..024123b949 100644 --- a/utils/kamctl/mysql/usrloc-create.sql +++ b/utils/kamctl/mysql/usrloc-create.sql @@ -38,7 +38,7 @@ CREATE TABLE `location_attrs` ( `domain` VARCHAR(64) DEFAULT NULL, `aname` VARCHAR(64) DEFAULT '' NOT NULL, `atype` INT(11) DEFAULT 0 NOT NULL, - `avalue` VARCHAR(255) DEFAULT '' NOT NULL, + `avalue` VARCHAR(512) DEFAULT '' NOT NULL, `last_modified` DATETIME DEFAULT '2000-01-01 00:00:01' NOT NULL ); diff --git a/utils/kamctl/oracle/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 4857ed827d..0cf6d822f1 100644 --- a/utils/kamctl/oracle/usrloc-create.sql +++ b/utils/kamctl/oracle/usrloc-create.sql @@ -46,7 +46,7 @@ CREATE TABLE location_attrs ( domain VARCHAR2(64) DEFAULT NULL, aname VARCHAR2(64) DEFAULT '', atype NUMBER(10) DEFAULT 0 NOT NULL, - avalue VARCHAR2(255) DEFAULT '', + avalue VARCHAR2(512) DEFAULT '', last_modified DATE DEFAULT to_date('2000-01-01 00:00:01','yyyy-mm-dd hh24:mi:ss') ); diff --git a/utils/kamctl/postgres/usrloc-create.sql b/utils/kamctl/postgres/usrloc-create.sql index 7046294784..b9e9c90583 100644 --- a/utils/kamctl/postgres/usrloc-create.sql +++ b/utils/kamctl/postgres/usrloc-create.sql @@ -38,7 +38,7 @@ CREATE TABLE location_attrs ( domain VARCHAR(64) DEFAULT NULL, aname VARCHAR(64) DEFAULT '' NOT NULL, atype INTEGER DEFAULT 0 NOT NULL, - avalue VARCHAR(255) DEFAULT '' NOT NULL, + avalue VARCHAR(512) DEFAULT '' NOT NULL, last_modified TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:01' NOT NULL );

1 0

git:master:5ce0020f: lib/srdb1: schema - defined entities for sizes of aname and avalue columns
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 5ce0020f25b4131e5b122df3d075eeb68626b470 URL: https://github.com/kamailio/kamailio/commit/5ce0020f25b4131e5b122df3d075eeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:49:13+01:00 lib/srdb1: schema - defined entities for sizes of aname and avalue columns - avalue column size set to 512 - GH #1723 --- Modified: src/lib/srdb1/schema/entities.xml Modified: src/lib/srdb1/schema/location_attrs.xml --- Diff: https://github.com/kamailio/kamailio/commit/5ce0020f25b4131e5b122df3d075eeb… Patch: https://github.com/kamailio/kamailio/commit/5ce0020f25b4131e5b122df3d075eeb… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 819fa74c3a..2bfe39540f 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -24,6 +24,8 @@ <!ENTITY description_len "255"> <!ENTITY event_len "64"> <!ENTITY etag_len "128"> +<!ENTITY aname_len "64"> +<!ENTITY avalue_len "512"> <!ENTITY MYSQL_TABLE_TYPE ""> <!ENTITY USERCOL "username"> <!ENTITY DEFAULT_ALIASES_EXPIRES "2030-05-28 21:32:15"> diff --git a/src/lib/srdb1/schema/location_attrs.xml b/src/lib/srdb1/schema/location_attrs.xml index 9e62e39ce0..24bf14e2eb 100644 --- a/src/lib/srdb1/schema/location_attrs.xml +++ b/src/lib/srdb1/schema/location_attrs.xml @@ -63,7 +63,7 @@ <column> <name>aname</name> <type>string</type> - <size>64</size> + <size>&aname_len;</size> <default/> <description>Attribute name.</description> </column> @@ -79,7 +79,7 @@ <column> <name>avalue</name> <type>string</type> - <size>255</size> + <size>&avalue_len;</size> <default/> <description>Attribute value.</description> </column>

1 0

Broken: kamailio/kamailio#6674 (5.2 - 1b71de8)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6674 Status: Broken Duration: 7 mins and 8 secs Commit: 1b71de8 (5.2) Author: Victor Seva Message: pkg/kamailio/deb: version set to 5.2.0~rc1 View the changeset: https://github.com/kamailio/kamailio/compare/555322155ce3...1b71de82c145 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456925519?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Broken: kamailio/kamailio#6673 (5.2 - 5553221)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6673 Status: Broken Duration: 6 mins and 1 sec Commit: 5553221 (5.2) Author: Daniel-Constantin Mierla Message: Makefile.defs: version set to 5.2.0-rc1 View the changeset: https://github.com/kamailio/kamailio/compare/3986987d97f3...555322155ce3 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456924088?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:5.2:1b71de82: pkg/kamailio/deb: version set to 5.2.0~rc1
by Victor Seva 19 Nov '18

19 Nov '18

Module: kamailio Branch: 5.2 Commit: 1b71de82c145285fb83478e65ac25a96d6d1bd2f URL: https://github.com/kamailio/kamailio/commit/1b71de82c145285fb83478e65ac25a9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-19T12:39:21+01:00 pkg/kamailio/deb: version set to 5.2.0~rc1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/1b71de82c145285fb83478e65ac25a9… Patch: https://github.com/kamailio/kamailio/commit/1b71de82c145285fb83478e65ac25a9…

1 0

git: new commits in branch 5.2
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

- URL: https://github.com/kamailio/kamailio/commit/9374328bb2c05955658042fbf31807b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:23:05+01:00 cfgutils: error log message mentioning the param lock_set_size (cherry picked from commit 55347626b189cd009c29b0e058949ed7671ae0d0) - URL: https://github.com/kamailio/kamailio/commit/0305e2773a07472f442ab8cf4fbecdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:23:20+01:00 tmx: use branch index for $T_rpl() cache invalidation (cherry picked from commit e2ca5516ae086cf33c61dbb9e653a5484cca2074) - URL: https://github.com/kamailio/kamailio/commit/d9544b6fecdb72e5b1080434a2bdea1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:24:05+01:00 lib/srdb1: added entities to define the size for event and etag columns - etag column size set to 128 (it was 64, but some UAs generate a longer one) (cherry picked from commit 117051c695c815ab40b34c21c852a34386022116) - URL: https://github.com/kamailio/kamailio/commit/26f699afd218c1429894c2a50b95a21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:24:16+01:00 kamctl: regenerated the sql creation scripts (cherry picked from commit 89fcea29b43b3d456ce23ba31bf902add070c223) - URL: https://github.com/kamailio/kamailio/commit/44947e9626473909acf235f6e221e9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:24:32+01:00 lib/srdb1: schema - use etag size entity also for pua and xcap tables (cherry picked from commit 01ba0f334b5a3c2f9cbd5c746c18ac65ecdf44be) - URL: https://github.com/kamailio/kamailio/commit/9eac906cae5a8b6b6a26080056d9d0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:24:43+01:00 kamctl: new update to the sql creation scripts (cherry picked from commit aaabbc1adbd11724031c54137cd00ef01af3962a) - URL: https://github.com/kamailio/kamailio/commit/0327674281bcd27ef72bf617215f8e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:24:56+01:00 websocket: aligned example statements - few more details about return code of handshake process (cherry picked from commit d33ee59bc807acf95b07838d24b888b14a286ddd) - URL: https://github.com/kamailio/kamailio/commit/7ac7761891005ac5bebd2b19c2d0179… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:25:09+01:00 dispatcher: search in xavp sublist for ds_update_dst() attributes - safety checks for type of the value for root xavp - related to GH #1725 (cherry picked from commit f465d2410084ba9118c1f2610fbefa6989974ce9) - URL: https://github.com/kamailio/kamailio/commit/848252c1b202463965bcbb950521b69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:25:22+01:00 htable: init vars in ht_dmq_handle_sync() to avoid compile warnings (cherry picked from commit e0256096742a1f86e571949a5ffcf5e453401977) - URL: https://github.com/kamailio/kamailio/commit/25d2d9f41c6caec6bda3bbbba068235… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:25:38+01:00 htable: use local variable for name in log message instead of null htable pointer (cherry picked from commit 78225d064a76a5d5a3dbd198a4ae38f6423dd272) - URL: https://github.com/kamailio/kamailio/commit/46d4ecc67cddda1dafa834e1c005c98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:25:51+01:00 db_redis: log message if failure to get reply (cherry picked from commit cb8d366d6c5cc9a0af7159e8be65444ac23f47a1) - URL: https://github.com/kamailio/kamailio/commit/0532b6fec0fecf5a6262b04a0e2e31d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:26:01+01:00 tm: t_serial - safety check for searched xavps (cherry picked from commit 372993c82d2ebdafe9f7e1a672a3e3141a8ae2f5) - URL: https://github.com/kamailio/kamailio/commit/1333340f129b51b2e027d83d14e69ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:26:10+01:00 smsops: free after error log message printing a field (cherry picked from commit c571efefebc305b2049eb55458cb0ac1dc3202bb) - URL: https://github.com/kamailio/kamailio/commit/84ecfe146dd629d30086ac12a2c48d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:26:20+01:00 siptrace: convert status code to string using static buffer function (cherry picked from commit 95d56e986e90b0d9a7527d7fa026cb510b41d9c5) - URL: https://github.com/kamailio/kamailio/commit/5460f19d0129256a21794d4fe342033… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:26:39+01:00 presence: safety check for structure vars before accessing fields (cherry picked from commit ed861cfe7f0f4e265b6dc104a79d07ad7d2997e2) - URL: https://github.com/kamailio/kamailio/commit/555322155ce31a43e4528d984b1c722… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:35:20+01:00 Makefile.defs: version set to 5.2.0-rc1

1 0

Still Failing: kamailio/kamailio#6672 (master - ed861cf)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6672 Status: Still Failing Duration: 5 mins and 59 secs Commit: ed861cf (master) Author: Daniel-Constantin Mierla Message: presence: safety check for structure vars before accessing fields View the changeset: https://github.com/kamailio/kamailio/compare/95d56e986e90...ed861cfe7f0f View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456872851?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:ed861cfe: presence: safety check for structure vars before accessing fields
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: ed861cfe7f0f4e265b6dc104a79d07ad7d2997e2 URL: https://github.com/kamailio/kamailio/commit/ed861cfe7f0f4e265b6dc104a79d07a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T10:17:27+01:00 presence: safety check for structure vars before accessing fields --- Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/ed861cfe7f0f4e265b6dc104a79d07a… Patch: https://github.com/kamailio/kamailio/commit/ed861cfe7f0f4e265b6dc104a79d07a… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 9ce259eeaa..258116d53a 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -193,9 +193,13 @@ presentity_t *pres_parse_json_presentity(srjson_t *in) } } + if(!p_event) { + LM_ERR("presence event not found\n"); + return NULL; + } + LM_DBG("building presentity from domain: %.*s, user: %.*s, expires: %d, " - "event: " - "%.*s, etag: %.*s, sender: %.*s", + "event: %.*s, etag: %.*s, sender: %.*s", p_domain.len, p_domain.s, p_user.len, p_user.s, p_expires, p_event->name.len, p_event->name.s, p_etag.len, p_etag.s, p_sender.len, p_sender.s); @@ -301,9 +305,9 @@ int pres_dmq_handle_msg( switch(action) { case PRES_DMQ_UPDATE_PRESENTITY: - if(update_presentity(NULL, presentity, &p_body, t_new, &sent_reply, - sphere, &cur_etag, &ruid, 0) - < 0) { + if(presentity==NULL + || update_presentity(NULL, presentity, &p_body, t_new, + &sent_reply, sphere, &cur_etag, &ruid, 0) < 0) { goto error; } break; diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 497bfa95ea..5527d3736a 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -807,7 +807,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } else { - LM_DBG("updating existing presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); if (ruid) { @@ -1265,7 +1264,7 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, done: - if (pres_enable_dmq>0) { + if (pres_enable_dmq>0 && p_ruid.s!=NULL) { pres_dmq_replicate_presentity(presentity, body, new_t, &cur_etag, sphere, &p_ruid, NULL); } @@ -1934,9 +1933,9 @@ int delete_offline_presentities(str *pres_uri, pres_ev_t *event) int _api_update_presentity(str *event, str *realm, str *user, str *etag, str *sender, str *body, int expires, int new_t, int replace) { - int ret; + int ret = -1; presentity_t *pres = NULL; - pres_ev_t *ev; + pres_ev_t *ev = NULL; char *sphere = NULL; ev = contains_event(event, NULL); @@ -1950,10 +1949,12 @@ int _api_update_presentity(str *event, str *realm, str *user, str *etag, if(sphere_enable) { sphere = extract_sphere(*body); } - ret = update_presentity(NULL, pres, body, new_t, NULL, sphere, NULL, NULL, replace); - - if(pres) + if(pres) { + ret = update_presentity(NULL, pres, body, new_t, NULL, sphere, NULL, + NULL, replace); pkg_free(pres); + } + if(sphere) pkg_free(sphere);

1 0

Still Failing: kamailio/kamailio#6671 (master - 95d56e9)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6671 Status: Still Failing Duration: 6 mins and 21 secs Commit: 95d56e9 (master) Author: Daniel-Constantin Mierla Message: siptrace: convert status code to string using static buffer function View the changeset: https://github.com/kamailio/kamailio/compare/c571efefebc3...95d56e986e90 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456866391?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2018