[tm] added $tm.branch.xxxx family of variables

Also the t_get_branch_idx_by_attr() script function

Author: bogdan-iancu

modules/tm/h_table.h

@@ -143,6 +143,17 @@ typedef struct ua_client
 	   timer may fire and interfere with whoever tries to
 	   rewrite it */
 	struct retr_buf local_cancel;
+	/* UAC specific flags */
+	short            flags;
+	/* the onreply_route to be processed only for this branch */
+	struct script_route_ref *on_reply;
+	/* if we store a reply (branch picking), this is where it is */
+	struct sip_msg  *reply;
+	/* if we don't store, we at least want to know the status */
+	short            last_received;
+	/* number of RR headers that were locally added for this branch */
+	unsigned int     added_rr;
+
 	/* pointer to retransmission buffer where uri is printed;
 	   good for generating ACK/CANCEL */
 	str              uri;
@@ -154,19 +165,13 @@ typedef struct ua_client
 	str              adv_address;
 	/* the advertised port used for this branch */
 	str              adv_port;
-	/* number of RR headers that were locally added for this branch */
-	unsigned int     added_rr;
-	/* if we store a reply (branch picking), this is where it is */
-	struct sip_msg  *reply;
-	/* if we don't store, we at least want to know the status */
-	short            last_received;
-	/* UAC specific flags */
-	short            flags;
 	/* script flags, specific to this branch */
 	int              br_flags;
-	/* the onreply_route to be processed only for this branch */
-	struct script_route_ref *on_reply;
-	/* head list for avps */
+	/* q value of this branch */
+	int              q;
+	/* head list for branch attrs */
+	struct usr_avp   *battrs;
+	/* head list for script bavps */
 	struct usr_avp *user_avps;
 }ua_client_type;
 

modules/tm/t_funcs.h

@@ -170,6 +170,8 @@ static inline void force_retr(struct retr_buf *rb)
 			free_f((br).duri.s); \
 		if ((br).user_avps) \
 			avp_destr_f(&(br).user_avps); \
+		if ((br).battrs) \
+			avp_destr_f(&(br).battrs); \
 	} while (0)
 
 #define clean_branch(br) \

modules/tm/t_fwd.c

@@ -396,7 +396,8 @@ static inline unsigned int count_local_rr(struct sip_msg *req)
    may break the function logic!
 */
 static int add_uac( struct cell *t, struct sip_msg *request, const str *uri,
-		str* next_hop, unsigned int bflags, str* path, struct proxy_l *proxy)
+		str* next_hop, unsigned int bflags, str* path,
+		int q, struct usr_avp **attrs, struct proxy_l *proxy)
 {
 	unsigned short branch;
 	struct sip_msg_body *body_clone=NO_BODY_CLONE_MARKER;
@@ -424,6 +425,16 @@ static int add_uac( struct cell *t, struct sip_msg *request, const str *uri,
 	request->path_vec=*path;
 	request->ruri_bflags=bflags;
 
+	/* we attach the attrs here as we need to see them in branch route
+	 * (inside pre_print_uac_request())
+	 * They will remain attached here if the UAC is successfully created;
+	 * if we exit with return the attrs will be freed by clean_branch().
+	 * Bottom line, we take over the attr list handling, so we NULL the
+	 * received holder (so the upper level will havve nothing to care furhter)
+	 */
+	t->uac[branch].battrs = *attrs;
+	*attrs = NULL;
+
 	if ( pre_print_uac_request( t, branch, request, &body_clone)!= 0 ) {
 		ret = -1;
 		goto error01;
@@ -471,6 +482,7 @@ static int add_uac( struct cell *t, struct sip_msg *request, const str *uri,
 	t->uac[branch].uri.len=request->new_uri.len;
 	t->uac[branch].br_flags = request->ruri_bflags;
 	t->uac[branch].added_rr = count_local_rr( request );
+	t->uac[branch].q = q;
 	t->nr_of_outgoings++;
 
 	/* done! */
@@ -766,7 +778,8 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg ,
 
 	/* as first branch, use current R-URI, bflags, etc. */
 	branch_ret = add_uac( t, p_msg, &current_uri, &backup_dst,
-		getb0flags(p_msg), &p_msg->path_vec, proxy);
+		getb0flags(p_msg), &p_msg->path_vec, p_msg->ruri_q,
+		ruri_branch_attrs_head() , proxy);
 	if (branch_ret>=0)
 		added_branches |= 1<<branch_ret;
 	else
@@ -776,7 +789,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg ,
 	for( idx=0; (branch=get_msg_branch(idx))!=NULL ; idx++ ) {
 		p_msg->force_send_socket = branch->force_send_socket;
 		branch_ret = add_uac( t, p_msg, &branch->uri, &branch->dst_uri,
-			branch->bflags, &branch->path, proxy);
+			branch->bflags, &branch->path, branch->q, &branch->attrs, proxy);
 		/* pick some of the errors in case things go wrong;
 		   note that picking lowest error is just as good as
 		   any other algorithm which picks any other negative