sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
417 discussions

[kamailio/kamailio] Kamailio Service error (#2210)
by ratssingh 29 Jan '20

29 Jan '20

Hi There! Can anyone help on this why this error occurring. Active: active (running) since Thu 2017-10-05 21:52:21 IST; 26min ago Main PID: 19657 (kamailio) CGroup: /system.slice/kamailio.service ├─19657 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19659 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19660 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19661 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19662 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19663 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19664 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19665 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19666 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19667 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19668 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19669 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19670 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19671 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19672 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19673 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19674 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19675 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19676 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19677 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19678 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19679 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19680 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19681 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19682 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 ├─19683 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 └─19684 /usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 4 Oct 05 22:15:55 localhost.localdomain /usr/sbin/kamailio[19681]: ERROR: <core> [core/parser/msg_parser.c:671]: parse_msg(): ERROR: parse_msg: message=<PING> Oct 05 22:15:55 localhost.localdomain /usr/sbin/kamailio[19681]: ERROR: <core> [core/parser/msg_parser.c:330]: parse_headers(): bad header field [(null)] Oct 05 22:16:55 localhost.localdomain /usr/sbin/kamailio[19682]: INFO: <core> [core/parser/parse_fline.c:87]: parse_first_line(): ERROR: parse_first_line: me...short: 4 Oct 05 22:16:55 localhost.localdomain /usr/sbin/kamailio[19682]: ERROR: <core> [core/parser/parse_fline.c:257]: parse_first_line(): parse_first_line: bad mes...fset: 0) Oct 05 22:16:55 localhost.localdomain /usr/sbin/kamailio[19682]: ERROR: <core> [core/parser/msg_parser.c:671]: parse_msg(): ERROR: parse_msg: message=<PING> Oct 05 22:16:55 localhost.localdomain /usr/sbin/kamailio[19682]: ERROR: <core> [core/parser/msg_parser.c:330]: parse_headers(): bad header field [(null)] Oct 05 22:17:55 localhost.localdomain /usr/sbin/kamailio[19683]: INFO: <core> [core/parser/parse_fline.c:87]: parse_first_line(): ERROR: parse_first_line: me...short: 4 Oct 05 22:17:55 localhost.localdomain /usr/sbin/kamailio[19683]: ERROR: <core> [core/parser/parse_fline.c:257]: parse_first_line(): parse_first_line: bad mes...fset: 0) Oct 05 22:17:55 localhost.localdomain /usr/sbin/kamailio[19683]: ERROR: <core> [core/parser/msg_parser.c:671]: parse_msg(): ERROR: parse_msg: message=<PING> Oct 05 22:17:55 localhost.localdomain /usr/sbin/kamailio[19683]: ERROR: <core> [core/parser/msg_parser.c:330]: parse_headers(): bad header field [(null)] Hint: Some lines were ellipsized, use -l to show in full. -- 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/2210

2 2

git:5.3:0864bad2: htable: safety check for item name value
by Daniel-Constantin Mierla 29 Jan '20

29 Jan '20

