sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:4.4:b5427f85: Merge pull request #1029 from jchavanton/4.4-dmqfix-backport

by GitHub

Module: kamailio Branch: 4.4 Commit: b5427f85590bd9e5111669cbd665ca7b5181797c URL: https://github.com/kamailio/kamailio/commit/b5427f85590bd9e5111669cbd665ca7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-14T20:12:29+01:00 Merge pull request #1029 from jchavanton/4.4-dmqfix-backport 4.4 dmqfix backport --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/b5427f85590bd9e5111669cbd665ca7… Patch: https://github.com/kamailio/kamailio/commit/b5427f85590bd9e5111669cbd665ca7… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 1c78e71..c9c02bf 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -50,9 +50,9 @@ extern int _dmq_usrloc_batch_usleep; static int add_contact(str aor, ucontact_info_t* ci) { - urecord_t* r; + urecord_t* r = NULL; udomain_t* _d; - ucontact_t* c; + ucontact_t* c = NULL; str contact; int res; @@ -61,37 +61,53 @@ static int add_contact(str aor, ucontact_info_t* ci) return -1; } - dmq_ul.lock_udomain(_d, &aor); + LM_DBG("aor: %.*s\n", aor.len, aor.s); + LM_DBG("ci->ruid: %.*s\n", ci->ruid.len, ci->ruid.s); + LM_DBG("aorhash: %i\n", dmq_ul.get_aorhash(&aor)); - res = dmq_ul.get_urecord(_d, &aor, &r); - if (res < 0) { - LM_ERR("failed to retrieve record from usrloc\n"); - goto error; - } else if ( res == 0) { - LM_DBG("'%.*s' found in usrloc\n", aor.len, ZSW(aor.s)); - res = dmq_ul.get_ucontact(r, ci->c, ci->callid, ci->path, ci->cseq, &c); - LM_DBG("get_ucontact = %d\n", res); - if (res==-1) { - LM_ERR("Invalid cseq\n"); + if (ci->ruid.len > 0) { + // Search by ruid, if possible + res = dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(&aor), &ci->ruid, &r, &c); + if (res == 0) { + LM_DBG("Found contact\n"); + dmq_ul.update_ucontact(r, c, ci); + LM_DBG("Release record\n"); + dmq_ul.release_urecord(r); + LM_DBG("Unlock udomain\n"); + dmq_ul.unlock_udomain(_d, &aor); + return 0; + } + } + dmq_ul.lock_udomain(_d, &aor); + res = dmq_ul.get_urecord(_d, &aor, &r); + if (res < 0) { + LM_ERR("failed to retrieve record from usrloc\n"); goto error; - } else if (res > 0 ) { - LM_DBG("Not found contact\n"); + } else if ( res == 0) { + LM_DBG("'%.*s' found in usrloc\n", aor.len, ZSW(aor.s)); + res = dmq_ul.get_ucontact(r, ci->c, ci->callid, ci->path, ci->cseq, &c); + LM_DBG("get_ucontact = %d\n", res); + if (res==-1) { + LM_ERR("Invalid cseq\n"); + goto error; + } else if (res > 0 ) { + LM_DBG("Not found contact\n"); + contact.s = ci->c->s; + contact.len = ci->c->len; + dmq_ul.insert_ucontact(r, &contact, ci, &c); + } else if (res == 0) { + LM_DBG("Found contact\n"); + dmq_ul.update_ucontact(r, c, ci); + } + } else { + LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); + dmq_ul.insert_urecord(_d, &aor, &r); + LM_DBG("Insert record\n"); contact.s = ci->c->s; contact.len = ci->c->len; dmq_ul.insert_ucontact(r, &contact, ci, &c); - } else if (res == 0) { - LM_DBG("Found contact\n"); - dmq_ul.update_ucontact(r, c, ci); + LM_DBG("Insert ucontact\n"); } - } else { - LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); - dmq_ul.insert_urecord(_d, &aor, &r); - LM_DBG("Insert record\n"); - contact.s = ci->c->s; - contact.len = ci->c->len; - dmq_ul.insert_ucontact(r, &contact, ci, &c); - LM_DBG("Insert ucontact\n"); - } LM_DBG("Release record\n"); dmq_ul.release_urecord(r);

7 years, 9 months

git:4.4:40cce572: dmq_usrloc: adjust locking sequence

by Julien Chavanton

