sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Peter Dunkley 12 Dec '12

12 Dec '12

Module: sip-router Branch: master Commit: 1c36a534096e6ba37395e2ce1676526a02d1dac3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c36a53… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Dec 12 15:25:53 2012 +0000 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: modules/tm: forgot to commit new version of t_funcs.c ---

1 0

git:master: parser/sdp: Fixed double free
by Peter Dunkley 12 Dec '12

12 Dec '12

Module: sip-router Branch: master Commit: 8ec30688617a260d478402e59ef465c69e8247d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ec3068… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Dec 12 15:24:38 2012 +0000 parser/sdp: Fixed double free - Found and fixed by Hugh Waite @ Crocodile RCS --- parser/sdp/sdp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 134a676..df017be 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -665,8 +665,7 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) /* LM_DBG("we need to check session %d: <%.*s>\n", session_num, _sdp.raw_sdp.len, _sdp.raw_sdp.s); */ res = parse_sdp_session(&_sdp->raw_sdp, session_num, &cnt_disp, _sdp); if (res != 0) { - LM_DBG("free_sdp\n"); - free_sdp((sdp_info_t**)(void*)&(_sdp)); + /* _sdp is freed by the calling function */ return -1; } session_num++; @@ -746,6 +745,7 @@ int parse_sdp(struct sip_msg* _m) } res = parse_mixed_content(&body, mp_delimiter, (sdp_info_t*)_m->body); if (res != 0) { + LM_DBG("free_sdp\n"); free_sdp((sdp_info_t**)(void*)&_m->body); } return res;

1 0

git:master: modules/tm: forgot to commit new version of t_funcs.c
by admin＠sip-router.org 12 Dec '12

12 Dec '12

Module: sip-router Branch: master Commit: 2d53d99abcf9ae218fa547d572aee3f55dbba79b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d53d99… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 12 17:03:42 2012 +0200 modules/tm: forgot to commit new version of t_funcs.c - reported by Peter Dunkley. --- modules/tm/t_funcs.c | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 1b43cc1..e9d9598 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -85,10 +85,6 @@ int fr_inv_timer_avp_type = 0; int_str fr_inv_timer_avp = {0}; static str fr_inv_timer_str; static int fr_inv_timer_index = 0; -int contacts_avp_type = 0; -int_str contacts_avp = {0}; -static str contacts_avp_str; -static int contacts_avp_index = 0; int tm_error = 0; /* delayed tm error */ @@ -398,8 +394,7 @@ done: * Initialize parameters containing the ID of * AVPs with various timers */ -int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, - char* contacts_avp_param) +int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param) { pv_spec_t avp_spec; unsigned short avp_type; @@ -469,34 +464,6 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, } } - if (contacts_avp_param && *contacts_avp_param) { - contacts_avp_str.s = contacts_avp_param; - contacts_avp_str.len = strlen(contacts_avp_str.s); - - if(contacts_avp_str.s[0]==PV_MARKER) { - if ((pv_parse_spec(&contacts_avp_str, &avp_spec) == 0) - || (avp_spec.type != PVT_AVP)) { - LM_ERR("malformed or non AVP definition <%s>\n", - contacts_avp_param); - return -1; - } - - if(pv_get_avp_name(0, &(avp_spec.pvp), &contacts_avp, - &avp_type) != 0) { - LM_ERR("invalid AVP definition <%s>\n", contacts_avp_param); - return -1; - } - contacts_avp_type = avp_type; - } else { - if (parse_avp_spec( &contacts_avp_str, &contacts_avp_type, - &contacts_avp, &contacts_avp_index)<0) { - LOG(L_CRIT,"ERROR:tm:init_avp_params: invalid contact_avp_params " - "AVP specs \"%s\"\n", contacts_avp_param); - return -1; - } - } - } - return 0; }

1 0

git:master: modules/tm: forgot to commit new version of t_funcs.h
by admin＠sip-router.org 12 Dec '12

12 Dec '12

Module: sip-router Branch: master Commit: 9c7edfe9edc02ea8b62c40349262b035f0b21510 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c7edfe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 12 16:59:12 2012 +0200 modules/tm: forgot to commit new version of t_funcs.h - reported by Peter Dunkley. --- modules/tm/t_funcs.h | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/tm/t_funcs.h b/modules/tm/t_funcs.h index 940e843..c4b5d23 100644 --- a/modules/tm/t_funcs.h +++ b/modules/tm/t_funcs.h @@ -79,8 +79,8 @@ extern struct msgid_var user_cell_reset_flags; extern int fr_inv_timer_avp_type; extern int_str fr_inv_timer_avp; -extern int contacts_avp_type; -extern int_str contacts_avp; +extern str contacts_avp; +extern str contact_flows_avp; /* default names for timer's AVPs */ #define FR_TIMER_AVP "callee_fr_timer" @@ -153,8 +153,7 @@ int send_pr_buffer( struct retr_buf *rb, void *buf, int len); /* * Parse and fixup the fr_*_timer AVP specs */ -int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, - char *contacts_avp_param); +int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param); typedef void (*unref_cell_f)(struct cell *t);

