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

ensure that jingle ft transport is terminated

Browse source
This commit is contained in:
Daniel Gultsch 2024-03-12 19:01:39 +01:00
parent 0f50f71176
commit a2c67a6e38
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
View file

@ -253,6 +253,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
id.account.getJid().asBareJid() + ": improperly formatted contents", id.account.getJid().asBareJid() + ": improperly formatted contents",
Throwables.getRootCause(e)); Throwables.getRootCause(e));
respondOk(jinglePacket); respondOk(jinglePacket);
terminateTransport();
sendSessionTerminate(Reason.of(e), e.getMessage()); sendSessionTerminate(Reason.of(e), e.getMessage());
return; return;
} }
@ -534,6 +535,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
if (isTerminated()) { if (isTerminated()) {
return; return;
} }
terminateTransport();
final Throwable rootCause = Throwables.getRootCause(throwable); final Throwable rootCause = Throwables.getRootCause(throwable);
Log.d(Config.LOGTAG, "unable to send session accept", rootCause); Log.d(Config.LOGTAG, "unable to send session accept", rootCause);
sendSessionTerminate(Reason.ofThrowable(rootCause), rootCause.getMessage()); sendSessionTerminate(Reason.ofThrowable(rootCause), rootCause.getMessage());
@ -603,6 +605,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
id.account.getJid().asBareJid() + ": improperly formatted contents", id.account.getJid().asBareJid() + ": improperly formatted contents",
Throwables.getRootCause(e)); Throwables.getRootCause(e));
respondOk(jinglePacket); respondOk(jinglePacket);
terminateTransport();
sendSessionTerminate(Reason.of(e), e.getMessage()); sendSessionTerminate(Reason.of(e), e.getMessage());
return; return;
} }
@ -646,6 +649,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
id.account.getJid().asBareJid() + ": improperly formatted contents", id.account.getJid().asBareJid() + ": improperly formatted contents",
Throwables.getRootCause(e)); Throwables.getRootCause(e));
respondOk(jinglePacket); respondOk(jinglePacket);
terminateTransport();
sendSessionTerminate(Reason.of(e), e.getMessage()); sendSessionTerminate(Reason.of(e), e.getMessage());
return; return;
} }
@ -708,6 +712,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
} else if (transportInfo } else if (transportInfo
instanceof SocksByteStreamsTransportInfo.CandidateUsed candidateUsed) { instanceof SocksByteStreamsTransportInfo.CandidateUsed candidateUsed) {
if (!socksBytestreamsTransport.setCandidateUsed(candidateUsed.cid)) { if (!socksBytestreamsTransport.setCandidateUsed(candidateUsed.cid)) {
terminateTransport();
sendSessionTerminate( sendSessionTerminate(
Reason.FAILED_TRANSPORT, Reason.FAILED_TRANSPORT,
String.format( String.format(
@ -734,6 +739,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
id.account.getJid().asBareJid() + ": improperly formatted contents", id.account.getJid().asBareJid() + ": improperly formatted contents",
Throwables.getRootCause(e)); Throwables.getRootCause(e));
respondOk(jinglePacket); respondOk(jinglePacket);
terminateTransport();
sendSessionTerminate(Reason.of(e), e.getMessage()); sendSessionTerminate(Reason.of(e), e.getMessage());
return; return;
} }
@ -843,8 +849,9 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
if (transport == null) { if (transport == null) {
return; return;
} }
// TODO consider setting transport callback to null. requires transport to handle null callback // TODO consider setting transport callback to null. requires transport to handle null
//transport.setTransportCallback(null); // callback
// transport.setTransportCallback(null);
transport.terminate(); transport.terminate();
this.transport = null; this.transport = null;
} }
@ -875,8 +882,12 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
} }
@Override @Override
public void onFailure(@NonNull Throwable throwable) { public void onFailure(@NonNull final Throwable throwable) {
onFileTransmissionFailed(throwable); // The state transition in here should be synchronized to not race with the
// state transition in receiveSessionTerminate
synchronized (JingleFileTransferConnection.this) {
onFileTransmissionFailed(throwable);
}
} }
}, },
MoreExecutors.directExecutor()); MoreExecutors.directExecutor());