b2b_logic: always terminate a bridge initiator

Before this commit, only if the `notify` flag was used, the entity would have been deleted. (cherry picked from commit aff2d96)
OpenSIPS · Oct 24, 2024 · db624a1 · db624a1
1 parent c2f1291
commit db624a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/modules/b2b_logic/bridging.c b/modules/b2b_logic/bridging.c
@@ -1117,9 +1117,7 @@ int b2b_script_bridge(struct sip_msg *msg, str *br_ent1_str, str *br_ent2_str,
 		goto done;
 	}
 
-	if ((params->flags & B2BL_BR_FLAG_NOTIFY ||
-		params->flags & B2BL_BR_FLAG_RETURN_AFTER_FAILURE) && entity)
-		tuple->bridge_initiator = entity;
+	tuple->bridge_initiator = entity;
 
 	cur_route_ctx.flags |= B2BL_RT_DO_UPDATE;
 

diff --git a/modules/b2b_logic/logic.c b/modules/b2b_logic/logic.c
@@ -905,9 +905,10 @@ int _b2b_handle_reply(struct sip_msg *msg, b2bl_tuple_t *tuple,
 		/* Reply from new bridge entity */
 		if(statuscode >= 200 &&
 			entity == (tuple->bridge_entities[2]?tuple->bridge_entities[2]:tuple->bridge_entities[1]) &&
-			tuple->bridge_flags & B2BL_BR_FLAG_NOTIFY && tuple->bridge_initiator != 0)
+			tuple->bridge_initiator != 0)
 		{
-			send_bridge_notify(tuple->bridge_initiator, cur_route_ctx.hash_index, msg);
+			if (tuple->bridge_flags & B2BL_BR_FLAG_NOTIFY)
+				send_bridge_notify(tuple->bridge_initiator, cur_route_ctx.hash_index, msg);
 			if(statuscode == 200 || !(tuple->bridge_flags & B2BL_BR_FLAG_RETURN_AFTER_FAILURE))
 			{
 				if (!(tuple->bridge_flags & B2BL_BR_FLAG_DONT_DELETE_BRIDGE_INITIATOR)) {