From 30b1a7cbaf3d6e4f43ae6d1ce8888bb2b611aad0 Mon Sep 17 00:00:00 2001 From: Jan-Ivar Bruaroey Date: Thu, 27 Dec 2012 17:38:45 -0500 Subject: [PATCH] Bug 824263 - Shutdown: PeerConnectionMedia disconnect_all() + peer_ctx cleanup. r=jesup,ekr --- media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c | 2 +- .../signaling/src/peerconnection/PeerConnectionMedia.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c b/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c index 6a2576aed995..3295a1e6fbab 100644 --- a/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c +++ b/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c @@ -291,7 +291,7 @@ static void nr_ice_peer_ctx_destroy_cb(NR_SOCKET s, int how, void *cb_arg) STAILQ_REMOVE(&pctx->peer_streams,str1,nr_ice_media_stream_,entry); nr_ice_media_stream_destroy(&str1); } - + STAILQ_REMOVE(&pctx->ctx->peers, pctx, nr_ice_peer_ctx_, entry); RFREE(pctx); } diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp index 0ac18d1cffad..8f8ebc2d3d01 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp @@ -245,8 +245,7 @@ PeerConnectionMedia::DisconnectMediaStreams() void PeerConnectionMedia::ShutdownMediaTransport() { - mIceCtx->SignalCompleted.disconnect(this); - mIceCtx->SignalGatheringCompleted.disconnect(this); + disconnect_all(); mTransportFlows.clear(); mIceStreams.clear(); mIceCtx = NULL;