sr-dev July 2014

sr-dev@lists.kamailio.org

25 participants
140 discussions

[tracker] Comment added: Crash in core when freeing shm dup'ed request (Attachment added)
by sip-router 28 Jul '14

28 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#454 - Crash in core when freeing shm dup'ed request User who did this - Hugh Waite (hugh.waite) ---------- The attached patch will generate the hash based on the original request (where present) not the one duplicated in shared mem. I've tested and it fixes the crash. If it's OK, I'll commit to master, 4.1 and 4.0 ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=454#comment1563 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: Crash in core when freeing shm dup'ed request
by sip-router 28 Jul '14

28 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#454 - Crash in core when freeing shm dup'ed request User who did this - Daniel-Constantin Mierla (miconda) ---------- You can go ahead an commit - using local msg struct should be ok. However, iirc, the From should be parsed before creating the transaction. For a double check, in frame 5, can you get in gdb: p *hf ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=454#comment1562 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: Crash in core when freeing shm dup'ed request (Attachment added)
by sip-router 28 Jul '14

28 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#454 - Crash in core when freeing shm dup'ed request User who did this - Hugh Waite (hugh.waite) ---------- The attached patch will generate the hash based on the original request (where present) not the one duplicated in shared mem. I've tested and it fixes the crash. If it's OK, I'll commit to master, 4.1 and 4.0 ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=454#comment1561 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: Crash in core when freeing shm dup'ed request (Attachment added)
by sip-router 28 Jul '14

28 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Hugh Waite (hugh.waite) Attached to Project - sip-router Summary - Crash in core when freeing shm dup'ed request Task Type - Bug Report Category - Core Status - New Assigned To - Operating System - All Severity - High Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - I have found a crash in core/tm which is easily reproducible. An OPTIONS passes through kamailio to another kamailio server which responds with a 403. The response enters a failure route and crashes (due to an abort) when attempting to free the memory in the faked_req structure. Attached is the backtrace and the relevant section of the DEBUG level output. It appears from the DEBUG, that a pkg-memory address is stored in the shm_cloned structure, which is invalid when attempting to free from a different process. The allocated address in this core is 0x7fd12559ee28 called from parse_from_header. This only occurs when the Via branch is 'pre-RFC3261'. In this case the perpetrator is using "branch=foo". I think the allocation occurs in char_msg_val.h:83 where the from body is parsed to extract the tag (only for pre-3261 requests). h_table.c:309 build_cell h_table.c:390 init_synonym_id h_table.c:274 char_mag_val The tm module is pretty stable (last relevant change was removing the syn_branch parameter in May 2013) so I would rather have some guidance before making changes. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=454 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: pv: new variables - $expires(min) and $expires(max)
by Daniel-Constantin Mierla 28 Jul '14

28 Jul '14

