sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 discussions

About regular expression syntax
by Iñaki Baz Castillo 24 Mar '09

24 Mar '09

Hi, Kamailio uses the following syntax for =~ operator: if ( $rU =~ "^2[0-9]{2}$" ) { Reading the SR commits, it seems that SR will support regular expressions in 'switch' stament: switch ($rU) { case 200: # INTEGER [...] case "alice": # STRING [...] case /2[0-9]{2}/: # REGULAR EXPRESSION [...] } If the above is correct, it requires two different syntax for a regular expression: a) =~ "^2[0-9]{2}$" b) case /2[0-9]{2}/: Wouldn't make sense to have … [View More]

1 0

PATCH: add parsing support for "mixed" content type
by Ovidiu Sas 24 Mar '09

24 Mar '09

Patch attached for parsing "mixed" content type. Regards, Ovidiu Sas

2 1

git:master: Support for mixed content type.
by Jan Janak 24 Mar '09

24 Mar '09

Module: sip-router Branch: master Commit: 44a06042caaf45156862e71e654c781cd5b9332c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44a0604… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 24 15:14:53 2009 +0100 Support for mixed content type. This patch extendes the content type parser and adds support for content type mixed. Signed-off-by: Jan Janak <jan(a)iptel.org> --- parser/… [View More]

1 0

avp naming
by Daniel-Constantin Mierla 24 Mar '09

24 Mar '09

Hello, working to integrate the PV module I reached the AVPs and after a short analyze I wonder (and ask you) whether you should drop the naming scheme we have in Kamailio (integer id and string name) and stick to string names all the time. ser seems to use mostly that although looks like support for ID is still there, but I cannot see how they can be used with the naming scheme in config (e.g., is it possible to have $f.i:34 in config to refer to avp with id 34?). The benefits I see: - … [View More]

4 8

[PATCH 01/10] Fix header files of acc module
by Jan Janak 23 Mar '09

23 Mar '09

This commit fixes paths to various header files included by the module: * DB API headers are now included from libsrdb1 * libkcore/km_ut.h included in files where functions from kamailio/ut.h are used * Included flags.h for flag setters and getters * Included local_route.h from libkcore intead of the top level directory --- modules/acc/acc.c | 3 ++- modules/acc/acc_extra.c | 1 + modules/acc/acc_logic.c | 2 ++ modules/acc/acc_mod.c | 2 +- 4 files changed, 6 … [View More]

4 20

PATCH: support for PRACK and UPDATE methods
by Ovidiu Sas 23 Mar '09

23 Mar '09

Here's a small patch that will add support for PRACK and UPDATE parsing. Some modules in k require this. Regards, Ovidiu Sas $ git diff diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 48790c9..d1c6324 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -79,7 +79,8 @@ enum request_method { METHOD_UNDEF=0, METHOD_INVITE=1, METHOD_CANCEL=2, METHOD_ACK=4, METHOD_BYE=8, METHOD_INFO=16, METHOD_REGISTER=32, METHOD_SUBSCRIBE=64, METHOD_NOTIFY=128, … [View More]

2 1

git:master: Teach the parser recognize PRACK and UPDATE methods
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: master Commit: 74ca8909a3b2ffd7a26a3cb10b0422f2cccd17d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74ca890… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 23 20:09:40 2009 +0100 Teach the parser recognize PRACK and UPDATE methods Signed-off-by: Jan Janak <jan(a)iptel.org> --- parser/msg_parser.h | 2 +- parser/parse_fline.c | 2 ++ parser/parse_fline.h |… [View More]

1 0

git:master: Kamailio compatiblity: Added pointer to a free function to tm callbacks
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: master Commit: 657f117b853f8a33677ad0f4ffb482e6e25296fc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=657f117… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 23 15:04:41 2009 +0100 Kamailio compatiblity: Added pointer to a free function to tm callbacks This patch adds a new pointer to the tm_callback structure. The parameter contains pointer to a function which, if not NULL, will … [View More]be called to dispose the callback parameter when it is not needed anymore. This is useful if the parameter given ti a transaction callback is a complex data structure of it is stored on the heap and the memory needs to be free when the corresponding transaction is being destroyed. Patch contributed by Ovidiu Sas. --- modules/tm/dlg.c | 2 +- modules/tm/h_table.c | 3 +++ modules/tm/t_hooks.c | 9 ++++++--- modules/tm/t_hooks.h | 13 ++++++++++--- modules/tm/uac.c | 3 ++- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/modules/tm/dlg.c b/modules/tm/dlg.c index 1daab19..10429a9 100644 --- a/modules/tm/dlg.c +++ b/modules/tm/dlg.c @@ -126,7 +126,7 @@ int register_dlg_tmcb(int types, dlg_t* dlg, transaction_cb f, void* param) LOG(L_CRIT, "BUG: tm: register_dlg_tmcb: null callback function"); return E_BUG; } - return insert_tmcb(&dlg->dlg_callbacks, types, f, param); + return insert_tmcb(&dlg->dlg_callbacks, types, f, param, NULL); } diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 6b38496..11fb1a8 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -141,6 +141,9 @@ void free_cell( struct cell* dead_cell ) for( cbs=(struct tm_callback*)dead_cell->tmcb_hl.first ; cbs ; ) { cbs_tmp = cbs; cbs = cbs->next; + if (cbs_tmp->release) { + cbs_tmp->release(cbs_tmp->param); + } shm_free_unsafe( cbs_tmp ); } diff --git a/modules/tm/t_hooks.c b/modules/tm/t_hooks.c index 788172a..6e149ea 100644 --- a/modules/tm/t_hooks.c +++ b/modules/tm/t_hooks.c @@ -117,7 +117,8 @@ void destroy_tmcb_lists() /* lockless insert: should be always safe */ int insert_tmcb(struct tmcb_head_list *cb_list, int types, - transaction_cb f, void *param ) + transaction_cb f, void *param, + release_tmcb_param rel_func) { struct tm_callback *cbp; struct tm_callback *old; @@ -133,6 +134,7 @@ int insert_tmcb(struct tmcb_head_list *cb_list, int types, /* ... and fill it up */ cbp->callback = f; cbp->param = param; + cbp->release = rel_func; cbp->types = types; cbp->id=0; old=(struct tm_callback*)cb_list->first; @@ -164,7 +166,8 @@ int insert_tmcb(struct tmcb_head_list *cb_list, int types, * from mod_init (before forking!). */ int register_tmcb( struct sip_msg* p_msg, struct cell *t, int types, - transaction_cb f, void *param ) + transaction_cb f, void *param, + release_tmcb_param rel_func) { //struct cell* t; struct tmcb_head_list *cb_list; @@ -217,7 +220,7 @@ int register_tmcb( struct sip_msg* p_msg, struct cell *t, int types, cb_list = &(t->tmcb_hl); } - return insert_tmcb( cb_list, types, f, param ); + return insert_tmcb( cb_list, types, f, param, rel_func ); } diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index 38721fb..b396737 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -385,9 +385,12 @@ do{ \ /* callback function prototype */ typedef void (transaction_cb) (struct cell* t, int type, struct tmcb_params*); +/*! \brief function to release the callback param */ +typedef void (release_tmcb_param) (void* param); /* register callback function prototype */ typedef int (*register_tmcb_f)(struct sip_msg* p_msg, struct cell *t, - int cb_types, transaction_cb f, void *param); + int cb_types, transaction_cb f, void *param, + release_tmcb_param func); struct tm_callback { @@ -395,6 +398,8 @@ struct tm_callback { int types; /* types of events that trigger the callback*/ transaction_cb* callback; /* callback function */ void *param; /* param to be passed to callback function */ + release_tmcb_param* release; /**< Function to release the callback param + * when the callback is deleted */ struct tm_callback* next; }; @@ -423,11 +428,13 @@ void destroy_tmcb_lists(); /* register a callback for several types of events */ int register_tmcb( struct sip_msg* p_msg, struct cell *t, int types, - transaction_cb f, void *param ); + transaction_cb f, void *param, + release_tmcb_param rel_func); /* inserts a callback into the a callback list */ int insert_tmcb(struct tmcb_head_list *cb_list, int types, - transaction_cb f, void *param ); + transaction_cb f, void *param, + release_tmcb_param rel_func); /* run all transaction callbacks for an event type */ void run_trans_callbacks( int type , struct cell *trans, diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 50089c0..6dfd0fc 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -319,7 +319,8 @@ static inline int t_uac_prepare(uac_req_t *uac_r, /* Register the callbacks after everything is successful and nothing can fail. Otherwise the callback parameter would be freed twise, once from TMCB_DESTROY, and again because of the negative return code. */ - if(uac_r->cb && insert_tmcb(&(new_cell->tmcb_hl), uac_r->cb_flags, *(uac_r->cb), uac_r->cbp)!=1){ + if(uac_r->cb && insert_tmcb(&(new_cell->tmcb_hl), uac_r->cb_flags, + *(uac_r->cb), uac_r->cbp, NULL)!=1){ ret=E_OUT_OF_MEM; LOG(L_ERR, "t_uac: short of tmcb shmem\n"); goto error1; [View Less]

1 1

git:master: Kamailio compatiblity: Added pointer to a free function to tm callbacks
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: master Commit: f971c09ff103cfe61bbf8bf930905432ca528b95 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f971c09… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 23 15:04:41 2009 +0100 Kamailio compatiblity: Added pointer to a free function to tm callbacks This patch adds a new pointer to the tm_callback structure. The parameter contains pointer to a function which, if not NULL, will … [View More]be called to dispose the callback parameter when it is not needed anymore. This is useful if the parameter given ti a transaction callback is a complex data structure of it is stored on the heap and the memory needs to be free when the corresponding transaction is being destroyed. Patch contributed by Ovidiu Sas. --- modules/tm/h_table.c | 3 +++ modules/tm/t_hooks.c | 9 ++++++--- modules/tm/t_hooks.h | 13 ++++++++++--- modules/tm/uac.c | 3 ++- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 6b38496..11fb1a8 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -141,6 +141,9 @@ void free_cell( struct cell* dead_cell ) for( cbs=(struct tm_callback*)dead_cell->tmcb_hl.first ; cbs ; ) { cbs_tmp = cbs; cbs = cbs->next; + if (cbs_tmp->release) { + cbs_tmp->release(cbs_tmp->param); + } shm_free_unsafe( cbs_tmp ); } diff --git a/modules/tm/t_hooks.c b/modules/tm/t_hooks.c index 788172a..6e149ea 100644 --- a/modules/tm/t_hooks.c +++ b/modules/tm/t_hooks.c @@ -117,7 +117,8 @@ void destroy_tmcb_lists() /* lockless insert: should be always safe */ int insert_tmcb(struct tmcb_head_list *cb_list, int types, - transaction_cb f, void *param ) + transaction_cb f, void *param, + release_tmcb_param rel_func) { struct tm_callback *cbp; struct tm_callback *old; @@ -133,6 +134,7 @@ int insert_tmcb(struct tmcb_head_list *cb_list, int types, /* ... and fill it up */ cbp->callback = f; cbp->param = param; + cbp->release = rel_func; cbp->types = types; cbp->id=0; old=(struct tm_callback*)cb_list->first; @@ -164,7 +166,8 @@ int insert_tmcb(struct tmcb_head_list *cb_list, int types, * from mod_init (before forking!). */ int register_tmcb( struct sip_msg* p_msg, struct cell *t, int types, - transaction_cb f, void *param ) + transaction_cb f, void *param, + release_tmcb_param rel_func) { //struct cell* t; struct tmcb_head_list *cb_list; @@ -217,7 +220,7 @@ int register_tmcb( struct sip_msg* p_msg, struct cell *t, int types, cb_list = &(t->tmcb_hl); } - return insert_tmcb( cb_list, types, f, param ); + return insert_tmcb( cb_list, types, f, param, rel_func ); } diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index 38721fb..b396737 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -385,9 +385,12 @@ do{ \ /* callback function prototype */ typedef void (transaction_cb) (struct cell* t, int type, struct tmcb_params*); +/*! \brief function to release the callback param */ +typedef void (release_tmcb_param) (void* param); /* register callback function prototype */ typedef int (*register_tmcb_f)(struct sip_msg* p_msg, struct cell *t, - int cb_types, transaction_cb f, void *param); + int cb_types, transaction_cb f, void *param, + release_tmcb_param func); struct tm_callback { @@ -395,6 +398,8 @@ struct tm_callback { int types; /* types of events that trigger the callback*/ transaction_cb* callback; /* callback function */ void *param; /* param to be passed to callback function */ + release_tmcb_param* release; /**< Function to release the callback param + * when the callback is deleted */ struct tm_callback* next; }; @@ -423,11 +428,13 @@ void destroy_tmcb_lists(); /* register a callback for several types of events */ int register_tmcb( struct sip_msg* p_msg, struct cell *t, int types, - transaction_cb f, void *param ); + transaction_cb f, void *param, + release_tmcb_param rel_func); /* inserts a callback into the a callback list */ int insert_tmcb(struct tmcb_head_list *cb_list, int types, - transaction_cb f, void *param ); + transaction_cb f, void *param, + release_tmcb_param rel_func); /* run all transaction callbacks for an event type */ void run_trans_callbacks( int type , struct cell *trans, diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 50089c0..6dfd0fc 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -319,7 +319,8 @@ static inline int t_uac_prepare(uac_req_t *uac_r, /* Register the callbacks after everything is successful and nothing can fail. Otherwise the callback parameter would be freed twise, once from TMCB_DESTROY, and again because of the negative return code. */ - if(uac_r->cb && insert_tmcb(&(new_cell->tmcb_hl), uac_r->cb_flags, *(uac_r->cb), uac_r->cbp)!=1){ + if(uac_r->cb && insert_tmcb(&(new_cell->tmcb_hl), uac_r->cb_flags, + *(uac_r->cb), uac_r->cbp, NULL)!=1){ ret=E_OUT_OF_MEM; LOG(L_ERR, "t_uac: short of tmcb shmem\n"); goto error1; [View Less]

1 0

git:janakj/kcore: Use next_sibling_hdr to obtain next header with same type
by Jan Janak 23 Mar '09

23 Mar '09

Module: sip-router Branch: janakj/kcore Commit: fc75032e611db1d6611a0c7806a15d6a16dd9967 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc75032… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 23 13:48:29 2009 +0100 Use next_sibling_hdr to obtain next header with same type --- lib/kcore/parser_helpers.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/lib/kcore/parser_helpers.c b/… [View More]

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
19
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2009