sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:master: core: msg_ldata_t field is memset to 0 in the shm clone
by Daniel-Constantin Mierla 19 Sep '13

19 Sep '13

Module: sip-router Branch: master Commit: 7730b5c3cf6b889f34de6004ce87341c746968ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7730b5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 15:50:29 2013 +0200 core: msg_ldata_t field is memset to 0 in the shm clone --- sip_msg_clone.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 6a5da1a..1bb55ee 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -550,6 +550,8 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, new_msg->location_ua.len=0; /* reg_id is not cloned (it's reset instead) */ new_msg->reg_id=0; + /* local data struct is not cloned (it's reset instead) */ + memset(&new_msg->ldv, 0, sizeof(msg_ldata_t)); /* message buffers(org and scratch pad) */ memcpy( p , org_msg->buf, org_msg->len); /* ZT to be safer */

1 0

git:master: outbound: updated access cached flow through local data structire in sip_msg_t
by Daniel-Constantin Mierla 19 Sep '13

19 Sep '13

Module: sip-router Branch: master Commit: 859a322a1f664fcdd9563619fa0448be2911aa07 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=859a322… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 15:49:48 2013 +0200 outbound: updated access cached flow through local data structire in sip_msg_t --- modules/outbound/ob_mod.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 0233ee5..9902e91 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -214,7 +214,7 @@ int decode_flow_token(struct sip_msg *msg, struct receive_info **rcv, str flow_t { int pos = FLOW_TOKEN_START_POS, flow_length, i; - if (msg->flow.decoded) + if (msg->ldv.flow.decoded) goto end; if (flow_token.s == NULL) @@ -263,31 +263,31 @@ int decode_flow_token(struct sip_msg *msg, struct receive_info **rcv, str flow_t /* Decode protocol information */ if (unenc_flow_token[pos] & 0x80) { - msg->flow.rcv.dst_ip.af = msg->flow.rcv.src_ip.af = AF_INET6; - msg->flow.rcv.dst_ip.len = msg->flow.rcv.src_ip.len = 16; + msg->ldv.flow.rcv.dst_ip.af = msg->ldv.flow.rcv.src_ip.af = AF_INET6; + msg->ldv.flow.rcv.dst_ip.len = msg->ldv.flow.rcv.src_ip.len = 16; } else { - msg->flow.rcv.dst_ip.af = msg->flow.rcv.src_ip.af = AF_INET; - msg->flow.rcv.dst_ip.len = msg->flow.rcv.src_ip.len = 4; + msg->ldv.flow.rcv.dst_ip.af = msg->ldv.flow.rcv.src_ip.af = AF_INET; + msg->ldv.flow.rcv.dst_ip.len = msg->ldv.flow.rcv.src_ip.len = 4; } - msg->flow.rcv.proto = unenc_flow_token[pos++] & 0x7f; + msg->ldv.flow.rcv.proto = unenc_flow_token[pos++] & 0x7f; /* Decode destination address */ - for (i = 0; i < (msg->flow.rcv.dst_ip.af == AF_INET6 ? 16 : 4); i++) - msg->flow.rcv.dst_ip.u.addr[i] = unenc_flow_token[pos++]; - msg->flow.rcv.dst_port = unenc_flow_token[pos++] << 8; - msg->flow.rcv.dst_port |= unenc_flow_token[pos++]; + for (i = 0; i < (msg->ldv.flow.rcv.dst_ip.af == AF_INET6 ? 16 : 4); i++) + msg->ldv.flow.rcv.dst_ip.u.addr[i] = unenc_flow_token[pos++]; + msg->ldv.flow.rcv.dst_port = unenc_flow_token[pos++] << 8; + msg->ldv.flow.rcv.dst_port |= unenc_flow_token[pos++]; /* Decode source address */ - for (i = 0; i < (msg->flow.rcv.src_ip.af == AF_INET6 ? 16 : 4); i++) - msg->flow.rcv.src_ip.u.addr[i] = unenc_flow_token[pos++]; - msg->flow.rcv.src_port = unenc_flow_token[pos++] << 8; - msg->flow.rcv.src_port |= unenc_flow_token[pos++]; - msg->flow.decoded = 1; + for (i = 0; i < (msg->ldv.flow.rcv.src_ip.af == AF_INET6 ? 16 : 4); i++) + msg->ldv.flow.rcv.src_ip.u.addr[i] = unenc_flow_token[pos++]; + msg->ldv.flow.rcv.src_port = unenc_flow_token[pos++] << 8; + msg->ldv.flow.rcv.src_port |= unenc_flow_token[pos++]; + msg->ldv.flow.decoded = 1; end: - *rcv = &msg->flow.rcv; + *rcv = &msg->ldv.flow.rcv; return 0; }

1 0

git:master: tm: reset local data structure for faked request after failure handlers
by Daniel-Constantin Mierla 19 Sep '13

19 Sep '13

Module: sip-router Branch: master Commit: 4b99ad9e3bc364745d21eef11a392168eeb17077 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b99ad9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 15:49:17 2013 +0200 tm: reset local data structure for faked request after failure handlers --- modules/tm/t_reply.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index e3aa49e..1a9f33f 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -997,6 +997,7 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t) reset_instance(faked_req); reset_ruid(faked_req); reset_ua(faked_req); + msg_ldata_reset(faked_req); }

