sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

[tracker] Comment added: avpops: use xavp semantic on second parameter (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#346 - avpops: use xavp semantic on second parameter User who did this - Víctor Seva (linuxmaniac) ---------- With this change I can remove the dependency. is it OK with you? ---------- One or more files have been attached. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=346#comment1088 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.

11 years, 1 month

[tracker] User took ownership: xavp semantics

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Víctor Seva has taken ownership of the following task: FS#345 - xavp semantics More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=345 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.

11 years, 1 month

[tracker] Comment added: xavp semantics (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#345 - xavp semantics User who did this - Víctor Seva (linuxmaniac) ---------- This patch just allows all values on second key. 3(3494) INFO: app_lua [app_lua_sr.c:98]: lua_sr_log(): xavp(test[0]):{re={"sip:.*@ar.net","sip:.*@bar.net","sip:no@.*","sip:yes@.*"}} 3(3494) INFO: <script>: $xavp(test[0]=>re[0]):sip:.*@ar.net 3(3494) INFO: <script>: $xavp(test[0]=>re[1]):sip:.*@bar.net 3(3494) INFO: <script>: $xavp(test[0]=>re[2]):sip:no@.* 3(3494) INFO: <script>: $xavp(test[0]=>re[3]):sip:yes@.* 3(3494) INFO: <script>: $xavp(test[0]=>re[*]):sip:.*@ar.net, sip:.*@bar.net, sip:no@.*, sip:yes@.* 3(3494) INFO: <script>: $(avp(s:test)[*]):sip:no@.*, sip:yes@.* ---------- One or more files have been attached. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=345#comment1087 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.

11 years, 1 month

git:master: core: set to NULL the pointers to several sip msg fileds in cloned structure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 659b920399ee2a75973c610f5dec4c6292903f67 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=659b920… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 13:25:41 2013 +0200 core: set to NULL the pointers to several sip msg fileds in cloned structure - instance, ruid and location_ua are reset to null for the clone in shm, otherwise they point to pkg and the shm can be used from other process, resulting in crash - reported and credits for testing and troubleshooting to Alex Balashov --- sip_msg_clone.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 58ce353..6a5da1a 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -539,6 +539,17 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, /* path_vec is not cloned (it's reset instead) */ new_msg->path_vec.s=0; new_msg->path_vec.len=0; + /* instance is not cloned (it's reset instead) */ + new_msg->instance.s=0; + new_msg->instance.len=0; + /* ruid is not cloned (it's reset instead) */ + new_msg->ruid.s=0; + new_msg->ruid.len=0; + /* location ua is not cloned (it's reset instead) */ + new_msg->location_ua.s=0; + new_msg->location_ua.len=0; + /* reg_id is not cloned (it's reset instead) */ + new_msg->reg_id=0; /* message buffers(org and scratch pad) */ memcpy( p , org_msg->buf, org_msg->len); /* ZT to be safer */

11 years, 1 month

git:master: tm: faked request fields are freed using wrapper functions from core

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cebbacc3167f0fd4a4f3fd96393b5cf85e13d861 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cebbacc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 13:24:57 2013 +0200 tm: faked request fields are freed using wrapper functions from core --- modules/tm/t_reply.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 97b813f..e3aa49e 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -954,6 +954,7 @@ error00: if (faked_req->dst_uri.s) { pkg_free(faked_req->dst_uri.s); faked_req->dst_uri.s = 0; + faked_req->dst_uri.len = 0; } error01: return 0; @@ -963,15 +964,8 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t) { struct hdr_field *hdr; - if (faked_req->new_uri.s) { - pkg_free(faked_req->new_uri.s); - faked_req->new_uri.s = 0; - } - - if (faked_req->dst_uri.s) { - pkg_free(faked_req->dst_uri.s); - faked_req->dst_uri.s = 0; - } + reset_new_uri(faked_req); + reset_dst_uri(faked_req); /* free all types of lump that were added in failure handlers */ del_nonshm_lump( &(faked_req->add_rm) ); @@ -997,6 +991,12 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t) faked_req->body->free(&faked_req->body); faked_req->body = 0; } + + /* free sip_msg_t fileds that can be set in pkg */ + reset_path_vector(faked_req); + reset_instance(faked_req); + reset_ruid(faked_req); + reset_ua(faked_req); }

11 years, 1 month

