sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
313 discussions

git:master:50557b84: app_perl change to ignore "die" signals from eval blocks
by Daniel-Constantin Mierla 07 Jun '21

07 Jun '21

Module: kamailio Branch: master Commit: 50557b8433e137a9095b4d48df8ac9b8c3fd8807 URL: https://github.com/kamailio/kamailio/commit/50557b8433e137a9095b4d48df8ac9b… Author: rodolfojcj <458749+rodolfojcj(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-07T15:11:27+02:00 app_perl change to ignore "die" signals from eval blocks --- Modified: src/modules/app_perl/lib/perl/Kamailio.pm --- Diff: https://github.com/kamailio/kamailio/commit/50557b8433e137a9095b4d48df8ac9b… Patch: https://github.com/kamailio/kamailio/commit/50557b8433e137a9095b4d48df8ac9b… --- diff --git a/src/modules/app_perl/lib/perl/Kamailio.pm b/src/modules/app_perl/lib/perl/Kamailio.pm index eda5ede8b7..aa587424e1 100644 --- a/src/modules/app_perl/lib/perl/Kamailio.pm +++ b/src/modules/app_perl/lib/perl/Kamailio.pm @@ -40,6 +40,7 @@ bootstrap Kamailio; BEGIN { $SIG{'__DIE__'} = sub { + die @_ if( $^S or not defined $^S ); Kamailio::Message::log(undef, L_ERR, "perl error: $_[0]\n"); }; $SIG{'__WARN__'} = sub {

1 0

git:master:0e806316: mtree: docs - added section ids for parameters
by Daniel-Constantin Mierla 04 Jun '21

04 Jun '21

Module: kamailio Branch: master Commit: 0e806316b84be8388dad670e964e54011000b4a4 URL: https://github.com/kamailio/kamailio/commit/0e806316b84be8388dad670e964e540… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-04T17:59:58+02:00 mtree: docs - added section ids for parameters --- Modified: src/modules/mtree/doc/mtree_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0e806316b84be8388dad670e964e540… Patch: https://github.com/kamailio/kamailio/commit/0e806316b84be8388dad670e964e540…

1 0