Module: kamailio Branch: 4.4 Commit: 40cce572ebb30dd63470ab59e15e8751c655f4a2 URL: https://github.com/kamailio/kamailio/commit/40cce572ebb30dd63470ab59e15e875… Author: jchavanton <jchavanton(a)flowroute.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2017-03-10T13:47:42-08:00 dmq_usrloc: adjust locking sequence to avoid dead-lock get_urecord_by_ruid returns with the lock if the record was found --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/40cce572ebb30dd63470ab59e15e875… Patch: https://github.com/kamailio/kamailio/commit/40cce572ebb30dd63470ab59e15e875… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 63e664b..c9c02bf 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -61,8 +61,6 @@ static int add_contact(str aor, ucontact_info_t* ci) return -1; } - dmq_ul.lock_udomain(_d, &aor); - LM_DBG("aor: %.*s\n", aor.len, aor.s); LM_DBG("ci->ruid: %.*s\n", ci->ruid.len, ci->ruid.s); LM_DBG("aorhash: %i\n", dmq_ul.get_aorhash(&aor)); @@ -80,6 +78,7 @@ static int add_contact(str aor, ucontact_info_t* ci) return 0; } } + dmq_ul.lock_udomain(_d, &aor); res = dmq_ul.get_urecord(_d, &aor, &r); if (res < 0) { LM_ERR("failed to retrieve record from usrloc\n");

7 years, 9 months

git:4.4:d782f0d0: dmq_usrloc: Use ruid for saving/updating contacts

by Julien Chavanton

Module: kamailio Branch: 4.4 Commit: d782f0d052f7092576b4935987b9ee25beb0f771 URL: https://github.com/kamailio/kamailio/commit/d782f0d052f7092576b4935987b9ee2… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2017-03-10T13:47:31-08:00 dmq_usrloc: Use ruid for saving/updating contacts --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/d782f0d052f7092576b4935987b9ee2… Patch: https://github.com/kamailio/kamailio/commit/d782f0d052f7092576b4935987b9ee2… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 1c78e71..63e664b 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -50,9 +50,9 @@ extern int _dmq_usrloc_batch_usleep; static int add_contact(str aor, ucontact_info_t* ci) { - urecord_t* r; + urecord_t* r = NULL; udomain_t* _d; - ucontact_t* c; + ucontact_t* c = NULL; str contact; int res; @@ -63,35 +63,52 @@ static int add_contact(str aor, ucontact_info_t* ci) dmq_ul.lock_udomain(_d, &aor); - res = dmq_ul.get_urecord(_d, &aor, &r); - if (res < 0) { - LM_ERR("failed to retrieve record from usrloc\n"); - goto error; - } else if ( res == 0) { - LM_DBG("'%.*s' found in usrloc\n", aor.len, ZSW(aor.s)); - res = dmq_ul.get_ucontact(r, ci->c, ci->callid, ci->path, ci->cseq, &c); - LM_DBG("get_ucontact = %d\n", res); - if (res==-1) { - LM_ERR("Invalid cseq\n"); + LM_DBG("aor: %.*s\n", aor.len, aor.s); + LM_DBG("ci->ruid: %.*s\n", ci->ruid.len, ci->ruid.s); + LM_DBG("aorhash: %i\n", dmq_ul.get_aorhash(&aor)); + + if (ci->ruid.len > 0) { + // Search by ruid, if possible + res = dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(&aor), &ci->ruid, &r, &c); + if (res == 0) { + LM_DBG("Found contact\n"); + dmq_ul.update_ucontact(r, c, ci); + LM_DBG("Release record\n"); + dmq_ul.release_urecord(r); + LM_DBG("Unlock udomain\n"); + dmq_ul.unlock_udomain(_d, &aor); + return 0; + } + } + res = dmq_ul.get_urecord(_d, &aor, &r); + if (res < 0) { + LM_ERR("failed to retrieve record from usrloc\n"); goto error; - } else if (res > 0 ) { - LM_DBG("Not found contact\n"); + } else if ( res == 0) { + LM_DBG("'%.*s' found in usrloc\n", aor.len, ZSW(aor.s)); + res = dmq_ul.get_ucontact(r, ci->c, ci->callid, ci->path, ci->cseq, &c); + LM_DBG("get_ucontact = %d\n", res); + if (res==-1) { + LM_ERR("Invalid cseq\n"); + goto error; + } else if (res > 0 ) { + LM_DBG("Not found contact\n"); + contact.s = ci->c->s; + contact.len = ci->c->len; + dmq_ul.insert_ucontact(r, &contact, ci, &c); + } else if (res == 0) { + LM_DBG("Found contact\n"); + dmq_ul.update_ucontact(r, c, ci); + } + } else { + LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); + dmq_ul.insert_urecord(_d, &aor, &r); + LM_DBG("Insert record\n"); contact.s = ci->c->s; contact.len = ci->c->len; dmq_ul.insert_ucontact(r, &contact, ci, &c); - } else if (res == 0) { - LM_DBG("Found contact\n"); - dmq_ul.update_ucontact(r, c, ci); + LM_DBG("Insert ucontact\n"); } - } else { - LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); - dmq_ul.insert_urecord(_d, &aor, &r); - LM_DBG("Insert record\n"); - contact.s = ci->c->s; - contact.len = ci->c->len; - dmq_ul.insert_ucontact(r, &contact, ci, &c); - LM_DBG("Insert ucontact\n"); - } LM_DBG("Release record\n"); dmq_ul.release_urecord(r);