Module: kamailio Branch: 5.3 Commit: 0864bad2953aa2c85e4da0e8ebe0ce110a22db52 URL: https://github.com/kamailio/kamailio/commit/0864bad2953aa2c85e4da0e8ebe0ce1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-29T10:48:06+01:00 htable: safety check for item name value (cherry picked from commit 0dbf08635a4b2f6e544c26da0a7f542f1863939b) --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/0864bad2953aa2c85e4da0e8ebe0ce1… Patch: https://github.com/kamailio/kamailio/commit/0864bad2953aa2c85e4da0e8ebe0ce1… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index e8c27c426e..d6b94a05a6 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -237,6 +237,10 @@ ht_t* ht_get_table(str *name) unsigned int htid; ht_t *ht; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return NULL; + } htid = ht_compute_hash(name); /* does it exist */ @@ -263,6 +267,10 @@ int ht_add_table(str *name, int autoexp, str *dbtable, str *dbcols, int size, int c; int i; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } htid = ht_compute_hash(name); /* does it exist */ @@ -463,8 +471,14 @@ int ht_set_cell_ex(ht_t *ht, str *name, int type, int_str *val, int mode, ht_cell_t *it, *prev, *cell; time_t now; - if(ht==NULL || ht->entries==NULL) + if(ht==NULL || ht->entries==NULL) { + LM_WARN("invalid ht parameter\n"); return -1; + } + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } hid = ht_compute_hash(name); @@ -639,6 +653,10 @@ int ht_del_cell(ht_t *ht, str *name) if(ht==NULL || ht->entries==NULL) return -1; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize); @@ -685,6 +703,10 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, ht_cell_t *old) if(ht==NULL || ht->entries==NULL) return NULL; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return NULL; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize); @@ -807,6 +829,10 @@ ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) if(ht==NULL || ht->entries==NULL) return NULL; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return NULL; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize); @@ -1157,6 +1183,10 @@ int ht_set_cell_expire(ht_t *ht, str *name, int type, int_str *val) if(ht->htexpire==0) return 0; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize); @@ -1202,6 +1232,10 @@ int ht_get_cell_expire(ht_t *ht, str *name, unsigned int *val) if(ht->htexpire==0) return 0; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize);

1 0

git:master:0dbf0863: htable: safety check for item name value
by Daniel-Constantin Mierla 29 Jan '20

29 Jan '20

Module: kamailio Branch: master Commit: 0dbf08635a4b2f6e544c26da0a7f542f1863939b URL: https://github.com/kamailio/kamailio/commit/0dbf08635a4b2f6e544c26da0a7f542… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-29T10:45:28+01:00 htable: safety check for item name value --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/0dbf08635a4b2f6e544c26da0a7f542… Patch: https://github.com/kamailio/kamailio/commit/0dbf08635a4b2f6e544c26da0a7f542… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 4812e8aacd..7bade571c3 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -237,6 +237,10 @@ ht_t* ht_get_table(str *name) unsigned int htid; ht_t *ht; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return NULL; + } htid = ht_compute_hash(name); /* does it exist */ @@ -263,6 +267,10 @@ int ht_add_table(str *name, int autoexp, str *dbtable, str *dbcols, int size, int c; int i; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } htid = ht_compute_hash(name); /* does it exist */ @@ -463,8 +471,14 @@ int ht_set_cell_ex(ht_t *ht, str *name, int type, int_str *val, int mode, ht_cell_t *it, *prev, *cell; time_t now; - if(ht==NULL || ht->entries==NULL) + if(ht==NULL || ht->entries==NULL) { + LM_WARN("invalid ht parameter\n"); return -1; + } + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } hid = ht_compute_hash(name); @@ -639,6 +653,10 @@ int ht_del_cell(ht_t *ht, str *name) if(ht==NULL || ht->entries==NULL) return -1; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize); @@ -685,6 +703,10 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, ht_cell_t *old) if(ht==NULL || ht->entries==NULL) return NULL; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return NULL; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize); @@ -807,6 +829,10 @@ ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) if(ht==NULL || ht->entries==NULL) return NULL; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return NULL; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize); @@ -860,6 +886,10 @@ int ht_cell_exists(ht_t *ht, str *name) if(ht==NULL || ht->entries==NULL) return 0; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize); @@ -1197,6 +1227,10 @@ int ht_set_cell_expire(ht_t *ht, str *name, int type, int_str *val) if(ht->htexpire==0) return 0; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize); @@ -1242,6 +1276,10 @@ int ht_get_cell_expire(ht_t *ht, str *name, unsigned int *val) if(ht->htexpire==0) return 0; + if(name==NULL || name->s==NULL) { + LM_WARN("invalid name parameter\n"); + return -1; + } hid = ht_compute_hash(name); idx = ht_get_entry(hid, ht->htsize);

1 0

git:master:0bf30a3b: htable: kemi - exported functions to inc and dec hash table values
by Daniel-Constantin Mierla 29 Jan '20

