sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
295 discussions

[kamailio] Enable/disable persistence for uacreg (#369)

by Dan Christian Bogos

As discussed over mailing list, it will be useful to have enable/disable flags inside uacreg table. Ta, DanB --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/369

8 years, 10 months

git:master:7466ec93: uac: support for initial delay of registration

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7466ec937e50d274ec032d37f7de26eee1418625 URL: https://github.com/kamailio/kamailio/commit/7466ec937e50d274ec032d37f7de26e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-18T10:03:28+01:00 uac: support for initial delay of registration - delay initial registration with at least reg_delay value from uacreg table --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/7466ec937e50d274ec032d37f7de26e… Patch: https://github.com/kamailio/kamailio/commit/7466ec937e50d274ec032d37f7de26e… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 509d2ef..b3ad819 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -46,6 +46,7 @@ #define UAC_REG_ONGOING (1<<1) #define UAC_REG_ONLINE (1<<2) #define UAC_REG_AUTHSENT (1<<3) +#define UAC_REG_INIT (1<<4) #define MAX_UACH_SIZE 2048 #define UAC_REG_GC_INTERVAL 150 @@ -70,6 +71,7 @@ typedef struct _reg_uac unsigned int expires; time_t timer_expires; unsigned int reg_delay; + time_t reg_init; } reg_uac_t; typedef struct _reg_item @@ -534,6 +536,7 @@ int reg_ht_add(reg_uac_t *reg) nr->expires = reg->expires; nr->flags = reg->flags; nr->reg_delay = reg->reg_delay; + nr->reg_init = time(NULL); nr->h_uuid = reg_compute_hash(&reg->l_uuid); nr->h_user = reg_compute_hash(&reg->l_username); @@ -961,6 +964,16 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) } if(reg->flags&UAC_REG_DISABLED) return 4; + + if(!(reg->flags & UAC_REG_INIT)) { + if(reg->reg_delay>0) { + if(tn < reg->reg_init+reg->reg_delay) { + return 2; + } + } + } + reg->flags |= UAC_REG_INIT; + if(reg->timer_expires > tn + reg_timer_interval + 3) return 3; uuid = (char*)shm_malloc(reg->l_uuid.len+1); @@ -1526,7 +1539,7 @@ static void rpc_uac_reg_dump(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error creating rpc"); return; } - if(rpc->struct_add(th, "SSSSSSSSSddddd", + if(rpc->struct_add(th, "SSSSSSSSSdddddd", "l_uuid", &reg->r->l_uuid, "l_username", &reg->r->l_username, "l_domain", &reg->r->l_domain, @@ -1541,6 +1554,7 @@ static void rpc_uac_reg_dump(rpc_t* rpc, void* ctx) "flags", (int)reg->r->flags, "diff_expires", (int)(reg->r->timer_expires - tn), "timer_expires", (int)reg->r->timer_expires, + "reg_init", (int)reg->r->reg_init, "reg_delay", (int)reg->r->reg_delay )<0) {

8 years, 10 months

git:master:5b9c5b7d: uac: update flags for disabled state when refreshing record from db

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5b9c5b7dfac1aa7eb98e7986fd3345e3f411783a URL: https://github.com/kamailio/kamailio/commit/5b9c5b7dfac1aa7eb98e7986fd3345e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-18T09:15:37+01:00 uac: update flags for disabled state when refreshing record from db --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/5b9c5b7dfac1aa7eb98e7986fd3345e… Patch: https://github.com/kamailio/kamailio/commit/5b9c5b7dfac1aa7eb98e7986fd3345e… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index cadc473..509d2ef 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -532,6 +532,8 @@ int reg_ht_add(reg_uac_t *reg) } memset(nr, 0, sizeof(reg_uac_t) + len); nr->expires = reg->expires; + nr->flags = reg->flags; + nr->reg_delay = reg->reg_delay; nr->h_uuid = reg_compute_hash(&reg->l_uuid); nr->h_user = reg_compute_hash(&reg->l_username); @@ -595,6 +597,7 @@ int reg_ht_update_attrs(reg_uac_t *reg) strncpy(ri->r->auth_proxy.s, reg->auth_proxy.s, reg->auth_proxy.len); ri->r->auth_proxy.len = reg->auth_proxy.len; ri->r->auth_proxy.s[reg->auth_proxy.len] = '\0'; + if(reg->flags & UAC_REG_DISABLED) ri->r->flags |= UAC_REG_DISABLED; lock_release(&_reg_htable->entries[slot].lock); return 0; }

8 years, 10 months

git:master:b711cb98: uac: load flags column from database

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b711cb98b4111c4f1d7fe73ed005fd54e2634696 URL: https://github.com/kamailio/kamailio/commit/b711cb98b4111c4f1d7fe73ed005fd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-18T09:08:20+01:00 uac: load flags column from database - related to GH #369 --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/b711cb98b4111c4f1d7fe73ed005fd5… Patch: https://github.com/kamailio/kamailio/commit/b711cb98b4111c4f1d7fe73ed005fd5…

8 years, 10 months

git:master:8fb9f171: kamctl: updated db definition scripts for uacreg table

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8fb9f17154ab17c41091b9d71b13b3089b79338a URL: https://github.com/kamailio/kamailio/commit/8fb9f17154ab17c41091b9d71b13b30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-18T09:07:40+01:00 kamctl: updated db definition scripts for uacreg table --- Modified: utils/kamctl/db_berkeley/kamailio/uacreg Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/dbtext/kamailio/uacreg Modified: utils/kamctl/dbtext/kamailio/version 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/8fb9f17154ab17c41091b9d71b13b30… Patch: https://github.com/kamailio/kamailio/commit/8fb9f17154ab17c41091b9d71b13b30…

8 years, 10 months

git:master:c0166c03: lib/srdb1: uacreg table has two new columns - flags, reg_delay

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c0166c037a9db4d0cc90e335541ea7b24add4768 URL: https://github.com/kamailio/kamailio/commit/c0166c037a9db4d0cc90e335541ea7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-18T09:05:39+01:00 lib/srdb1: uacreg table has two new columns - flags, reg_delay - store the flags for runtime behavior - delay intial registration (allow to spread registrations over an interval of time, not to flood the registrar at the same time) --- Modified: lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/c0166c037a9db4d0cc90e335541ea7b… Patch: https://github.com/kamailio/kamailio/commit/c0166c037a9db4d0cc90e335541ea7b… --- diff --git a/lib/srdb1/schema/uacreg.xml b/lib/srdb1/schema/uacreg.xml index 7f690b6..18baeff 100644 --- a/lib/srdb1/schema/uacreg.xml +++ b/lib/srdb1/schema/uacreg.xml @@ -9,7 +9,7 @@ <table id="uacreg" xmlns:db="http://docbook.org/ns/docbook"> <name>uacreg</name> - <version>1</version> + <version>2</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by theuac module to load user details for remote server registration: &KAMAILIO_MOD_DOC;uac.html @@ -105,6 +105,20 @@ <description>Expiration time (in seconds, 0 means disabled)</description> </column> + <column id="flags"> + <name>flags</name> + <type>int</type> + <default>0</default> + <description>Flags to control the behavior</description> + </column> + + <column id="reg_delay"> + <name>reg_delay</name> + <type>int</type> + <default>0</default> + <description>Initial registration delay</description> + </column> + <index> <name>l_uuid_idx</name> <colref linkend="l_uuid"/>

8 years, 10 months

git:master:ee20f55a: uac: reg - auth proxy address can be updated upon account refresh

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ee20f55a16e5015dd6e3ac76c318131240de6688 URL: https://github.com/kamailio/kamailio/commit/ee20f55a16e5015dd6e3ac76c318131… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-18T08:41:42+01:00 uac: reg - auth proxy address can be updated upon account refresh --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/ee20f55a16e5015dd6e3ac76c318131… Patch: https://github.com/kamailio/kamailio/commit/ee20f55a16e5015dd6e3ac76c318131… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 39499b6..f614b33 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -51,6 +51,8 @@ #define UAC_REG_GC_INTERVAL 150 #define UAC_REG_MAX_PASSWD_SIZE 63 +#define UAC_REG_MAX_URI_SIZE 127 + typedef struct _reg_uac { unsigned int h_uuid; @@ -471,13 +473,13 @@ int reg_ht_add_byuser(reg_uac_t *reg) return 0; } -#define reg_copy_shm(dst, src) do { \ +#define reg_copy_shm(dst, src, bsize) do { \ if((src)->s!=NULL) { \ (dst)->s = p; \ strncpy((dst)->s, (src)->s, (src)->len); \ (dst)->len = (src)->len; \ (dst)->s[(dst)->len] = '\0'; \ - p = p + (dst)->len + 1; \ + p = p + ((bsize)?(bsize):(dst)->len) + 1; \ } \ } while(0); @@ -501,6 +503,12 @@ int reg_ht_add(reg_uac_t *reg) reg, _reg_htable, reg->auth_password.len); return -1; } + if(reg->auth_proxy.len>UAC_REG_MAX_URI_SIZE) + { + LM_ERR("bad parameters: %p/%p -- proxy uri too long %d\n", + reg, _reg_htable, reg->auth_proxy.len); + return -1; + } len = reg->l_uuid.len + 1 + reg->l_username.len + 1 @@ -508,7 +516,7 @@ int reg_ht_add(reg_uac_t *reg) + reg->r_username.len + 1 + reg->r_domain.len + 1 + reg->realm.len + 1 - + reg->auth_proxy.len + 1 + + UAC_REG_MAX_URI_SIZE /*reg->auth_proxy.len*/ + 1 + reg->auth_username.len + 1 + UAC_REG_MAX_PASSWD_SIZE /*reg->auth_password.len*/ + 1; nr = (reg_uac_t*)shm_malloc(sizeof(reg_uac_t) + len); @@ -524,16 +532,16 @@ int reg_ht_add(reg_uac_t *reg) p = (char*)nr + sizeof(reg_uac_t); - reg_copy_shm(&nr->l_uuid, &reg->l_uuid); - reg_copy_shm(&nr->l_username, &reg->l_username); - reg_copy_shm(&nr->l_domain, &reg->l_domain); - reg_copy_shm(&nr->r_username, &reg->r_username); - reg_copy_shm(&nr->r_domain, &reg->r_domain); - reg_copy_shm(&nr->realm, &reg->realm); - reg_copy_shm(&nr->auth_proxy, &reg->auth_proxy); - reg_copy_shm(&nr->auth_username, &reg->auth_username); + reg_copy_shm(&nr->l_uuid, &reg->l_uuid, 0); + reg_copy_shm(&nr->l_username, &reg->l_username, 0); + reg_copy_shm(&nr->l_domain, &reg->l_domain, 0); + reg_copy_shm(&nr->r_username, &reg->r_username, 0); + reg_copy_shm(&nr->r_domain, &reg->r_domain, 0); + reg_copy_shm(&nr->realm, &reg->realm, 0); + reg_copy_shm(&nr->auth_proxy, &reg->auth_proxy, UAC_REG_MAX_URI_SIZE); + reg_copy_shm(&nr->auth_username, &reg->auth_username, 0); /* password at the end, to be able to update it easily */ - reg_copy_shm(&nr->auth_password, &reg->auth_password); + reg_copy_shm(&nr->auth_password, &reg->auth_password, 0); reg_ht_add_byuser(nr); reg_ht_add_byuuid(nr); @@ -546,7 +554,7 @@ int reg_ht_add(reg_uac_t *reg) /** * */ -int reg_ht_update_password(reg_uac_t *reg) +int reg_ht_update_attrs(reg_uac_t *reg) { unsigned int slot; reg_item_t *ri = NULL; @@ -562,6 +570,11 @@ int reg_ht_update_password(reg_uac_t *reg) LM_ERR("password is too big: %d\n", reg->auth_password.len); return -1; } + if(reg->auth_proxy.len>UAC_REG_MAX_URI_SIZE) + { + LM_ERR("proxy uri is too big: %d\n", reg->auth_proxy.len); + return -1; + } slot = reg_get_entry(reg->h_user, _reg_htable->htsize); lock_get(&_reg_htable->entries[slot].lock); @@ -574,6 +587,9 @@ int reg_ht_update_password(reg_uac_t *reg) strncpy(ri->r->auth_password.s, reg->auth_password.s, reg->auth_password.len); ri->r->auth_password.len = reg->auth_password.len; ri->r->auth_password.s[reg->auth_password.len] = '\0'; + strncpy(ri->r->auth_proxy.s, reg->auth_proxy.s, reg->auth_proxy.len); + ri->r->auth_proxy.len = reg->auth_proxy.len; + ri->r->auth_proxy.s[reg->auth_proxy.len] = '\0'; lock_release(&_reg_htable->entries[slot].lock); return 0; } @@ -1288,7 +1304,7 @@ int uac_reg_db_refresh(str *pl_uuid) lock_get(_reg_htable_gc_lock); if(reg_ht_get_byuuid(pl_uuid)!=NULL) { - if(reg_ht_update_password(&reg)<0) + if(reg_ht_update_attrs(&reg)<0) { lock_release(_reg_htable_gc_lock); LM_ERR("Error updating reg to htable\n");

8 years, 10 months

[kamailio] modules/uac: Record-Route header parameter format for replace_uri (#455)

by Dmitri Savolainen

Module uac use some kind of Base64 for SipUri saving in Record-Route header parameter "rr_from_store_param" Base64 is case sensitive, but according to rfc3261: ``` When comparing header fields, field names are always case- insensitive Unless otherwise stated in the definition of a particular header field, field values, parameter names, and parameter values are case-insensitive Tokens are always case-insensitive Unless specified otherwise, values expressed as quoted strings are case-sensitive For example, Contact: <sip:alice@atlantacom>;expires=3600 is equivalent to CONTACT: <sip:alice@atlantacom>;ExPiReS=3600 and Content-Disposition: session;handling=optional is equivalent to content-disposition: Session;HANDLING=OPTIONAL The following two header fields are not equivalent: Warning: 370 devnull "Choose a bigger pipe" Warning: 370 devnull "CHOOSE A BIGGER PIPE" ``` Ok " values expressed as quoted strings are case-sensitive", so I thought to make a quoted string like ``` Record-Route: <sip:xxxxxxxxxxxx:5071;lr;ftag=SDj3nsa01-78422015;vsf="baSE64strinG";nat=yes> ``` but according to rfc3261 DQUATE is not possible here: ``` other-param = pname [ "=" pvalue ] pname = 1*paramchar pvalue = 1*paramchar paramchar = param-unreserved / unreserved / escaped param-unreserved = "[" / "]" / "/" / ":" / "&" / "+" / "$" ``` Some devices in my network convert "rr_from_store_param" to lower-case letters, so there is trash in To/From headers after restore, It is not wise behaviour, but is rfc compliant So any idea for using Base32 instead of Base64? --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/455

8 years, 10 months

Canceled: kamailio/kamailio#1788 (master - 2370c6d)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #1788 Status: Canceled Duration: 1 minute and 6 seconds Commit: 2370c6d (master) Author: Carsten Bock Message: ims_charging: Added missing field in Ro-Session (introduced in previous commit) View the changeset: https://github.com/kamailio/kamailio/compare/6f46f87acf7b...2370c6dccec3 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/102558916 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

8 years, 10 months

Errored: kamailio/kamailio#1788 (master - 2370c6d)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #1788 Status: Errored Duration: 10 minutes and 46 seconds Commit: 2370c6d (master) Author: Carsten Bock Message: ims_charging: Added missing field in Ro-Session (introduced in previous commit) View the changeset: https://github.com/kamailio/kamailio/compare/6f46f87acf7b...2370c6dccec3 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/102558916 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

8 years, 10 months

← Newer
1
...
18
19
20
21
22
23
24
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016