TELECOM-12357: One way topology hiding

Author: davidtrihy-genesys

modules/rr/rr_mod.c

@@ -102,7 +102,7 @@ static const cmd_export_t cmds[] = {
 	{"record_route_preset", (cmd_function)w_record_route_preset, {
 		{CMD_PARAM_STR, 0, 0},
 		{CMD_PARAM_STR | CMD_PARAM_OPT ,0, 0}, {0,0,0}},
-		REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},
+		REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE},
 	{"add_rr_param", (cmd_function)w_add_rr_param, {
 		{CMD_PARAM_STR, 0, 0}, {0,0,0}},
 		REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},

modules/tm/t_hooks.c

@@ -88,6 +88,10 @@ 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 )
@@ -109,6 +113,7 @@ 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
@@ -211,6 +216,7 @@ 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) {
@@ -224,6 +230,7 @@ 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,6 +204,7 @@ struct tmcb_params {
 	struct sip_msg* req;
 	struct sip_msg* rpl;
 	int code;
+	unsigned int flags;
 	void **param;
 	void *extra1;
 	void *extra2;
@@ -216,14 +217,15 @@ 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, release_tmcb_param func);
-
+typedef void (*set_tmcb_flags_f)(unsigned int flags);
 
 struct tm_callback {
 	int id;                      /* id of this callback - useless */
 	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 */
+	unsigned int flags;          /* flags to be passed into the callback*/
 	struct tm_callback* next;
 };
 
@@ -264,6 +266,9 @@ 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

@@ -768,6 +768,7 @@ 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,6 +47,8 @@
 
 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/doc/topology_hiding_admin.xml

@@ -256,6 +256,26 @@ modparam("topology_hiding", "th_contact_callee_username_var", "__topo_hiding_use
 		</example>
 	</section>
 
+	<section id="param_th_internal_trusted_tag" xreflabel="th_internal_trusted_tag">
+		<title><varname>th_internal_trusted_tag</varname> (string)</title>
+		<para>
+			Tag of one of the sockets in OpenSIPs to define if topology hiding should be applied to that socket
+		</para>
+		<para>
+		<emphasis>
+			Default value is <quote>empty</quote> - no tag
+		</emphasis>
+		</para>
+		<example>
+		<title>Set <varname>th_internal_trusted_tag</varname> parameter</title>
+		<programlisting format="linespecific">
+...
+modparam("topology_hiding", "th_internal_trusted_tag", "TopoInternalTag")
+...
+</programlisting>
+		</example>
+	</section>
+
 	</section>
 	<section id="exported_functions" xreflabel="exported_functions">
 	<title>Exported Functions</title>