sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

by Juha Heinanen

k 5.1 crashes when executing this: $var(test_uri) = "tel:+358447058060"; xlog("L_INFO", "****** extracting domain from <$var(test_uri)>\n"); $rd = $(var(test_uri){uri.host}); xlog("L_INFO", "****** request uri is <$ru>\n"); Apr 7 15:15:17 lohi /usr/bin/sip-proxy[14477]: INFO: ****** extracting domain from <tel:+358447058060> Apr 7 15:15:17 lohi kernel: [63113.914477] sip-proxy[14477]: segfault at 7c0410 ip 00007f9d268703e0 sp 00007ffe1d5bcd20 error 7 in pv.so[7f9d2680a000+9e000] Apr 7 15:15:17 lohi /usr/bin/sip-proxy[14503]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 38 bt is below. -- juha ----------------------------------------------------------------- (gdb) bt #0 0x00007f9d268703e0 in pv_set_ruri_host (msg=0x7f9d33607090, param=0x7f9d32ca42c0, op=254, val=0x7ffe1d5bcfc0) at pv_core.c:2243 #1 0x00000000005964dc in lval_pvar_assign (h=0x7ffe1d5bd770, msg=0x7f9d33607090, lv=0x7f9d32ca4240, rv=0x7f9d32ca4918) at core/lvalue.c:351 #2 0x0000000000596eed in lval_assign (h=0x7ffe1d5bd770, msg=0x7f9d33607090, lv=0x7f9d32ca4240, rve=0x7f9d32ca4910) at core/lvalue.c:399 #3 0x00000000004807c4 in do_action (h=0x7ffe1d5bd770, a=0x7f9d32ca44e0, msg=0x7f9d33607090) at core/action.c:1430 #4 0x000000000048224e in run_actions (h=0x7ffe1d5bd770, a=0x7f9d32ca3170, msg=0x7f9d33607090) at core/action.c:1552 #5 0x0000000000482a11 in run_top_route (a=0x7f9d32ca3170, msg=0x7f9d33607090, c=0x0) at core/action.c:1641 #6 0x000000000059a3e0 in receive_msg ( buf=0x1242930 "SUBSCRIBE sip:127.0.0.1:5080;transport=tcp SIP/2.0\r\nVia: SIP/2.0/TCP 192.168.43.192:35987;branch=z9hG4bK60fe34942bb48c45;rport\r\nContact: <sip:test@test.tutpro.com;gr=urn:uuid:47759291-c9db-4eb3-a540-5"..., len=945, rcv_info=0x7f9d28a2b5d8) at core/receive.c:263 #7 0x0000000000624f83 in receive_tcp_msg ( tcpbuf=0x7f9d28a2b8b0 "SUBSCRIBE sip:127.0.0.1:5080;transport=tcp SIP/2.0\r\nVia: SIP/2.0/TCP 192.168.43.192:35987;branch=z9hG4bK60fe34942bb48c45;rport\r\nContact: <sip:test@test.tutpro.com;gr=urn:uuid:47759291-c9db-4eb3-a540-5"..., len=945, rcv_info=0x7f9d28a2b5d8, con=0x7f9d28a2b5c0) at core/tcp_read.c:1277 #8 0x0000000000626fa3 in tcp_read_req (con=0x7f9d28a2b5c0, bytes_read=0x7ffe1d5bdc68, read_flags=0x7ffe1d5bdc6c) at core/tcp_read.c:1445 #9 0x0000000000629c26 in handle_io (fm=0x7f9d3366cb38, events=1, idx=-1) at core/tcp_read.c:1619 #10 0x000000000061bcce in io_wait_loop_epoll (h=0xa9a900 <io_w>, t=2, repeat=0) at core/io_wait.h:1065 #11 0x000000000062baad in tcp_receive_loop (unix_sock=41) at core/tcp_read.c:1789 #12 0x0000000000502498 in tcp_init_children () at core/tcp_main.c:4816 #13 0x0000000000424b9f in main_loop () at main.c:1708 #14 0x000000000042b2e9 in main (argc=17, argv=0x7ffe1d5be308) at main.c:2639 (gdb)

7 years, 7 months

git:master:8e037f62: modules/siputils: made tel2sip to return 2 if no conversion was needed

by Juha Heinanen

