sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

git:master: Teach the parser recognize PRACK and UPDATE methods

by Jan Janak

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 | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 624c2ab..af85f21 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -79,7 +79,7 @@ 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, METHOD_MESSAGE=256, METHOD_OPTIONS=512, - METHOD_OTHER=1024 }; + METHOD_PRACK=1024, METHOD_UPDATE=2048, METHOD_OTHER=4096 }; #define FL_FORCE_RPORT (1 << 0) /* force rport */ #define FL_FORCE_ACTIVE (1 << 1) /* force active SDP */ diff --git a/parser/parse_fline.c b/parser/parse_fline.c index e234835..81b235f 100644 --- a/parser/parse_fline.c +++ b/parser/parse_fline.c @@ -125,6 +125,8 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) else IFISMETHOD( NOTIFY, 'N') else IFISMETHOD( MESSAGE, 'M') else IFISMETHOD( OPTIONS, 'O') + else IFISMETHOD( PRACK, 'P') + else IFISMETHOD( UPDATE, 'U') /* if you want to add another method XXX, include METHOD_XXX in H-file (this is the value which you will take later in processing and define XXX_LEN as length of method name; diff --git a/parser/parse_fline.h b/parser/parse_fline.h index f8b3e06..aae71a4 100644 --- a/parser/parse_fline.h +++ b/parser/parse_fline.h @@ -60,6 +60,8 @@ #define NOTIFY_LEN 6 #define MESSAGE_LEN 7 #define OPTIONS_LEN 7 +#define PRACK_LEN 5 +#define UPDATE_LEN 6 struct msg_start { int type; /* Type of the Message - Request/Response */

15 years, 9 months

git:master: Kamailio compatiblity: Added pointer to a free function to tm callbacks

by Jan Janak

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 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;

15 years, 9 months

git:master: Kamailio compatiblity: Added pointer to a free function to tm callbacks

by Jan Janak

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 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;

15 years, 9 months

git:janakj/kcore: Kamailio compatiblity: export last_retcode via a global variable

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 68b7a89891c1391ce518d3684d5f813556786d6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68b7a89… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Mar 19 14:44:52 2009 +0100 Kamailio compatiblity: export last_retcode via a global variable --- action.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index 2baa6cb..75072dd 100644 --- a/action.c +++ b/action.c @@ -93,7 +93,7 @@ #include <dmalloc.h> #endif - +int _last_returned_code = 0; struct onsend_info* p_onsend=0; /* onsend route send info */ /* ret= 0! if action -> end of list(e.g DROP), @@ -461,6 +461,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) /*ret=((ret=run_actions(rlist[a->val[0].u.number], msg))<0)?ret:1;*/ ret=run_actions(h, main_rt.rlist[a->val[0].u.number], msg); h->last_retcode=ret; + _last_returned_code = h->last_retcode; h->run_flags&=~(RETURN_R_F|BREAK_R_F); /* absorb return & break */ break; case EXEC_T: @@ -745,6 +746,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -762,6 +764,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -777,6 +780,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -793,6 +797,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -810,6 +815,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -823,6 +829,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ); if (ret==0) h->run_flags|=EXIT_R_F; h->last_retcode=ret; + _last_returned_code = h->last_retcode; } else { LOG(L_CRIT,"BUG: do_action: bad module call\n"); } @@ -1119,6 +1126,7 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if (h->rec_lev==1){ h->run_flags=0; h->last_retcode=0; + _last_returned_code = h->last_retcode; #ifdef USE_LONGJMP if (setjmp(h->jmp_env)){ h->rec_lev=0; @@ -1142,6 +1150,7 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if (h->run_flags & EXIT_R_F){ #ifdef USE_LONGJMP h->last_retcode=ret; + _last_returned_code = h->last_retcode; longjmp(h->jmp_env, ret); #endif }

15 years, 9 months

git:janakj/kcore: Merge branch 'master' of ssh://janakj@git.sip-router.org/ sip-router into sr

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 9b63900b14a17f46e45c8aad3e0f970dbc17b73f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b63900… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 23 11:16:52 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into sr * 'master' of ssh://janakj@git.sip-router.org/sip-router: New function to return the To tag for local reply Allow parser syn'ced with kamailio version New functions that can be used to search for a header with given type ---

15 years, 9 months

git:janakj/kcore: Merge branch 'master' of ssh://janakj@git.sip-router.org/ sip-router into sr

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 8a7db2aacd98e1ac0a13753a8cfe82cbd1de14d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a7db2a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 23 10:44:07 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into sr * 'master' of ssh://janakj@git.sip-router.org/sip-router: tcp: minor optimization sercmd: minor makefile fix tcp internal: send timeout is now kept only in ticks core: typo fix tcp: typo & minor optimization Support for auto_inv_100_reason tm parameter. Rename Contact parameter select 'method' to 'methods' Rename Contact parameter 'method' to 'methods' make install: avoid re-linking lib dependent modules build system: avoid libraries re-compiling fixing missing $ in ser_mysql.sh script Debian packaging - fixing path to mysql sql files in my_create.sh script The fixup function prototypes of the config variables have been Strip, prefix, rewriteuser, ... all the SET_* actions preserve the core: check & fix Content-Length when sending on tcp tcp: config option for the async write block size tcp: config option for the read buffer size tcp: dyn. config fix for tcp_con_lifetime tcp: diff. connect timeout for async & states cleanup ---

