sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
341 discussions

Start a nNew thread

outbound force_outbound_flag
by GG GG 27 Feb '15

27 Feb '15

I just realized that I need to set a flag transaction in the script... Sorry.

1 0

outbound force_outbound_flag
by GG GG 27 Feb '15

27 Feb '15

modparam("outbound", "force_outbound_flag", 1) doesn't work. In modules/outbound/ob_mod.c: int use_outbound(struct sip_msg *msg) ... /* If Outbound is forced return success without any further checks */ if (ob_force_flag != -1 && isflagset(msg, ob_force_flag) > 0) isflagset(msg, ob_force_flag) > 0 is always false, it seems the flag is never set. If I remove isflagset(msg, ob_force_flag) > 0, it works, and the token is added in Path header. What's the isflagset() supposed to check ? I'm using the edge proxy example at http://kamailio.org/docs/modules/4.2.x/modules/outbound.html#idp190984 Thanks.

1 0

git:4.2:af726efb: kazoo - fix compilation
by Luis Azedo 27 Feb '15

27 Feb '15

Module: kamailio Branch: 4.2 Commit: af726efbe52bfa082d4b8060be01b0a69c732b0d URL: https://github.com/kamailio/kamailio/commit/af726efbe52bfa082d4b8060be01b0a… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-24T22:38:34Z kazoo - fix compilation (cherry picked from commit 12af51df76e779c70470c57ef0b992831441f275) --- Modified: modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/af726efbe52bfa082d4b8060be01b0a… Patch: https://github.com/kamailio/kamailio/commit/af726efbe52bfa082d4b8060be01b0a… --- diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index c3f6a00..89484d1 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -240,7 +240,7 @@ static int mod_init(void) { } if(kz_timer_ms > 0) { - kz_timer_tv.tv_usec = (kz_timer_ms 1000) * 1000; + kz_timer_tv.tv_usec = (kz_timer_ms % 1000) * 1000; kz_timer_tv.tv_sec = kz_timer_ms / 1000; }

1 0

git:4.2:9b44517c: kazoo - fix timer interval
by Luis Azedo 27 Feb '15

27 Feb '15

Module: kamailio Branch: 4.2 Commit: 9b44517c6e8efe9e6445940ee7f0c505abef613d URL: https://github.com/kamailio/kamailio/commit/9b44517c6e8efe9e6445940ee7f0c50… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-24T22:27:47Z kazoo - fix timer interval amqp timer and publish proc take all cpu new param amqp_timmer_process_interval in MS and removed the timeout on select from tcp workers (cherry picked from commit 7ae9f6693406c76d7d58389d5cf4ccaa44958a02) --- Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/9b44517c6e8efe9e6445940ee7f0c50… Patch: https://github.com/kamailio/kamailio/commit/9b44517c6e8efe9e6445940ee7f0c50… --- diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index d110131..c3f6a00 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -70,6 +70,8 @@ struct timeval kz_sock_tv = (struct timeval){0,100000}; struct timeval kz_amqp_tv = (struct timeval){0,100000}; struct timeval kz_qtimeout_tv = (struct timeval){2,0}; struct timeval kz_ack_tv = (struct timeval){0,100000}; +struct timeval kz_timer_tv = (struct timeval){0,200000}; +int kz_timer_ms = 200; str dbk_consumer_event_key = str_init("Event-Category"); @@ -148,6 +150,7 @@ static param_export_t params[] = { // {"mwi_expires", INT_PARAM, &dbk_mwi_expires}, {"amqp_connection", STR_PARAM|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, {"amqp_max_channels", INT_PARAM, &dbk_channels}, + {"amqp_timmer_process_interval", INT_PARAM, &kz_timer_ms}, {"amqp_consumer_ack_timeout_micro", INT_PARAM, &kz_ack_tv.tv_usec}, {"amqp_consumer_ack_timeout_sec", INT_PARAM, &kz_ack_tv.tv_sec}, {"amqp_interprocess_timeout_micro", INT_PARAM, &kz_sock_tv.tv_usec}, @@ -235,6 +238,11 @@ static int mod_init(void) { if(!kz_amqp_init()) { return -1; } + + if(kz_timer_ms > 0) { + kz_timer_tv.tv_usec = (kz_timer_ms 1000) * 1000; + kz_timer_tv.tv_sec = kz_timer_ms / 1000; + } if(dbk_pua_mode == 1) { kz_db_url.len = kz_db_url.s ? strlen(kz_db_url.s) : 0; diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 498347e..f1534d8 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -35,6 +35,7 @@ extern struct timeval kz_sock_tv; extern struct timeval kz_amqp_tv; extern struct timeval kz_qtimeout_tv; extern struct timeval kz_ack_tv; +extern struct timeval kz_timer_tv; extern int dbk_internal_loop_count; extern int dbk_consumer_loop_count; @@ -1909,6 +1910,7 @@ void kz_amqp_timeout_proc(int child_no) int i; while(1) { struct timeval now; + usleep(kz_timer_tv.tv_usec); for(i=0; i < dbk_channels; i++) { gettimeofday(&now, NULL); if(channels[i].state == KZ_AMQP_CALLING @@ -1972,7 +1974,7 @@ void kz_amqp_publisher_proc(int child_no) while(OK) { FD_ZERO(&fdset); FD_SET(data_pipe, &fdset); - selret = select(FD_SETSIZE, &fdset, NULL, NULL, &kz_sock_tv); + selret = select(FD_SETSIZE, &fdset, NULL, NULL, NULL); if (selret < 0) { LM_ERR("select() failed: %s\n", strerror(errno)); continue;