Module: kamailio Branch: master Commit: 8e037f623ae6daf58e092d8a41430fd13d1d38ec URL: https://github.com/kamailio/kamailio/commit/8e037f623ae6daf58e092d8a41430fd… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-04-08T10:31:23+03:00 modules/siputils: made tel2sip to return 2 if no conversion was needed --- Modified: src/modules/siputils/README Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8e037f623ae6daf58e092d8a41430fd… Patch: https://github.com/kamailio/kamailio/commit/8e037f623ae6daf58e092d8a41430fd… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index e7e5b79..8815baa 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -561,8 +561,8 @@ get_uri_param("nat", "$var(nat)"); Converts URI in first param (pseudo variable or string) to SIP URI, if it is a tel URI. If conversion was done, writes resulting SIP URI to - third param (pseudo variable). Returns 1 if conversion succeeded or if - no conversion was needed. + third param (pseudo variable). Returns 1 if conversion succeeded, 2 if + no conversion was needed, and -1 in case of error. The conversion follows the rules in RFC 3261 section 19.1.6: * Visual separators ( "-", ".", "(", ")" ) are removed from tel URI diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index ca6991f..0a33bdd 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -349,7 +349,7 @@ int add_uri_param(struct sip_msg* _msg, char* _param, char* _s2) /* * Converts URI, if it is tel URI, to SIP URI. Returns 1, if - * conversion succeeded or if no conversion was needed, i.e., URI was not + * conversion succeeded and 2 if no conversion was needed, i.e., URI was not * tel URI. Returns -1, if conversion failed. Takes SIP URI hostpart from * second parameter and (if needed) writes the result to third paramater. */ @@ -364,15 +364,17 @@ int tel2sip(struct sip_msg* _msg, char* _uri, char* _hostpart, char* _res) /* get parameters */ if (get_str_fparam(&uri, _msg, (fparam_t*)_uri) < 0) { LM_ERR("failed to get uri value\n"); + return -1; } if (get_str_fparam(&hostpart, _msg, (fparam_t*)_hostpart) < 0) { LM_ERR("failed to get hostpart value\n"); + return -1; } res = (pv_spec_t *)_res; /* check if anything needs to be done */ - if (uri.len < 4) return 1; - if (strncasecmp(uri.s, "tel:", 4) != 0) return 1; + if (uri.len < 4) return 2; + if (strncasecmp(uri.s, "tel:", 4) != 0) return 2; /* reserve memory for clean tel uri */ tel_uri.s = pkg_malloc(uri.len+1); diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index e28f7a2..2031ad2 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -513,8 +513,8 @@ get_uri_param("nat", "$var(nat)"); Converts URI in first param (pseudo variable or string) to SIP URI, if it is a tel URI. If conversion was done, writes resulting SIP URI to third param (pseudo variable). - Returns 1 if conversion succeeded or if no conversion - was needed. + Returns 1 if conversion succeeded, 2 if no conversion + was needed, and -1 in case of error. </para> <para> The conversion follows the rules in RFC 3261 section 19.1.6:

7 years, 7 months

git:5.0:2705a9d3: core: use buffers instead of static empty string

by Juha Heinanen

