Skip to content

Commit

Permalink
Fix some Erizo crashes and client logs (#1046)
Browse files Browse the repository at this point in the history
  • Loading branch information
jcague authored Oct 6, 2017
1 parent 6547cc6 commit 4561131
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
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

0 comments on commit 4561131

Please sign in to comment.