sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:master: tm: added tm_ctx to collect K extension requirements

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ded63f919ba33f6ddc6c4170166e247bd52cf96a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ded63f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 1 13:40:33 2009 +0200 tm: added tm_ctx to collect K extension requirements - it holds now branch index value used by $T_branch_index - added function in TM API to access tm_ctx --- modules/tm/t_fwd.c | 3 ++- modules/tm/t_lookup.c | 21 +++++++++++++++++++++ modules/tm/t_lookup.h | 24 ++++++++++++++++++++++++ modules/tm/t_reply.c | 2 ++ modules/tm/tm_load.c | 4 ++++ modules/tm/tm_load.h | 5 +++++ 6 files changed, 58 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 46ddbfb..97b36c2 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -190,10 +190,11 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, if (unlikely(branch_route)) { /* run branch_route actions if provided */ set_route_type(BRANCH_ROUTE); - + tm_ctx_set_branch_index(branch+1); if (run_top_route(branch_rt.rlist[branch_route], i_req) < 0) { LOG(L_ERR, "ERROR: print_uac_request: Error in run_top_route\n"); } + tm_ctx_set_branch_index(0); } /* run the specific callbacks for this transaction */ diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index 8f59e8a..c8e1c9d 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1869,3 +1869,24 @@ int t_reset_max_lifetime() return 1; } +#ifdef WITH_TM_CTX + +tm_ctx_t _tm_ctx; + +tm_ctx_t* tm_ctx_get(void) +{ + return &_tm_ctx; +} + +void tm_ctx_init(void) +{ + memset(&_tm_ctx, 0, sizeof(tm_ctx_t)); +} + +void tm_ctx_set_branch_index(int v) +{ + _tm_ctx.branch_index = v; +} + +#endif + diff --git a/modules/tm/t_lookup.h b/modules/tm/t_lookup.h index cb21048..070add5 100644 --- a/modules/tm/t_lookup.h +++ b/modules/tm/t_lookup.h @@ -123,4 +123,28 @@ typedef int (*t_get_canceled_ident_f)(struct sip_msg *msg, unsigned int *hash_index, unsigned int *label); #endif /* WITH_AS_SUPPORT */ +/** + * required by TMX (K/O extensions) + */ +#define WITH_TM_CTX +#ifdef WITH_TM_CTX + +typedef struct _tm_ctx { + int branch_index; +} tm_ctx_t; + +typedef tm_ctx_t* (*tm_ctx_get_f)(void); + +tm_ctx_t* tm_ctx_get(void); +void tm_ctx_init(void); +void tm_ctx_set_branch_index(int v); + +#else + +#define tm_ctx_get() +#define tm_ctx_init() +#define tm_ctx_set_branch_index(v) + +#endif /* WITH_TM_CTX */ + #endif diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index e51142c..848cebb 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1833,6 +1833,7 @@ int reply_received( struct sip_msg *p_msg ) if ( (t==0)||(t==T_UNDEFINED)) goto trans_not_found; + tm_ctx_set_branch_index(branch); cancel_bitmap=0; msg_status=p_msg->REPLY_STATUS; @@ -2070,6 +2071,7 @@ int reply_received( struct sip_msg *p_msg ) } /* provisional replies */ done: + tm_ctx_set_branch_index(0); /* we are done with the transaction, so unref it - the reference * was incremented by t_check() function -bogdan*/ t_unref(p_msg); diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 6f8bba5..afb5e30 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -233,5 +233,9 @@ int load_tm( struct tm_binds *tmb) tmb->generate_fromtag = generate_fromtag; tmb->t_lookup_request = t_lookup_request; tmb->t_check = t_check; + +#ifdef WITH_TM_CTX + tmb->tm_ctx_get = tm_ctx_get; +#endif return 1; } diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index e3640b7..ec84143 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -140,6 +140,11 @@ struct tm_binds { generate_fromtag_f generate_fromtag; tlookup_request_f t_lookup_request; tcheck_f t_check; +#ifdef WITH_TM_CTX + tm_ctx_get_f tm_ctx_get; +#else + void* reserved5; +#endif }; extern int tm_init;

14 years, 11 months

git:master: tm: define tm_ctx_get() to NULL if no WITH_TM_CTX

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c40ade61c41e33db7e7038a255a9561b60cd1693 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c40ade6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 1 14:01:26 2009 +0200 tm: define tm_ctx_get() to NULL if no WITH_TM_CTX --- modules/tm/t_lookup.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_lookup.h b/modules/tm/t_lookup.h index 070add5..a9a98e6 100644 --- a/modules/tm/t_lookup.h +++ b/modules/tm/t_lookup.h @@ -141,7 +141,7 @@ void tm_ctx_set_branch_index(int v); #else -#define tm_ctx_get() +#define tm_ctx_get() NULL #define tm_ctx_init() #define tm_ctx_set_branch_index(v)

