--- modules/acc/acc_logic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/acc/acc_logic.c b/modules/acc/acc_logic.c index 59e4440..4182a92 100644 --- a/modules/acc/acc_logic.c +++ b/modules/acc/acc_logic.c @@ -363,9 +363,9 @@ static inline void acc_onreply( struct cell* t, struct sip_msg *req, return;

/* for reply processing, set as new_uri the winning branch */ - if (t->relaied_reply_branch>=0) { + if (t->relayed_reply_branch>=0) { new_uri_bk = req->new_uri; - req->new_uri = t->uac[t->relaied_reply_branch].uri; + req->new_uri = t->uac[t->relayed_reply_branch].uri; req->parsed_uri_ok = 0; } else { new_uri_bk.len = -1;

This flag was originally defined in file msg_parser.h. But the sip-router core does not contain this definition and it does not make much sense to add it there because the acc module is the only module using it and later, if we merge acc implementations from ser and kamailio, this flag will be probably gone.

File sip_router/msg_parser.h contains a warning about the flag being defined here, this is to make sure we don't create another flag with conflicting value. --- modules/acc/acc.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/modules/acc/acc.h b/modules/acc/acc.h index 3c99212..576de17 100644 --- a/modules/acc/acc.h +++ b/modules/acc/acc.h @@ -73,6 +73,14 @@

#define MAX_SYSLOG_SIZE 65536

+/* WARNING: This is a flag stored in the sip_msg structure, the flag is + * temporarily defined here to make the module work with the sip-router core, + * I assume it won't be needed once we merge acc implementations from both + * projects. The value of the flag must be kept synchronized with other flags + * defined in parser/msg_parser.h! + */ +#define FL_REQ_UPSTREAM (1<<11) + void acc_log_init(void); int acc_log_request( struct sip_msg *req);

The original (kamailio) version of acc module accesed the flags in sip_msg structure directly through a few macros declared in this module. In SER we introduced the concept of named flags and created a set of functions that can be used to access and modify the flags.

First of all we need to replace calls to flag_idx2mask from mod_init function, this function does not exist in the sip-router core because all flag related functions there get the index of the flag as parameter. This means that we do not have to convert values of flag-related modparams in this module, all we have to do is check whether they have a valid value. This is done using flag_is_in_range. But because the module uses -1 to denote that a particular flag is not set, we need only need to call that function if the flag is not set to -1.

After that we need to update is_acc_flag_set and reset_acc_flag macros to call functions from flags.h, instead of modifying the flags directly. But again, the functions from flags.h should only be called if the particular flag is not set to -1.

If we also wanted to add support for named flags then we would need to update the definition of modparams holding the value of flags in this module. This is not done in this patch. We can do it later after we merge acc modules from ser and kamailio. --- modules/acc/acc_logic.c | 4 ++-- modules/acc/acc_mod.c | 33 ++++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/modules/acc/acc_logic.c b/modules/acc/acc_logic.c index e92d827..90426a5 100644 --- a/modules/acc/acc_logic.c +++ b/modules/acc/acc_logic.c @@ -55,8 +55,8 @@ extern struct rr_binds rrb; struct acc_enviroment acc_env;

-#define is_acc_flag_set(_rq,_flag) (((_rq)->flags)&(_flag)) -#define reset_acc_flag(_rq,_flag) (_rq)->flags &= ~(_flag) +#define is_acc_flag_set(_rq,_flag) (((_flag) != -1) && (isflagset((_rq), (_flag)) == 1)) +#define reset_acc_flag(_rq,_flag) (resetflag((_rq), (_flag)))

#define is_failed_acc_on(_rq) is_acc_flag_set(_rq,failed_transaction_flag)

diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c index a9da577..17f159a 100644 --- a/modules/acc/acc_mod.c +++ b/modules/acc/acc_mod.c @@ -377,8 +377,11 @@ static int mod_init( void )

/* ----------- GENERIC INIT SECTION ----------- */

- if (flag_idx2mask(&failed_transaction_flag)<0) + if ((failed_transaction_flag != -1) && + !flag_in_range(failed_transaction_flag)) { + LM_ERR("failed_transaction_flag set to invalid value\n"); return -1; + }

/* load the TM API */ if (load_tm_api(&tmb)!=0) { @@ -423,11 +426,15 @@ static int mod_init( void ) return -1; }

- if (flag_idx2mask(&log_flag)<0) + if ((log_flag != -1) && !flag_in_range(log_flag)) { + LM_ERR("log_flag set to invalid value\n"); return -1; + }

- if (flag_idx2mask(&log_missed_flag)<0) + if ((log_missed_flag != -1) && !flag_in_range(log_missed_flag)) { + LM_ERR("log_missed_flag set to invalid value\n"); return -1; + }

acc_log_init();

@@ -445,10 +452,16 @@ static int mod_init( void ) return -1; } /* fix the flags */ - if (flag_idx2mask(&db_flag)<0) + + if ((db_flag != -1) && !flag_in_range(db_flag)) { + LM_ERR("db_flag set to invalid value\n"); return -1; - if (flag_idx2mask(&db_missed_flag)<0) + } + + if ((db_missed_flag != -1) && !flag_in_range(db_missed_flag)) { + LM_ERR("db_missed_flag set to invalid value\n"); return -1; + } } else { db_flag = 0; db_missed_flag = 0; @@ -466,10 +479,16 @@ static int mod_init( void ) }

/* fix the flags */ - if (flag_idx2mask(&radius_flag)<0) + if ((radius_flag != -1) && !flag_in_range(radius_flag)) { + LM_ERR("radius_flag set to invalid value\n"); return -1; - if (flag_idx2mask(&radius_missed_flag)<0) + } + + if ((radius_missed_flag != -1) && !flag_in_range(radius_missed_flag)) { + LM_ERR("radius_missed_flag set to invalid value\n"); return -1; + } + if (init_acc_rad( radius_config, service_type)!=0 ) { LM_ERR("failed to init radius\n"); return -1;

The kamailio acc module needs to be linked with libsrdb1 database library, this is the library which contains the database api from kamailio/db directory, and libkcore. libkcore contains ut.h and local_route init functions from kamailio core. --- modules/acc/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/modules/acc/Makefile b/modules/acc/Makefile index a25c0f5..ee6d3ff 100644 --- a/modules/acc/Makefile +++ b/modules/acc/Makefile @@ -30,4 +30,7 @@ endif

DEFS+=-DOPENSER_MOD_INTERFACE

+SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/kcore/kcore + include ../../Makefile.modules

The last parameter from the register_tmcb is vital for the dialog module from kamailio to work properly. The tm modules should be merged instead of removing functionality from kamailio modules.

Regards, Ovidiu Sas

On Mon, Mar 2, 2009 at 7:16 PM, Jan Janak jan@iptel.org wrote:

In the kamailio version of tm module function register_tmcb accepts an extra parameter, some kind of clean up function. There is no such parameter in ser and thus sip-router (remember, we imported tm from ser) and thus we need to remove the parameter here too.

In acc module it was set to 0 anyway so there is no harm done.

modules/acc/acc_logic.c |    2 +-  modules/acc/acc_mod.c   |    2 +-  2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/acc/acc_logic.c b/modules/acc/acc_logic.c index 4182a92..e92d827 100644 --- a/modules/acc/acc_logic.c +++ b/modules/acc/acc_logic.c @@ -241,7 +241,7 @@ void acc_onreq( struct cell* t, int type, struct tmcb_params *ps )                        TMCB_RESPONSE_IN |                        /* report on missed calls */                        ((is_invite && is_mc_on(ps->req))?TMCB_ON_FAILURE:0) ;

• if (tmb.register_tmcb( 0, t, tmcb_types, tmcb_func, 0, 0 )<=0) {

• if (tmb.register_tmcb( 0, t, tmcb_types, tmcb_func, 0)<=0) {

LM_ERR("cannot register additional callbacks\n");                        return;                } diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c index 7e234e6..a9da577 100644 --- a/modules/acc/acc_mod.c +++ b/modules/acc/acc_mod.c @@ -401,7 +401,7 @@ static int mod_init( void )        }

/* listen for all incoming requests  */

• if ( tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, acc_onreq, 0, 0 ) <=0 ) {

• if ( tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, acc_onreq, 0) <=0 ) {

LM_ERR("cannot register TMCB_REQUEST_IN callback\n");                return -1;        } -- 1.5.6.5

---

sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev