projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add conference mixing to LCR's internal bridge
[lcr.git]
/
joinpbx.cpp
diff --git
a/joinpbx.cpp
b/joinpbx.cpp
index
2e2fabf
..
988ba24
100644
(file)
--- a/
joinpbx.cpp
+++ b/
joinpbx.cpp
@@
-368,10
+368,11
@@
void JoinPBX::bridge(void)
/*
* Bridge between port instances if:
/*
* Bridge between port instances if:
+ * - two or more relations
* - one or all are not mISDN
*/
message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_BRIDGE);
* - one or all are not mISDN
*/
message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_BRIDGE);
- message->param.bridge_id =
j_serial
;
+ 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);
PDEBUG(DEBUG_JOIN, "join%u EP%u requests bridge=%u\n", j_serial, relation->epoint_id, message->param.bridge_id);
message_put(message);
@@
-498,9
+499,6
@@
int joinpbx_countrelations(unsigned int join_id)
if (!join)
return(0);
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;
if (join->j_type != JOIN_TYPE_PBX)
return(0);
joinpbx = (class JoinPBX *)join;