[sr-dev] git:carstenbock/ims: - for the E-CSCF there is no XML-File

Module: sip-router Branch: carstenbock/ims Commit: 5ce033192493b2d71c8c066625c677eda225eaa6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ce0331… Author: Carsten Bock &lt;carsten(a)bock.info&gt; Committer: Carsten Bock &lt;carsten(a)bock.info&gt; Date: Tue Jan 11 14:29:01 2011 +0100 - for the E-CSCF there is no XML-File - changes, in order to make the LRF-mofule compile (path adaptions) --- modules/ecscf/Makefile | 2 +- modules/lrf/Makefile | 20 ++++++++------------ modules/lrf/dlg_state.c | 6 +----- modules/tm/t_reply.c | 14 ++++++++++---- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/modules/ecscf/Makefile b/modules/ecscf/Makefile index 5110deb..3cdbf04 100644 --- a/modules/ecscf/Makefile +++ b/modules/ecscf/Makefile @@ -17,6 +17,6 @@ DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2 -I$(SERLIBPATH) -I../.. LIBS += -L$(LOCALBASE)/lib -lxml2 -#MOD_INSTALL_CFGS=ecscf.cfg ecscf.xml +#MOD_INSTALL_CFGS=ecscf.cfg include ../../Makefile.modules diff --git a/modules/lrf/Makefile b/modules/lrf/Makefile index 758fca9..edc2c7e 100644 --- a/modules/lrf/Makefile +++ b/modules/lrf/Makefile @@ -10,21 +10,17 @@ auto_gen= NAME=lrf.so LIBS= -ifeq ($(CFG_NAME),sip-router) - DEFS += -DSER_MOD_INTERFACE - SERLIBPATH=/../lib - #SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 - DEFS += -I/usr/include/libxml2 -I../lib -DSER -I../.. - DEFS += -I../../lib - LIBS += -L/usr/local/lib -L../lib/cds -L../lib/lost -llost_client -lcds -else - DEFS += -I/usr/include/libxml2 -I../../lib -DSER -I../.. - LIBS += -L/usr/local/lib -L../../lib/cds -L../../lib/lost -l_lost_client -endif -LIBS += -lxml2 +DEFS+=-DSER +INCLUDES = -I../../lib -I../.. +DEFS+=-DSER_MOD_INTERFACE + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/cds/ser_cds DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2 LIBS += -L$(LOCALBASE)/lib -lxml2 +#MOD_INSTALL_CFGS=lrf.cfg + include ../../Makefile.modules diff --git a/modules/lrf/dlg_state.c b/modules/lrf/dlg_state.c index e3f7879..0c27eab 100644 --- a/modules/lrf/dlg_state.c +++ b/modules/lrf/dlg_state.c @@ -59,11 +59,7 @@ #include "../../mem/shm_mem.h" -#ifdef SER_MOD_INTERFACE - #include "../../modules_s/sl/sl_funcs.h" -#else - #include "../sl/sl_funcs.h" -#endif +#include "../../modules/sl/sl_funcs.h" #include "sip.h" //#include "release_call.h" diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 5790748..ba48309 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -236,7 +236,14 @@ int t_get_picked_branch(void) *inside* t_relay using hints stored in private memory before t_relay is called */ +enum route_mode get_rmode(){ + return rmode; +} +void set_rmode(enum route_mode crt_rmode){ + + rmode = crt_rmode; +} void t_on_negative( unsigned int go_to ) { @@ -2620,9 +2627,8 @@ int t_enter_ctx(unsigned int new_hash_index, unsigned int new_label, t = get_t(); if(t == NULL || t == T_UNDEFINED) ERR("t_enter_ctx: null crt trans\n"); - else {DEBUG("t_enter_ctx: ref number is %i\n", t->ref_count); - *crt_trans = get_t(); - } + else *crt_trans = get_t(); + *crt_rmode = get_rmode(); if(t_lookup_ident(new_trans, new_hash_index, new_label) < 0 ) { @@ -2652,7 +2658,7 @@ int t_exit_ctx(struct cell * new_trans, enum route_mode new_rmode){ crt_trans = get_t(); UNREF(crt_trans); - set_t(new_trans); + set_t(new_trans, T_BR_UNDEFINED); set_rmode(new_rmode); return 0;