1 0

tm module in git master not compiling
by Peter Dunkley 12 Dec '12

12 Dec '12

Hi, The tm module in git master does not compile at the moment. The output I get is: CC (gcc) [M tm.so] dlg.o CC (gcc) [M tm.so] select.o CC (gcc) [M tm.so] t_reply.o CC (gcc) [M tm.so] config.o CC (gcc) [M tm.so] t_msgbuilder.o CC (gcc) [M tm.so] tm.o tm.c:310:5: error: conflicting types for 'contacts_avp' In file included from t_lookup.h:46:0, from tm_load.h:46, from tm.c:171: t_funcs.h:83:16: note: previous declaration of 'contacts_avp' was here tm.c: In function 'mod_init': tm.c:848:2: error: too few arguments to function 'init_avp_params' In file included from t_lookup.h:46:0, from tm_load.h:46, from tm.c:171: t_funcs.h:156:5: note: declared here make[1]: *** [tm.o] Error 1 make: *** [modules] Error 1 Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

1 0

git:master: modules/tm: added outbound support to t_load_contact()/ t_next_contacts()
by admin＠sip-router.org 12 Dec '12

12 Dec '12

Module: sip-router Branch: master Commit: 74a9baf6fd2903efc874edc48dd99d6a11afc83b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74a9baf… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 12 16:11:50 2012 +0200 modules/tm: added outbound support to t_load_contact()/t_next_contacts() - added new function t_next_contact_flows() - readme not updated yet --- modules/tm/t_serial.c | 944 +++++++++++++++++++++++++++++++++---------------- modules/tm/t_serial.h | 2 + modules/tm/tm.c | 17 +- 3 files changed, 661 insertions(+), 302 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=74a…

1 0

git:master: modules_k/registrar: lookup now handles also instance and reg_id
by admin＠sip-router.org 12 Dec '12

12 Dec '12

Module: sip-router Branch: master Commit: 89ac4ae40234e02d71f619c2f750ed34333c9d5d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89ac4ae… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 12 16:10:34 2012 +0200 modules_k/registrar: lookup now handles also instance and reg_id --- modules_k/registrar/lookup.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 96ecfc1..f98887a 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -264,6 +264,15 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) } } + if (ptr->instance.len) { + if (set_instance(_m, &(ptr->instance)) < 0) { + ret = -3; + goto done; + } + } + + _m->reg_id = ptr->reg_id; + set_ruri_q(ptr->q); old_bflags = 0; @@ -293,8 +302,15 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) /* The same as for the first contact applies for branches * regarding path vs. received. */ - if (km_append_branch(_m,&ptr->c,path_dst.len?&path_dst:&ptr->received, - &ptr->path, ptr->q, ptr->cflags, ptr->sock) == -1) { + LM_INFO("instance is %.*s\n", + ptr->instance.len, ptr->instance.s); + if (append_branch(_m, &ptr->c, + path_dst.len?&path_dst:&ptr->received, + &ptr->path, ptr->q, ptr->cflags, + ptr->sock, + ptr->instance.len?&(ptr->instance):0, + ptr->instance.len?ptr->reg_id:0) + == -1) { LM_ERR("failed to append a branch\n"); /* Also give a chance to the next branches*/ continue; @@ -319,6 +335,8 @@ int reset_ruri_branch(sip_msg_t *msg) set_ruri_q(Q_UNSPECIFIED); reset_force_socket(msg); setbflagsval(0, 0); + reset_instance(msg); + msg->reg_id = 0; return 0; } @@ -341,6 +359,8 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) int ruri_b_q = Q_UNSPECIFIED; struct socket_info *ruri_b_socket = 0; flag_t ruri_b_flags = 0; + str ruri_b_instance = {0}; + unsigned int ruri_b_reg_id = 0; branch_t *crt = NULL; ret = 1; @@ -363,6 +383,8 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) ruri_b_q = get_ruri_q(); ruri_b_socket = msg->force_send_socket; getbflagsval(0, &ruri_b_flags); + ruri_b_instance = msg->instance; + ruri_b_reg_id = msg->reg_id; reset_ruri_branch(msg); for(i=0; i<nr_branches; i++) { @@ -440,6 +462,8 @@ done: set_ruri_q(ruri_b_q); set_force_socket(msg, ruri_b_socket); setbflagsval(0, ruri_b_flags); + msg->instance = ruri_b_instance; + msg->reg_id = ruri_b_reg_id; return (found)?1:ret; }

1 0

git:master: parser: added instance and reg_id fields to sip_msg_t
by admin＠sip-router.org 12 Dec '12

12 Dec '12