Module: kamailio Branch: 5.0 Commit: 2705a9d36481d66ea86f79b574760f3009118775 URL: https://github.com/kamailio/kamailio/commit/2705a9d36481d66ea86f79b574760f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-04-08T09:02:39+03:00 core: use buffers instead of static empty string - if code tries to write in, results in a crash - reported by Juha Heinanen (cherry picked from commit 6aa2b91b581d7e0f138a9a19f61d848caeb61a19) --- Modified: src/core/lvalue.c Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/2705a9d36481d66ea86f79b574760f3… Patch: https://github.com/kamailio/kamailio/commit/2705a9d36481d66ea86f79b574760f3… --- diff --git a/src/core/lvalue.c b/src/core/lvalue.c index b348b53..99fbc27 100644 --- a/src/core/lvalue.c +++ b/src/core/lvalue.c @@ -25,6 +25,9 @@ #include "dprint.h" #include "route.h" +static char _lval_empty_buf[2] = {0}; +static str _lval_empty = { _lval_empty_buf, 0 }; + /* callback to log assign actions */ static log_assign_action_f _log_assign_action = NULL; @@ -124,8 +127,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, flags=avp->type|AVP_VAL_STR; v=run_select(&value.s, &rv->v.sel, msg); if (unlikely(v!=0)){ - value.s.s=""; - value.s.len=0; + value.s = _lval_empty; if (v<0){ ret=-1; break; @@ -302,8 +304,7 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, v=run_select(&pval.rs, &rv->v.sel, msg); if (unlikely(v!=0)){ pval.flags|=PV_VAL_EMPTY; - pval.rs.s=""; - pval.rs.len=0; + pval.rs = _lval_empty; if (v<0){ ret=-1; break; diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 4e0be0f..71d56f5 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -34,6 +34,9 @@ #include "../error.h" #include "../core_stats.h" +static char _sr_uri_empty_buf[2] = {0}; +static str _sr_uri_empty = { _sr_uri_empty_buf, 0 }; + /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri * returns: fills uri & returns <0 on error or 0 if ok @@ -1191,8 +1194,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) case TELS_URI_T: /* fix tel uris, move the number in uri and empty the host */ uri->user=uri->host; - uri->host.s=""; - uri->host.len=0; + uri->host=_sr_uri_empty; break; /* urn: do nothing */ case URN_URI_T:

7 years, 7 months

git:5.0:f9fbd7a9: pv: renamed empty buf variable

by Juha Heinanen

Module: kamailio Branch: 5.0 Commit: f9fbd7a97cae4431a64ab350c2eed7bbc0586049 URL: https://github.com/kamailio/kamailio/commit/f9fbd7a97cae4431a64ab350c2eed7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-04-08T09:02:39+03:00 pv: renamed empty buf variable (cherry picked from commit cdd7bc29a900d787b8d99f7296306f99c53a5e29) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/f9fbd7a97cae4431a64ab350c2eed7b… Patch: https://github.com/kamailio/kamailio/commit/f9fbd7a97cae4431a64ab350c2eed7b… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 25723bd..ef88423 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -50,8 +50,8 @@ #include "pv_trans.h" -static char _empty_str[2] = {0}; -static str _tr_empty = { _empty_str, 0 }; +static char _tr_empty_buf[2] = {0}; +static str _tr_empty = { _tr_empty_buf, 0 }; static str _tr_uri = {0, 0}; static struct sip_uri _tr_parsed_uri; static param_t* _tr_uri_params = NULL;

7 years, 7 months

git:5.0:dccca195: pv: declare the pv_empty as buffer with size

by Juha Heinanen

Module: kamailio Branch: 5.0 Commit: dccca1959b6f96bb508baa9dab0eacba7c69f20c URL: https://github.com/kamailio/kamailio/commit/dccca1959b6f96bb508baa9dab0eacb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-04-08T09:02:38+03:00 pv: declare the pv_empty as buffer with size - otherwise it can crash when code tries to write in it, if pointing to static empty string - reported by Juha Heinanen (cherry picked from commit 1e37b31f8a28ccc6f44eaf75e5f02e836df20411) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/dccca1959b6f96bb508baa9dab0eacb… Patch: https://github.com/kamailio/kamailio/commit/dccca1959b6f96bb508baa9dab0eacb… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 6ad9a97..25723bd 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -50,7 +50,7 @@ #include "pv_trans.h" -static char _empty_str[] = ""; +static char _empty_str[2] = {0}; static str _tr_empty = { _empty_str, 0 }; static str _tr_uri = {0, 0}; static struct sip_uri _tr_parsed_uri;

7 years, 7 months

git:master:8bfabb97: kazoo: add exchange bindings

by lazedo

Module: kamailio Branch: master Commit: 8bfabb975a59e43bf5a18fde0b0ab2b2feef94f6 URL: https://github.com/kamailio/kamailio/commit/8bfabb975a59e43bf5a18fde0b0ab2b… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-07T18:27:43+01:00 kazoo: add exchange bindings --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h Modified: src/modules/kazoo/kz_json.c Modified: src/modules/kazoo/kz_json.h --- Diff: https://github.com/kamailio/kamailio/commit/8bfabb975a59e43bf5a18fde0b0ab2b… Patch: https://github.com/kamailio/kamailio/commit/8bfabb975a59e43bf5a18fde0b0ab2b…

7 years, 7 months