7 years, 9 months

[kamailio/kamailio] 4.4 dmqfix backport (#1029)

by Julien Chavanton

backport the synchronisation problem fix You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1029 -- Commit Summary -- * dmq_usrloc: Use ruid for saving/updating contacts * dmq_usrloc: adjust locking sequence -- File Changes -- M modules/dmq_usrloc/usrloc_sync.c (70) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1029.patch https://github.com/kamailio/kamailio/pull/1029.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/1029

7 years, 9 months

git:5.0:074f52de: app_perl: Make sv2int_str() static

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 074f52de88f473945628f81740a87e5f6bc072ea URL: https://github.com/kamailio/kamailio/commit/074f52de88f473945628f81740a87e5… Author: James Cloos <cloos(a)jhcloos.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-14T20:11:29+01:00 app_perl: Make sv2int_str() static - The function is only called from the xs file, and C11âs inline semantics mean that gcc-5 and later miscompile this file when no optimization is specified. Signed-off-by: James Cloos <cloos(a)jhcloos.com> (cherry picked from commit 42d3b93f838d1c2eeb009894422fe016a6572520) --- Modified: src/modules/app_perl/kamailioxs.xs --- Diff: https://github.com/kamailio/kamailio/commit/074f52de88f473945628f81740a87e5… Patch: https://github.com/kamailio/kamailio/commit/074f52de88f473945628f81740a87e5… --- diff --git a/src/modules/app_perl/kamailioxs.xs b/src/modules/app_perl/kamailioxs.xs index 02fb5a5..8d2604c 100644 --- a/src/modules/app_perl/kamailioxs.xs +++ b/src/modules/app_perl/kamailioxs.xs @@ -402,7 +402,7 @@ char *pv_sprintf(struct sip_msg *m, char *fmt) { * - strflag: flag mask to be or-applied for string match */ -inline int sv2int_str(SV *val, int_str *is, +static inline int sv2int_str(SV *val, int_str *is, unsigned short *flags, unsigned short strflag) { char *s; STRLEN len;

7 years, 9 months

git:master:770331df: Merge pull request #1020 from jhcloos/master

by GitHub

Module: kamailio Branch: master Commit: 770331dfe0d82ac699d5c4452cedf6c877f27046 URL: https://github.com/kamailio/kamailio/commit/770331dfe0d82ac699d5c4452cedf6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-14T20:10:26+01:00 Merge pull request #1020 from jhcloos/master app_perl: Make sv2int_str() static --- Modified: src/modules/app_perl/kamailioxs.xs --- Diff: https://github.com/kamailio/kamailio/commit/770331dfe0d82ac699d5c4452cedf6c… Patch: https://github.com/kamailio/kamailio/commit/770331dfe0d82ac699d5c4452cedf6c… --- diff --git a/src/modules/app_perl/kamailioxs.xs b/src/modules/app_perl/kamailioxs.xs index 02fb5a5..8d2604c 100644 --- a/src/modules/app_perl/kamailioxs.xs +++ b/src/modules/app_perl/kamailioxs.xs @@ -402,7 +402,7 @@ char *pv_sprintf(struct sip_msg *m, char *fmt) { * - strflag: flag mask to be or-applied for string match */ -inline int sv2int_str(SV *val, int_str *is, +static inline int sv2int_str(SV *val, int_str *is, unsigned short *flags, unsigned short strflag) { char *s; STRLEN len;

7 years, 9 months

git:master:42d3b93f: app_perl: Make sv2int_str() static

by James Cloos

Module: kamailio Branch: master Commit: 42d3b93f838d1c2eeb009894422fe016a6572520 URL: https://github.com/kamailio/kamailio/commit/42d3b93f838d1c2eeb009894422fe01… Author: James Cloos <cloos(a)jhcloos.com> Committer: James Cloos <cloos(a)jhcloos.com> Date: 2017-03-10T16:52:55-05:00 app_perl: Make sv2int_str() static - The function is only called from the xs file, and C11âs inline semantics mean that gcc-5 and later miscompile this file when no optimization is specified. Signed-off-by: James Cloos <cloos(a)jhcloos.com> --- Modified: src/modules/app_perl/kamailioxs.xs --- Diff: https://github.com/kamailio/kamailio/commit/42d3b93f838d1c2eeb009894422fe01… Patch: https://github.com/kamailio/kamailio/commit/42d3b93f838d1c2eeb009894422fe01… --- diff --git a/src/modules/app_perl/kamailioxs.xs b/src/modules/app_perl/kamailioxs.xs index 02fb5a5..8d2604c 100644 --- a/src/modules/app_perl/kamailioxs.xs +++ b/src/modules/app_perl/kamailioxs.xs @@ -402,7 +402,7 @@ char *pv_sprintf(struct sip_msg *m, char *fmt) { * - strflag: flag mask to be or-applied for string match */ -inline int sv2int_str(SV *val, int_str *is, +static inline int sv2int_str(SV *val, int_str *is, unsigned short *flags, unsigned short strflag) { char *s; STRLEN len;

7 years, 9 months

[kamailio/kamailio] Make app_perl’s sv2int_str() static (#1020)

by James Cloos

The function is only called from the xs file, and C11’s inline semantics mean that gcc-5 and later miscompile this file when no optimization is specified. Signed-off-by: James Cloos <cloos(a)jhcloos.com> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1020 -- Commit Summary -- * Make app_perl’s sv2int_str() static -- File Changes -- M src/modules/app_perl/kamailioxs.xs (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1020.patch https://github.com/kamailio/kamailio/pull/1020.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/1020

7 years, 9 months

[kamailio/kamailio] Dialog: Core dump when using dlg_set_timeout (#1011)

by Olle E. Johansson

dlg_set_timeout("2419200", $var(entry), $var(id)); The both $var's contains strings. If I enclose them with "" there's no segfault, but the var's doesn't seem to be parsed by dlg_set_timeout either. Doing this causes a seg fault when kamailio starts. Version 4.4.2 Will try to get a core dump, but not sure since this is a production system... -- 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/1011

7 years, 9 months

git:4.4:99c0c6ea: dialog: more checks for dlg_set_timeout() params

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 99c0c6ea153ca4299b22c3639cfd3613d0711f43 URL: https://github.com/kamailio/kamailio/commit/99c0c6ea153ca4299b22c3639cfd361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-14T20:06:37+01:00 dialog: more checks for dlg_set_timeout() params - related to GH #1011 (cherry picked from commit 618888cc9497ae5c478c41d7b0efc27731b42b22) (cherry picked from commit 943a5b2c12426b5b6d3839ae899411f4e1a42414) --- Modified: modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/99c0c6ea153ca4299b22c3639cfd361… Patch: https://github.com/kamailio/kamailio/commit/99c0c6ea153ca4299b22c3639cfd361… --- diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index ceaf08a..591a8ec 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -1142,8 +1142,16 @@ static int w_dlg_set_timeout(struct sip_msg *msg, char *pto, char *phe, char *ph LM_ERR("no timeout value\n"); return -1; } + if(to<=0) { + LM_ERR("invalid timeout value: %d\n", to); + return -1; + } if(phe!=NULL) { + if(phi==NULL) { + LM_ERR("invalid number of parameters\n"); + return -1; + } if(fixup_get_ivalue(msg, (gparam_p)phe, (int*)&he)!=0) { LM_ERR("no hash entry value value\n"); @@ -1165,7 +1173,7 @@ static int w_dlg_set_timeout(struct sip_msg *msg, char *pto, char *phe, char *ph return -1; } - if(update_dlg_timeout(dlg, to) != 0) + if(update_dlg_timeout(dlg, to) != 0) return -1; return 1;

7 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2017