- sr-dev - kamailio.org

git:master:4cd55a86: textops: find_hdr_line_start() - search for header name with colon
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: 4cd55a86cdc3477da0ca4c384227833ec404bfa2 URL: https://github.com/kamailio/kamailio/commit/4cd55a86cdc3477da0ca4c384227833… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T21:22:48+02:00 textops: find_hdr_line_start() - search for header name with colon --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/4cd55a86cdc3477da0ca4c384227833… Patch: https://github.com/kamailio/kamailio/commit/4cd55a86cdc3477da0ca4c384227833… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index e93bc82bf2..75a00f16a8 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1619,7 +1619,7 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, while (hname_len <= len) { /* attempt to find a header name */ - parse_sip_header_name(start, start + hname_len, &h2, 1, 0); + parse_sip_header_name(start, start + hname_len, &h2, 0, 0); if(h2.type!=HDR_ERROR_T) { if(h1.type>0 && h1.type==h2.type) { *buf = start;

1 0

git:master:785bbaa0: core: kemi - check hdr type HDR_ERROR_T after parsing
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: 785bbaa0f16f83353ad1d776816f439608a67858 URL: https://github.com/kamailio/kamailio/commit/785bbaa0f16f83353ad1d776816f439… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T18:57:53+02:00 core: kemi - check hdr type HDR_ERROR_T after parsing --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/785bbaa0f16f83353ad1d776816f439… Patch: https://github.com/kamailio/kamailio/commit/785bbaa0f16f83353ad1d776816f439… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 324e7cd6cf..bee8a98f07 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1988,7 +1988,8 @@ static int sr_kemi_hdr_append_after(sip_msg_t *msg, str *txt, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2056,7 +2057,8 @@ int sr_kemi_hdr_remove(sip_msg_t *msg, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2106,7 +2108,8 @@ static int sr_kemi_hdr_is_present(sip_msg_t *msg, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2188,7 +2191,8 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2305,7 +2309,8 @@ static sr_kemi_xval_t* sr_kemi_hdr_get_mode(sip_msg_t *msg, str *hname, int idx, sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } - if (parse_hname2_str(hname, &shdr)==0) { + parse_hname2_str(hname, &shdr); + if(shdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; @@ -2426,7 +2431,8 @@ static int sr_kemi_hdr_match_content(sip_msg_t *msg, str *hname, str *op, return SR_KEMI_FALSE; } - if (parse_hname2_str(hname, &hfm)==0) { + parse_hname2_str(hname, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return SR_KEMI_FALSE; }

1 0

git:master:95034f62: xprint: check hdr type HDR_ERROR_T after parsing
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: 95034f62d4a0cf536da1c5c26c748c1cf8ccb280 URL: https://github.com/kamailio/kamailio/commit/95034f62d4a0cf536da1c5c26c748c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T18:48:50+02:00 xprint: check hdr type HDR_ERROR_T after parsing --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/95034f62d4a0cf536da1c5c26c748c1… Patch: https://github.com/kamailio/kamailio/commit/95034f62d4a0cf536da1c5c26c748c1… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index b2bcc077b7..4adb5c31c6 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1481,16 +1481,17 @@ static int _xl_parse_format(char *s, xl_elog_p *el, int shm, xl_parse_cb parse_c /* ugly hack for compact header names -- !!fake length!! * -- parse_hname2 expects name buffer length >= 4 */ - if (parse_hname2(e->hparam.s, + parse_hname2(e->hparam.s, e->hparam.s + ((e->hparam.len<4)?4:e->hparam.len), - &hdr)==0) + &hdr); + if(hdr.type==HDR_ERROR_T) { - LOG(L_ERR,"xprint: xl_parse_format: strange error\n"); + LOG(L_ERR,"xprint: xl_parse_format: header parsing error\n"); goto error; } e->hparam.len--; e->hparam.s[e->hparam.len] = c; - if (hdr.type!=HDR_OTHER_T && hdr.type!=HDR_ERROR_T) + if (hdr.type!=HDR_OTHER_T) { LOG(L_INFO,"INFO:xprint: xl_parse_format: using " "hdr type (%d) instead of <%.*s>\n",

1 0