[kamailio/kamailio] kazoo: add exchange bindings (#1062)

by lazedo

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1062 -- Commit Summary -- * kazoo: add exchange bindings -- File Changes -- M src/modules/kazoo/kz_amqp.c (743) M src/modules/kazoo/kz_amqp.h (54) M src/modules/kazoo/kz_json.c (16) M src/modules/kazoo/kz_json.h (53) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1062.patch https://github.com/kamailio/kamailio/pull/1062.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/1062

7 years, 7 months

registrar method_filtering

by Juha Heinanen

if registrar method_filtering param is set, lookup produces -2 and $du is not set if method is not listed in allow header of register request. this is fine with initial requests, but in case of an invite dialog, initial invite may list another set of methods that the ua supports in in-dialog requests. if request uri of in-dialog request is gruu, lookup on it would thus fail and $du is not set if method of the request was not in allow header of register request, but was in allow header of initial invite. in order to solve the problem, my suggestion is that lookup would set $du also when it returns -2. comments? -- juha

7 years, 7 months

git:master:6aa2b91b: core: use buffers instead of static empty string

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6aa2b91b581d7e0f138a9a19f61d848caeb61a19 URL: https://github.com/kamailio/kamailio/commit/6aa2b91b581d7e0f138a9a19f61d848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-07T17:05:44+02:00 core: use buffers instead of static empty string - if code tries to write in, results in a crash - reported by Juha Heinanen --- Modified: src/core/lvalue.c Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/6aa2b91b581d7e0f138a9a19f61d848… Patch: https://github.com/kamailio/kamailio/commit/6aa2b91b581d7e0f138a9a19f61d848… --- diff --git a/src/core/lvalue.c b/src/core/lvalue.c index b348b53..99fbc27 100644 --- a/src/core/lvalue.c +++ b/src/core/lvalue.c @@ -25,6 +25,9 @@ #include "dprint.h" #include "route.h" +static char _lval_empty_buf[2] = {0}; +static str _lval_empty = { _lval_empty_buf, 0 }; + /* callback to log assign actions */ static log_assign_action_f _log_assign_action = NULL; @@ -124,8 +127,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, flags=avp->type|AVP_VAL_STR; v=run_select(&value.s, &rv->v.sel, msg); if (unlikely(v!=0)){ - value.s.s=""; - value.s.len=0; + value.s = _lval_empty; if (v<0){ ret=-1; break; @@ -302,8 +304,7 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, v=run_select(&pval.rs, &rv->v.sel, msg); if (unlikely(v!=0)){ pval.flags|=PV_VAL_EMPTY; - pval.rs.s=""; - pval.rs.len=0; + pval.rs = _lval_empty; if (v<0){ ret=-1; break; diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 4e0be0f..71d56f5 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -34,6 +34,9 @@ #include "../error.h" #include "../core_stats.h" +static char _sr_uri_empty_buf[2] = {0}; +static str _sr_uri_empty = { _sr_uri_empty_buf, 0 }; + /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri * returns: fills uri & returns <0 on error or 0 if ok @@ -1191,8 +1194,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) case TELS_URI_T: /* fix tel uris, move the number in uri and empty the host */ uri->user=uri->host; - uri->host.s=""; - uri->host.len=0; + uri->host=_sr_uri_empty; break; /* urn: do nothing */ case URN_URI_T:

7 years, 7 months

git:master:cdd7bc29: pv: renamed empty buf variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cdd7bc29a900d787b8d99f7296306f99c53a5e29 URL: https://github.com/kamailio/kamailio/commit/cdd7bc29a900d787b8d99f7296306f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-07T17:05:27+02:00 pv: renamed empty buf variable --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/cdd7bc29a900d787b8d99f7296306f9… Patch: https://github.com/kamailio/kamailio/commit/cdd7bc29a900d787b8d99f7296306f9… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 25723bd..ef88423 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -50,8 +50,8 @@ #include "pv_trans.h" -static char _empty_str[2] = {0}; -static str _tr_empty = { _empty_str, 0 }; +static char _tr_empty_buf[2] = {0}; +static str _tr_empty = { _tr_empty_buf, 0 }; static str _tr_uri = {0, 0}; static struct sip_uri _tr_parsed_uri; static param_t* _tr_uri_params = NULL;

7 years, 7 months

← Newer
1
...
30
31
32
33
34
35
36
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017