sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
475 discussions

Broken: linuxmaniac/kamailio#58 (master - 9e4619d)

by Travis CI

Build Update for linuxmaniac/kamailio ------------------------------------- Build: #58 Status: Broken Duration: 6 minutes and 14 seconds Commit: 9e4619d (master) Author: Victor Seva Message: travis-ci: create matrix for builds it will generate CC/clang build for debug/release profiles View the changeset: https://github.com/linuxmaniac/kamailio/compare/cea7270c7607...9e4619d49b3b View the full build log and details: https://travis-ci.org/linuxmaniac/kamailio/builds/316425292?utm_source=emai… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years

git:5.1:aaef1468: core: events - fix getting str pointer for EXTRA_DEBUG log message

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: aaef146868dfd3117f7130a95c908d47de0cb56f URL: https://github.com/kamailio/kamailio/commit/aaef146868dfd3117f7130a95c908d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-14T14:08:42+01:00 core: events - fix getting str pointer for EXTRA_DEBUG log message - reported by GH #1367 (cherry picked from commit 49a12679ffa20ccef4d9cc14c426d4d5c2567816) --- Modified: src/core/events.c --- Diff: https://github.com/kamailio/kamailio/commit/aaef146868dfd3117f7130a95c908d4… Patch: https://github.com/kamailio/kamailio/commit/aaef146868dfd3117f7130a95c908d4… --- diff --git a/src/core/events.c b/src/core/events.c index 5293969ff5..5f71cd8f22 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -221,7 +221,7 @@ int sr_event_exec(int type, sr_event_param_t *evp) if(unlikely(_sr_events_list.net_data_out[SREV_CB_LIST_SIZE-1]!=0)) { #ifdef EXTRA_DEBUG - p = (str*)data; + p = (str*)evp->data; LM_DBG("PRE-OUT ++++++++++++++++++++\n" "%.*s\n+++++++++++++++++++\n", p->len, p->s); #endif /* EXTRA_DEBUG */

7 years