git:master:d3b693fa: xprint: remove history and svn id
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: d3b693fa5725b45f24d68956658800de7b9ec19c URL: https://github.com/kamailio/kamailio/commit/d3b693fa5725b45f24d68956658800d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T18:45:22+02:00 xprint: remove history and svn id --- Modified: src/modules/xprint/xp_lib.c Modified: src/modules/xprint/xp_lib.h --- Diff: https://github.com/kamailio/kamailio/commit/d3b693fa5725b45f24d68956658800d… Patch: https://github.com/kamailio/kamailio/commit/d3b693fa5725b45f24d68956658800d… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 5771b77399..b2bcc077b7 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1,7 +1,5 @@ /** - * $Id$ - * - * XLOG module + * XPRINT module * * Copyright (C) 2001-2003 FhG Fokus * @@ -27,15 +25,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* History: - * -------- - * 2004-10-20 - added header name specifier (ramona) - * 2005-07-04 - added color printing support via escape sequesnces - * contributed by Ingo Wolfsberger (ramona) - * 2005-12-23 - parts from private branch merged (mma) - * - */ - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/modules/xprint/xp_lib.h b/src/modules/xprint/xp_lib.h index 9c8812029a..fb429dec9b 100644 --- a/src/modules/xprint/xp_lib.h +++ b/src/modules/xprint/xp_lib.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of ser, a free SIP server. @@ -20,8 +18,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */

1 0

git:master:260a825a: core: parser/parse_hname2 - option to skip printing logs on parse failure
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: 260a825a48ac6f8b845a4b934f86ea3e04c120d4 URL: https://github.com/kamailio/kamailio/commit/260a825a48ac6f8b845a4b934f86ea3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T18:00:35+02:00 core: parser/parse_hname2 - option to skip printing logs on parse failure --- Modified: src/core/parser/parse_hname2.c Modified: src/core/parser/parse_hname2.h --- Diff: https://github.com/kamailio/kamailio/commit/260a825a48ac6f8b845a4b934f86ea3… Patch: https://github.com/kamailio/kamailio/commit/260a825a48ac6f8b845a4b934f86ea3… --- diff --git a/src/core/parser/parse_hname2.c b/src/core/parser/parse_hname2.c index ab56fa4ea5..20398a9595 100644 --- a/src/core/parser/parse_hname2.c +++ b/src/core/parser/parse_hname2.c @@ -219,21 +219,25 @@ int ksr_hname_init_config(void) * - fills hdr structure (must not be null) * - set hdr->type=HDR_ERROR_T in case of parsing error * - if emode==1, then parsing does not expect : after header name + * - if logmode==1, then print error log messages on parsing failure * - returns pointer after : if emode==0 or after header name if emode==1 + * in case of parsing error, returns begin and sets hdr->type to HDR_ERROR_T */ char *parse_sip_header_name(char* const begin, const char* const end, - hdr_field_t* const hdr, int emode) + hdr_field_t* const hdr, int emode, int logmode) { char *p; int i; - if (end <= begin) { + if (begin == NULL || end == NULL || end <= begin) { hdr->type = HDR_ERROR_T; return begin; } if(_ksr_hname_chars_idx[(unsigned char)(*begin)] == 0) { - LM_ERR("invalid start of header name for [%.*s]\n", - (int)(end-begin), begin); + if(likely(logmode)) { + LM_ERR("invalid start of header name for [%.*s]\n", + (int)(end-begin), begin); + } hdr->type = HDR_ERROR_T; return begin; } @@ -262,8 +266,10 @@ char *parse_sip_header_name(char* const begin, const char* const end, } if(*p != ' ' && *p != '\t') { /* no white space - bad header name format */ - LM_ERR("invalid header name for [%.*s]\n", - (int)(end-begin), begin); + if(likely(logmode)) { + LM_ERR("invalid header name for [%.*s]\n", + (int)(end-begin), begin); + } hdr->type = HDR_ERROR_T; return begin; } @@ -271,8 +277,10 @@ char *parse_sip_header_name(char* const begin, const char* const end, if(p == end) { /* no : found - emode==0 */ - LM_ERR("invalid end of header name for [%.*s]\n", - (int)(end-begin), begin); + if(likely(logmode)) { + LM_ERR("invalid end of header name for [%.*s]\n", + (int)(end-begin), begin); + } hdr->type = HDR_ERROR_T; return begin; } @@ -298,7 +306,7 @@ char *parse_sip_header_name(char* const begin, const char* const end, char* parse_hname2(char* const begin, const char* const end, struct hdr_field* const hdr) { - return parse_sip_header_name(begin, end, hdr, 0); + return parse_sip_header_name(begin, end, hdr, 0, 1); } /** @@ -307,11 +315,11 @@ char* parse_hname2(char* const begin, const char* const end, struct hdr_field* c */ char* parse_hname2_short(char* const begin, const char* const end, struct hdr_field* const hdr) { - return parse_sip_header_name(begin, end, hdr, 0); + return parse_sip_header_name(begin, end, hdr, 0, 1); } char* parse_hname2_str (str* const hbuf, hdr_field_t* const hdr) { - return parse_sip_header_name(hbuf->s, hbuf->s + hbuf->len, hdr, 1); + return parse_sip_header_name(hbuf->s, hbuf->s + hbuf->len, hdr, 1, 1); } diff --git a/src/core/parser/parse_hname2.h b/src/core/parser/parse_hname2.h index 2c864857d6..fc52c1c802 100644 --- a/src/core/parser/parse_hname2.h +++ b/src/core/parser/parse_hname2.h @@ -35,6 +35,15 @@ /** Fast 32-bit header field name parser. * @file */ + +char *parse_sip_header_name(char* const begin, const char* const end, + hdr_field_t* const hdr, int emode, int logmode); + +/* macro to find header name without printing errors in failure case */ +#define find_hname2_str(hbuf, hdr) \ + parse_sip_header_name((hbuf)->s, (hbuf)->s + (hbuf)->len, hdr, 1, 0) + + char* parse_hname2(char* const begin, const char* const end, struct hdr_field* const hdr); char* parse_hname2_short(char* const begin, const char* const end, struct hdr_field* const hdr); char* parse_hname2_str (str* const hbuf, hdr_field_t* const hdr);