1 0

git:master: parser: refactored a bit sip_msg_t struct for extra fields needed per process
by Daniel-Constantin Mierla 19 Sep '13

19 Sep '13

Module: sip-router Branch: master Commit: 949e1f3c3e1f1afa02c696403399a093905c3f0a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=949e1f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 15:45:43 2013 +0200 parser: refactored a bit sip_msg_t struct for extra fields needed per process - a new structure to keep cached decoded flow for outbound, previously was declared inline - easier to reset it for shm clone and tm faked environment - new fields that are needed inside the sip_msg_t but not cloned in shm, must be added in the msg_ldata_t structure, accessible via ldv field --- parser/msg_parser.c | 11 +++++++++++ parser/msg_parser.h | 25 +++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 02ad583..1631401 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -734,6 +734,7 @@ void free_sip_msg(struct sip_msg* const msg) if (msg->add_rm) free_lump_list(msg->add_rm); if (msg->body_lumps) free_lump_list(msg->body_lumps); if (msg->reply_lump) free_reply_lump(msg->reply_lump); + msg_ldata_reset(msg); /* don't free anymore -- now a pointer to a static buffer */ # ifdef DYN_BUF pkg_free(msg->buf); @@ -952,6 +953,16 @@ void reset_ua(struct sip_msg* const msg) msg->location_ua.len = 0; } +/** + * reset content of msg->ldv (msg_ldata_t structure) + */ +void msg_ldata_reset(sip_msg_t *msg) +{ + if(msg==NULL) + return; + memset(&msg->ldv, 0, sizeof(msg_ldata_t)); +} + hdr_field_t* get_hdr(const sip_msg_t* const msg, const enum _hdr_types_t ht) { diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 08b76ed..d6df9b3 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -253,6 +253,19 @@ typedef struct msg_body { /* pre-declaration, to include sys/time.h in .c */ struct timeval; +/* structure for cached decoded flow for outbound */ +typedef struct ocd_flow { + int decoded; + struct receive_info rcv; +} ocd_flow_t; + +/* structure holding fields that don't have to be cloned in shm + * - its content is memset'ed to in shm clone + * - add to msg_ldata_reset() if a field uses dynamic memory */ +typedef struct msg_ldata { + ocd_flow_t flow; +} msg_ldata_t; + /*! \brief The SIP message */ typedef struct sip_msg { unsigned int id; /*!< message id, unique/process*/ @@ -363,10 +376,9 @@ typedef struct sip_msg { str ruid; str location_ua; - struct { - int decoded; - struct receive_info rcv; - } flow; + /* structure with fields that are needed for local processing + * - not cloned to shm, reset to 0 in the clone */ + msg_ldata_t ldv; /* IMPORTANT: when adding new fields in this structure (sip_msg_t), * be sure it is freed in free_sip_msg() and it is cloned or reset @@ -514,4 +526,9 @@ int msg_ctx_id_match(const sip_msg_t* const msg, const msg_ctx_id_t* const mid); */ int msg_set_time(sip_msg_t* const msg); +/** + * reset content of msg->ldv (msg_ldata_t structure) + */ +void msg_ldata_reset(sip_msg_t*); + #endif

1 0

git:master: core: fix for warning dereferencing type-punned pointer will break strict-aliasing rules
by Daniel-Constantin Mierla 19 Sep '13

19 Sep '13