[kamailio/kamailio] Make the code compile in debug mode (#1367)

by David Minh Phan

#### Pre-Submission Checklist    - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  There was a typo that generated an error when compling in debug mode. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1367 -- Commit Summary -- * typo fix -- File Changes -- M src/core/events.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1367.patch https://github.com/kamailio/kamailio/pull/1367.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/1367

7 years

git:master:49a12679: core: events - fix getting str pointer for EXTRA_DEBUG log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 49a12679ffa20ccef4d9cc14c426d4d5c2567816 URL: https://github.com/kamailio/kamailio/commit/49a12679ffa20ccef4d9cc14c426d4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-14T14:06:43+01:00 core: events - fix getting str pointer for EXTRA_DEBUG log message - reported by GH #1367 --- Modified: src/core/events.c --- Diff: https://github.com/kamailio/kamailio/commit/49a12679ffa20ccef4d9cc14c426d4d… Patch: https://github.com/kamailio/kamailio/commit/49a12679ffa20ccef4d9cc14c426d4d… --- diff --git a/src/core/events.c b/src/core/events.c index 5293969ff5..5f71cd8f22 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -221,7 +221,7 @@ int sr_event_exec(int type, sr_event_param_t *evp) if(unlikely(_sr_events_list.net_data_out[SREV_CB_LIST_SIZE-1]!=0)) { #ifdef EXTRA_DEBUG - p = (str*)data; + p = (str*)evp->data; LM_DBG("PRE-OUT ++++++++++++++++++++\n" "%.*s\n+++++++++++++++++++\n", p->len, p->s); #endif /* EXTRA_DEBUG */

7 years

[kamailio/kamailio] 5.1.0 group use_domain not working (after upgrade from 5.0) (#1363)

by Anthony Messina

### Description  After upgrading from 5.0 to 5.1.0, the use_domain parameter of the group module doesn't seem to work properly. The configuration file was not changed for the upgrade. ### Troubleshooting #### Reproduction Verified proper configuration ``` #!define WITH_GROUP ... #!ifdef WITH_MULTIDOMAIN #!define MULTIDOMAIN 1 #!else #!define MULTIDOMAIN 0 #!endif ... #!ifdef WITH_GROUP # ----- group params ----- modparam("group", "db_url", DBURL) modparam("group", "use_domain", MULTIDOMAIN) #!endif ``` #### Log Messages  The actual phone number has been replaced by `+1NXXNXXXXXX` below. ``` kamailio[5663]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f072eecf700 kamailio[5663]: DEBUG: db_postgres [km_val.c:154]: db_postgres_val2str(): PQescapeStringConn: in: 12 chars, out: 12 chars kamailio[5663]: DEBUG: db_postgres [km_val.c:154]: db_postgres_val2str(): PQescapeStringConn: in: 3 chars, out: 3 chars kamailio[5663]: DEBUG: db_postgres [km_val.c:154]: db_postgres_val2str(): PQescapeStringConn: in: 0 chars, out: 0 chars kamailio[5663]: DEBUG: db_postgres [km_dbase.c:248]: db_postgres_submit_query(): sending query ok: 0x7f072efefca0 (2) - [select grp from grp where username='+1NXXNXXXXXX' AND grp='did' AND domain=''] kamailio[5663]: DEBUG: <core> [db_res.c:119]: db_new_result(): allocate 56 bytes for result set at 0x7f072efce170 kamailio[5663]: DEBUG: db_postgres [km_dbase.c:530]: db_postgres_store_result(): 0x7f072efefca0 PQresultStatus(PGRES_TUPLES_OK) PQgetResult(0x14f5d00) kamailio[5663]: DEBUG: db_postgres [km_res.c:95]: db_postgres_get_columns(): 1 columns returned from the query kamailio[5663]: DEBUG: <core> [db_res.c:156]: db_allocate_columns(): allocate 8 bytes for result names at 0x7f072f065478 kamailio[5663]: DEBUG: <core> [db_res.c:167]: db_allocate_columns(): allocate 4 bytes for result types at 0x7f072f065118 kamailio[5663]: DEBUG: db_postgres [km_res.c:112]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[0] at 0x7f072efef9e8 kamailio[5663]: DEBUG: db_postgres [km_res.c:119]: db_postgres_get_columns(): RES_NAMES(0x7f072efef9e8)[0]=[grp] kamailio[5663]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type kamailio[5663]: DEBUG: db_postgres [km_res.c:200]: db_postgres_convert_rows(): no rows returned from the query kamailio[5663]: DEBUG: group [group.c:182]: is_user_in_helper(): user is not in group 'did' ``` #### SIP Traffic  Since the group isn't found with the domain, the call is rejected (but the SIP traffic isn't an issue here). ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.0 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 18:49:15 Dec 11 2017 with gcc 7.2.1 ``` * **Operating System**:  ``` Linux example.com 4.14.3-300.fc27.x86_64 #1 SMP Mon Dec 4 17:18:27 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/issues/1363

7 years

[kamailio/kamailio] usrloc: extend handle_lost_tcp use for get_urecord (#1366)

by Vasiliy Ganchev

#### 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) - [ ] 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hi there! So my case, and why I did not use the existing code: - incoming INVITE to a user with 2 records in usrloc (1st - UDP, 2nd - TLS) - some time before lookup, TLS connect of 2nd device is closed, but usrloc record still exists (it going to be removed in the next iteration of timer) - after lookup(location) - 2 branches are created - send to 1st - UDP succeed - send to 2nd - TLS failed. And here is my headache. -- I want to send push notification to this device -- I set t_on_branch_failure -- if I try failure_exec_mode=1 - I get control, and I am able to send push, but I need to wait until fr_timer fire (I wanted not to wait, and send immediately) The idea of changes: - usrloc -> get_urecord: if t_contact has tcpcon_id & connection is not alive => mark record as expired - as a result, in the registrar, while lookup, this contact will fail VALID_CONTACT - and will not be returned to the scriptwriter. All of this is wrapped by handle_lost_tcp parameter (that is 0 by default), so changes are extending of handle_lost_tcp parameter of usrloc. Checked doc for usrloc, and seems to me that current description of this parameter should be untouched. Marked as expired contact will be removed by timer as usual. Open for discussion, and thanks in advance. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1366 -- Commit Summary -- * usrloc: extend handle_lost_tcp use for get_urecord * usrloc: extend handle_lost_tcp, do not use inline functions -- File Changes -- M src/modules/usrloc/udomain.c (15) M src/modules/usrloc/urecord.c (4) M src/modules/usrloc/urecord.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1366.patch https://github.com/kamailio/kamailio/pull/1366.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/1366

7 years

git:master:a1cf1aa3: usrloc: extend handle_lost_tcp use for get_urecord (#1366)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a1cf1aa3861aeecca8c06e284fe90c4acc71fe08 URL: https://github.com/kamailio/kamailio/commit/a1cf1aa3861aeecca8c06e284fe90c4… Author: Vasiliy Ganchev <vance(a)ukr.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-14T14:04:07+01:00 usrloc: extend handle_lost_tcp use for get_urecord (#1366) * usrloc: extend handle_lost_tcp use for get_urecord * usrloc: extend handle_lost_tcp, do not use inline functions --- Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/urecord.c Modified: src/modules/usrloc/urecord.h --- Diff: https://github.com/kamailio/kamailio/commit/a1cf1aa3861aeecca8c06e284fe90c4… Patch: https://github.com/kamailio/kamailio/commit/a1cf1aa3861aeecca8c06e284fe90c4… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 95994c201b..bf4a040e58 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -40,6 +40,7 @@ #include "usrloc.h" #include "utime.h" #include "usrloc.h" +#include "urecord.h" #ifdef STATISTICS static char *build_stat_name( str* domain, char *var_name) @@ -1116,6 +1117,7 @@ int get_urecord(udomain_t* _d, str* _aor, struct urecord** _r) { unsigned int sl, i, aorhash; urecord_t* r; + ucontact_t* ptr = NULL; if (db_mode!=DB_ONLY) { /* search in cache */ @@ -1125,7 +1127,18 @@ int get_urecord(udomain_t* _d, str* _aor, struct urecord** _r) for(i = 0; r!=NULL && i < _d->table[sl].n; i++) { if((r->aorhash==aorhash) && (r->aor.len==_aor->len) - && !memcmp(r->aor.s,_aor->s,_aor->len)){ + && !memcmp(r->aor.s,_aor->s,_aor->len)) + { + if (handle_lost_tcp) + { + for (ptr = r->contacts;ptr;ptr = ptr->next) + { + if (ptr->expires == UL_EXPIRED_TIME ) + continue; + if (is_valid_tcpconn(ptr) && !is_tcp_alive(ptr)) + ptr->expires = UL_EXPIRED_TIME; + } + } *_r = r; return 0; } diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index 9223b857df..ef223db960 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -216,7 +216,7 @@ void mem_delete_ucontact(urecord_t* _r, ucontact_t* _c) free_ucontact(_c); } -static inline int is_valid_tcpconn(ucontact_t *c) +int is_valid_tcpconn(ucontact_t *c) { if (c->tcpconn_id == -1) return 0; /* tcpconn_id is not present */ @@ -224,7 +224,7 @@ static inline int is_valid_tcpconn(ucontact_t *c) return 1; /* valid tcpconn_id */ } -static inline int is_tcp_alive(ucontact_t *c) +int is_tcp_alive(ucontact_t *c) { struct tcp_connection *con = NULL; int rc = 0; diff --git a/src/modules/usrloc/urecord.h b/src/modules/usrloc/urecord.h index 83b3c044e7..5ac7c9ae62 100644 --- a/src/modules/usrloc/urecord.h +++ b/src/modules/usrloc/urecord.h @@ -189,4 +189,8 @@ int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, int get_ucontact_by_instance(urecord_t* _r, str* _c, ucontact_info_t* _ci, ucontact_t** _co); +int is_valid_tcpconn(ucontact_t *c); + +int is_tcp_alive(ucontact_t *c); + #endif

7 years

git:master:cea7270c: pkg/kamailio/deb: version set to 5.2.0~dev2

by Victor Seva

Module: kamailio Branch: master Commit: cea7270c7607bb9ca58667f6322f20629e5d2338 URL: https://github.com/kamailio/kamailio/commit/cea7270c7607bb9ca58667f6322f206… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-14T13:08:02+01:00 pkg/kamailio/deb: version set to 5.2.0~dev2 --- 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/cea7270c7607bb9ca58667f6322f206… Patch: https://github.com/kamailio/kamailio/commit/cea7270c7607bb9ca58667f6322f206… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index ee14ead055..9c23511c6e 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev2) UNRELEASED; urgency=medium + + * version set to 5.2.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Thu, 14 Dec 2017 13:07:23 +0100 + kamailio (5.2.0~dev1) unstable; urgency=medium * version set to 5.2.0-dev1 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index ee14ead055..9c23511c6e 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev2) UNRELEASED; urgency=medium + + * version set to 5.2.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Thu, 14 Dec 2017 13:07:23 +0100 + kamailio (5.2.0~dev1) unstable; urgency=medium * version set to 5.2.0-dev1 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index ee14ead055..9c23511c6e 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev2) UNRELEASED; urgency=medium + + * version set to 5.2.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Thu, 14 Dec 2017 13:07:23 +0100 + kamailio (5.2.0~dev1) unstable; urgency=medium * version set to 5.2.0-dev1 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index ee14ead055..9c23511c6e 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev2) UNRELEASED; urgency=medium + + * version set to 5.2.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Thu, 14 Dec 2017 13:07:23 +0100 + kamailio (5.2.0~dev1) unstable; urgency=medium * version set to 5.2.0-dev1 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index ee14ead055..9c23511c6e 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev2) UNRELEASED; urgency=medium + + * version set to 5.2.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Thu, 14 Dec 2017 13:07:23 +0100 + kamailio (5.2.0~dev1) unstable; urgency=medium * version set to 5.2.0-dev1 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index ee14ead055..9c23511c6e 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev2) UNRELEASED; urgency=medium + + * version set to 5.2.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Thu, 14 Dec 2017 13:07:23 +0100 + kamailio (5.2.0~dev1) unstable; urgency=medium * version set to 5.2.0-dev1 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index ee14ead055..9c23511c6e 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev2) UNRELEASED; urgency=medium + + * version set to 5.2.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Thu, 14 Dec 2017 13:07:23 +0100 + kamailio (5.2.0~dev1) unstable; urgency=medium * version set to 5.2.0-dev1 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index ee14ead055..9c23511c6e 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev2) UNRELEASED; urgency=medium + + * version set to 5.2.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Thu, 14 Dec 2017 13:07:23 +0100 + kamailio (5.2.0~dev1) unstable; urgency=medium * version set to 5.2.0-dev1 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index ee14ead055..9c23511c6e 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev2) UNRELEASED; urgency=medium + + * version set to 5.2.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Thu, 14 Dec 2017 13:07:23 +0100 + kamailio (5.2.0~dev1) unstable; urgency=medium * version set to 5.2.0-dev1

7 years

git:5.0:89baecd1: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.0 Commit: 89baecd169ce6a0ee0a084eb17dd8a7ea674b960 URL: https://github.com/kamailio/kamailio/commit/89baecd169ce6a0ee0a084eb17dd8a7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-12-14T12:46:25+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/89baecd169ce6a0ee0a084eb17dd8a7… Patch: https://github.com/kamailio/kamailio/commit/89baecd169ce6a0ee0a084eb17dd8a7… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 036e44356f..32fe34657f 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -980,7 +980,8 @@ if (registered("location","$rz:$Au", 2)) { This makes sense only in multiple replicated servers scenarios. Meaning of the parameters is as follows: - * hdr_name - header name to be used. + * hdr_name - header name to be used, it can be a static string or + contain variables. This function can be used from REQUEST_ROUTE. @@ -1140,6 +1141,7 @@ event_route[usrloc:contact-expired] { * regid - reg-id value * instance - instance value * conid - TCP socket internal connection ID ($null if UDP) + * server_id - server_id value The pseudo-variable accepts positive index value to access a specific contact record.

7 years

git:5.0:620b326b: registrar: added server_id to pv attributes

by Charles Chance

Module: kamailio Branch: 5.0 Commit: 620b326b35e3b836e816422dbf0a236185040db3 URL: https://github.com/kamailio/kamailio/commit/620b326b35e3b836e816422dbf0a236… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-12-14T09:41:19Z registrar: added server_id to pv attributes (cherry picked from commit 616a89f281bfe77c4d31719dc3d7bd27de5c6bac) --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/620b326b35e3b836e816422dbf0a236… Patch: https://github.com/kamailio/kamailio/commit/620b326b35e3b836e816422dbf0a236… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 98a21dccea..709f8a9484 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1598,7 +1598,11 @@ event_route[usrloc:contact-expired] { <listitem> <para><emphasis>conid</emphasis> - TCP socket internal connection ID ($null if UDP) </para> - </listitem> + </listitem> + <listitem> + <para><emphasis>server_id</emphasis> - server_id value + </para> + </listitem> </itemizedlist> <para> The pseudo-variable accepts positive index value to access diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index 8e9146b1ce..7edfd87275 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -273,6 +273,9 @@ int pv_get_ulc(struct sip_msg *msg, pv_param_t *param, if (c->sock && (c->sock->proto == PROTO_TCP || c->sock->proto == PROTO_TLS || c->sock->proto == PROTO_WS || c->sock->proto == PROTO_WSS)) return pv_get_sintval(msg, param, res, c->tcpconn_id); break; + case 22: /* server_id */ + return pv_get_uintval(msg, param, res, c->server_id); + break; } return pv_get_null(msg, param, res); @@ -400,6 +403,10 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) rp->attr = 20; else goto error; break; + case 9: + if(strncmp(pa.s, "server_id", 9)==0) + rp->attr = 22; + break; case 10: if(strncmp(pa.s, "user_agent", 10)==0) rp->attr = 12;

7 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017