1 0

git:master:a4d94268: textops: find_hdr_line_start() - locate header name without error logs
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: a4d94268c7cf5d31e3660b543b10ef6e7ca891ab URL: https://github.com/kamailio/kamailio/commit/a4d94268c7cf5d31e3660b543b10ef6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T18:02:24+02:00 textops: find_hdr_line_start() - locate header name without error logs --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/a4d94268c7cf5d31e3660b543b10ef6… Patch: https://github.com/kamailio/kamailio/commit/a4d94268c7cf5d31e3660b543b10ef6… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index cbc2309cfe..40ea02c273 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1611,13 +1611,16 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, start = *buf; len = *buf_len; - if(parse_hname2_str(&sname, &h1)==NULL) { + parse_hname2_str(&sname, &h1); + if(h1.type!=HDR_ERROR_T) { LM_ERR("not a header name: %.*s\n", hname_len, hname); return 0; } while (hname_len <= len) { - if(parse_hname2(start, start + hname_len, &h2)!=NULL) { + /* attempt to find a header name */ + parse_sip_header_name(start, start + hname_len, &h2, 1, 0); + if(h2.type!=HDR_ERROR_T) { if(h1.type>0 && h1.type==h2.type) { *buf = start; *buf_len = len; @@ -1628,6 +1631,7 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, return 1; } } + /* jump to next line */ if ((ch = memchr(start, 13, len - 1))) { if (*(ch + 1) != 10) { LM_ERR("No LF after CR\n");

1 0

