sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
299 discussions

git:master: tm: proper data type for xavp in tm_xdata_t struct
by Daniel-Constantin Mierla 14 Sep '11

14 Sep '11

Module: sip-router Branch: master Commit: 260d43bb8bda0e9f0445d7d942dc10e976ff4621 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=260d43b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 14 20:59:54 2011 +0200 tm: proper data type for xavp in tm_xdata_t struct - reported by Juha Heinanen - no real effect on branch 3.1 as xavps not enabled, but anyhow safer --- modules/… [View More]

1 0

git:3.1: pkg: version set to 3.1.5 for kamailio debs
by Daniel-Constantin Mierla 14 Sep '11

14 Sep '11

Module: sip-router Branch: 3.1 Commit: 97607a0da2bc284500e03bce77247e9588a7a9db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97607a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 14 18:52:10 2011 +0200 pkg: version set to 3.1.5 for kamailio debs --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/lenny/changelog | 6 ++++++ pkg/kamailio/deb/… [View More]

1 0

git:3.1: ChangeLog: content updated for v3.1.5
by Daniel-Constantin Mierla 14 Sep '11

14 Sep '11

Module: sip-router Branch: 3.1 Commit: 932df68a040e38275184059ead3f5317a302c245 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=932df68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 14 18:57:22 2011 +0200 ChangeLog: content updated for v3.1.5 --- ChangeLog | 902 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 902 insertions(+), 0 … [View More]

1 0

git:3.1: pkg: version set to 3.1.5 for kamailio rpms
by Daniel-Constantin Mierla 14 Sep '11

14 Sep '11

Module: sip-router Branch: 3.1 Commit: df2ff926c990b4123bf02cd51a15c9e1390cc55b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df2ff92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 14 18:53:56 2011 +0200 pkg: version set to 3.1.5 for kamailio rpms --- pkg/kamailio/rpm/kamailio.spec-4.1 | 2 +- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- pkg/kamailio/rpm/… [View More]

1 0

git:3.1: Makefile: version set to 3.1.5
by Daniel-Constantin Mierla 14 Sep '11

14 Sep '11

Module: sip-router Branch: 3.1 Commit: d616d8372da87a3cf404c8573467a3d64eb37f14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d616d83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 14 18:49:49 2011 +0200 Makefile: version set to 3.1.5 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index … [View More]

1 0

git:3.1: tm: backup X/AVP lists when building new T in t_uac()
by Daniel-Constantin Mierla 14 Sep '11

14 Sep '11

Module: sip-router Branch: 3.1 Commit: 53ee5d0e7e387cdf0f39a371b356ff44f3d36fa9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53ee5d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 14 18:39:37 2011 +0200 tm: backup X/AVP lists when building new T in t_uac() - build_cell() is setting core X/AVP lists to new T structure, losing the lists that existed in case another T … [View More]was set already. This is in t_uac() which is used for local generated requests, such as uac_req_send(), presence notifications, msilo... - a revious patch was backing up only X/AVPs lists for execution of event_route[tm:local-request] - reported by Vitaliy Aleksandrov (cherry picked from commit 1e83919bcb3f1a2fb2890a6766a007b8f50cb986) --- modules/tm/h_table.c | 44 +++++++++++++++++++++++++++++++++++++++++--- modules/tm/h_table.h | 25 ++++++++++++++++++++++--- modules/tm/uac.c | 9 ++++++++- 3 files changed, 71 insertions(+), 7 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index b472787..b18e2d0 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -499,10 +499,10 @@ error0: * - mode = 0 - from msg context to _txdata and use T lists * - mode = 1 - restore to msg context from _txdata */ -void tm_xdata_swap(tm_cell_t *t, tm_xdata_t *xd, int mode) +void tm_xdata_swap(tm_cell_t *t, tm_xlinks_t *xd, int mode) { - static tm_xdata_t _txdata; - tm_xdata_t *x; + static tm_xlinks_t _txdata; + tm_xlinks_t *x; if(xd==NULL) x = &_txdata; @@ -535,3 +535,41 @@ void tm_xdata_swap(tm_cell_t *t, tm_xdata_t *xd, int mode) } } + +/** + * replace existing lists with newxd and backup in bakxd or restore from bakxd + */ +void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd) +{ + if(newxd==NULL && bakxd!=NULL) { + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, bakxd->uri_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, bakxd->uri_avps_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, bakxd->user_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, bakxd->user_avps_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, bakxd->domain_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, bakxd->domain_avps_to); +#ifdef WITH_XAVP + xavp_set_list(bakxd->xavps_list); +#endif + return; + } + + if(newxd!=NULL && bakxd!=NULL) { + bakxd->uri_avps_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, + &newxd->uri_avps_from); + bakxd->uri_avps_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, + &newxd->uri_avps_to); + bakxd->user_avps_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, + &newxd->user_avps_from); + bakxd->user_avps_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, + &newxd->user_avps_to); + bakxd->domain_avps_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, + &newxd->domain_avps_from); + bakxd->domain_avps_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, + &newxd->domain_avps_to); +#ifdef WITH_XAVP + bakxd->xavps_list = xavp_set_list(&newxd->xavps_list); +#endif + return; + } +} diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 5f74ba3..ea8acd4 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -300,13 +300,30 @@ struct totag_elem { * saves us 2*2 bytes */ typedef unsigned short retr_timeout_t; - /** * extra data from SIP message context to transaction storage */ typedef struct tm_xdata { /* lists with avps */ + struct usr_avp *uri_avps_from; + struct usr_avp *uri_avps_to; + struct usr_avp *user_avps_from; + struct usr_avp *user_avps_to; + struct usr_avp *domain_avps_from; + struct usr_avp *domain_avps_to; +#ifdef WITH_XAVP + sr_xavp_t **xavps_list; +#endif +} tm_xdata_t; + + +/** + * links to extra data from SIP message context to transaction storage + */ +typedef struct tm_xlinks +{ + /* links to lists with avps */ struct usr_avp **uri_avps_from; struct usr_avp **uri_avps_to; struct usr_avp **user_avps_from; @@ -316,7 +333,7 @@ typedef struct tm_xdata #ifdef WITH_XAVP sr_xavp_t **xavps_list; #endif -} tm_xdata_t; +} tm_xlinks_t; /* transaction context */ @@ -565,7 +582,9 @@ inline static void remove_from_hash_table_unsafe( struct cell * p_cell) /** * backup xdata from/to msg context to local var and use T lists */ -void tm_xdata_swap(tm_cell_t *t, tm_xdata_t *xd, int mode); +void tm_xdata_swap(tm_cell_t *t, tm_xlinks_t *xd, int mode); + +void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd); #endif diff --git a/modules/tm/uac.c b/modules/tm/uac.c index c552f5a..6ba1e91 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -216,7 +216,8 @@ static inline int t_uac_prepare(uac_req_t *uac_r, int backup_route_type; #endif snd_flags_t snd_flags; - tm_xdata_t backup_xd; + tm_xlinks_t backup_xd; + tm_xdata_t local_xd; ret=-1; hi=0; /* make gcc happy */ @@ -276,7 +277,13 @@ static inline int t_uac_prepare(uac_req_t *uac_r, } #endif /* USE_DNS_FAILOVER */ + /* build cell sets X/AVP lists to new transaction structure + * => bakup in a tmp struct and restore afterwards */ + memset(&local_xd, 0, sizeof(tm_xdata_t)); + tm_xdata_replace(&local_xd, &backup_xd); new_cell = build_cell(0); + tm_xdata_replace(0, &backup_xd); + if (!new_cell) { ret=E_OUT_OF_MEM; LOG(L_ERR, "t_uac: short of cell shmem\n"); [View Less]

1 0

git:master: tm: backup X/AVP lists when building new T in t_uac()
by Daniel-Constantin Mierla 14 Sep '11

14 Sep '11

Module: sip-router Branch: master Commit: 1e83919bcb3f1a2fb2890a6766a007b8f50cb986 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e83919… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 14 18:39:37 2011 +0200 tm: backup X/AVP lists when building new T in t_uac() - build_cell() is setting core X/AVP lists to new T structure, losing the lists that existed in case another … [View More]T was set already. This is in t_uac() which is used for local generated requests, such as uac_req_send(), presence notifications, msilo... - a revious patch was backing up only X/AVPs lists for execution of event_route[tm:local-request] - reported by Vitaliy Aleksandrov --- modules/tm/h_table.c | 44 +++++++++++++++++++++++++++++++++++++++++--- modules/tm/h_table.h | 25 ++++++++++++++++++++++--- modules/tm/uac.c | 9 ++++++++- 3 files changed, 71 insertions(+), 7 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index aff447d..18b0857 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -492,10 +492,10 @@ error0: * - mode = 0 - from msg context to _txdata and use T lists * - mode = 1 - restore to msg context from _txdata */ -void tm_xdata_swap(tm_cell_t *t, tm_xdata_t *xd, int mode) +void tm_xdata_swap(tm_cell_t *t, tm_xlinks_t *xd, int mode) { - static tm_xdata_t _txdata; - tm_xdata_t *x; + static tm_xlinks_t _txdata; + tm_xlinks_t *x; if(xd==NULL) x = &_txdata; @@ -528,3 +528,41 @@ void tm_xdata_swap(tm_cell_t *t, tm_xdata_t *xd, int mode) } } + +/** + * replace existing lists with newxd and backup in bakxd or restore from bakxd + */ +void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd) +{ + if(newxd==NULL && bakxd!=NULL) { + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, bakxd->uri_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, bakxd->uri_avps_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, bakxd->user_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, bakxd->user_avps_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, bakxd->domain_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, bakxd->domain_avps_to); +#ifdef WITH_XAVP + xavp_set_list(bakxd->xavps_list); +#endif + return; + } + + if(newxd!=NULL && bakxd!=NULL) { + bakxd->uri_avps_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, + &newxd->uri_avps_from); + bakxd->uri_avps_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, + &newxd->uri_avps_to); + bakxd->user_avps_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, + &newxd->user_avps_from); + bakxd->user_avps_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, + &newxd->user_avps_to); + bakxd->domain_avps_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, + &newxd->domain_avps_from); + bakxd->domain_avps_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, + &newxd->domain_avps_to); +#ifdef WITH_XAVP + bakxd->xavps_list = xavp_set_list(&newxd->xavps_list); +#endif + return; + } +} diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index df4f979..8b8741b 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -299,13 +299,30 @@ struct totag_elem { * max retr. = 65 s which should be enough and saves us 2*2 bytes */ typedef unsigned short retr_timeout_t; - /** * extra data from SIP message context to transaction storage */ typedef struct tm_xdata { /* lists with avps */ + struct usr_avp *uri_avps_from; + struct usr_avp *uri_avps_to; + struct usr_avp *user_avps_from; + struct usr_avp *user_avps_to; + struct usr_avp *domain_avps_from; + struct usr_avp *domain_avps_to; +#ifdef WITH_XAVP + sr_xavp_t **xavps_list; +#endif +} tm_xdata_t; + + +/** + * links to extra data from SIP message context to transaction storage + */ +typedef struct tm_xlinks +{ + /* links to lists with avps */ struct usr_avp **uri_avps_from; struct usr_avp **uri_avps_to; struct usr_avp **user_avps_from; @@ -315,7 +332,7 @@ typedef struct tm_xdata #ifdef WITH_XAVP sr_xavp_t **xavps_list; #endif -} tm_xdata_t; +} tm_xlinks_t; /* transaction context */ @@ -564,7 +581,9 @@ inline static void remove_from_hash_table_unsafe( struct cell * p_cell) /** * backup xdata from/to msg context to local var and use T lists */ -void tm_xdata_swap(tm_cell_t *t, tm_xdata_t *xd, int mode); +void tm_xdata_swap(tm_cell_t *t, tm_xlinks_t *xd, int mode); + +void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd); #endif diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 15add04..e6ba762 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -216,7 +216,8 @@ static inline int t_uac_prepare(uac_req_t *uac_r, int backup_route_type; #endif snd_flags_t snd_flags; - tm_xdata_t backup_xd; + tm_xlinks_t backup_xd; + tm_xdata_t local_xd; ret=-1; hi=0; /* make gcc happy */ @@ -276,7 +277,13 @@ static inline int t_uac_prepare(uac_req_t *uac_r, } #endif /* USE_DNS_FAILOVER */ + /* build cell sets X/AVP lists to new transaction structure + * => bakup in a tmp struct and restore afterwards */ + memset(&local_xd, 0, sizeof(tm_xdata_t)); + tm_xdata_replace(&local_xd, &backup_xd); new_cell = build_cell(0); + tm_xdata_replace(0, &backup_xd); + if (!new_cell) { ret=E_OUT_OF_MEM; LOG(L_ERR, "t_uac: short of cell shmem\n"); [View Less]

1 0

git:master: Fix bug which causes an error during the convertion from string to timeb
by Sven Knoblich 14 Sep '11

14 Sep '11

Module: sip-router Branch: master Commit: 61b184441ae41d08c9af06bc5192453f6f424d20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61b1844… Author: Sven Knoblich <sven.knoblich(a)1und1.de> Committer: Sven Knoblich <sven.knoblich(a)1und1.de> Date: Wed Sep 14 14:43:32 2011 +0200 Fix bug which causes an error during the convertion from string to timeb - add buffer in time_from_string. copy given string into buffer and finish it with '\0' to use c-string … [View More]functions correctly. --- modules_k/acc/acc_cdr.c | 48 ++++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index c2ecf44..9595718 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -46,6 +46,8 @@ #include <sys/timeb.h> +#define TIME_STR_BUFFER_SIZE 20 + struct dlg_binds dlgb; struct acc_extra* cdr_extra = NULL; int cdr_facility = LOG_DAEMON; @@ -196,37 +198,49 @@ static int write_cdr( struct dlg_cell* dialog, /* convert a string into a timeb struct */ static struct timeb time_from_string( str* time_value) -{ - char* point_adresse = NULL; - int point_position = -1; +{ + char* dot_adress = NULL; + int dot_position = -1; + char zero_terminated_value[TIME_STR_BUFFER_SIZE]; if( !time_value) { LM_ERR( "time_value is empty!"); return time_error; } - - point_adresse = strchr( time_value->s, time_separator); - - if( !point_adresse) + + if( time_value->len >= TIME_STR_BUFFER_SIZE) + { + LM_ERR( "time_value is to long %d >= %d!", + time_value->len, + TIME_STR_BUFFER_SIZE); + return time_error; + } + + memcpy( zero_terminated_value, time_value->s, time_value->len); + zero_terminated_value[time_value->len] = '\0'; + + dot_adress = strchr( zero_terminated_value, time_separator); + + if( !dot_adress) { LM_ERR( "failed to find separator('%c') in '%s'!\n", time_separator, - time_value->s); + zero_terminated_value); return time_error; } - - point_position = point_adresse-time_value->s + 1; - - if( point_position >= strlen(time_value->s) || - strchr(point_adresse + 1, time_separator)) + + dot_position = dot_adress-zero_terminated_value + 1; + + if( dot_position >= strlen(zero_terminated_value) || + strchr(dot_adress + 1, time_separator)) { - LM_ERR( "invalid time-string '%s'\n", time_value->s); + LM_ERR( "invalid time-string '%s'\n", zero_terminated_value); return time_error; } - - return (struct timeb) { atoi( time_value->s), - atoi( point_adresse + 1), + + return (struct timeb) { atoi( zero_terminated_value), + atoi( dot_adress + 1), 0, 0}; } [View Less]

1 0

compiler warning
by Juha Heinanen 14 Sep '11

14 Sep '11

after recent commits: CC (cc) [M tm.so] h_table.o h_table.c: In function ‘tm_xdata_replace’: h_table.c:564: warning: passing argument 1 of ‘xavp_set_list’ from incompatible pointer type ../../xavp.h:89: note: expected ‘struct sr_xavp_t **’ but argument is of type ‘struct sr_xavp_t ***’ -- juha

1 0

preparing release of v3.1.5
by Daniel-Constantin Mierla 14 Sep '11

14 Sep '11

Hello, today starting with 14:00 I will be preparing the release of v3.1.5. If any devel has commits to do in branch 3.1, please do it before to avoid conflicts. Thanks, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 1

← Newer
1
...
13
14
15
16
17
18
19
...
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 2011