Module: sip-router Branch: master Commit: c1b51e38f0904217b0a07b8b9aedc51519fe250e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1b51e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 28 14:24:21 2014 +0200 pv: new variables - $expires(min) and $expires(max) - return the min and max of expires value for sip message - contact headers are checked with higher priority, if no expires parameter there, then Expires header is used - if none is found, $null is returned --- modules/pv/pv.c | 2 + modules/pv/pv_core.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ modules/pv/pv_core.h | 5 ++ 3 files changed, 122 insertions(+), 0 deletions(-) diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 3b962f4..8488b67 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -436,6 +436,8 @@ static pv_export_t mod_pvs[] = { 0, pv_parse_sr_version_name, 0, 0, 0}, { {"K", (sizeof("K")-1)}, PVT_OTHER, pv_get_K, 0, pv_parse_K_name, 0, 0, 0 }, + { {"expires", (sizeof("expires")-1)}, PVT_OTHER, pv_get_expires, 0, + pv_parse_expires_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 2d34df5..d41a399 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -44,6 +44,9 @@ #include "../../parser/parse_diversion.h" #include "../../parser/parse_ppi_pai.h" #include "../../parser/digest/digest.h" +#include "../../parser/contact/contact.h" +#include "../../parser/contact/parse_contact.h" +#include "../../parser/parse_expires.h" #include "pv_core.h" #include "pv_svar.h" @@ -2941,3 +2944,115 @@ int pv_get__s(sip_msg_t *msg, pv_param_t *param, } return pv_get_strval(msg, param, res, &sdata); } + +/** + * + */ +int pv_parse_expires_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 3: + if(strncmp(in->s, "min", 3)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "max", 3)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV expires key: %.*s\n", in->len, in->s); + return -1; +} + +/** + * + */ +int pv_get_expires(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + unsigned int exp_min = 0xffffffff; + unsigned int exp_max = 0; + hdr_field_t* hdr; + contact_t* c; + unsigned int eval = 0; + unsigned int ehdr = 0; + unsigned int efound = 0; + + if(param==NULL) + return -1; + + if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse headers\n"); + return pv_get_null(msg, param, res); + } + + if (msg->expires) { + if(!msg->expires->parsed && (parse_expires(msg->expires) < 0)) { + LM_ERR("failed to parse hdr expires body\n"); + return pv_get_null(msg, param, res); + } + ehdr = ((exp_body_t*)msg->expires->parsed)->val; + } + + if (msg->contact) { + hdr = msg->contact; + while(hdr) { + if (hdr->type == HDR_CONTACT_T) { + if (!hdr->parsed && (parse_contact(hdr) < 0)) { + LM_ERR("failed to parse Contact body\n"); + return pv_get_null(msg, param, res); + } + c = ((contact_body_t*)hdr->parsed)->contacts; + while(c) { + c = c->next; + if(c->expires && c->expires->body.len) { + if (str2int(&c->expires->body, &eval) < 0) { + LM_ERR("failed to parse expires\n"); + return pv_get_null(msg, param, res); + } + efound = 1; + if(eval>exp_max) exp_max = eval; + if(eval<exp_min) exp_min = eval; + } else if(msg->expires && msg->expires->parsed) { + eval = ehdr; + efound = 1; + if(eval>exp_max) exp_max = eval; + if(eval<exp_min) exp_min = eval; + } + } + } + hdr = hdr->next; + } + } + + if(efound==0 && msg->expires && msg->expires->parsed) { + eval = ehdr; + efound = 1; + if(eval>exp_max) exp_max = eval; + if(eval<exp_min) exp_min = eval; + } + + if(efound==0) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) + { + case 0: + return pv_get_uintval(msg, param, res, exp_min); + case 1: + return pv_get_uintval(msg, param, res, exp_max); + default: + return pv_get_null(msg, param, res); + } +} diff --git a/modules/pv/pv_core.h b/modules/pv/pv_core.h index 46bde9e..a444ffe 100644 --- a/modules/pv/pv_core.h +++ b/modules/pv/pv_core.h @@ -320,5 +320,10 @@ int pv_parse__s_name(pv_spec_p sp, str *in); int pv_get__s(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_expires_name(pv_spec_p sp, str *in); + +int pv_get_expires(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); + #endif

1 0

[tracker] Task closed: PARAM_STR vs STR_PARAM
by sip-router 28 Jul '14

28 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#453 - PARAM_STR vs STR_PARAM User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=453 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: PARAM_STR vs STR_PARAM
by sip-router 28 Jul '14

28 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#453 - PARAM_STR vs STR_PARAM User who did this - Daniel-Constantin Mierla (miconda) ---------- Should be fixed, thanks for catching it. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=453#comment1560 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: ims_registrar_scscf: fixed compile error of removed vars by moving to PARAM_STR
by Daniel-Constantin Mierla 28 Jul '14

28 Jul '14

Module: sip-router Branch: master Commit: c445e0c299a21cb268101c716147d53f1d897dcf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c445e0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 28 09:32:03 2014 +0200 ims_registrar_scscf: fixed compile error of removed vars by moving to PARAM_STR - reported by Victor Seva --- modules/ims_registrar_scscf/reg_mod.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/modules/ims_registrar_scscf/reg_mod.c b/modules/ims_registrar_scscf/reg_mod.c index 0af9009..a92ac97 100644 --- a/modules/ims_registrar_scscf/reg_mod.c +++ b/modules/ims_registrar_scscf/reg_mod.c @@ -312,12 +312,6 @@ static int mod_init(void) { scscf_serviceroute_uri_str.len += scscf_name_str.len; } - cxdx_forced_peer.s = cxdx_forced_peer_s; - cxdx_forced_peer.len = strlen(cxdx_forced_peer_s); - - cxdx_dest_realm.s = cxdx_dest_realm_s; - cxdx_dest_realm.len = strlen(cxdx_dest_realm_s); - /* </build required strings> */ #ifdef STATISTICS

1 0

[tracker] Comment added: PARAM_STR vs STR_PARAM
by sip-router 28 Jul '14

28 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#453 - PARAM_STR vs STR_PARAM User who did this - Víctor Seva (linuxmaniac) ---------- There is a compilation error so nigthly builds fails https://kamailio.sipwise.com/view/kamdev/job/kamailiodev-nightly-binaries/1… 01:26:39 CC (gcc) [M ims_registrar_scscf.so] api.o 01:26:39 CC (gcc) [M ims_registrar_scscf.so] common.o 01:26:39 CC (gcc) [M ims_registrar_scscf.so] config.o 01:26:40 CC (gcc) [M ims_registrar_scscf.so] cxdx_avp.o 01:26:41 CC (gcc) [M ims_registrar_scscf.so] cxdx_callbacks.o 01:26:41 CC (gcc) [M ims_registrar_scscf.so] cxdx_sar.o 01:26:42 CC (gcc) [M ims_registrar_scscf.so] lookup.o 01:26:42 CC (gcc) [M ims_registrar_scscf.so] path.o 01:26:42 CC (gcc) [M ims_registrar_scscf.so] reg_mod.o 01:26:43 reg_mod.c: In function 'mod_init': 01:26:43 reg_mod.c:315:26: error: 'cxdx_forced_peer_s' undeclared (first use in this function) 01:26:43 reg_mod.c:315:26: note: each undeclared identifier is reported only once for each function it appears in 01:26:43 reg_mod.c:318:25: error: 'cxdx_dest_realm_s' undeclared (first use in this function) 01:26:43 make[2]: *** [reg_mod.o] Error 1 01:26:43 make[1]: *** [install-modules] Error 1 blaming commit ef3def8cba78d2a58ab89a93424665986f886655 ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=453#comment1559 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task reopened: PARAM_STR vs STR_PARAM
by sip-router 28 Jul '14

28 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been re-opened: FS#453 - PARAM_STR vs STR_PARAM User who did this - Víctor Seva (linuxmaniac) More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=453 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
2
3
4
5
6
7
...
14
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2014