Skip to content

Commit 5993a1f

Browse files
committed
b2b_logic: turn of bridge initiator in case transfer fails
(cherry picked from commit 381e725)
1 parent 203094a commit 5993a1f

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

modules/b2b_logic/bridging.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ int process_bridge_dialog_end(b2bl_tuple_t* tuple, unsigned int hash_index,
270270
/* send cancel or bye to the peers */
271271
b2b_end_dialog(tuple->bridge_entities[1], tuple, hash_index);
272272
b2b_end_dialog(tuple->bridge_entities[2], tuple, hash_index);
273+
b2b_end_dialog(tuple->bridge_initiator, tuple, hash_index);
273274
b2b_mark_todel(tuple);
274275
}
275276
else
@@ -386,17 +387,13 @@ int process_bridge_bye(struct sip_msg* msg, b2bl_tuple_t* tuple,
386387
entity && tuple->bridge_initiator == entity)
387388
{
388389
entity_no = 3; // Bridge initiator
390+
} else if (!entity) {
391+
LM_ERR("No match found\n");
392+
return -1;
389393
} else {
390394
entity_no = bridge_get_entityno(tuple, entity);
391-
if(entity_no < 0)
392-
{
393-
if (!entity) {
394-
LM_ERR("No match found\n");
395-
return -1;
396-
}
397-
/* we've got a known entity, but no longer part of the
398-
* bridge - we gracefully reply and drop */
399-
}
395+
/* we've got a known entity, but no longer part of the
396+
* bridge - we gracefully reply and drop */
400397
}
401398

402399
memset(&rpl_data, 0, sizeof(b2b_rpl_data_t));

0 commit comments

Comments
 (0)