Module: sip-router Branch: master Commit: a3a8457e9bfe4dea48c0acd7421952014346a907 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3a8457… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 15:17:38 2013 +0200 core: fix for warning dereferencing type-punned pointer will break strict-aliasing rules - related to timer list operation --- timer_funcs.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/timer_funcs.h b/timer_funcs.h index 8e17b8a..28c223d 100644 --- a/timer_funcs.h +++ b/timer_funcs.h @@ -157,6 +157,8 @@ static inline void timer_redist(ticks_t t, struct timer_head *h) static inline void timer_run(ticks_t t) { + struct timer_head *thp; + /* trust the compiler for optimizing */ if ((t & H0_MASK)==0){ /*r1*/ if ((t & H1_H0_MASK)==0){ /*r2*/ @@ -168,7 +170,8 @@ static inline void timer_run(ticks_t t) /* DBG("timer_run: ticks %u, expire h0[%u]\n", (unsigned ) t, (unsigned)(t & H0_MASK));*/ - _timer_mv_expire(&timer_lst->h0[t & H0_MASK]); /*r1*/ + thp = &timer_lst->h0[t & H0_MASK]; + _timer_mv_expire(thp); /*r1*/ } #else

1 0

git:master: parser: added note about new fields in sip_msg_t
by Daniel-Constantin Mierla 19 Sep '13

19 Sep '13

Module: sip-router Branch: master Commit: 10cc1dd7a3f4481c677022e7ff0da87f004077f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10cc1dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 15:12:29 2013 +0200 parser: added note about new fields in sip_msg_t --- parser/msg_parser.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 5d481e0..08b76ed 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -367,6 +367,12 @@ typedef struct sip_msg { int decoded; struct receive_info rcv; } flow; + + /* IMPORTANT: when adding new fields in this structure (sip_msg_t), + * be sure it is freed in free_sip_msg() and it is cloned or reset + * to shm structure for transaction - see sip_msg_clone.c. In tm + * module, take care of these fields for faked environemt used for + * runing failure handlers - see modules/tm/t_reply.c */ } sip_msg_t; /*! \brief pointer to a fakes message which was never received ;

1 0

[tracker] User took ownership: avpops: use xavp semantic on second parameter
by sip-router 19 Sep '13

19 Sep '13

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

cloning several fields from sip_msg_t to shm structure
by Daniel-Constantin Mierla 19 Sep '13

19 Sep '13

Hello, some (not so) recently fields added to sip_msg_t structure were not handled properly. These are instance (added by Juha), ruid, location_ua (added by Crocodile patches), so I explicitely put to repicients the people working with them to check my changes I did for fixing some related issues. The issues: 1) sip_msg_t is cloned in shm for transaction. So each new field added to this structure has to be handled in the function that clones to shm, otherwise their values will stay referencing to pkg. Then, same fields have to be handled in tm when running sip failure handlers -- there a faked environment and sip msg structure are created from shm back to pkg. 2) if the new fields allocate memory, the free sip msg function has to clean that, otherwise will be a memory leak The reason writing here is that for 1) I didn't clone the values in shm, just reset the pointers to NULL (same is done for path vector). But if you need these values to be in transaction, then you have to clone them. What I did fixes a crash when trying to use lookup() in failure route -- because these fields are set, when the new values have a lower lenght, it will just write in buffer, which is invalid as either the pkg pointer was freed or the failure route is executed in another process (resulting in writing at inappropriate addresses in current process). My assumption was that no one used these fields from transaction, because would have reported a crash as well, thus I didn't clone and set them to NULL. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Trainings - Berlin, Oct 21-24; Miami, Nov 11-13, 2013 - more details about Kamailio trainings at http://www.asipto.com -

1 0

git:4.0: core: reset fields from sip_msg_t in shm cloned structure
by Daniel-Constantin Mierla 19 Sep '13

19 Sep '13

Module: sip-router Branch: 4.0 Commit: 38157fdbdadd1ff2a0ac902088082ad96b0c2f04 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=38157fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 14:06:46 2013 +0200 core: reset fields from sip_msg_t in shm cloned structure - instance was pointing to pkg --- parser/msg_parser.c | 1 + parser/msg_parser.h | 4 ++-- sip_msg_clone.c | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index dfed08d..3ea8ad7 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -726,6 +726,7 @@ 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_instance(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); diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 2453715..15d557f 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -364,8 +364,8 @@ typedef struct sip_msg { struct socket_info* force_send_socket; /* force sending on this socket, if ser */ str path_vec; - str instance; - unsigned int reg_id; + str instance; + unsigned int reg_id; } sip_msg_t; /*! \brief pointer to a fakes message which was never received ; diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 58ce353..13bc9cd 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -539,6 +539,11 @@ 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; + /* 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 */

1 0

git:4.0: tm: reset faked request fields that can be set in failure handlers
by Daniel-Constantin Mierla 19 Sep '13

19 Sep '13

Module: sip-router Branch: 4.0 Commit: 1550ce9a0ffa012daf413a0abee5d80bd7cc60de URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1550ce9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 19 14:05:21 2013 +0200 tm: reset faked request fields that can be set in failure handlers --- modules/tm/t_reply.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index b79200b..c36daf6 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -932,6 +932,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; @@ -975,6 +976,9 @@ 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); }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013