15 years, 9 months

git:janakj/kcore: Merge branch 'sr' into kcore

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 534aa29209a94390f6867b406cb7f69960bcb6c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=534aa29… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 23 13:48:17 2009 +0100 Merge branch 'sr' into kcore * sr: (39 commits) New function to return the To tag for local reply Allow parser syn'ced with kamailio version New functions that can be used to search for a header with given type tcp: minor optimization sercmd: minor makefile fix tcp internal: send timeout is now kept only in ticks core: typo fix tcp: typo & minor optimization Support for auto_inv_100_reason tm parameter. Rename Contact parameter select 'method' to 'methods' Rename Contact parameter 'method' to 'methods' make install: avoid re-linking lib dependent modules Kamailio compatiblity: export last_retcode via a global variable build system: avoid libraries re-compiling Add support for SET_HOSTALL_T action. Replace missing logging macros with va_arg support using static buffer. Adding send_sock to the dlg_t structure. Update to the refurbished event parser. Refurbished event header field parser. Extend the parser parameter with support for dialog event parameters. ... ---

15 years, 9 months

git:janakj/kcore: Use next_sibling_hdr to obtain next header with same type

by Jan Janak

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/lib/kcore/parser_helpers.c index fbfc5a0..e769160 100644 --- a/lib/kcore/parser_helpers.c +++ b/lib/kcore/parser_helpers.c @@ -112,10 +112,7 @@ int print_rr_body(struct hdr_field *iroute, str *oroute, int order, p = p->next; } - for(iroute = iroute->next; iroute; iroute = iroute->next) { - if (iroute->type == HDR_ROUTE_T) break; - } -/* iroute = iroute->sibling; */ + iroute = next_sibling_hdr(iroute); } for(i=0;i<n;i++){

15 years, 9 months

git:master: New function to return the To tag for local reply

by Jan Janak

Module: sip-router Branch: master Commit: bc384ddb1ddb1ec32ae115548d2dee93d4ebf74d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc384dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 20 17:42:53 2009 +0100 New function to return the To tag for local reply Added t_get_reply_totag() to access the to-tag value for generated replies. This is needed by sl to cope with presence modules Signed-off-by: Jan Janak <jan(a)iptel.org> --- modules/tm/t_reply.c | 13 +++++++++++++ modules/tm/t_reply.h | 3 +++ modules/tm/tm_load.c | 2 ++ modules/tm/tm_load.h | 1 + 4 files changed, 19 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index c774d84..a72f134 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -170,6 +170,19 @@ static unsigned short resp_class_prio[]={ }; +int t_get_reply_totag(struct sip_msg *msg, str *totag) +{ + if(msg==NULL || totag==NULL) { + return -1; + } + + calc_crc_suffix(msg, tm_tag_suffix); + *totag = tm_tag; + + return 1; +} + + /* we store the reply_route # in private memory which is then processed during t_relay; we cannot set this value diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 054272e..fa9324d 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -73,6 +73,9 @@ typedef int (*treply_wb_f)( struct cell* trans, /* wrapper function needed after changes in w_t_reply */ int w_t_reply_wrp(struct sip_msg *m, unsigned int code, char *txt); +typedef int (*tget_reply_totag_f)(struct sip_msg *, str *); +int t_get_reply_totag(struct sip_msg *msg, str *totag); + #define LOCK_REPLIES(_t) lock(&(_t)->reply_mutex ) #define UNLOCK_REPLIES(_t) unlock(&(_t)->reply_mutex ) diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 26bf700..c61d39d 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -225,5 +225,7 @@ int load_tm( struct tm_binds *tmb) LOG( L_ERR, LOAD_ERROR "'t_continue' not found\n"); return -1; } + + tmb->t_get_reply_totag = t_get_reply_totag; return 1; } diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index dc00a91..98b9ff2 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -132,6 +132,7 @@ struct tm_binds { #endif t_suspend_f t_suspend; t_continue_f t_continue; + tget_reply_totag_f t_get_reply_totag; }; extern int tm_init;

15 years, 9 months

git:master: Allow parser syn'ced with kamailio version

by Jan Janak

Module: sip-router Branch: master Commit: 0d54a7754641467aa3dab8ed86979a6f6f96532d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d54a77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 20 17:19:22 2009 +0100 Allow parser syn'ced with kamailio version Sync'ed parse_allow_header() prototype name with implementation. New parse_allow() function that work over sim_msg structure Signed-off-by: Jan Janak <jan(a)iptel.org> --- parser/hf.c | 2 + parser/parse_allow.c | 83 +++++++++++++++++++++++++++++++++++++++----------- parser/parse_allow.h | 28 ++++++++++++++-- 3 files changed, 91 insertions(+), 22 deletions(-) diff --git a/parser/hf.c b/parser/hf.c index c5f7ba3..f33aaa1 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -52,6 +52,7 @@ #include "parse_subscription_state.h" #include "contact/parse_contact.h" #include "parse_disposition.h" +#include "parse_allow.h" #include "../ut.h" @@ -138,6 +139,7 @@ void clean_hdr_field(struct hdr_field* hf) break; case HDR_ALLOW_T: + free_allow_header(hf); break; case HDR_EVENT_T: diff --git a/parser/parse_allow.c b/parser/parse_allow.c index 62cec93..ce435ac 100644 --- a/parser/parse_allow.c +++ b/parser/parse_allow.c @@ -43,41 +43,88 @@ */ int parse_allow_header(struct hdr_field* _hf) { - unsigned int* methods; - + struct allow_body* ab = 0; + if (!_hf) { LOG(L_ERR, "parse_allow_header: Invalid parameter value\n"); return -1; } - /* maybe the header is already parsed! */ + /* maybe the header is already parsed! */ if (_hf->parsed) { return 0; } - /* bad luck! :-( - we have to parse it */ - methods = pkg_malloc(sizeof(unsigned int)); - if (methods == 0) { - LOG(L_ERR, "ERROR:parse_allow_header: Out of pkg_memory\n"); - return -1; - } + ab = (struct allow_body*)pkg_malloc(sizeof(struct allow_body)); + if (ab == 0) { + LOG(L_ERR, "ERROR:parse_allow_header: out of pkg_memory\n"); + return -1; + } + memset(ab,'\0', sizeof(struct allow_body)); + + if (parse_methods(&(_hf->body), &(ab->allow)) !=0 ) { + LOG(L_ERR, "ERROR:parse_allow_header: bad allow body header\n"); + goto error; + } + + ab->allow_all = 0; + _hf->parsed = (void*)ab; + return 0; + +error: + if (ab) pkg_free(ab); + return -1; +} + +/*! + * \brief This method is used to parse all Allow HF body. + * \param msg sip msg + * \return 0 on success,-1 on failure. + */ +int parse_allow(struct sip_msg *msg) +{ + unsigned int allow; + struct hdr_field *hdr; + + /* maybe the header is already parsed! */ + if (msg->allow && msg->allow->parsed) { + return 0; + } - if (!parse_methods(&(_hf->body), methods)) { - LOG(L_ERR, "ERROR:parse_allow_header: Bad allow header\n"); - pkg_free(methods); + /* parse to the end in order to get all ALLOW headers */ + if (parse_headers(msg,HDR_EOH_F,0)==-1 || !msg->allow) { return -1; - } + } + allow = 0; - _hf->parsed = methods; - return 0; + for(hdr = msg->allow ; hdr ; hdr = next_sibling_hdr(hdr)) { + if (hdr->parsed == 0) { + if(parse_allow_header(hdr) < 0) { + return -1; + } + } + + allow |= ((struct allow_body*)hdr->parsed)->allow; + } + + ((struct allow_body*)msg->allow->parsed)->allow_all = allow; + return 0; } /* * Release memory */ -void free_allow(unsigned int** _methods) +void free_allow_body(struct allow_body **ab) +{ + if (ab && *ab) { + pkg_free(*ab); + *ab = 0; + } +} + + +void free_allow_header(struct hdr_field* hf) { - if (_methods && *_methods) pkg_free(*_methods); - *_methods = 0; + free_allow_body((struct allow_body**)(void*)(&(hf->parsed))); } diff --git a/parser/parse_allow.h b/parser/parse_allow.h index b939c7a..743e6bb 100644 --- a/parser/parse_allow.h +++ b/parser/parse_allow.h @@ -29,23 +29,43 @@ #define PARSE_ALLOW_H #include "hf.h" +#include "msg_parser.h" /* - * casting macro for accessing RPID body + * casting macro for accessing Allow body */ -#define get_allow_methods(p_msg) (unsigned int)(p_msg)->allow->parsed) +#define get_allow_methods(p_msg) \ + (((struct allow_body*)(p_msg)->allow->parsed)->allow_all) + + +struct allow_body { + unsigned int allow; /* allow mask for the current hdr */ + unsigned int allow_all; /* allow mask for the all allow hdr - it's + * set only for the first hdr in sibling + * list*/ +}; + + +/* + * Parse all Allow HFs + */ +int parse_allow(struct sip_msg *msg); /* * Parse Allow HF body */ -int parse_allow(struct hdr_field* _h); +int parse_allow_header(struct hdr_field* _h); /* * Release memory */ -void free_allow(unsigned int** _methods); +void free_allow_body(struct allow_body **ab); + +void free_allow_header(struct hdr_field* hf); + + #endif /* PARSE_ALLOW_H */

15 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev