Ported user changes

Author: davidtrihy-genesys

modules/tm/t_hooks.c

@@ -88,11 +88,6 @@ void destroy_tmcb_lists(void)
 	}
 }
 
-static unsigned int tmcb_flags = 0;
-void set_tmcb_flags(unsigned int flags) {
-	tmcb_flags |= flags;
-}
-
 int insert_tmcb(struct tmcb_head_list *cb_list, int types,
 				transaction_cb f, void *param, release_tmcb_param release_func )
 {
@@ -113,7 +108,6 @@ int insert_tmcb(struct tmcb_head_list *cb_list, int types,
 	cbp->param = param;
 	cbp->release = release_func;
 	cbp->types = types;
-	cbp->flags = tmcb_flags;
 	if (cbp->next)
 		cbp->id = cbp->next->id+1;
 	else
@@ -216,7 +210,6 @@ static void run_any_trans_callbacks(struct tmcb_head_list *list, unsigned int ty
 			LM_DBG("trans=%p, callback type %d, id %d entered\n",
 				trans, type, cbp->id );
 			params.param = &(cbp->param);
-			params.flags = cbp->flags;
 			cbp->callback( trans, type, &params );
 			if ((cbp->types)&(TMCB_REQUEST_IN|TMCB_LOCAL_TRANS_NEW)) {
 				if (req && req->dst_uri.len==-1) {
@@ -230,7 +223,6 @@ static void run_any_trans_callbacks(struct tmcb_head_list *list, unsigned int ty
 	/* env cleanup */
 	set_avp_list( backup );
 	tmcb_extra1 = tmcb_extra2 = 0;
-	tmcb_flags = 0;
 	set_t(trans_backup);
 }
 

modules/tm/t_hooks.h

@@ -204,7 +204,6 @@ struct tmcb_params {
 	struct sip_msg* req;
 	struct sip_msg* rpl;
 	int code;
-	unsigned int flags;
 	void **param;
 	void *extra1;
 	void *extra2;
@@ -225,7 +224,6 @@ struct tm_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 */
-	unsigned int flags;          /* flags to be passed into the callback*/
 	struct tm_callback* next;
 };
 
@@ -266,9 +264,6 @@ int insert_tmcb(struct tmcb_head_list *cb_list, int types,
 /* set extra params for callbacks */
 void set_extra_tmcb_params(void *extra1, void *extra2);
 
-/* set extra params for callbacks */
-void set_tmcb_flags(unsigned int flags);
-
 /* run all transaction callbacks for an event type */
 void run_trans_callbacks( int type , struct cell *trans,
 						struct sip_msg *req, struct sip_msg *rpl, int code );

modules/tm/tm.c

@@ -767,7 +767,6 @@ static int fixup_inject_flags(void **param)
 int load_tm( struct tm_binds *tmb)
 {
 	tmb->register_tmcb = register_tmcb;
-	tmb->set_tmcb_flags = set_tmcb_flags;
 
 	/* relay function */
 	tmb->t_relay = w_t_relay;

modules/tm/tm_load.h

@@ -47,8 +47,6 @@
 
 struct tm_binds {
 	register_tmcb_f  register_tmcb;
-	set_tmcb_flags_f set_tmcb_flags;
-
 	trelay_f         t_relay;
 	tcheck_trans_f   t_check_trans;
 

modules/topology_hiding/th_common_logic.h

@@ -23,8 +23,14 @@
 
 #include "../../str.h"
 #include "../../data_lump.h"
+#include "../../mem/shm_mem.h"
 #include "../../parser/contact/parse_contact.h"
 
+struct th_params {
+	str ct_caller_user;
+	str ct_callee_user;
+};
+
 #define RECORD_ROUTE "Record-Route: "
 #define RECORD_ROUTE_LEN (sizeof(RECORD_ROUTE)-1)
 
@@ -70,4 +76,9 @@ static inline char *topo_ct_param_copy(char *buf, str *name, str *val, int shoul
 	return buf;
 }
 
+static void shm_free_wrap(void *param) {
+	if (param)
+		shm_free(param);
+}
+
 #endif