[kamailio/kamailio] evapi: Evapi MAX clients set to 8 can it be made configurable parameter? (#2762)
by Balajee 04 Jun '21

04 Jun '21

### Description Evapi max client is set to 8 in [evapi module](https://github.com/kamailio/kamailio/blob/master/src/modules/evapi/… Can this be increased or can be made as configuration parameter?  ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2762

2 2

[kamailio/kamailio] pv: fixed error "pv_get_method(): no CSEQ header" (#2761)
by sergey-safarov 04 Jun '21

04 Jun '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description pv: fixed error "pv_get_method(): no CSEQ header" when sent HTTP request like ``` HTTP/1.1 200 OK Sia: SIP/2.0/TCP 8.8.8.8:39813 Content-Type: application/json Server: kamailio Content-Length: 49 {"data":{"status-code":200,"reason-phrase":"OK"}} ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2761 -- Commit Summary -- * pv: fixed error "pv_get_method(): no CSEQ header" -- File Changes -- M src/modules/pv/pv_core.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2761.patch https://github.com/kamailio/kamailio/pull/2761.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/2761

2 7

git:master:de8c85ce: pv: pv_get_method fixed error "pv_get_method(): no CSEQ header"
by Daniel-Constantin Mierla 04 Jun '21

04 Jun '21

Module: kamailio Branch: master Commit: de8c85ceae93779cdf7d6aea2eabb7567d69d7ce URL: https://github.com/kamailio/kamailio/commit/de8c85ceae93779cdf7d6aea2eabb75… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-04T16:22:49+02:00 pv: pv_get_method fixed error "pv_get_method(): no CSEQ header" GH #2761: Error obeserver when sent HTTP reply like HTTP/1.1 200 OK Sia: SIP/2.0/TCP 8.8.8.8:39813 Content-Type: application/json Server: kamailio Content-Length: 49 {"data":{"status-code":200,"reason-phrase":"OK"}} --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/de8c85ceae93779cdf7d6aea2eabb75… Patch: https://github.com/kamailio/kamailio/commit/de8c85ceae93779cdf7d6aea2eabb75… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5b011ea248..1b39ef3fb8 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -147,6 +147,9 @@ int pv_get_method(struct sip_msg *msg, pv_param_t *param, (int)msg->first_line.u.request.method_value); } + if (IS_HTTP_REPLY(msg)) + return pv_get_null(msg, param, res); + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || (msg->cseq==NULL))) {

1 0

git:master:b775bbdf: dmq: warning about protocol made info
by Daniel-Constantin Mierla 04 Jun '21

04 Jun '21

Module: kamailio Branch: master Commit: b775bbdff501de0ca1f1a0bc1ab39a3b790c166f URL: https://github.com/kamailio/kamailio/commit/b775bbdff501de0ca1f1a0bc1ab39a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-04T09:08:06+02:00 dmq: warning about protocol made info --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/b775bbdff501de0ca1f1a0bc1ab39a3… Patch: https://github.com/kamailio/kamailio/commit/b775bbdff501de0ca1f1a0bc1ab39a3… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 1db7cdd1f4..817fc3f3bb 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -161,7 +161,7 @@ static int make_socket_str_from_uri(struct sip_uri *uri, str *socket) } if(get_valid_proto_string(uri->proto, 0, 0, &sproto)<0) { - LM_WARN("unknown transport protocol - fall back to udp\n"); + LM_INFO("unknown transport protocol - fall back to udp\n"); sproto.s = "udp"; sproto.len = 3; }

1 0

git:master:c264fbc6: pv: test for HDR_ERROR_T after header name parsing
by Daniel-Constantin Mierla 04 Jun '21

04 Jun '21

Module: kamailio Branch: master Commit: c264fbc66a4690b073c72ffa8fc095227ce0ae8b URL: https://github.com/kamailio/kamailio/commit/c264fbc66a4690b073c72ffa8fc0952… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-03T15:29:50+02:00 pv: test for HDR_ERROR_T after header name parsing --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/c264fbc66a4690b073c72ffa8fc0952… Patch: https://github.com/kamailio/kamailio/commit/c264fbc66a4690b073c72ffa8fc0952… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 8f398cdf43..5b011ea248 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3501,8 +3501,8 @@ int pv_parse_hdr_name(pv_spec_p sp, str *in) s.s = p; s.len = in->len+1; - if (parse_hname2_short(s.s, s.s + s.len, &hdr)==0) - { + parse_hname2_short(s.s, s.s + s.len, &hdr); + if(hdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", s.len, s.s); goto error; }

1 0

git:master:490ae559: dialog: safety checks for bind addr fields
by Daniel-Constantin Mierla 04 Jun '21

04 Jun '21

Module: kamailio Branch: master Commit: 490ae559d2b77b13b3f3831e7ff1aa58980e4086 URL: https://github.com/kamailio/kamailio/commit/490ae559d2b77b13b3f3831e7ff1aa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-03T15:28:31+02:00 dialog: safety checks for bind addr fields - they can be null on non-local sockets - GH #2757 --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/490ae559d2b77b13b3f3831e7ff1aa5… Patch: https://github.com/kamailio/kamailio/commit/490ae559d2b77b13b3f3831e7ff1aa5… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 1bfcb2cad7..b6a49da2a4 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -802,6 +802,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) int i; struct dlg_var *var; srjson_doc_t jdoc; + str sempty = str_init(""); db_val_t values[DIALOG_TABLE_COL_NO]; @@ -870,14 +871,25 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) SET_STR_VALUE(values+6, cell->tag[DLG_CALLEE_LEG]); SET_PROPER_NULL_FLAG(cell->tag[DLG_CALLEE_LEG], values, 6); - LM_DBG("caller sock_info is %.*s, callee sock_info is %.*s\n", - cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLER_LEG]->sock_str.s, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); - SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); - SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + if(cell->bind_addr[DLG_CALLER_LEG]) { + LM_DBG("caller sock_info is %.*s\n", + cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLER_LEG]->sock_str.s); + SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); + } else { + LM_DBG("no caller sock_info\n"); + SET_STR_VALUE(values+7, sempty); + } + if(cell->bind_addr[DLG_CALLEE_LEG]) { + LM_DBG("callee sock_info is %.*s\n", + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); + SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + } else { + LM_DBG("no callee sock_info\n"); + SET_STR_VALUE(values+8, sempty); + } SET_STR_VALUE(values+12, cell->cseq[DLG_CALLER_LEG]); SET_STR_VALUE(values+13, cell->cseq[DLG_CALLEE_LEG]);

1 0

git:master:e8fa2b3e: pv: support Contact header in $hfl(...)
by Daniel-Constantin Mierla 03 Jun '21

03 Jun '21

Module: kamailio Branch: master Commit: e8fa2b3e8e5a789ac6d6d35f75ec61d09f487d6c URL: https://github.com/kamailio/kamailio/commit/e8fa2b3e8e5a789ac6d6d35f75ec61d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-03T11:11:50+02:00 pv: support Contact header in $hfl(...) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/e8fa2b3e8e5a789ac6d6d35f75ec61d… Patch: https://github.com/kamailio/kamailio/commit/e8fa2b3e8e5a789ac6d6d35f75ec61d… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 073d0dccb8..8f398cdf43 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2191,6 +2191,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) pv_value_t tv = {0}; via_body_t *vb = NULL; rr_t *rrb = NULL; + contact_t *cb = NULL; hdr_field_t *hf = NULL; int n = 0; str sval = STR_NULL; @@ -2358,6 +2359,62 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } + if((tv.flags == 0) && (tv.ri==HDR_CONTACT_T)) { + if(msg->contact==NULL) { + LM_DBG("no Contact header\n"); + return pv_get_null(msg, param, res); + } + if(parse_contact_headers(msg) < 0) { + LM_DBG("failed to parse Contact headers\n"); + return pv_get_null(msg, param, res); + } + if(idx<0) { + n = 1; + /* count Contact header bodies */ + for(hf=msg->contact; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_CONTACT_T) { + for(cb=(((contact_body_t*)hf->parsed)->contacts); + cb!=NULL; cb=cb->next) { + n++; + } + } + } + + idx = -idx; + if(idx>n) { + LM_DBG("index out of range\n"); + return pv_get_null(msg, param, res); + } + idx = n - idx; + } + if(idx==0) { + cb = ((contact_body_t*)msg->contact->parsed)->contacts; + sval.s = cb->name.s; + sval.len = cb->len; + trim(&sval); + res->rs = sval; + return 0; + } + n=0; + for(hf=msg->contact; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_CONTACT_T) { + for(cb=(((contact_body_t*)hf->parsed)->contacts); + cb!=NULL; cb=cb->next) { + if(n==idx) { + sval.s = cb->name.s; + sval.len = cb->len; + trim(&sval); + res->rs = sval; + return 0; + } + n++; + } + } + } + LM_DBG("unexpected contact index out of range\n"); + return pv_get_null(msg, param, res); + } + return pv_get_hdr_helper(msg, param, res, &tv, idx, idxf); }

1 0

git:master:25834469: core: select - test for HDR_ERROR_T after header name parsing
by Daniel-Constantin Mierla 03 Jun '21

03 Jun '21

Module: kamailio Branch: master Commit: 2583446968d81a9351caab1cfdd2cc86434850f3 URL: https://github.com/kamailio/kamailio/commit/2583446968d81a9351caab1cfdd2cc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-03T10:55:22+02:00 core: select - test for HDR_ERROR_T after header name parsing --- Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/2583446968d81a9351caab1cfdd2cc8… Patch: https://github.com/kamailio/kamailio/commit/2583446968d81a9351caab1cfdd2cc8… --- diff --git a/src/core/select_core.c b/src/core/select_core.c index 029f880a48..02d393a6ba 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -595,7 +595,7 @@ int select_msg_header(str* res, select_t* s, struct sip_msg* msg) { /* get all headers */ char *c; - res->s = SIP_MSG_START(msg) + msg->first_line.len; + res->s = SIP_MSG_START(msg) + msg->first_line.len; c = get_body(msg); res->len = c - res->s; return 0; @@ -607,7 +607,7 @@ int select_anyheader(str* res, select_t* s, struct sip_msg* msg) int hi; char c; struct hdr_field hdr; - + if(msg==NULL) { if (res!=NULL) return -1; @@ -622,13 +622,15 @@ int select_anyheader(str* res, select_t* s, struct sip_msg* msg) /* if header name is parseable, parse it and set SEL_PARAM_DIV */ c=s->params[2].v.s.s[s->params[2].v.s.len]; s->params[2].v.s.s[s->params[2].v.s.len]=':'; - if (parse_hname2_short(s->params[2].v.s.s,s->params[2].v.s.s+(s->params[2].v.s.len<3?4:s->params[2].v.s.len+1), - &hdr)==0) { + parse_hname2_short(s->params[2].v.s.s,s->params[2].v.s.s + +(s->params[2].v.s.len<3?4:s->params[2].v.s.len+1), + &hdr); + if(hdr.type==HDR_ERROR_T) { LM_ERR("fixup_call:parse error\n"); return -1; } s->params[2].v.s.s[s->params[2].v.s.len]=c; - + if (hdr.type!=HDR_OTHER_T && hdr.type!=HDR_ERROR_T) { /* pkg_free(s->params[1].v.s.s); */ /* don't free it (the mem can leak only once at startup)

1 0

← Newer
1
...
24
25
26
27
28
29
30
31
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021