29 Jan '20

Module: kamailio Branch: master Commit: 0bf30a3b953ef64007552199f653310fc4aeb257 URL: https://github.com/kamailio/kamailio/commit/0bf30a3b953ef64007552199f653310… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-29T09:07:44+01:00 htable: kemi - exported functions to inc and dec hash table values --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/0bf30a3b953ef64007552199f653310… Patch: https://github.com/kamailio/kamailio/commit/0bf30a3b953ef64007552199f653310… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index afb22fe241..144a65beaa 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1204,6 +1204,52 @@ static int ki_ht_setxi(sip_msg_t *msg, str *htname, str *itname, int itval, return 0; } +#define KSR_HT_KEMI_NOINTVAL -255 +static ht_cell_t *_htc_ki_local=NULL; + +static int ki_ht_add_op(sip_msg_t *msg, str *htname, str *itname, int itval) +{ + ht_t *ht; + ht_cell_t *htc=NULL; + + ht = ht_get_table(htname); + if(ht==NULL) { + return KSR_HT_KEMI_NOINTVAL; + } + + htc = ht_cell_value_add(ht, itname, itval, _htc_ki_local); + if(_htc_ki_local!=htc) { + ht_cell_pkg_free(_htc_ki_local); + _htc_ki_local=htc; + } + if(htc==NULL) { + return KSR_HT_KEMI_NOINTVAL; + } + + if(htc->flags&AVP_VAL_STR) { + return KSR_HT_KEMI_NOINTVAL; + } + + /* integer */ + if (ht->dmqreplicate>0) { + if (ht_dmq_replicate_action(HT_DMQ_SET_CELL, htname, itname, 0, + &htc->value, 1)!=0) { + LM_ERR("dmq relication failed\n"); + } + } + return htc->value.n; +} + +static int ki_ht_inc(sip_msg_t *msg, str *htname, str *itname) +{ + return ki_ht_add_op(msg, htname, itname, 1); +} + +static int ki_ht_dec(sip_msg_t *msg, str *htname, str *itname) +{ + return ki_ht_add_op(msg, htname, itname, -1); +} + #define RPC_DATE_BUF_LEN 21 static const char* htable_dump_doc[2] = { @@ -1846,6 +1892,16 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_inc"), + SR_KEMIP_INT, ki_ht_inc, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_dec"), + SR_KEMIP_INT, ki_ht_dec, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] developing hiops module (#1856)
by mojtabaesfandiari 28 Jan '20

28 Jan '20

This is new module in Kamailio, named hiops module. I am developing and it take few time to done. In all over the module i used LM_INFO instead of LM_DBG, just for much easy troubleshooting. And also I would use lock for share memory in all project. These are some 'todo' project that i have to do.   #### 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 - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1856 -- Commit Summary -- * add received_in_via function(use it in hiops module) * developing hiops module -- File Changes -- M src/core/msg_translator.c (25) M src/core/msg_translator.h (3) A src/modules/hiops (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1856.patch https://github.com/kamailio/kamailio/pull/1856.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/1856

4 22

git:master:30eaf980: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 28 Jan '20

28 Jan '20