14 years, 11 months

git:master: tm: exported more functions via TM API

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9874877e47e7aec1c1a77696acb71cb94ad94228 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9874877… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 1 12:35:01 2009 +0200 tm: exported more functions via TM API - t_lookup_callid, generate_callid, generate_fromtag, t_lookup_request, t_check are now available via API --- modules/tm/callid.h | 2 ++ modules/tm/t_lookup.h | 7 ++++++- modules/tm/tm_load.c | 5 +++++ modules/tm/tm_load.h | 6 ++++++ modules/tm/uac.h | 2 +- 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/tm/callid.h b/modules/tm/callid.h index 2363abb..e117686 100644 --- a/modules/tm/callid.h +++ b/modules/tm/callid.h @@ -49,6 +49,8 @@ int init_callid(void); int child_init_callid(int rank); +typedef void (*generate_callid_f)(str*); + /* * Get a unique Call-ID */ diff --git a/modules/tm/t_lookup.h b/modules/tm/t_lookup.h index 8994999..cb21048 100644 --- a/modules/tm/t_lookup.h +++ b/modules/tm/t_lookup.h @@ -55,7 +55,10 @@ void init_t(); int init_rb( struct retr_buf *rb, struct sip_msg *msg ); struct cell* t_lookupOriginalT( struct sip_msg* p_msg ); int t_reply_matching( struct sip_msg* , int* ); -int t_lookup_request( struct sip_msg* p_msg , int leave_new_locked, + +typedef int (*tlookup_request_f)(struct sip_msg*, int, int*); + +int t_lookup_request( struct sip_msg* p_msg, int leave_new_locked, int* canceled); int t_newtran( struct sip_msg* p_msg ); @@ -68,6 +71,7 @@ int add_branch_label( struct cell *trans, int t_unref( struct sip_msg *p_msg); typedef int (*tunref_f)( struct sip_msg *p_msg); +typedef int (*tcheck_f)(struct sip_msg*, int*); /* old t_check version (no e2eack support) */ int t_check(struct sip_msg* , int *branch ); @@ -91,6 +95,7 @@ typedef int (*tnewtran_f)(struct sip_msg*); typedef int (*tget_ti_f)(struct sip_msg*, unsigned int*, unsigned int*); typedef int (*tlookup_ident_f)(struct cell**, unsigned int, unsigned int); typedef int (*trelease_f)(struct sip_msg*); +typedef int (*tlookup_callid_f)(struct cell **, str, str); int t_is_local(struct sip_msg*); int t_get_trans_ident(struct sip_msg* p_msg, unsigned int* hash_index, unsigned int* label); diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index ebdf0a8..6f8bba5 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -228,5 +228,10 @@ int load_tm( struct tm_binds *tmb) tmb->t_get_reply_totag = t_get_reply_totag; tmb->t_get_picked_branch = t_get_picked_branch; + tmb->t_lookup_callid = t_lookup_callid; + tmb->generate_callid = generate_callid; + tmb->generate_fromtag = generate_fromtag; + tmb->t_lookup_request = t_lookup_request; + tmb->t_check = t_check; return 1; } diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index bc99256..e3640b7 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -46,6 +46,7 @@ #include "t_lookup.h" #include "t_reply.h" #include "dlg.h" +#include "callid.h" #include "t_cancel.h" #include "t_suspend.h" @@ -134,6 +135,11 @@ struct tm_binds { t_continue_f t_continue; tget_reply_totag_f t_get_reply_totag; tget_picked_f t_get_picked_branch; + tlookup_callid_f t_lookup_callid; + generate_callid_f generate_callid; + generate_fromtag_f generate_fromtag; + tlookup_request_f t_lookup_request; + tcheck_f t_check; }; extern int tm_init; diff --git a/modules/tm/uac.h b/modules/tm/uac.h index f4c14e9..8106727 100644 --- a/modules/tm/uac.h +++ b/modules/tm/uac.h @@ -88,7 +88,7 @@ typedef int (*ack_local_uac_f)(struct cell *trans, str *hdrs, str *body); typedef int (*prepare_request_within_f)(uac_req_t *uac_r, struct retr_buf **dst_req); typedef void (*send_prepared_request_f)(struct retr_buf *request_dst); - +typedef void (*generate_fromtag_f)(str*, str*); /* * Generate a fromtag based on given Call-ID

14 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009