[kamailio/kamailio] core kamailio 5.4 (#2740)
by descartin 02 Jun '21

02 Jun '21

Dear all we have seen a core in a running production kamailio instance today, i attach you the bt in dropbox version: kamailio 5.4.4 (x86_64/linux) 0ddb01-dirty centos7 3.10.0-693.17.1.el7.x86_64 #1 SMP Thu Jan 25 20:13:58 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux https://www.dropbox.com/s/3dg72cbuz7nvx5b/core_kamailio_21mayo?dl=0 https://www.dropbox.com/s/iyko32fwfxj8aam/core_kamailio_21mayo_2?dl=0 seems there might be a relation async module when delaying a request after communicating with the rtpengine ?¿ could you please take a look? thanks a lot and regards david -- 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/2740

3 10

git:master:f3332c7d: pv: suport also Route headers in $hfl(...)
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: f3332c7dddda83d18ea1b1dc86fea5ad3886e010 URL: https://github.com/kamailio/kamailio/commit/f3332c7dddda83d18ea1b1dc86fea5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T16:57:05+02:00 pv: suport also Route headers in $hfl(...) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/f3332c7dddda83d18ea1b1dc86fea5a… Patch: https://github.com/kamailio/kamailio/commit/f3332c7dddda83d18ea1b1dc86fea5a… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 65afab14e9..073d0dccb8 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2227,6 +2227,10 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } if((tv.flags == 0) && (tv.ri==HDR_VIA_T)) { + if(msg->h_via1==NULL) { + LM_WARN("no Via header\n"); + return pv_get_null(msg, param, res); + } if(idx<0) { n = 1; /* count Via header bodies */ @@ -2271,17 +2275,28 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_DBG("unexpected via index out of range\n"); return pv_get_null(msg, param, res); } - if((tv.flags == 0) && (tv.ri==HDR_RECORDROUTE_T)) { + if((tv.flags == 0) && (tv.ri==HDR_RECORDROUTE_T || tv.ri==HDR_ROUTE_T)) { + if(tv.ri==HDR_RECORDROUTE_T) { + hf=msg->record_route; + } else { + hf=msg->route; + } + if(hf==NULL) { + LM_DBG("no %s header\n", (tv.ri==HDR_ROUTE_T)?"route":"record-route"); + return pv_get_null(msg, param, res); + } + if(idx<0) { n = 1; - /* count Record-Route header bodies */ - for(hf=msg->record_route; hf!=NULL; hf=hf->next) { - if(hf->type==HDR_RECORDROUTE_T) { + /* count Record-Route/Route header bodies */ + for(; hf!=NULL; hf=hf->next) { + if(hf->type==tv.ri) { if(parse_rr(hf) == -1) { - LM_ERR("failed parsing rr header\n"); + LM_ERR("failed parsing %s header\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); return pv_get_null(msg, param, res); } - for(rrb=(rr_t*)hf->parsed; vb!=NULL; rrb=rrb->next) { + for(rrb=(rr_t*)hf->parsed; rrb!=NULL; rrb=rrb->next) { n++; } } @@ -2289,17 +2304,24 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) idx = -idx; if(idx>n) { - LM_DBG("index out of rr headers range\n"); + LM_DBG("index out of %s headers range\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); return pv_get_null(msg, param, res); } idx = n - idx; } if(idx==0) { - if(parse_rr(msg->record_route) == -1) { - LM_ERR("failed parsing rr header\n"); + if(tv.ri==HDR_RECORDROUTE_T) { + hf=msg->record_route; + } else { + hf=msg->route; + } + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing %s header\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); return pv_get_null(msg, param, res); } - rrb = (rr_t*)(msg->record_route->parsed); + rrb = (rr_t*)(hf->parsed); sval.s = rrb->nameaddr.name.s; sval.len = rrb->len; trim(&sval); @@ -2307,13 +2329,19 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return 0; } n=0; - for(hf=msg->record_route; hf!=NULL; hf=hf->next) { - if(hf->type==HDR_RECORDROUTE_T) { + if(tv.ri==HDR_RECORDROUTE_T) { + hf=msg->record_route; + } else { + hf=msg->route; + } + for(; hf!=NULL; hf=hf->next) { + if(hf->type==tv.ri) { if(parse_rr(hf) == -1) { - LM_ERR("failed parsing rr header\n"); + LM_ERR("failed parsing %s header\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); return pv_get_null(msg, param, res); } - for(rrb=(rr_t*)hf->parsed; vb!=NULL; rrb=rrb->next) { + for(rrb=(rr_t*)hf->parsed; rrb!=NULL; rrb=rrb->next) { if(n==idx) { sval.s = rrb->nameaddr.name.s; sval.len = rrb->len; @@ -2325,7 +2353,8 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } } - LM_DBG("unexpected record-route index out of range\n"); + LM_DBG("unexpected %s index out of range\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); return pv_get_null(msg, param, res); }

1 0

Kamailio v5.4.6 Released
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Hello, Kamailio SIP Server v5.4.6 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.5. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.6. Note that 5.4 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.5, with v5.5.0 being release out of it. For more details about version 5.4.6 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/06/kamailio-v5-4-6-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

Kamailio v5.4.5 Released
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Hello, Kamailio SIP Server v5.4.6 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.5. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.6. Note that 5.4 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.5, with v5.5.0 being release out of it. For more details about version 5.4.6 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/06/kamailio-v5-4-6-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:7d1e1a34: pv: support for Record-Route in $hfl(...)
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: master Commit: 7d1e1a349d5590f3754976b2e169fd30795c7f1b URL: https://github.com/kamailio/kamailio/commit/7d1e1a349d5590f3754976b2e169fd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T12:23:40+02:00 pv: support for Record-Route in $hfl(...) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/7d1e1a349d5590f3754976b2e169fd3… Patch: https://github.com/kamailio/kamailio/commit/7d1e1a349d5590f3754976b2e169fd3… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 4dc6d56882..65afab14e9 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2190,6 +2190,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int idxf = 0; pv_value_t tv = {0}; via_body_t *vb = NULL; + rr_t *rrb = NULL; hdr_field_t *hf = NULL; int n = 0; str sval = STR_NULL; @@ -2228,7 +2229,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) if((tv.flags == 0) && (tv.ri==HDR_VIA_T)) { if(idx<0) { n = 1; - /* count Vua header bodies */ + /* count Via header bodies */ for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { if(hf->type==HDR_VIA_T) { for(vb=(via_body_t*)hf->parsed; vb!=NULL; vb=vb->next) { @@ -2270,6 +2271,64 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_DBG("unexpected via index out of range\n"); return pv_get_null(msg, param, res); } + if((tv.flags == 0) && (tv.ri==HDR_RECORDROUTE_T)) { + if(idx<0) { + n = 1; + /* count Record-Route header bodies */ + for(hf=msg->record_route; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_RECORDROUTE_T) { + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + for(rrb=(rr_t*)hf->parsed; vb!=NULL; rrb=rrb->next) { + n++; + } + } + } + + idx = -idx; + if(idx>n) { + LM_DBG("index out of rr headers range\n"); + return pv_get_null(msg, param, res); + } + idx = n - idx; + } + if(idx==0) { + if(parse_rr(msg->record_route) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + rrb = (rr_t*)(msg->record_route->parsed); + sval.s = rrb->nameaddr.name.s; + sval.len = rrb->len; + trim(&sval); + res->rs = sval; + return 0; + } + n=0; + for(hf=msg->record_route; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_RECORDROUTE_T) { + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + for(rrb=(rr_t*)hf->parsed; vb!=NULL; rrb=rrb->next) { + if(n==idx) { + sval.s = rrb->nameaddr.name.s; + sval.len = rrb->len; + trim(&sval); + res->rs = sval; + return 0; + } + n++; + } + } + } + LM_DBG("unexpected record-route 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:5.4:be668987: ChangeLog: content updated for v5.4.6
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: 5.4 Commit: be668987e9296232a00fa7bba82bc72abd72a743 URL: https://github.com/kamailio/kamailio/commit/be668987e9296232a00fa7bba82bc72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T11:27:34+02:00 ChangeLog: content updated for v5.4.6 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/be668987e9296232a00fa7bba82bc72… Patch: https://github.com/kamailio/kamailio/commit/be668987e9296232a00fa7bba82bc72…

1 0

git:5.4:0546511e: pkg/kamailio/deb: version set 5.4.6
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: 5.4 Commit: 0546511ed7eb47004c2df2f0806dff413468a1c4 URL: https://github.com/kamailio/kamailio/commit/0546511ed7eb47004c2df2f0806dff4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T11:23:35+02:00 pkg/kamailio/deb: version set 5.4.6 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0546511ed7eb47004c2df2f0806dff4… Patch: https://github.com/kamailio/kamailio/commit/0546511ed7eb47004c2df2f0806dff4…

1 0

git:5.4:a2b34363: Makefile.defs: version set to 5.4.6
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: 5.4 Commit: a2b34363aa5e97f171d933b08dc57f8e7a1b3d58 URL: https://github.com/kamailio/kamailio/commit/a2b34363aa5e97f171d933b08dc57f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T10:44:48+02:00 Makefile.defs: version set to 5.4.6 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a2b34363aa5e97f171d933b08dc57f8… Patch: https://github.com/kamailio/kamailio/commit/a2b34363aa5e97f171d933b08dc57f8… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 621f646b23..40bbef82bc 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:aaa556f2: pkg: version set to 5.4.6 for rpms and apline
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Module: kamailio Branch: 5.4 Commit: aaa556f2d5a80e7a0bfa609d2478a9b75a530d0b URL: https://github.com/kamailio/kamailio/commit/aaa556f2d5a80e7a0bfa609d2478a9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T10:12:15+02:00 pkg: version set to 5.4.6 for rpms and apline --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/aaa556f2d5a80e7a0bfa609d2478a9b… Patch: https://github.com/kamailio/kamailio/commit/aaa556f2d5a80e7a0bfa609d2478a9b… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e6576c616a..f4ff87ce2d 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.5 +pkgver=5.4.6 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ba4cb80618..e73c048b22 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.5 +%define ver 5.4.6 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing Kamailio v5.4.6
by Daniel-Constantin Mierla 02 Jun '21

02 Jun '21

Hello, I am considering to release Kamailio v5.4.6 sometime next week, likely on Wednesday or Thursday (June 2 or 3, 2021). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

param.count broken in latest master?
by Juha Heinanen 01 Jun '21

01 Jun '21

This used to work: $var(count) = $(var(servers){param.count,%}); but latest master gives: Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) INFO: pv [pv_shv.c:60]: shvar_init_locks(): locks array size 16 Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: pv [pv_trans.c:3254]: tr_parse_paramlist(): invalid count transformation: count,%}! Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: <core> [core/pvapi.c:1799]: tr_lookup(): error parsing [{param.count,%}] Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: <core> [core/pvapi.c:1106]: pv_parse_spec2(): bad tr in pvar name "var" Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: <core> [core/pvapi.c:1131]: pv_parse_spec2(): invalid parsing in [$(var(servers){param.count,%})] at (4) Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) CRITICAL: <core> [core/cfg.y:3683]: yyerror_at(): parse error in config file /etc/sip-proxy/sip-proxy.cfg, line 7591, column 19-48: Can't get from cache: $(var(servers){param.count,%}) -- Juha