1 0

git:4.2:856b9e7d: kazoo - fix crashing on heavy load
by Luis Azedo 27 Feb '15

27 Feb '15

Module: kamailio Branch: 4.2 Commit: 856b9e7df04d41a5564a755ce60be5bd708c80cb URL: https://github.com/kamailio/kamailio/commit/856b9e7df04d41a5564a755ce60be5b… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-24T22:27:14Z kazoo - fix crashing on heavy load (cherry picked from commit 0506b9898867c5d165defa0acf1501cad13513eb) --- Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c Modified: modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/856b9e7df04d41a5564a755ce60be5b… Patch: https://github.com/kamailio/kamailio/commit/856b9e7df04d41a5564a755ce60be5b…

1 0

[kamailio] usrloc - fix contacts attrs not deleted (#102)
by lazedo 27 Feb '15

27 Feb '15

when the contact is deleted using db_delete_ucontact_ruid (default) the uldb_attrs_delete is not called leaving the location_attrs with unwanted records created uldb_attrs_delete_ruid to be called by db_delete_ucontact_ruid redirected uldb_attrs_delete to uldb_attrs_delete_ruid also changed the places inside contact where uldb_attrs_delete was called to call new uldb_attrs_delete_ruid function You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/102 -- Commit Summary -- * usrloc - fix contacts attrs not deleted -- File Changes -- M modules/usrloc/ucontact.c (80) -- Patch Links -- https://github.com/kamailio/kamailio/pull/102.patch https://github.com/kamailio/kamailio/pull/102.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/102

2 8

git:master:f5a7b12c: usrloc - fix db_delete_ucontact_ruid
by Luis Azedo 27 Feb '15

27 Feb '15

Module: kamailio Branch: master Commit: f5a7b12ce5f73749e9ae3d7a31e2a3616539421c URL: https://github.com/kamailio/kamailio/commit/f5a7b12ce5f73749e9ae3d7a31e2a36… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-27T11:20:20Z usrloc - fix db_delete_ucontact_ruid when the contact is deleted using db_delete_ucontact_ruid (default) the uldb_attrs_delete is not called leaving the location_attrs with unwanted records created uldb_attrs_delete_ruid to be called by db_delete_ucontact_ruid redirected uldb_attrs_delete to uldb_attrs_delete_ruid when ul_db_ops_ruid == 1 (cherry picked from commit 09c51685af36071aad6054d84571c260be2ba9e2) --- Modified: modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/f5a7b12ce5f73749e9ae3d7a31e2a36… Patch: https://github.com/kamailio/kamailio/commit/f5a7b12ce5f73749e9ae3d7a31e2a36… --- diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 737da03..89b94dc 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -76,6 +76,8 @@ void ucontact_xavp_store(ucontact_t *_c) } #endif +int uldb_delete_attrs_ruid(str* _dname, str *_ruid); + /*! * \brief Create a new contact structure * \param _dom domain @@ -1451,6 +1453,8 @@ int db_delete_ucontact_ruid(ucontact_t* _c) vals[n].val.str_val = _c->ruid; n++; + uldb_delete_attrs_ruid(_c->domain, &_c->ruid); + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { LM_ERR("sql use_table failed\n"); return -1; @@ -1611,6 +1615,9 @@ int uldb_delete_attrs(str* _dname, str *_user, str *_domain, str *_ruid) db_key_t keys[3]; db_val_t vals[3]; + if(ul_db_ops_ruid==1) + return uldb_delete_attrs_ruid(_dname, _ruid); + LM_DBG("trying to delete location attributes\n"); if(ul_xavp_contact_name.s==NULL) { @@ -1660,6 +1667,56 @@ int uldb_delete_attrs(str* _dname, str *_user, str *_domain, str *_ruid) } /*! + * \brief Delete all location attributes from a udomain by ruid + * + * \param _dname loaded domain name + * \param _ruid usrloc record unique id + * \return 0 on success, -1 on failure + */ +int uldb_delete_attrs_ruid(str* _dname, str *_ruid) +{ + char tname_buf[64]; + str tname; + db_key_t keys[1]; + db_val_t vals[1]; + + LM_DBG("trying to delete location attributes\n"); + + if(ul_xavp_contact_name.s==NULL) { + /* feature disabled by mod param */ + return 0; + } + + if(_dname->len+6>=64) { + LM_ERR("attributes table name is too big\n"); + return -1; + } + strncpy(tname_buf, _dname->s, _dname->len); + tname_buf[_dname->len] = '\0'; + strcat(tname_buf, "_attrs"); + tname.s = tname_buf; + tname.len = _dname->len + 6; + + keys[0] = &ulattrs_ruid_col; + + vals[0].type = DB1_STR; + vals[0].nul = 0; + vals[0].val.str_val = *_ruid; + + if (ul_dbf.use_table(ul_dbh, &tname) < 0) { + LM_ERR("sql use_table failed\n"); + return -1; + } + + if (ul_dbf.delete(ul_dbh, keys, 0, vals, 1) < 0) { + LM_ERR("deleting from database failed\n"); + return -1; + } + + return 0; +} + +/*! * \brief Insert contact attributes into the database * \param _dname loaded domain name * \param _user sip username

1 0

git:master:d3cbfb6a: tls: initialize the per-socket lifetime
by Camille Oudot 27 Feb '15

27 Feb '15

Module: kamailio Branch: master Commit: d3cbfb6aa0e4e3b9232a00e294e1353ee66b32d1 URL: https://github.com/kamailio/kamailio/commit/d3cbfb6aa0e4e3b9232a00e294e1353… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-27T11:47:33+01:00 tls: initialize the per-socket lifetime --- Modified: modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/d3cbfb6aa0e4e3b9232a00e294e1353… Patch: https://github.com/kamailio/kamailio/commit/d3cbfb6aa0e4e3b9232a00e294e1353… --- diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 26872c9..1d86140 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -591,6 +591,7 @@ int tls_h_tcpconn_init(struct tcp_connection *c, int sock) c->type = PROTO_TLS; c->rcv.proto = PROTO_TLS; c->timeout = get_ticks_raw() + cfg_get(tls, tls_cfg, con_lifetime); + c->lifetime = cfg_get(tls, tls_cfg, con_lifetime); c->extra_data = 0; return 0; }

1 0

git:master:8eda2405: dialog_ng: Safety check on create_cbs
by Carsten Bock 26 Feb '15

26 Feb '15

Module: kamailio Branch: master Commit: 8eda24052be7f1a955074996245668b2c749fb4b URL: https://github.com/kamailio/kamailio/commit/8eda24052be7f1a955074996245668b… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-02-26T22:04:10+01:00 dialog_ng: Safety check on create_cbs --- Modified: modules/dialog_ng/dlg_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/8eda24052be7f1a955074996245668b… Patch: https://github.com/kamailio/kamailio/commit/8eda24052be7f1a955074996245668b… --- diff --git a/modules/dialog_ng/dlg_cb.c b/modules/dialog_ng/dlg_cb.c index ebbf5d6..3365e7b 100644 --- a/modules/dialog_ng/dlg_cb.c +++ b/modules/dialog_ng/dlg_cb.c @@ -235,7 +235,7 @@ void run_create_callbacks(struct dlg_cell *dlg, struct sip_msg *msg) { struct dlg_callback *cb; - if (create_cbs==NULL || create_cbs->first==NULL) + if (create_cbs==NULL || create_cbs==POINTER_CLOSED_MARKER || create_cbs->first==NULL) return; params.req = msg;

1 0

git:master:634db00a: uac: skip only the invalid record when loading remote registration records
by Daniel-Constantin Mierla 26 Feb '15

26 Feb '15

Module: kamailio Branch: master Commit: 634db00a82f36c6c60d272ccada4a1d5338d1cbc URL: https://github.com/kamailio/kamailio/commit/634db00a82f36c6c60d272ccada4a1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-26T21:58:47+01:00 uac: skip only the invalid record when loading remote registration records - fixes loading only the good records before the wrong record, thus working with partial valid data afterwards, even more valid records were in the db --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/634db00a82f36c6c60d272ccada4a1d… Patch: https://github.com/kamailio/kamailio/commit/634db00a82f36c6c60d272ccada4a1d… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index f0829fe..b52a044 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -1007,9 +1007,9 @@ void uac_reg_timer(unsigned int ticks) (char*)(RES_ROWS(db_res)[i].values[pos].val.string_val); \ reg.attr.len = strlen(reg.attr.s); \ if(reg.attr.len == 0) { \ - LM_ERR("empty value not allowed for column[%d]=%.*s\n", \ + LM_ERR("empty value not allowed for column[%d]='%.*s' - ignoring record\n", \ pos, db_cols[pos]->len, db_cols[pos]->s); \ - goto error; \ + continue; \ } \ } \ } while(0);

1 0

← Newer
1
2
3
4
5
6
7
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2015