Module: kamailio Branch: master Commit: 30eaf98045834e315497aa19744b0b0082b4c294 URL: https://github.com/kamailio/kamailio/commit/30eaf98045834e315497aa19744b0b0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-28T20:01:10+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/30eaf98045834e315497aa19744b0b0… Patch: https://github.com/kamailio/kamailio/commit/30eaf98045834e315497aa19744b0b0… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index b7fdfc2a75..67e7b4475f 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1882,20 +1882,22 @@ rtpengine_offer(); “Via” header; “auto” - use the first “Via” header if this is a request, or the second one if this is a reply; “extra” - don't take the value from a header, but instead use the value of the - “extra_id_pv” variable; “next” - use the value of the - “Via/branch” tag that Kamailio will generate for the next - branch. This can be used to create one media session per - branch on the RTP proxy. When sending a subsequent “delete” - command to the RTP proxy, you can then stop just the session - for a specific branch when passing the flag '1' or '2' in the - “rtpengine_delete”, or stop all sessions for a call when not - passing one of those two flags there. This is especially - useful if you have serially forked call scenarios where the - RTP proxy gets an “offer” command for a new branch, and then a - “delete” command for the previous branch, which would - otherwise delete the full call, breaking the subsequent - “answer” for the new branch. This flag is only supported by - the Sipwise rtpengine RTP proxy at the moment! + “extra_id_pv” variable; “next” - use the branch ID generated + by Kamailio for the next outgoing branch; “auto-next” - use + “next” in requests and “1” in replies; “auto-extra” - use + “extra” in requests and “1” in replies. This can be used to + create one media session per branch on the RTP proxy. When + sending a subsequent “delete” command to the RTP proxy, you + can then stop just the session for a specific branch when + passing the flag '1' or '2' in the “rtpengine_delete”, or stop + all sessions for a call when not passing one of those two + flags there. This is especially useful if you have serially + forked call scenarios where the RTP proxy gets an “offer” + command for a new branch, and then a “delete” command for the + previous branch, which would otherwise delete the full call, + breaking the subsequent “answer” for the new branch. This flag + is only supported by the Sipwise rtpengine RTP proxy at the + moment! + asymmetric - flags that UA from which message is received doesn't support symmetric RTP. Disables learning of endpoint addresses in the Sipwise rtpengine proxy.

1 0

git:master:ad3ae013: rtpengine: update/fix via-branch=next ID generation
by Richard Fuchs 28 Jan '20

28 Jan '20

Module: kamailio Branch: master Commit: ad3ae0133f321e357cf09f65f2067ed10d9c64a2 URL: https://github.com/kamailio/kamailio/commit/ad3ae0133f321e357cf09f65f2067ed… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-01-28T10:40:45-05:00 rtpengine: update/fix via-branch=next ID generation - via-branch=next should not use a hard-coded branch index of zero, but instead use the actual branch index from the tm module - also adds via-branch=auto-next and via-branch=auto-extra for easier processing in scripts --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/ad3ae0133f321e357cf09f65f2067ed… Patch: https://github.com/kamailio/kamailio/commit/ad3ae0133f321e357cf09f65f2067ed… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index ceb070d583..f4213f2cab 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2111,8 +2111,12 @@ rtpengine_offer(); a request, or the second one if this is a reply; <quote>extra</quote> - don't take the value from a header, but instead use the value of the <quote>extra_id_pv</quote> variable; - <quote>next</quote> - use the value of the <quote>Via/branch</quote> - tag that Kamailio will generate for the next branch. + <quote>next</quote> - use the branch ID generated by &kamailio; for the + next outgoing branch; + <quote>auto-next</quote> - use <quote>next</quote> in requests and + <quote>1</quote> in replies; + <quote>auto-extra</quote> - use <quote>extra</quote> in requests and + <quote>1</quote> in replies. This can be used to create one media session per branch on the &rtp; proxy. When sending a subsequent <quote>delete</quote> command to the &rtp; proxy, you can then stop just the session for a specific branch when diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 9399f94e00..4db1461f0d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2268,6 +2268,10 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu ng_flags->via = -1; else if (str_eq(&val, "next")) ng_flags->via = -2; + else if (str_eq(&val, "auto-next") || str_eq(&val, "next-auto")) + ng_flags->via = -3; + else if (str_eq(&val, "auto-extra") || str_eq(&val, "extra-auto")) + ng_flags->via = -4; else goto error; goto next; @@ -2363,6 +2367,8 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ char md5[MD5_LEN]; char branch_buf[MAX_BRANCH_PARAM_LEN]; bencode_item_t *result; + tm_cell_t *t; + unsigned int branch_idx; /*** get & init basic stuff needed ***/ @@ -2453,11 +2459,21 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ bencode_dictionary_add_str(ng_flags.dict, "call-id", &ng_flags.call_id); if (ng_flags.via) { - ret = -1; + /* pre-process */ switch (ng_flags.via) { case 3: ng_flags.via = (msg->first_line.type == SIP_REPLY) ? 2 : 1; - /* fall thru */ + break; + case -3: + ng_flags.via = (msg->first_line.type == SIP_REPLY) ? 1 : -2; + break; + case -4: + ng_flags.via = (msg->first_line.type == SIP_REPLY) ? 1 : -1; + break; + } + + ret = -1; + switch (ng_flags.via) { case 1: case 2: ret = get_via_branch(msg, ng_flags.via, &viabranch); @@ -2469,10 +2485,16 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ case -2: if (!char_msg_val(msg, md5)) break; + branch_idx = 0; + if (tmb.t_gett) { + t = tmb.t_gett(); + if (t && t != T_UNDEFINED) + branch_idx = t->nr_of_outgoings; + } msg->hash_index = hash(msg->callid->body, get_cseq(msg)->number); viabranch.s = branch_buf; - if (branch_builder(msg->hash_index, 0, md5, 0, branch_buf, &viabranch.len)) + if (branch_builder(msg->hash_index, 0, md5, branch_idx, branch_buf, &viabranch.len)) ret = 0; break; }