2 3

git:master:6e8e5ed1: pv: fix {param.count} transformation broken by previous commit
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: master Commit: 6e8e5ed121028bd851d7de214271881a0bb1e4d3 URL: https://github.com/kamailio/kamailio/commit/6e8e5ed121028bd851d7de214271881… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T19:45:16+02:00 pv: fix {param.count} transformation broken by previous commit --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/6e8e5ed121028bd851d7de214271881… Patch: https://github.com/kamailio/kamailio/commit/6e8e5ed121028bd851d7de214271881… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 6ad760f19a..98cce7caa8 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -3203,6 +3203,28 @@ char* tr_parse_paramlist(str* in, trans_t *t) goto unknown; } + if(t->subtype == TR_PL_COUNT) { + if(*p==TR_PARAM_MARKER) { + start_pos = ++p; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + if (t->params->type != TR_PARAM_SPEC && p - start_pos != 1) { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) { + LM_ERR("invalid name transformation: %.*s!\n", + in->len, in->s); + goto error; + } + } + goto done; + } + + /* now transformations with mandatory parameters */ if(*p!=TR_PARAM_MARKER) { LM_ERR("invalid %.*s transformation: %.*s\n", @@ -3223,29 +3245,15 @@ char* tr_parse_paramlist(str* in, trans_t *t) while(is_in_str(p, in) && (*p==' ' || *p=='\t' || *p=='\n')) p++; } - if(t->subtype == TR_PL_COUNT) { - if(*p==TR_PARAM_MARKER) { - start_pos = ++p; - _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); - t->params = tp; - tp = 0; - if (tp->type != TR_PARAM_SPEC && p - start_pos != 1) { - LM_ERR("invalid separator in transformation: " - "%.*s\n", in->len, in->s); - goto error; - } - } - } else { - if(*p==TR_PARAM_MARKER) { - start_pos = ++p; - _tr_parse_sparam(p, p0, tp, spec, ps, in, s); - t->params->next = tp; - tp = 0; - if (p - start_pos != 1) { - LM_ERR("invalid separator in transformation: " - "%.*s\n", in->len, in->s); - goto error; - } + if(*p==TR_PARAM_MARKER) { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + if (p - start_pos != 1) { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; } } @@ -3256,6 +3264,7 @@ char* tr_parse_paramlist(str* in, trans_t *t) goto error; } +done: t->name = name; return p;

