sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

git:master:13f34f0e: htable: removed useless mode param from ht_cell_value_add()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 13f34f0effc936030baf82bbdd10285b98d6d790 URL: https://github.com/kamailio/kamailio/commit/13f34f0effc936030baf82bbdd10285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-24T08:18:18+02:00 htable: removed useless mode param from ht_cell_value_add() - it was used only once with mode=1 --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/13f34f0effc936030baf82bbdd10285… Patch: https://github.com/kamailio/kamailio/commit/13f34f0effc936030baf82bbdd10285… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 03aee19a72..9d066eb999 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -641,8 +641,7 @@ int ht_del_cell(ht_t *ht, str *name) return 0; } -ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, - ht_cell_t *old) +ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, ht_cell_t *old) { unsigned int idx; unsigned int hid; @@ -661,7 +660,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(ht->htexpire>0) now = time(NULL); prev = NULL; - if(mode) ht_slot_lock(ht, idx); + ht_slot_lock(ht, idx); it = ht->entries[idx].first; while(it!=NULL && it->cellid < hid) { @@ -683,7 +682,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, it->value.n = ht->initval.n; /* increment will be done below */ } else { - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return NULL; } } @@ -691,7 +690,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(it->flags&AVP_VAL_STR) { /* string value cannot be incremented */ - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return NULL; } else { it->value.n += val; @@ -702,7 +701,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(old->msize>=it->msize) { memcpy(old, it, it->msize); - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return old; } } @@ -710,7 +709,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(cell!=NULL) memcpy(cell, it, it->msize); - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return cell; } } @@ -720,7 +719,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, /* add val if htable has an integer init value */ if(ht->flags!=PV_VAL_INT) { - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return NULL; } isval.n = ht->initval.n + val; @@ -728,7 +727,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(it == NULL) { LM_ERR("cannot create new cell.\n"); - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return NULL; } it->expire = now + ht->htexpire; @@ -753,7 +752,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(old->msize>=it->msize) { memcpy(old, it, it->msize); - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return old; } } @@ -761,7 +760,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, if(cell!=NULL) memcpy(cell, it, it->msize); - if(mode) ht_slot_unlock(ht, idx); + ht_slot_unlock(ht, idx); return cell; } diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index d64b68ac95..c9bbd68c94 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -91,8 +91,7 @@ int ht_init_tables(void); int ht_destroy(void); int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode); int ht_del_cell(ht_t *ht, str *name); -ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, - ht_cell_t *old); +ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, ht_cell_t *old); int ht_dbg(void); ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old); diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 2713f41ddd..9ef26a9e7e 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -331,7 +331,7 @@ int pv_get_ht_add(struct sip_msg *msg, pv_param_t *param, LM_ERR("cannot get $sht name\n"); return -1; } - htc = ht_cell_value_add(hpv->ht, &htname, val, 1, _htc_local); + htc = ht_cell_value_add(hpv->ht, &htname, val, _htc_local); if(_htc_local!=htc) { ht_cell_pkg_free(_htc_local);

7 years

git:master:8ce1bcd5: htable: map $shtrecord() inner names over integer ids

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8ce1bcd52cd5117f920acce5f78683e974d4a3a4 URL: https://github.com/kamailio/kamailio/commit/8ce1bcd52cd5117f920acce5f78683e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-24T08:18:18+02:00 htable: map $shtrecord() inner names over integer ids - avoid string comparison at runtime --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/8ce1bcd52cd5117f920acce5f78683e… Patch: https://github.com/kamailio/kamailio/commit/8ce1bcd52cd5117f920acce5f78683e… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index c928bf1b49..2713f41ddd 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -368,49 +368,57 @@ int pv_get_ht_dec(struct sip_msg *msg, pv_param_t *param, int pv_parse_ht_expired_cell(pv_spec_t *sp, str *in) { - if ((in->len != 3 || strncmp(in->s, "key", in->len) != 0) && - (in->len != 5 || strncmp(in->s, "value", in->len) != 0)) - { + if(sp==NULL || in==NULL || in->len<=0) return -1; + switch(in->len) + { + case 3: + if(strncmp(in->s, "key", in->len)==0) { + sp->pvp.pvn.u.isname.name.n = 0; + } else { + goto error; + } + break; + case 5: + if(strncmp(in->s, "value", in->len)==0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else { + goto error; + } + break; + default: + goto error; } - - sp->pvp.pvn.u.isname.name.s.s = in->s; - sp->pvp.pvn.u.isname.name.s.len = in->len; sp->pvp.pvn.u.isname.type = 0; sp->pvp.pvn.type = PV_NAME_INTSTR; return 0; + +error: + LM_ERR("unknown pv name %.*s\n", in->len, in->s); + return -1; } int pv_get_ht_expired_cell(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - if (res == NULL || ht_expired_cell == NULL) - { + if (res == NULL || ht_expired_cell == NULL) { return -1; } - if (param->pvn.u.isname.name.s.len == 3 && - strncmp(param->pvn.u.isname.name.s.s, "key", 3) == 0) - { - res->rs = ht_expired_cell->name; - } - else if (param->pvn.u.isname.name.s.len == 5 && - strncmp(param->pvn.u.isname.name.s.s, "value", 5) == 0) + switch(param->pvn.u.isname.name.n) { - if(ht_expired_cell->flags&AVP_VAL_STR) { - return pv_get_strval(msg, param, res, &ht_expired_cell->value.s); - } else { - return pv_get_sintval(msg, param, res, ht_expired_cell->value.n); - } + case 0: + return pv_get_strval(msg, param, res, &ht_expired_cell->name); + case 1: + if(ht_expired_cell->flags&AVP_VAL_STR) { + return pv_get_strval(msg, param, res, &ht_expired_cell->value.s); + } else { + return pv_get_sintval(msg, param, res, ht_expired_cell->value.n); + } + default: + return pv_get_null(msg, param, res); } - - if (res->rs.s == NULL) - res->flags = PV_VAL_NULL; - else - res->flags = PV_VAL_STR; - - return 0; } int pv_parse_iterator_name(pv_spec_t *sp, str *in)