Module: sip-router Branch: master Commit: 55e7820686cbfb6392e707e0ee4fae96b22670bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55e7820… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 12 16:06:52 2012 +0200 parser: added instance and reg_id fields to sip_msg_t - also added set_instance and reset_instance functions --- parser/msg_parser.c | 39 +++++++++++++++++++++++++++++++++++++++ parser/msg_parser.h | 5 +++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 7c9c04e..dfed08d 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -820,6 +820,45 @@ void reset_path_vector(struct sip_msg* const msg) } +int set_instance(struct sip_msg* msg, str* instance) +{ + char* ptr; + + if (unlikely(!msg || !instance)) { + LM_ERR("invalid instance parameter value\n"); + return -1; + } + + if (unlikely(instance->len == 0)) { + reset_instance(msg); + } else if (msg->instance.s && (msg->instance.len >= instance->len)) { + memcpy(msg->instance.s, instance->s, instance->len); + msg->instance.len = instance->len; + } else { + ptr = (char*)pkg_malloc(instance->len); + if (!ptr) { + LM_ERR("not enough pkg memory for instance\n"); + return -1; + } + memcpy(ptr, instance->s, instance->len); + if (msg->instance.s) pkg_free(msg->instance.s); + msg->instance.s = ptr; + msg->instance.len = instance->len; + } + return 0; +} + + +void reset_instance(struct sip_msg* const msg) +{ + if(msg->instance.s != 0) { + pkg_free(msg->instance.s); + } + msg->instance.s = 0; + msg->instance.len = 0; +} + + hdr_field_t* get_hdr(const sip_msg_t* const msg, const enum _hdr_types_t ht) { hdr_field_t *hdr; diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 1783ee8..79194e3 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -363,6 +363,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; } sip_msg_t; /*! \brief pointer to a fakes message which was never received ; @@ -447,6 +449,9 @@ int set_path_vector(struct sip_msg* msg, str* path); void reset_path_vector(struct sip_msg* const msg); +int set_instance(struct sip_msg* msg, str* instance); + +void reset_instance(struct sip_msg* const msg); /** force a specific send socket for forwarding a request. * @param msg - sip msg.

1 0

avoiding hash calculation in xavp api function calls
by Juha Heinanen 12 Dec '12

12 Dec '12

many xavp api functions take name (str) as argument and calculate hash based on it. when name of xavp is constant (not a pv value) hash could pre-calculated and passed as integer argument to xavp api functions. to me calculating hash each time when api function is called looks like waste of cpu resources. any comments on this? -- juha

1 0

git:master: core: added comments to xavps structures
by Daniel-Constantin Mierla 12 Dec '12

12 Dec '12

Module: sip-router Branch: master Commit: dccf5ede42eaf2b2f030d8c5a730418ce0517ec2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dccf5ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 12 11:08:45 2012 +0100 core: added comments to xavps structures --- xavp.h | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/xavp.h b/xavp.h index 9a31a0e..979bee4 100644 --- a/xavp.h +++ b/xavp.h @@ -32,43 +32,47 @@ struct _sr_xavp; +/* types for xavp values */ typedef enum { SR_XTYPE_NULL=0, - SR_XTYPE_INT, - SR_XTYPE_STR, - SR_XTYPE_TIME, - SR_XTYPE_LONG, - SR_XTYPE_LLONG, - SR_XTYPE_XAVP, - SR_XTYPE_DATA + SR_XTYPE_INT, /* integer value */ + SR_XTYPE_STR, /* str value */ + SR_XTYPE_TIME, /* timestamp value */ + SR_XTYPE_LONG, /* long value */ + SR_XTYPE_LLONG, /* long long value */ + SR_XTYPE_XAVP, /* xavp value */ + SR_XTYPE_DATA /* custom data value */ } sr_xtype_t; typedef void (*sr_xavp_sfree_f)(void *d); typedef void (*sr_data_free_f)(void *d, sr_xavp_sfree_f sfree); +/* structure custom data value */ typedef struct _sr_data { void *p; sr_data_free_f pfree; } sr_data_t; +/* avp value */ typedef struct _sr_xval { - sr_xtype_t type; + sr_xtype_t type; /* type of the value */ union { int i; - str s; /* replicated */ + str s; /* cloned in shared memory */ time_t t; long l; long long ll; - struct _sr_xavp *xavp; /* must be given in shm */ - sr_data_t *data; /* must be given in shm */ + struct _sr_xavp *xavp; /* must be given in shm (not cloned) */ + sr_data_t *data; /* must be given in shm (not cloned) */ } v; } sr_xval_t; +/* structure for extended avp */ typedef struct _sr_xavp { - unsigned int id; - str name; - sr_xval_t val; - struct _sr_xavp *next; + unsigned int id; /* internal hash id */ + str name; /* name of the xavp */ + sr_xval_t val; /* value of the xavp */ + struct _sr_xavp *next; /* pointer to next xavp in list */ } sr_xavp_t; int xavp_init_head(void);

2 1

← Newer
1
...
27
28
29
30
31
32
33
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012