git:master: parser: use wrapper functions to reset fields in sip_msg_t

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cae9659766c84e9451e4ea41e61bf85337c89693 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cae9659… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 13:23:53 2013 +0200 parser: use wrapper functions to reset fields in sip_msg_t - used for freeing the structure --- parser/msg_parser.c | 22 +++++++++++++++++++--- parser/msg_parser.h | 2 ++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index d8709e4..02ad583 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -723,9 +723,12 @@ void free_reply_lump( struct lump_rpl *lump) /*only the content*/ void free_sip_msg(struct sip_msg* const msg) { - if (msg->new_uri.s) { pkg_free(msg->new_uri.s); msg->new_uri.len=0; } - if (msg->dst_uri.s) { pkg_free(msg->dst_uri.s); msg->dst_uri.len=0; } - if (msg->path_vec.s) { pkg_free(msg->path_vec.s); msg->path_vec.len=0; } + reset_new_uri(msg); + reset_dst_uri(msg); + reset_path_vector(msg); + reset_instance(msg); + reset_ruid(msg); + reset_ua(msg); if (msg->headers) free_hdr_field_lst(msg->headers); if (msg->body && msg->body->free) msg->body->free(&msg->body); if (msg->add_rm) free_lump_list(msg->add_rm); @@ -737,6 +740,19 @@ void free_sip_msg(struct sip_msg* const msg) # endif } +/** + * reset new uri value + */ +void reset_new_uri(struct sip_msg* const msg) +{ + if(msg->new_uri.s != 0) { + pkg_free(msg->new_uri.s); + } + msg->new_uri.s = 0; + msg->new_uri.len = 0; + msg->parsed_uri_ok = 0; +} + /* * Make a private copy of the string and assign it to dst_uri diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 5a618c6..5d481e0 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -432,6 +432,8 @@ inline static char* get_body(struct sip_msg* const msg) return msg->unparsed + offset; } +/*! \brief If the new_uri is set, then reset it */ +void reset_new_uri(struct sip_msg* const msg); /*! \brief * Make a private copy of the string and assign it to dst_uri

11 years, 1 month

git:master: parser: ppi/ pai - fix warning dereferencing type-punned pointer will break strict-aliasing rules

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: deb007275ae6444037e74c82a48fc879a0cc98ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=deb0072… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 12:34:33 2013 +0200 parser: ppi/pai - fix warning dereferencing type-punned pointer will break strict-aliasing rules --- parser/parse_ppi_pai.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/parser/parse_ppi_pai.c b/parser/parse_ppi_pai.c index cce0b6c..f1b8d91 100644 --- a/parser/parse_ppi_pai.c +++ b/parser/parse_ppi_pai.c @@ -114,6 +114,7 @@ int parse_pai_header(struct sip_msg* const msg) p_id_body_t *pai_b; p_id_body_t **prev_pid_b; hdr_field_t *hf; + void **vp; if ( !msg->pai ) { @@ -130,7 +131,8 @@ int parse_pai_header(struct sip_msg* const msg) if ( msg->pai->parsed ) return 0; - prev_pid_b = (p_id_body_t**)(&msg->pai->parsed); + vp = &msg->pai->parsed; + prev_pid_b = (p_id_body_t**)vp; for (hf = msg->pai; hf != NULL; hf = next_sibling_hdr(hf)) {

11 years, 1 month

git:master: core: a bit of cleaning in sip_msg_t comments

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: aa9f500c80cb5372c40f1eb7f18b4e33dcd6acf5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa9f500… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 12:27:35 2013 +0200 core: a bit of cleaning in sip_msg_t comments --- parser/msg_parser.h | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 9e97e65..5a618c6 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -347,25 +347,19 @@ typedef struct sip_msg { struct lump_rpl *reply_lump; /*!< only for localy generated replies !!!*/ /*! \brief str add_to_branch; - whatever whoever want to append to branch comes here - */ + whatever whoever want to append to Via branch comes here */ char add_to_branch_s[MAX_BRANCH_PARAM_LEN]; int add_to_branch_len; unsigned int hash_index; /*!< index to TM hash table; stored in core to avoid unnecessary calculations */ - unsigned int msg_flags; /*!< flags used by core */ - /* allows to set various flags on the message; may be used for - * simple inter-module communication or remembering processing state - * reached - */ - flag_t flags; + unsigned int msg_flags; /*!< internal flags used by core */ + flag_t flags; /*!< config flags */ str set_global_address; str set_global_port; - struct socket_info* force_send_socket; /* force sending on this socket, - if ser */ + struct socket_info* force_send_socket; /*!< force sending on this socket */ str path_vec; - str instance; - unsigned int reg_id; + str instance; + unsigned int reg_id; str ruid; str location_ua;

11 years, 1 month

[tracker] Comment added: avpops: use xavp semantic on second parameter (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#346 - avpops: use xavp semantic on second parameter User who did this - Víctor Seva (linuxmaniac) ---------- With this change I can remove the dependency. is it OK with you? ---------- One or more files have been attached. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=346#comment1086 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.

11 years, 1 month

git:master: modules/app_lua: Fix off-by-one error in modf

by Hugh Waite

Module: sip-router Branch: master Commit: 8bb61ea287ccf670ef9cfe990d319249eafbe7c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bb61ea… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Sep 18 21:58:12 2013 +0100 modules/app_lua: Fix off-by-one error in modf - Fixes calling sr.modf with additional parameters --- modules/app_lua/app_lua_sr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index c5229f4..14ea838 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -240,7 +240,7 @@ static int lua_sr_modf (lua_State *L) goto error; } } else { - for(i=1; i<=argc; i++) + for(i=1; i<argc; i++) { if(expf->fixup(&(act->val[i+1].u.data), i)<0) { @@ -256,7 +256,7 @@ static int lua_sr_modf (lua_State *L) /* free fixups */ if (expf->fixup) { - for(i=1; i<=argc; i++) + for(i=1; i<argc; i++) { if ((act->val[i+1].type == MODFIXUP_ST) && (act->val[i+1].u.data)) {

11 years, 1 month

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013