1 0

git:master:c943fdf2: htable: export sht_is_null() function to kemi
by Daniel-Constantin Mierla 28 Jan '20

28 Jan '20

Module: kamailio Branch: master Commit: c943fdf2f3a690927d489d9f57cfc53bce00b49f URL: https://github.com/kamailio/kamailio/commit/c943fdf2f3a690927d489d9f57cfc53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T15:07:16+01:00 htable: export sht_is_null() function to kemi - return >0 if htable or item not found - return <0 if item found or htable defined with default value --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/c943fdf2f3a690927d489d9f57cfc53… Patch: https://github.com/kamailio/kamailio/commit/c943fdf2f3a690927d489d9f57cfc53… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index e8c27c426e..4812e8aacd 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -851,6 +851,46 @@ ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) return NULL; } +int ht_cell_exists(ht_t *ht, str *name) +{ + unsigned int idx; + unsigned int hid; + ht_cell_t *it; + + if(ht==NULL || ht->entries==NULL) + return 0; + + hid = ht_compute_hash(name); + + idx = ht_get_entry(hid, ht->htsize); + + /* head test and return */ + if(ht->entries[idx].first==NULL) + return 0; + + ht_slot_lock(ht, idx); + it = ht->entries[idx].first; + while(it!=NULL && it->cellid < hid) + it = it->next; + while(it!=NULL && it->cellid == hid) { + if(name->len==it->name.len + && strncmp(name->s, it->name.s, name->len)==0) { + /* found */ + if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { + /* entry has expired */ + ht_slot_unlock(ht, idx); + return 0; + } + ht_slot_unlock(ht, idx); + return 1; + } + it = it->next; + } + ht_slot_unlock(ht, idx); + return 0; +} + + int ht_dbg(void) { int i; diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index d1e9d2383e..65f821a266 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -92,6 +92,7 @@ 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, ht_cell_t *old); +int ht_cell_exists(ht_t *ht, str *name); 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/htable.c b/src/modules/htable/htable.c index 443502078d..afb22fe241 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -998,6 +998,31 @@ static sr_kemi_xval_t* ki_ht_getw(sip_msg_t *msg, str *htname, str *itname) } +/** + * + */ +static int ki_ht_is_null(sip_msg_t *msg, str *htname, str *itname) +{ + ht_t *ht = NULL; + + /* find the hash htable */ + ht = ht_get_table(htname); + if (ht == NULL) { + return 2; + } + + if(ht->flags==PV_VAL_INT) { + /* htable defined with default value */ + return -2; + } + + if(ht_cell_exists(ht, itname)>0) { + return -1; + } + + return 1; +} + /** * */ @@ -1816,6 +1841,11 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_is_null"), + SR_KEMIP_INT, ki_ht_is_null, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:1e3f4664: kemix: exported functions to get dst-uri variants
by Daniel-Constantin Mierla 28 Jan '20