7 years

list of listeners with ports and advertisements

by Luis Azedo

Hi, i don't think we can access this info at runtime from the script and i was thinking of implementing it. we have a timer proc that runs a script block and we need to access this info from that script. i'm think in adding a (maybe configurable name?) xavp with that info that would be available (only needs to evaluate once since listeners are not dynamic) what would be the best module to put this ? pv ? Thanks

7 years

git:master:f18da4c9: kazoo: use hardcoded max size of routing key

by lazedo

Module: kamailio Branch: master Commit: f18da4c9d6cc8d1ab061d68cbd8e9d988ebf2be6 URL: https://github.com/kamailio/kamailio/commit/f18da4c9d6cc8d1ab061d68cbd8e9d9… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-23T21:18:13+01:00 kazoo: use hardcoded max size of routing key --- Modified: src/modules/kazoo/defs.h Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/f18da4c9d6cc8d1ab061d68cbd8e9d9… Patch: https://github.com/kamailio/kamailio/commit/f18da4c9d6cc8d1ab061d68cbd8e9d9…

7 years

git:master:56e07cf2: kazoo: max size of routing key

by lazedo

Module: kamailio Branch: master Commit: 56e07cf2bb281d0aa78517e919055de640468020 URL: https://github.com/kamailio/kamailio/commit/56e07cf2bb281d0aa78517e919055de… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-23T21:09:54+01:00 kazoo: max size of routing key --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/56e07cf2bb281d0aa78517e919055de… Patch: https://github.com/kamailio/kamailio/commit/56e07cf2bb281d0aa78517e919055de…

7 years

