Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some Erizo crashes #1046

Merged
merged 1 commit into from
Oct 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions erizo/src/erizo/DtlsTransport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@ void DtlsTransport::updateIceState(IceState state, IceConnection *conn) {
}

void DtlsTransport::updateIceStateSync(IceState state, IceConnection *conn) {
if (!running_) {
return;
}
ELOG_DEBUG("%s message:IceState, transportName: %s, state: %d, isBundle: %d",
toLog(), transport_name.c_str(), state, bundle_);
if (state == IceState::INITIAL && this->getTransportState() != TRANSPORT_STARTED) {
Expand Down
4 changes: 4 additions & 0 deletions erizo/src/erizo/WebRtcConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ bool WebRtcConnection::createOffer(bool videoEnabled, bool audioEnabled, bool bu
bool WebRtcConnection::setRemoteSdp(const std::string &sdp) {
ELOG_DEBUG("%s message: setting remote SDP", toLog());

if (!sending_) {
return true;
}

remoteSdp_.initWithSdp(sdp, "");

if (remoteSdp_.videoBandwidth != 0) {
Expand Down
2 changes: 1 addition & 1 deletion erizo_controller/erizoClient/src/Socket.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const Socket = (newIo) => {

socket.on('connection_failed', () => {
Logger.error('connection failed, id:', that.id);
emit('connection_failed');
emit('connection_failed', { streamId: that.id });
});
socket.on('error', (err) => {
Logger.warning('socket error, id:', that.id, ', error:', err.message);
Expand Down