[tm] fixed init of branch bitmask in timeout handler

bogdan-iancu · bogdan-iancu · commit b25788dabc65 · 2026-03-16T15:14:22.000+02:00
related to f0223cc
diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c
@@ -56,6 +56,10 @@ void which_cancel( struct cell *t, branch_bm_t *cancel_bm )
 		if (should_cancel_branch(t, i))
 			BRANCH_BM_SET_IDX( *cancel_bm, i);
 	}
+
+	LM_DBG("branches to cancel ["BRANCH_BM_SPECS"], range %d:%d\n",
+		BRANCH_BM_ARGS(*cancel_bm),t->first_branch,t->nr_of_outgoings-1);
+
 }
 
 
@@ -123,7 +127,7 @@ void cancel_branch( struct cell *t, int branch )
 		_tm_branch_index = 0;
 	}
 
-	LM_DBG("sending cancel...\n");
+	LM_DBG("sending cancel on branch %d...\n",branch);
 	if (TM_BRANCH(t,branch).br_flags & tcp_no_new_conn_bflag)
 		tcp_no_new_conn = 1;
 	backup_list = set_avp_list( &t->user_avps );
diff --git a/modules/tm/timer.c b/modules/tm/timer.c
@@ -350,7 +350,7 @@ inline static void final_response_handler( struct timer_link *fr_tl )
 	context_p old_ctx;
 	struct retr_buf* r_buf;
 	struct cell *t;
-	branch_bm_t cancel_bitmap;
+	branch_bm_t cancel_bitmap = BRANCH_BM_ZERO;
 
 	if (fr_tl==0){
 		/* or BUG?, ignoring it for now */

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,10 @@ void which_cancel( struct cell t, branch_bm_t cancel_bm )`
`56`	`56`	`if (should_cancel_branch(t, i))`
`57`	`57`	`BRANCH_BM_SET_IDX( *cancel_bm, i);`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ LM_DBG("branches to cancel ["BRANCH_BM_SPECS"], range %d:%d\n",`
	`61`	`+ BRANCH_BM_ARGS(*cancel_bm),t->first_branch,t->nr_of_outgoings-1);`
	`62`	`+`
`59`	`63`	`}`
`60`	`64`
`61`	`65`
`@@ -123,7 +127,7 @@ void cancel_branch( struct cell *t, int branch )`
`123`	`127`	`_tm_branch_index = 0;`
`124`	`128`	`}`
`125`	`129`
`126`		`- LM_DBG("sending cancel...\n");`
	`130`	`+ LM_DBG("sending cancel on branch %d...\n",branch);`
`127`	`131`	`if (TM_BRANCH(t,branch).br_flags & tcp_no_new_conn_bflag)`
`128`	`132`	`tcp_no_new_conn = 1;`
`129`	`133`	`backup_list = set_avp_list( &t->user_avps );`