sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
312 discussions

git:master:4cd55a86: textops: find_hdr_line_start() - search for header name with colon

by Daniel-Constantin Mierla

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;

3 years, 5 months

git:master:cb2705f2: textops: check for HDR_ERROR_T after header name parsing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cb2705f21e56f884e733febc2362055da3ef2693 URL: https://github.com/kamailio/kamailio/commit/cb2705f21e56f884e733febc2362055… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T21:21:59+02:00 textops: check for HDR_ERROR_T after header name parsing --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/cb2705f21e56f884e733febc2362055… Patch: https://github.com/kamailio/kamailio/commit/cb2705f21e56f884e733febc2362055… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 40ea02c273..e93bc82bf2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1816,7 +1816,8 @@ static int ki_remove_hf_idx(sip_msg_t* msg, str* hname, int idx) return -1; } - if(parse_hname2_str(hname, &hfm)==NULL) { + parse_hname2_str(hname, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("failed to parse header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2098,12 +2099,13 @@ static int ki_hname_gparam(str *hname, gparam_t *gp) gp->v.str = *hname; - if (parse_hname2_short(hbuf, hbuf + gp->v.str.len + 1, &hdr)==0) { + parse_hname2_short(hbuf, hbuf + gp->v.str.len + 1, &hdr); + if(hdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name: %.*s\n", hname->len, hname->s); return -1; } - if (hdr.type!=HDR_OTHER_T && hdr.type!=HDR_ERROR_T) { + if (hdr.type!=HDR_OTHER_T) { LM_DBG("using hdr type (%d) instead of <%.*s>\n", hdr.type, gp->v.str.len, gp->v.str.s); gp->v.str.s = NULL; @@ -3713,17 +3715,19 @@ static int hname_fixup(void** param, int param_no) gp->v.str.s[gp->v.str.len] = ':'; gp->v.str.len++; - if (parse_hname2_short(gp->v.str.s, gp->v.str.s + gp->v.str.len, &hdr)==0) + parse_hname2_short(gp->v.str.s, gp->v.str.s + gp->v.str.len, &hdr); + + gp->v.str.len--; + gp->v.str.s[gp->v.str.len] = c; + + if(hdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name\n"); pkg_free(gp); return E_UNSPEC; } - gp->v.str.len--; - gp->v.str.s[gp->v.str.len] = c; - - if (hdr.type!=HDR_OTHER_T && hdr.type!=HDR_ERROR_T) + if (hdr.type!=HDR_OTHER_T) { LM_DBG("using hdr type (%d) instead of <%.*s>\n", hdr.type, gp->v.str.len, gp->v.str.s);

3 years, 5 months

git:master:785bbaa0: core: kemi - check hdr type HDR_ERROR_T after parsing

by Daniel-Constantin Mierla

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; }

3 years, 5 months

git:master:95034f62: xprint: check hdr type HDR_ERROR_T after parsing

by Daniel-Constantin Mierla

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",

3 years, 5 months

git:master:d3b693fa: xprint: remove history and svn id

by Daniel-Constantin Mierla

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 */

3 years, 5 months

git:master:a4d94268: textops: find_hdr_line_start() - locate header name without error logs

by Daniel-Constantin Mierla

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");

3 years, 5 months

git:master:260a825a: core: parser/parse_hname2 - option to skip printing logs on parse failure

by Daniel-Constantin Mierla

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);

3 years, 5 months

[kamailio/kamailio] core kamailio 5.4 (#2740)

by descartin

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 years, 5 months

git:master:f3332c7d: pv: suport also Route headers in $hfl(...)

by Daniel-Constantin Mierla

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); }

3 years, 5 months

Kamailio v5.4.6 Released

by Daniel-Constantin Mierla

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/

3 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021