28 Jan '20

Module: kamailio Branch: master Commit: 1e3f4664c3b568f310235c093218bf12cb7a52b4 URL: https://github.com/kamailio/kamailio/commit/1e3f4664c3b568f310235c093218bf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T14:35:13+01:00 kemix: exported functions to get dst-uri variants --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1e3f4664c3b568f310235c093218bf1… Patch: https://github.com/kamailio/kamailio/commit/1e3f4664c3b568f310235c093218bf1… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 91ad99dea9..7c87b7c68b 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -670,6 +670,46 @@ static sr_kemi_xval_t* ki_kx_getw_body(sip_msg_t *msg) return ki_kx_get_body_mode(msg, SR_KEMI_XVAL_NULL_PRINT); } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_duri_mode(sip_msg_t *msg, int xmode) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg->dst_uri.s==NULL || msg->dst_uri.len<=0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->dst_uri; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_duri(sip_msg_t *msg) +{ + return ki_kx_get_duri_mode(msg, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_duri(sip_msg_t *msg) +{ + return ki_kx_get_duri_mode(msg, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_duri(sip_msg_t *msg) +{ + return ki_kx_get_duri_mode(msg, SR_KEMI_XVAL_NULL_EMPTY); +} + /** * */ @@ -755,6 +795,22 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_duri"), + SR_KEMIP_XVAL, ki_kx_get_duri, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_duri"), + SR_KEMIP_XVAL, ki_kx_gete_duri, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_duri"), + SR_KEMIP_XVAL, ki_kx_getw_duri, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_ua"), SR_KEMIP_XVAL, ki_kx_get_ua, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:3e5633a1: pv: new transformation {s.rmsw} - remove whitespaces from value
by Daniel-Constantin Mierla 28 Jan '20

28 Jan '20

Module: kamailio Branch: master Commit: 3e5633a1d2a243a4ac9773efc361513720e04f68 URL: https://github.com/kamailio/kamailio/commit/3e5633a1d2a243a4ac9773efc361513… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T10:48:34+01:00 pv: new transformation {s.rmsw} - remove whitespaces from value - removes all occurences of ' ', '\t', '\r', '\n' --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/3e5633a1d2a243a4ac9773efc361513… Patch: https://github.com/kamailio/kamailio/commit/3e5633a1d2a243a4ac9773efc361513… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 354a51795c..5f20a22ba0 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -295,6 +295,25 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->flags = PV_TYPE_INT|PV_VAL_INT|PV_VAL_STR; break; + case TR_S_RMWS: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len >= TR_BUFFER_SIZE - 1) + return -1; + j = 0; + for(i=0; i < val->rs.len; i++) { + if(val->rs.s[i] != ' ' && val->rs.s[i] != '\t' + && val->rs.s[i] != '\r' && val->rs.s[i] != '\n') { + _tr_buffer[j] = val->rs.s[i]; + j++; + } + } + _tr_buffer[j] = '\0'; + val->flags = PV_VAL_STR; + val->ri = 0; + val->rs.s = _tr_buffer; + val->rs.len = j; + break; case TR_S_MD5: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -2322,6 +2341,9 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==3 && strncasecmp(name.s, "md5", 3)==0) { t->subtype = TR_S_MD5; goto done; + } else if(name.len==4 && strncasecmp(name.s, "rmws", 4)==0) { + t->subtype = TR_S_RMWS; + goto done; } else if(name.len==6 && strncasecmp(name.s, "sha256", 6)==0) { t->subtype = TR_S_SHA256; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 88cb9eb321..d663db76ed 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -42,7 +42,8 @@ enum _tr_s_subtype { TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE, - TR_S_UNBRACKET, TR_S_COUNT, TR_S_ENCODEBASE64T, TR_S_DECODEBASE64T + TR_S_UNBRACKET, TR_S_COUNT, TR_S_ENCODEBASE64T, TR_S_DECODEBASE64T, + TR_S_RMWS }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020