1 0

git:5.4:df8fb404: mtree: check if pv_count var is r/w
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: df8fb404c1f3d016f97872d78fe07d604de6ef8b URL: https://github.com/kamailio/kamailio/commit/df8fb404c1f3d016f97872d78fe07d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:13+02:00 mtree: check if pv_count var is r/w - reported by GH #2750 (cherry picked from commit 63b0345207ba67fcc6290d6dfc55f99ba58b13c9) (cherry picked from commit 7323d812dc4a39c0e60f11668e09a50ef586a8f7) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/df8fb404c1f3d016f97872d78fe07d6… Patch: https://github.com/kamailio/kamailio/commit/df8fb404c1f3d016f97872d78fe07d6… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index c04f031cfd..63180bbfb7 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -203,7 +203,7 @@ static int mod_init(void) } if(pv_parse_spec(&count_param, &pv_count) < 0 - || !(pv_is_w(&pv_weight))) + || !(pv_is_w(&pv_count))) { LM_ERR("cannot parse count pv or pv is read-only\n"); return -1;

1 0

git:5.4:b5ae51af: core: parse via - fixed whitespacing
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: b5ae51af479d4e54e5d8c3f5e85908e68183e9d4 URL: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:22+02:00 core: parse via - fixed whitespacing (cherry picked from commit 01664d1d82dcfe952fce29033b4fcd5e44cf2319) (cherry picked from commit 19901d0cdb6cf06a84315c19a27986bca7a05025) --- Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… Patch: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… --- diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index fca486e358..e4957961f1 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -32,11 +32,11 @@ struct sip_msg; /* via param types - * WARNING: keep in sync with parse_via.c FIN_HIDDEN... + * WARNING: keep in sync with parse_via.c FIN_HIDDEN... * and with tm/sip_msg.c via_body_cloner */ enum { - PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, + PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, PARAM_MADDR, PARAM_RECEIVED, PARAM_RPORT, PARAM_I, PARAM_ALIAS, #ifdef USE_COMP PARAM_COMP, @@ -60,12 +60,12 @@ typedef struct via_param { /* Format: name/version/transport host:port;params comment */ - /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ -typedef struct via_body { +/* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ +typedef struct via_body { int error; str hdr; /* Contains "Via" or "v" */ str name; - str version; + str version; str transport; str host; short proto; /* transport */ @@ -80,7 +80,7 @@ typedef struct via_body { struct via_param* param_lst; /* list of parameters*/ struct via_param* last_param; /*last via parameter, internal use*/ - /* shortcuts to "important" params*/ + /* shortcuts to "important" params*/ struct via_param* branch; str tid; /* transaction id, part of branch */ struct via_param* received; @@ -90,8 +90,8 @@ typedef struct via_body { #ifdef USE_COMP struct via_param* comp; /* see rfc3486 */ #endif - struct via_body* next; /* pointer to next via body string if - compact via or null */ + struct via_body* next; /* pointer to next via body string + if compact via or null */ } via_body_t;

1 0

git:5.4:30b33f77: async: safety check for async ms list
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 30b33f772739c593f1b58a2b871e127effd12f58 URL: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:37+02:00 async: safety check for async ms list (cherry picked from commit 5b0e74c1832d2d09fe36424e1e1aaaacde920b31) (cherry picked from commit 93dc038f3f1f854b1e0987ec28e49d8a70293e19) --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… Patch: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 1e81d3318c..bd17b0e1d9 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -370,6 +370,10 @@ int async_ms_sleep(sip_msg_t *msg, int milliseconds, cfg_action_t *act, str *cbn async_task_param_t *atp; async_task_t *at; + if (_async_ms_list==NULL) { + LM_ERR("async timer list not initialized - check modparams\n"); + return -1; + } if(milliseconds <= 0) { LM_ERR("negative or zero sleep time (%d)\n", milliseconds); return -1;

1 0

git:5.4:34ee120a: pv: more details in err log message for s.select parsing
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 34ee120ab555b9aab364af4570033c3a08451fda URL: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:10:28+02:00 pv: more details in err log message for s.select parsing (cherry picked from commit 02ad9e1b87f89b9456d0d85e16c2fe0cda67ab64) (cherry picked from commit 2273d7d856b5c1fca1ec24fbb6ee249793ea6719) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… Patch: https://github.com/kamailio/kamailio/commit/34ee120ab555b9aab364af4570033c3… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 0ce73c4542..2f5c2cd48d 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2532,8 +2532,8 @@ char* tr_parse_string(str* in, trans_t *t) while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; if(*p!=TR_RBRACKET) { - LM_ERR("invalid select transformation: %.*s!!\n", - in->len, in->s); + LM_ERR("invalid select transformation: %.*s (c:%c/%d - p:%d)!!\n", + in->len, in->s, *p, *p, (int)(p - in->s)); goto error; } goto done;

1 0

git:5.4:2c501f4d: snmpstats: Fix typo in MIB
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 2c501f4d7b9678f0cfad3afec5e3095fd61e1763 URL: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:10:43+02:00 snmpstats: Fix typo in MIB Reported by arkadiam on Github (cherry picked from commit 7f017707c91659641ce9ca87ee4149b2e39379f7) (cherry picked from commit dbd8e3899335eb8795763fd52b1f91aebfad1c92) --- Modified: src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB --- Diff: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… Patch: https://github.com/kamailio/kamailio/commit/2c501f4d7b9678f0cfad3afec5e3095… --- diff --git a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB index 3351a9e424..2aaddf01ca 100644 --- a/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB +++ b/src/modules/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB @@ -562,7 +562,7 @@ KAMAILIO-SIP-SERVER-MIB DEFINITIONS ::= BEGIN set the row-status to createAndGo. Then the client can do an SNMP GET on this table with the - aquired index. If the row-status is 'active', then the + acquired index. If the row-status is 'active', then the kamailioSIPRegUserIndex is the index into the kamailioSIPRegUserTable that has the specified URI (0 zero indicates no such URI). The client should then set the

1 0

git:5.4:00d71875: mtree: Fix some typos, adjust some formatting
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.4 Commit: 00d7187532b87507367b00110f22bd8e0e14db7c URL: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:11:43+02:00 mtree: Fix some typos, adjust some formatting (cherry picked from commit 316c80607243387015e35ac423238c5a32401a44) (cherry picked from commit 3bfb1773c01731177824b907180a7eeb7e43d3af) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… Patch: https://github.com/kamailio/kamailio/commit/00d7187532b87507367b00110f22bd8… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index badbd09dc8..c04f031cfd 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -175,37 +175,37 @@ static int mod_init(void) return -1; } - if(pv_parse_spec(&value_param, &pv_value)<00 + if(pv_parse_spec(&value_param, &pv_value) < 0 || !(pv_is_w(&pv_value))) { - LM_ERR("cannot parse value pv or is read only\n"); + LM_ERR("cannot parse value pv or pv is read-only\n"); return -1; } - if (pv_parse_spec(&values_param, &pv_values) <0 + if (pv_parse_spec(&values_param, &pv_values) < 0 || pv_values.type != PVT_AVP) { LM_ERR("cannot parse values avp\n"); return -1; } - if(pv_parse_spec(&dstid_param, &pv_dstid)<0 + if(pv_parse_spec(&dstid_param, &pv_dstid) < 0 || pv_dstid.type!=PVT_AVP) { LM_ERR("cannot parse dstid avp\n"); return -1; } - if(pv_parse_spec(&weight_param, &pv_weight)<0 + if(pv_parse_spec(&weight_param, &pv_weight) < 0 || pv_weight.type!=PVT_AVP) { - LM_ERR("cannot parse dstid avp\n"); + LM_ERR("cannot parse weight avp\n"); return -1; } - if(pv_parse_spec(&count_param, &pv_count)<0 + if(pv_parse_spec(&count_param, &pv_count) < 0 || !(pv_is_w(&pv_weight))) { - LM_ERR("cannot parse count pv or is read-only\n"); + LM_ERR("cannot parse count pv or pv is read-only\n"); return -1; } @@ -220,7 +220,7 @@ static int mod_init(void) LM_DBG("mt_char_list=%s \n", mt_char_list.s); mt_char_table_init(); - /* binding to mysql module */ + /* binding to database module */ if(db_bind_mod(&db_url, &mt_dbf)) { LM_ERR("database module not found\n"); @@ -614,7 +614,7 @@ static int mt_load_db(m_tree_t *pt) if(RES_ROWS(db_res)[0].values[0].type != DB1_STRING || RES_ROWS(db_res)[0].values[1].type != DB1_STRING) { - LM_ERR("wrond column types in db table (%d / %d)\n", + LM_ERR("wrong column types in db table (%d / %d)\n", RES_ROWS(db_res)[0].values[0].type, RES_ROWS(db_res)[0].values[1].type); goto error; @@ -1029,7 +1029,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) if(tr==NULL) { /* no tree with such name*/ - rpc->fault(ctx, 404, "Not found tree"); + rpc->fault(ctx, 404, "Tree not found"); goto error; } @@ -1038,7 +1038,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) LM_DBG("no prefix found in [%.*s] for [%.*s]\n", tname.len, tname.s, tomatch.len, tomatch.s); - rpc->fault(ctx, 404, "Not found"); + rpc->fault(ctx, 404, "Prefix not found"); } error:

1 0

git:5.5:97f9ede8: secsipid: note about libsecsipid location and failure return codes
by Daniel-Constantin Mierla 01 Jun '21

01 Jun '21

Module: kamailio Branch: 5.5 Commit: 97f9ede8b82cff8063c3fd1908d3c323997e9566 URL: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:59:32+02:00 secsipid: note about libsecsipid location and failure return codes (cherry picked from commit 59719a1ac97337ca7f8b83b0e8a9d63bf6ec0c7e) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… Patch: https://github.com/kamailio/kamailio/commit/97f9ede8b82cff8063c3fd1908d3c32… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 1e22e371fb..0d7147c35f 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -30,6 +30,17 @@ loads "secsipid_proc.so" in child init callback in order to initialize the "libsecsipid" per child process. </para> + <para> + The libsecsipid is provided by secsipidx project: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> + <para> + In case of failure, the functions in this module return error codes + (the negative values) listed in the code of libsecsipid, pretty much + at the top of: + <ulink url="https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go" + >https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go</ulink>. + </para> </section> <section> <title>Dependencies</title>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev