diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-20 17:08:44 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-20 17:08:44 +0000 |
| commit | 3c35e5e958ccff5a307542e84ae3916a3dc2ae06 (patch) | |
| tree | b179e2a337ef79f60903931a3f7b0543e3eedc03 /main | |
| parent | 543b3e9099aac1c668e7bd1828152004b0987cc6 (diff) | |
Totally break a P2P bridge upon going on hold, and re-establish it upon going off hold.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43343 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/main/rtp.c b/main/rtp.c index d29185fe8..0cf0aec76 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2940,14 +2940,30 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast if ((fr->subclass == AST_CONTROL_HOLD) || (fr->subclass == AST_CONTROL_UNHOLD) || (fr->subclass == AST_CONTROL_VIDUPDATE)) { - /* If we are going on hold, then break callback mode */ + /* If we are going on hold, then break callback mode and P2P bridging */ if (fr->subclass == AST_CONTROL_HOLD) { if (p0_callback) p0_callback = p2p_callback_disable(c0, p0, &p0_fds[0], &p0_iod[0]); if (p1_callback) p1_callback = p2p_callback_disable(c1, p1, &p1_fds[0], &p1_iod[0]); + p0->bridged = NULL; + p1->bridged = NULL; + if (vp0) { + vp0->bridged = NULL; + vp1->bridged = NULL; + } } else if (fr->subclass == AST_CONTROL_UNHOLD) { - /* If we are off hold, then go back to callback mode */ + /* If we are off hold, then go back to callback mode and P2P bridging */ + ast_clear_flag(p0, FLAG_P2P_SENT_MARK); + p0->bridged = p1; + ast_clear_flag(p1, FLAG_P2P_SENT_MARK); + p1->bridged = p0; + if (vp0) { + ast_clear_flag(vp0, FLAG_P2P_SENT_MARK); + vp0->bridged = vp1; + ast_clear_flag(vp1, FLAG_P2P_SENT_MARK); + vp1->bridged = vp0; + } p0_callback = p2p_callback_enable(c0, p0, &p0_fds[0], &p0_iod[0]); p1_callback = p2p_callback_enable(c1, p1, &p1_fds[0], &p1_iod[0]); } |