X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinpbx.cpp;h=988ba24280933fbbeb17277b19d432f617b7d8e0;hp=929065779125b2087890f9f0708d8e0285b9841c;hb=a698197188e22f42a5483bcb775f66522863d871;hpb=5b3a112115689caa6d145787e61c3716047ed49c diff --git a/joinpbx.cpp b/joinpbx.cpp index 9290657..988ba24 100644 --- a/joinpbx.cpp +++ b/joinpbx.cpp @@ -368,11 +368,11 @@ void JoinPBX::bridge(void) /* * Bridge between port instances if: - * - two relations + * - two or more relations * - one or all are not mISDN */ message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_BRIDGE); - message->param.bridge_id = (relations==2 && !allmISDN) ? j_serial : 0; + message->param.bridge_id = (relations>=2 && !allmISDN) ? j_serial : 0; PDEBUG(DEBUG_JOIN, "join%u EP%u requests bridge=%u\n", j_serial, relation->epoint_id, message->param.bridge_id); message_put(message); @@ -499,9 +499,6 @@ int joinpbx_countrelations(unsigned int join_id) if (!join) return(0); - if (join->j_type == JOIN_TYPE_REMOTE) - return(2); - if (join->j_type != JOIN_TYPE_PBX) return(0); joinpbx = (class JoinPBX *)join;