[kamailio/kamailio] presence: subsription double delete fix (#1163)

by Dmitri Savolainen

i have timeout_rm_subs=1 (as default) and It was a lot of messages in kamailio.log like this `Jun 23 12:08:56 kamailio[8366] ERROR: presence [subscribe.c:487]: delete_subs(): Failed to delete subscription from memory [slot: 255 ev: sip:2579*109@host pu: presence ci: 08f29987584a4e47b12110ff09e48d92 ft: 8fece9a08beb407cb0fec4c703e6f99e tt: 302fa4d0674d106ffe861f2ef3364869.711a]` The reason is timout NOTIFY with "Subscription-State: terminated;reason=timeout" You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1163 -- Commit Summary -- * presence: subsription double delete fix -- File Changes -- M src/modules/presence/notify.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1163.patch https://github.com/kamailio/kamailio/pull/1163.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/1163

7 years

git:master:1b56c964: Merge pull request #1163 from snen/presence_subcribe_delete_error

by GitHub

Module: kamailio Branch: master Commit: 1b56c96487d0788a0cbb21da71589f7d8314e7f8 URL: https://github.com/kamailio/kamailio/commit/1b56c96487d0788a0cbb21da71589f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-23T19:12:38+02:00 Merge pull request #1163 from snen/presence_subcribe_delete_error presence: subsription double delete fix --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/1b56c96487d0788a0cbb21da71589f7… Patch: https://github.com/kamailio/kamailio/commit/1b56c96487d0788a0cbb21da71589f7… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index e5cd1cdf42..63307c7e2e 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1847,7 +1847,7 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) if(ps->code == 404 || ps->code == 481 - || (ps->code == 408 && timeout_rm_subs) + || (ps->code == 408 && timeout_rm_subs && subs->status != TERMINATED_STATUS) || pres_get_delete_sub()) { delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag, &subs->from_tag, &subs->callid);

7 years

git:master:8e185ddf: presence: subsription double delete fix

by Dmitri Savolainen

Module: kamailio Branch: master Commit: 8e185ddf8e81af8d6283a87ec95116965235752a URL: https://github.com/kamailio/kamailio/commit/8e185ddf8e81af8d6283a87ec951169… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2017-06-23T18:57:00+03:00 presence: subsription double delete fix - if timeout_rm_subs parameter set to "1" and NOTIFY timeout about expired subsription --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/8e185ddf8e81af8d6283a87ec951169… Patch: https://github.com/kamailio/kamailio/commit/8e185ddf8e81af8d6283a87ec951169… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index e5cd1cdf42..63307c7e2e 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1847,7 +1847,7 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) if(ps->code == 404 || ps->code == 481 - || (ps->code == 408 && timeout_rm_subs) + || (ps->code == 408 && timeout_rm_subs && subs->status != TERMINATED_STATUS) || pres_get_delete_sub()) { delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag, &subs->from_tag, &subs->callid);

7 years

git:master:4514c918: htable: do not call expired event route on get/add operations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4514c91883d67ee062582aed7b414633609cf6ac URL: https://github.com/kamailio/kamailio/commit/4514c91883d67ee062582aed7b41463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-23T18:25:32+02:00 htable: do not call expired event route on get/add operations - have consistent behaviour with set operation - avoid accessing the same (expired) item twice, second after being removed if the item is accessed in the event route - reported by GH #1152 --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/4514c91883d67ee062582aed7b41463… Patch: https://github.com/kamailio/kamailio/commit/4514c91883d67ee062582aed7b41463… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 1bbd079b30..03aee19a72 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -676,7 +676,6 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, /* found */ if(now>0 && it->expire!=0 && it->expire<now) { /* entry has expired */ - ht_handle_expired_record(ht, it); if(ht->flags==PV_VAL_INT) { /* initval is integer, use it to create a fresh entry */ @@ -684,16 +683,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, it->value.n = ht->initval.n; /* increment will be done below */ } else { - /* delete expired entry */ - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; if(mode) ht_slot_unlock(ht, idx); - ht_cell_free(it); return NULL; } } @@ -804,18 +794,8 @@ ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) { /* found */ if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { - /* entry has expired, delete it and return NULL */ - ht_handle_expired_record(ht, it); - - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; + /* entry has expired, return NULL */ ht_slot_unlock(ht, idx); - ht_cell_free(it); return NULL; } if(old!=NULL) diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 522811da58..c928bf1b49 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -91,7 +91,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if((val==NULL) || (val->flags&PV_VAL_NULL)) { /* delete it */ - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, &htname, 0, NULL, 0)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, + &htname, 0, NULL, 0)!=0) { LM_ERR("dmq relication failed\n"); } ht_del_cell(hpv->ht, &htname); @@ -101,7 +103,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if(val->flags&PV_TYPE_INT) { isval.n = val->ri; - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, 0, &isval, 1)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, + &htname, 0, &isval, 1)!=0) { LM_ERR("dmq relication failed\n"); } if(ht_set_cell(hpv->ht, &htname, 0, &isval, 1)!=0) @@ -111,7 +115,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, } } else { isval.s = val->rs; - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, AVP_VAL_STR, &isval, 1)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, + &htname, AVP_VAL_STR, &isval, 1)!=0) { LM_ERR("dmq relication failed\n"); } if(ht_set_cell(hpv->ht, &htname, AVP_VAL_STR, &isval, 1)!=0)

7 years

Kamailio v4.3.7 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v4.3.7 stable release is out. This is a maintenance release of an old stable branch, 4.3, that includes fixes since release of v4.3.6. There is no change to database schema or configuration language structure that you have to do on installations of v4.3.x. Important note: unless some major regression is discovered in the near future, this is the latest release to be done from branch 4.3, which is no longer to be officially maintained. Therefore it is strongly advised to consider upgrading to 4.4.x or 5.0.x series. For more details about version 4.3.7 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2017/06/kamailio-v4-3-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the latest stable branch is 5.0, at this moment with its latest release v5.0.2. See more details about it at: * https://www.kamailio.org/w/kamailio-v5-0-0-release-notes/ Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/miconda - http://www.linkedin.com/in/miconda

7 years

← Newer
1
...
12
13
14
15
16
17
18
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017