narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

better crash than leave WebRTCWrapper unclosed

Browse source
This commit is contained in:
Daniel Gultsch 2020-04-18 18:22:10 +02:00
parent 934b98d199
commit 7dfd47a5c4
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
View file

@ -193,7 +193,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
sendSessionTerminate(Reason.CONNECTIVITY_ERROR); sendSessionTerminate(Reason.CONNECTIVITY_ERROR);
} else { } else {
transitionOrThrow(State.TERMINATED_CONNECTIVITY_ERROR); transitionOrThrow(State.TERMINATED_CONNECTIVITY_ERROR);
jingleConnectionManager.finishConnection(this); finish();
} }
} }
@ -213,7 +213,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
if (previous == State.PROPOSED || previous == State.SESSION_INITIALIZED) { if (previous == State.PROPOSED || previous == State.SESSION_INITIALIZED) {
xmppConnectionService.getNotificationService().cancelIncomingCallNotification(); xmppConnectionService.getNotificationService().cancelIncomingCallNotification();
} }
jingleConnectionManager.finishConnection(this); finish();
} }
private void receiveTransportInfo(final JinglePacket jinglePacket) { private void receiveTransportInfo(final JinglePacket jinglePacket) {
@ -466,7 +466,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
if (transition(State.TERMINATED_CONNECTIVITY_ERROR)) { if (transition(State.TERMINATED_CONNECTIVITY_ERROR)) {
webRTCWrapper.close(); webRTCWrapper.close();
Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": transitioned into connectivity error"); Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": transitioned into connectivity error");
this.jingleConnectionManager.finishConnection(this); this.finish();
} }
} }
@ -481,7 +481,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
this.message.setCarbon(true); //indicate that call was accepted on other device this.message.setCarbon(true); //indicate that call was accepted on other device
this.writeLogMessageSuccess(0); this.writeLogMessageSuccess(0);
this.xmppConnectionService.getNotificationService().cancelIncomingCallNotification(); this.xmppConnectionService.getNotificationService().cancelIncomingCallNotification();
this.jingleConnectionManager.finishConnection(this); this.finish();
} else { } else {
Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": unable to transition to accept because already in state=" + this.state); Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": unable to transition to accept because already in state=" + this.state);
} }
@ -496,7 +496,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
if (originatedFromMyself) { if (originatedFromMyself) {
if (transition(State.REJECTED)) { if (transition(State.REJECTED)) {
this.xmppConnectionService.getNotificationService().cancelIncomingCallNotification(); this.xmppConnectionService.getNotificationService().cancelIncomingCallNotification();
this.jingleConnectionManager.finishConnection(this); this.finish();
if (serverMsgId != null) { if (serverMsgId != null) {
this.message.setServerMsgId(serverMsgId); this.message.setServerMsgId(serverMsgId);
} }
@ -561,7 +561,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
if (transition(State.ACCEPTED)) { if (transition(State.ACCEPTED)) {
Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": moved session with " + id.with + " into state accepted after received carbon copied procced"); Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": moved session with " + id.with + " into state accepted after received carbon copied procced");
this.xmppConnectionService.getNotificationService().cancelIncomingCallNotification(); this.xmppConnectionService.getNotificationService().cancelIncomingCallNotification();
this.jingleConnectionManager.finishConnection(this); this.finish();
} }
} else { } else {
Log.d(Config.LOGTAG, String.format("%s: ignoring proceed from %s. was expected from %s", id.account.getJid().asBareJid(), from, id.with)); Log.d(Config.LOGTAG, String.format("%s: ignoring proceed from %s. was expected from %s", id.account.getJid().asBareJid(), from, id.with));
@ -578,7 +578,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
} }
this.message.setTime(timestamp); this.message.setTime(timestamp);
writeLogMessageMissed(); writeLogMessageMissed();
jingleConnectionManager.finishConnection(this); finish();
} else { } else {
Log.d(Config.LOGTAG, "ignoring retract because already in " + this.state); Log.d(Config.LOGTAG, "ignoring retract because already in " + this.state);
} }
@ -641,7 +641,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
jinglePacket.setReason(reason, text); jinglePacket.setReason(reason, text);
Log.d(Config.LOGTAG, jinglePacket.toString()); Log.d(Config.LOGTAG, jinglePacket.toString());
send(jinglePacket); send(jinglePacket);
jingleConnectionManager.finishConnection(this); finish();
} }
private void sendTransportInfo(final String contentName, IceUdpTransportInfo.Candidate candidate) { private void sendTransportInfo(final String contentName, IceUdpTransportInfo.Candidate candidate) {
@ -695,16 +695,16 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
} }
this.webRTCWrapper.close(); this.webRTCWrapper.close();
transition(State.TERMINATED_CONNECTIVITY_ERROR); transition(State.TERMINATED_CONNECTIVITY_ERROR);
this.jingleConnectionManager.finishConnection(this); this.finish();
} }
} }
private void terminateWithOutOfOrder(final JinglePacket jinglePacket) { private void terminateWithOutOfOrder(final JinglePacket jinglePacket) {
Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": terminating session with out-of-order"); Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": terminating session with out-of-order");
webRTCWrapper.close(); this.webRTCWrapper.close();
transitionOrThrow(State.TERMINATED_APPLICATION_FAILURE); transitionOrThrow(State.TERMINATED_APPLICATION_FAILURE);
respondWithOutOfOrder(jinglePacket); respondWithOutOfOrder(jinglePacket);
jingleConnectionManager.finishConnection(this); this.finish();
} }
private void respondWithOutOfOrder(final JinglePacket jinglePacket) { private void respondWithOutOfOrder(final JinglePacket jinglePacket) {
@ -820,13 +820,13 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
} }
if (isInState(State.PROCEED)) { if (isInState(State.PROCEED)) {
Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": ending call while in state PROCEED just means ending the connection"); Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": ending call while in state PROCEED just means ending the connection");
webRTCWrapper.close(); this.webRTCWrapper.close();
jingleConnectionManager.finishConnection(this); this.finish();
transitionOrThrow(State.TERMINATED_SUCCESS); //arguably this wasn't success; but not a real failure either transitionOrThrow(State.TERMINATED_SUCCESS); //arguably this wasn't success; but not a real failure either
return; return;
} }
if (isInitiator() && isInState(State.SESSION_INITIALIZED, State.SESSION_INITIALIZED_PRE_APPROVED)) { if (isInitiator() && isInState(State.SESSION_INITIALIZED, State.SESSION_INITIALIZED_PRE_APPROVED)) {
webRTCWrapper.close(); this.webRTCWrapper.close();
sendSessionTerminate(Reason.CANCEL); sendSessionTerminate(Reason.CANCEL);
return; return;
} }
@ -835,7 +835,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
return; return;
} }
if (isInState(State.SESSION_INITIALIZED_PRE_APPROVED, State.SESSION_ACCEPTED)) { if (isInState(State.SESSION_INITIALIZED_PRE_APPROVED, State.SESSION_ACCEPTED)) {
webRTCWrapper.close(); this.webRTCWrapper.close();
sendSessionTerminate(Reason.SUCCESS); sendSessionTerminate(Reason.SUCCESS);
return; return;
} }
@ -869,7 +869,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
writeLogMessageMissed(); writeLogMessageMissed();
xmppConnectionService.getNotificationService().cancelIncomingCallNotification(); xmppConnectionService.getNotificationService().cancelIncomingCallNotification();
this.sendJingleMessage("reject"); this.sendJingleMessage("reject");
jingleConnectionManager.finishConnection(this); finish();
} }
private void rejectCallFromSessionInitiate() { private void rejectCallFromSessionInitiate() {
@ -1020,8 +1020,8 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
continue; continue;
} }
if (Arrays.asList("stun", "stuns", "turn", "turns").contains(type) && Arrays.asList("udp", "tcp").contains(transport)) { if (Arrays.asList("stun", "stuns", "turn", "turns").contains(type) && Arrays.asList("udp", "tcp").contains(transport)) {
if (Arrays.asList("stuns","turns").contains(type) && "udp".equals(transport)) { if (Arrays.asList("stuns", "turns").contains(type) && "udp".equals(transport)) {
Log.d(Config.LOGTAG,id.account.getJid().asBareJid()+": skipping invalid combination of udp/tls in external services"); Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": skipping invalid combination of udp/tls in external services");
continue; continue;
} }
//TODO wrap ipv6 addresses //TODO wrap ipv6 addresses
@ -1054,6 +1054,11 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
} }
} }
private void finish() {
this.webRTCWrapper.verifyClosed();
this.jingleConnectionManager.finishConnection(this);
}
private void writeLogMessage(final State state) { private void writeLogMessage(final State state) {
final long started = this.rtpConnectionStarted; final long started = this.rtpConnectionStarted;
long duration = started <= 0 ? 0 : SystemClock.elapsedRealtime() - started; long duration = started <= 0 ? 0 : SystemClock.elapsedRealtime() - started;

11
src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java
View file

@ -218,6 +218,7 @@ public class WebRTCWrapper {
final EglBase eglBase = this.eglBase; final EglBase eglBase = this.eglBase;
if (peerConnection != null) { if (peerConnection != null) {
peerConnection.dispose(); peerConnection.dispose();
this.peerConnection = null;
} }
if (audioManager != null) { if (audioManager != null) {
mainHandler.post(audioManager::stop); mainHandler.post(audioManager::stop);
@ -233,6 +234,16 @@ public class WebRTCWrapper {
} }
if (eglBase != null) { if (eglBase != null) {
eglBase.release(); eglBase.release();
this.eglBase = null;
}
}
void verifyClosed() {
if (this.peerConnection != null
|| this.eglBase != null
|| this.localVideoTrack != null
|| this.remoteVideoTrack != null) {
throw new IllegalStateException("WebRTCWrapper hasn't been closed properly");
} }
} }