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

use ibb if other party doesn’t annouce s5b feature

Browse source
This commit is contained in:
Daniel Gultsch 2019-06-16 22:57:10 +02:00
parent fe6c981ae2
commit 9fc1ead74f
6 changed files with 1128 additions and 1132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/Config.java
View file

@ -101,7 +101,7 @@ public final class Config {
public static final boolean DISABLE_PROXY_LOOKUP = false; //useful to debug ibb public static final boolean DISABLE_PROXY_LOOKUP = false; //useful to debug ibb
public static final boolean DISABLE_HTTP_UPLOAD = false; public static final boolean DISABLE_HTTP_UPLOAD = true;
public static final boolean EXTENDED_SM_LOGGING = false; // log stanza counts public static final boolean EXTENDED_SM_LOGGING = false; // log stanza counts
public static final boolean BACKGROUND_STANZA_LOGGING = false; //log all stanzas that were received while the app is in background public static final boolean BACKGROUND_STANZA_LOGGING = false; //log all stanzas that were received while the app is in background
public static final boolean RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE = true; //setting to true might increase power consumption public static final boolean RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE = true; //setting to true might increase power consumption

4
src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
View file

@ -27,8 +27,8 @@ public abstract class AbstractGenerator {
Content.Version.FT_3.getNamespace(), Content.Version.FT_3.getNamespace(),
Content.Version.FT_4.getNamespace(), Content.Version.FT_4.getNamespace(),
Content.Version.FT_5.getNamespace(), Content.Version.FT_5.getNamespace(),
"urn:xmpp:jingle:transports:s5b:1", Namespace.JINGLE_TRANSPORTS_S5B,
"urn:xmpp:jingle:transports:ibb:1", Namespace.JINGLE_TRANSPORTS_IBB,
"http://jabber.org/protocol/muc", "http://jabber.org/protocol/muc",
"jabber:x:conference", "jabber:x:conference",
Namespace.OOB, Namespace.OOB,

2
src/main/java/eu/siacs/conversations/xml/Namespace.java
View file

@ -25,4 +25,6 @@ public final class Namespace {
public static final String BOOKMARKS = "storage:bookmarks"; public static final String BOOKMARKS = "storage:bookmarks";
public static final String SYNCHRONIZATION = "im.quicksy.synchronization:0"; public static final String SYNCHRONIZATION = "im.quicksy.synchronization:0";
public static final String AVATAR_CONVERSION = "urn:xmpp:pep-vcard-conversion:0"; public static final String AVATAR_CONVERSION = "urn:xmpp:pep-vcard-conversion:0";
public static final String JINGLE_TRANSPORTS_S5B = "urn:xmpp:jingle:transports:s5b:1";
public static final String JINGLE_TRANSPORTS_IBB = "urn:xmpp:jingle:transports:ibb:1";
} }

290
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View file

@ -10,6 +10,7 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -34,6 +35,7 @@ import eu.siacs.conversations.services.AbstractConnectionManager;
import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.utils.CryptoHelper; import eu.siacs.conversations.utils.CryptoHelper;
import eu.siacs.conversations.xml.Element; import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xml.Namespace;
import eu.siacs.conversations.xmpp.OnIqPacketReceived; import eu.siacs.conversations.xmpp.OnIqPacketReceived;
import eu.siacs.conversations.xmpp.jingle.stanzas.Content; import eu.siacs.conversations.xmpp.jingle.stanzas.Content;
import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket; import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket;
@ -43,16 +45,14 @@ import rocks.xmpp.addr.Jid;
public class JingleConnection implements Transferable { public class JingleConnection implements Transferable {
private static final int JINGLE_STATUS_INITIATED = 0;
private static final int JINGLE_STATUS_ACCEPTED = 1;
private static final int JINGLE_STATUS_FINISHED = 4;
static final int JINGLE_STATUS_TRANSMITTING = 5;
private static final int JINGLE_STATUS_FAILED = 99;
private static final int JINGLE_STATUS_OFFERED = -1;
private JingleConnectionManager mJingleConnectionManager; private JingleConnectionManager mJingleConnectionManager;
private XmppConnectionService mXmppConnectionService; private XmppConnectionService mXmppConnectionService;
private static final int JINGLE_STATUS_OFFERED = -1;
protected static final int JINGLE_STATUS_INITIATED = 0;
protected static final int JINGLE_STATUS_ACCEPTED = 1;
protected static final int JINGLE_STATUS_FINISHED = 4;
protected static final int JINGLE_STATUS_TRANSMITTING = 5;
protected static final int JINGLE_STATUS_FAILED = 99;
private Content.Version ftVersion = Content.Version.FT_3; private Content.Version ftVersion = Content.Version.FT_3;
private int ibbBlockSize = 8192; private int ibbBlockSize = 8192;
@ -96,27 +96,19 @@ public class JingleConnection implements Transferable {
} }
}; };
private byte[] expectedHash = new byte[0]; private byte[] expectedHash = new byte[0];
private final OnFileTransmissionStatusChanged onFileTransmissionStatusChanged = new OnFileTransmissionStatusChanged() {
private boolean responding() {
return responder != null && responder.equals(account.getJid());
}
private boolean initiating() {
return initiator.equals(account.getJid());
}
final OnFileTransmissionStatusChanged onFileTransmissionStatusChanged = new OnFileTransmissionStatusChanged() {
@Override @Override
public void onFileTransmitted(DownloadableFile file) { public void onFileTransmitted(DownloadableFile file) {
if (responding()) { if (responding()) {
if (expectedHash.length > 0 && !Arrays.equals(expectedHash,file.getSha1Sum())) { if (expectedHash.length > 0 && !Arrays.equals(expectedHash, file.getSha1Sum())) {
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": hashes did not match"); Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": hashes did not match");
} }
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": file transmitted(). we are responding");
sendSuccess(); sendSuccess();
mXmppConnectionService.getFileBackend().updateFileParams(message); mXmppConnectionService.getFileBackend().updateFileParams(message);
mXmppConnectionService.databaseBackend.createMessage(message); mXmppConnectionService.databaseBackend.createMessage(message);
mXmppConnectionService.markMessage(message,Message.STATUS_RECEIVED); mXmppConnectionService.markMessage(message, Message.STATUS_RECEIVED);
if (acceptedAutomatically) { if (acceptedAutomatically) {
message.markUnread(); message.markUnread();
if (message.getEncryption() == Message.ENCRYPTION_PGP) { if (message.getEncryption() == Message.ENCRYPTION_PGP) {
@ -125,7 +117,7 @@ public class JingleConnection implements Transferable {
mXmppConnectionService.getFileBackend().updateMediaScanner(file, () -> JingleConnection.this.mXmppConnectionService.getNotificationService().push(message)); mXmppConnectionService.getFileBackend().updateMediaScanner(file, () -> JingleConnection.this.mXmppConnectionService.getNotificationService().push(message));
} }
Log.d(Config.LOGTAG,"successfully transmitted file:" + file.getAbsolutePath()+" ("+ CryptoHelper.bytesToHex(file.getSha1Sum())+")"); Log.d(Config.LOGTAG, "successfully transmitted file:" + file.getAbsolutePath() + " (" + CryptoHelper.bytesToHex(file.getSha1Sum()) + ")");
return; return;
} }
} else { } else {
@ -139,7 +131,7 @@ public class JingleConnection implements Transferable {
file.delete(); file.delete();
} }
} }
Log.d(Config.LOGTAG,"successfully transmitted file:" + file.getAbsolutePath()+" ("+ CryptoHelper.bytesToHex(file.getSha1Sum())+")"); Log.d(Config.LOGTAG, "successfully transmitted file:" + file.getAbsolutePath() + " (" + CryptoHelper.bytesToHex(file.getSha1Sum()) + ")");
if (message.getEncryption() != Message.ENCRYPTION_PGP) { if (message.getEncryption() != Message.ENCRYPTION_PGP) {
mXmppConnectionService.getFileBackend().updateMediaScanner(file); mXmppConnectionService.getFileBackend().updateMediaScanner(file);
} }
@ -151,22 +143,6 @@ public class JingleConnection implements Transferable {
JingleConnection.this.fail(); JingleConnection.this.fail();
} }
}; };
InputStream getFileInputStream() {
return this.mFileInputStream;
}
OutputStream getFileOutputStream() throws IOException {
if (this.file == null) {
Log.d(Config.LOGTAG,"file object was not assigned");
return null;
}
this.file.getParentFile().mkdirs();
this.file.createNewFile();
this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file);
return this.mFileOutputStream;
}
private OnTransportConnected onIbbTransportConnected = new OnTransportConnected() { private OnTransportConnected onIbbTransportConnected = new OnTransportConnected() {
@Override @Override
public void failed() { public void failed() {
@ -175,10 +151,11 @@ public class JingleConnection implements Transferable {
@Override @Override
public void established() { public void established() {
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": ibb transport connected. sending file");
mJingleStatus = JINGLE_STATUS_TRANSMITTING;
JingleConnection.this.transport.send(file, onFileTransmissionStatusChanged); JingleConnection.this.transport.send(file, onFileTransmissionStatusChanged);
} }
}; };
private OnProxyActivated onProxyActivated = new OnProxyActivated() { private OnProxyActivated onProxyActivated = new OnProxyActivated() {
@Override @Override
@ -204,6 +181,29 @@ public class JingleConnection implements Transferable {
.getXmppConnectionService(); .getXmppConnectionService();
} }
private boolean responding() {
return responder != null && responder.equals(account.getJid());
}
private boolean initiating() {
return initiator.equals(account.getJid());
}
InputStream getFileInputStream() {
return this.mFileInputStream;
}
OutputStream getFileOutputStream() throws IOException {
if (this.file == null) {
Log.d(Config.LOGTAG, "file object was not assigned");
return null;
}
this.file.getParentFile().mkdirs();
this.file.createNewFile();
this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file);
return this.mFileOutputStream;
}
public String getSessionId() { public String getSessionId() {
return this.sessionId; return this.sessionId;
} }
@ -237,7 +237,7 @@ public class JingleConnection implements Transferable {
returnResult = true; returnResult = true;
Element checksum = packet.getChecksum(); Element checksum = packet.getChecksum();
Element file = checksum == null ? null : checksum.findChild("file"); Element file = checksum == null ? null : checksum.findChild("file");
Element hash = file == null ? null : file.findChild("hash","urn:xmpp:hashes:2"); Element hash = file == null ? null : file.findChild("hash", "urn:xmpp:hashes:2");
if (hash != null && "sha-1".equalsIgnoreCase(hash.getAttribute("algo"))) { if (hash != null && "sha-1".equalsIgnoreCase(hash.getAttribute("algo"))) {
try { try {
this.expectedHash = Base64.decode(hash.getContent(), Base64.DEFAULT); this.expectedHash = Base64.decode(hash.getContent(), Base64.DEFAULT);
@ -269,21 +269,18 @@ public class JingleConnection implements Transferable {
} else { } else {
response = packet.generateResponse(IqPacket.TYPE.ERROR); response = packet.generateResponse(IqPacket.TYPE.ERROR);
} }
mXmppConnectionService.sendIqPacket(account,response,null); mXmppConnectionService.sendIqPacket(account, response, null);
} }
public void init(final Message message) { public void init(final Message message) {
if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) { if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
Conversation conversation = (Conversation) message.getConversation(); Conversation conversation = (Conversation) message.getConversation();
conversation.getAccount().getAxolotlService().prepareKeyTransportMessage(conversation, new OnMessageCreatedCallback() { conversation.getAccount().getAxolotlService().prepareKeyTransportMessage(conversation, xmppAxolotlMessage -> {
@Override
public void run(XmppAxolotlMessage xmppAxolotlMessage) {
if (xmppAxolotlMessage != null) { if (xmppAxolotlMessage != null) {
init(message, xmppAxolotlMessage); init(message, xmppAxolotlMessage);
} else { } else {
fail(); fail();
} }
}
}); });
} else { } else {
init(message, null); init(message, null);
@ -297,28 +294,23 @@ public class JingleConnection implements Transferable {
this.message = message; this.message = message;
this.account = message.getConversation().getAccount(); this.account = message.getConversation().getAccount();
upgradeNamespace(); upgradeNamespace();
this.initialTransport = getRemoteFeatures().contains(Namespace.JINGLE_TRANSPORTS_S5B) ? Transport.SOCKS : Transport.IBB;
this.message.setTransferable(this); this.message.setTransferable(this);
this.mStatus = Transferable.STATUS_UPLOADING; this.mStatus = Transferable.STATUS_UPLOADING;
this.initiator = this.account.getJid(); this.initiator = this.account.getJid();
this.responder = this.message.getCounterpart(); this.responder = this.message.getCounterpart();
this.sessionId = this.mJingleConnectionManager.nextRandomId(); this.sessionId = this.mJingleConnectionManager.nextRandomId();
this.transportId = this.mJingleConnectionManager.nextRandomId(); this.transportId = this.mJingleConnectionManager.nextRandomId();
if (this.candidates.size() > 0) { if (this.initialTransport == Transport.IBB) {
this.sendInitRequest();
} else if (this.candidates.size() > 0) {
this.sendInitRequest(); this.sendInitRequest();
} else { } else {
this.mJingleConnectionManager.getPrimaryCandidate(account, this.mJingleConnectionManager.getPrimaryCandidate(account, (success, candidate) -> {
new OnPrimaryCandidateFound() {
@Override
public void onPrimaryCandidateFound(boolean success,
final JingleCandidate candidate) {
if (success) { if (success) {
final JingleSocks5Transport socksConnection = new JingleSocks5Transport( final JingleSocks5Transport socksConnection = new JingleSocks5Transport(this, candidate);
JingleConnection.this, candidate); connections.put(candidate.getCid(), socksConnection);
connections.put(candidate.getCid(), socksConnection.connect(new OnTransportConnected() {
socksConnection);
socksConnection
.connect(new OnTransportConnected() {
@Override @Override
public void failed() { public void failed() {
@ -340,26 +332,29 @@ public class JingleConnection implements Transferable {
Log.d(Config.LOGTAG, "no primary candidate of our own was found"); Log.d(Config.LOGTAG, "no primary candidate of our own was found");
sendInitRequest(); sendInitRequest();
} }
}
}); });
} }
} }
private void upgradeNamespace() { private void upgradeNamespace() {
Jid jid = this.message.getCounterpart(); List<String> features = getRemoteFeatures();
String resource = jid != null ?jid.getResource() : null;
if (resource != null) {
Presence presence = this.account.getRoster().getContact(jid).getPresences().getPresences().get(resource);
ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
if (result != null) {
List<String> features = result.getFeatures();
if (features.contains(Content.Version.FT_5.getNamespace())) { if (features.contains(Content.Version.FT_5.getNamespace())) {
this.ftVersion = Content.Version.FT_5; this.ftVersion = Content.Version.FT_5;
} else if (features.contains(Content.Version.FT_4.getNamespace())) { } else if (features.contains(Content.Version.FT_4.getNamespace())) {
this.ftVersion = Content.Version.FT_4; this.ftVersion = Content.Version.FT_4;
} }
} }
private List<String> getRemoteFeatures() {
Jid jid = this.message.getCounterpart();
String resource = jid != null ? jid.getResource() : null;
if (resource != null) {
Presence presence = this.account.getRoster().getContact(jid).getPresences().getPresences().get(resource);
ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
return result == null ? Collections.emptyList() : result.getFeatures();
} else {
return Collections.emptyList();
} }
} }
@ -391,11 +386,13 @@ public class JingleConnection implements Transferable {
try { try {
this.ibbBlockSize = Math.min(Integer.parseInt(receivedBlockSize), this.ibbBlockSize); this.ibbBlockSize = Math.min(Integer.parseInt(receivedBlockSize), this.ibbBlockSize);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
Log.d(Config.LOGTAG, "number format exception " + e.getMessage());
this.sendCancel(); this.sendCancel();
this.fail(); this.fail();
return; return;
} }
} else { } else {
Log.d(Config.LOGTAG, "received block size =" + receivedBlockSize);
this.sendCancel(); this.sendCancel();
this.fail(); this.fail();
return; return;
@ -409,7 +406,7 @@ public class JingleConnection implements Transferable {
} }
this.fileOffer = content.getFileOffer(this.ftVersion); this.fileOffer = content.getFileOffer(this.ftVersion);
mXmppConnectionService.sendIqPacket(account,packet.generateResponse(IqPacket.TYPE.RESULT),null); mXmppConnectionService.sendIqPacket(account, packet.generateResponse(IqPacket.TYPE.RESULT), null);
if (fileOffer != null) { if (fileOffer != null) {
Element encrypted = fileOffer.findChild("encrypted", AxolotlService.PEP_PREFIX); Element encrypted = fileOffer.findChild("encrypted", AxolotlService.PEP_PREFIX);
@ -424,14 +421,14 @@ public class JingleConnection implements Transferable {
String extension = filename[filename.length - 1]; String extension = filename[filename.length - 1];
if (VALID_IMAGE_EXTENSIONS.contains(extension)) { if (VALID_IMAGE_EXTENSIONS.contains(extension)) {
message.setType(Message.TYPE_IMAGE); message.setType(Message.TYPE_IMAGE);
message.setRelativeFilePath(message.getUuid()+"."+extension); message.setRelativeFilePath(message.getUuid() + "." + extension);
} else if (VALID_CRYPTO_EXTENSIONS.contains( } else if (VALID_CRYPTO_EXTENSIONS.contains(
filename[filename.length - 1])) { filename[filename.length - 1])) {
if (filename.length == 3) { if (filename.length == 3) {
extension = filename[filename.length - 2]; extension = filename[filename.length - 2];
if (VALID_IMAGE_EXTENSIONS.contains(extension)) { if (VALID_IMAGE_EXTENSIONS.contains(extension)) {
message.setType(Message.TYPE_IMAGE); message.setType(Message.TYPE_IMAGE);
message.setRelativeFilePath(message.getUuid()+"."+extension); message.setRelativeFilePath(message.getUuid() + "." + extension);
} else { } else {
message.setType(Message.TYPE_FILE); message.setType(Message.TYPE_FILE);
} }
@ -446,19 +443,33 @@ public class JingleConnection implements Transferable {
String parts[] = fileNameElement.getContent().split("/"); String parts[] = fileNameElement.getContent().split("/");
suffix = parts[parts.length - 1]; suffix = parts[parts.length - 1];
if (message.getEncryption() == Message.ENCRYPTION_PGP && (suffix.endsWith(".pgp") || suffix.endsWith(".gpg"))) { if (message.getEncryption() == Message.ENCRYPTION_PGP && (suffix.endsWith(".pgp") || suffix.endsWith(".gpg"))) {
suffix = suffix.substring(0,suffix.length() - 4); suffix = suffix.substring(0, suffix.length() - 4);
} }
} }
message.setRelativeFilePath(message.getUuid()+"_"+suffix); message.setRelativeFilePath(message.getUuid() + "_" + suffix);
} }
long size = Long.parseLong(fileSize.getContent()); long size = Long.parseLong(fileSize.getContent());
message.setBody(Long.toString(size)); message.setBody(Long.toString(size));
conversation.add(message); conversation.add(message);
mJingleConnectionManager.updateConversationUi(true); mJingleConnectionManager.updateConversationUi(true);
this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
if (mXmppAxolotlMessage != null) {
XmppAxolotlMessage.XmppAxolotlKeyTransportMessage transportMessage = account.getAxolotlService().processReceivingKeyTransportMessage(mXmppAxolotlMessage, false);
if (transportMessage != null) {
message.setEncryption(Message.ENCRYPTION_AXOLOTL);
this.file.setKey(transportMessage.getKey());
this.file.setIv(transportMessage.getIv());
message.setFingerprint(transportMessage.getFingerprint());
} else {
Log.d(Config.LOGTAG, "could not process KeyTransportMessage");
}
}
message.resetFileParams();
this.file.setExpectedSize(size);
if (mJingleConnectionManager.hasStoragePermission() if (mJingleConnectionManager.hasStoragePermission()
&& size < this.mJingleConnectionManager.getAutoAcceptFileSize() && size < this.mJingleConnectionManager.getAutoAcceptFileSize()
&& mXmppConnectionService.isDataSaverDisabled()) { && mXmppConnectionService.isDataSaverDisabled()) {
Log.d(Config.LOGTAG, "auto accepting file from "+ packet.getFrom()); Log.d(Config.LOGTAG, "auto accepting file from " + packet.getFrom());
this.acceptedAutomatically = true; this.acceptedAutomatically = true;
this.sendAccept(); this.sendAccept();
} else { } else {
@ -471,20 +482,6 @@ public class JingleConnection implements Transferable {
.getAutoAcceptFileSize()); .getAutoAcceptFileSize());
this.mXmppConnectionService.getNotificationService().push(message); this.mXmppConnectionService.getNotificationService().push(message);
} }
this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
if (mXmppAxolotlMessage != null) {
XmppAxolotlMessage.XmppAxolotlKeyTransportMessage transportMessage = account.getAxolotlService().processReceivingKeyTransportMessage(mXmppAxolotlMessage, false);
if (transportMessage != null) {
message.setEncryption(Message.ENCRYPTION_AXOLOTL);
this.file.setKey(transportMessage.getKey());
this.file.setIv(transportMessage.getIv());
message.setFingerprint(transportMessage.getFingerprint());
} else {
Log.d(Config.LOGTAG,"could not process KeyTransportMessage");
}
}
this.file.setExpectedSize(size);
message.resetFileParams();
Log.d(Config.LOGTAG, "receiving file: expecting size of " + this.file.getExpectedSize()); Log.d(Config.LOGTAG, "receiving file: expecting size of " + this.file.getExpectedSize());
} else { } else {
this.sendCancel(); this.sendCancel();
@ -519,23 +516,23 @@ public class JingleConnection implements Transferable {
return; return;
} }
content.setTransportId(this.transportId); content.setTransportId(this.transportId);
if (this.initialTransport == Transport.IBB) {
content.ibbTransport().setAttribute("block-size", Integer.toString(this.ibbBlockSize));
} else {
content.socks5transport().setChildren(getCandidatesAsElements()); content.socks5transport().setChildren(getCandidatesAsElements());
}
packet.setContent(content); packet.setContent(content);
this.sendJinglePacket(packet,new OnIqPacketReceived() { this.sendJinglePacket(packet, (account, response) -> {
if (response.getType() == IqPacket.TYPE.RESULT) {
@Override Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": other party received offer");
public void onIqPacketReceived(Account account, IqPacket packet) {
if (packet.getType() == IqPacket.TYPE.RESULT) {
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": other party received offer");
if (mJingleStatus == JINGLE_STATUS_OFFERED) { if (mJingleStatus == JINGLE_STATUS_OFFERED) {
mJingleStatus = JINGLE_STATUS_INITIATED; mJingleStatus = JINGLE_STATUS_INITIATED;
mXmppConnectionService.markMessage(message, Message.STATUS_OFFERED); mXmppConnectionService.markMessage(message, Message.STATUS_OFFERED);
} else { } else {
Log.d(Config.LOGTAG,"received ack for offer when status was "+mJingleStatus); Log.d(Config.LOGTAG, "received ack for offer when status was " + mJingleStatus);
} }
} else { } else {
fail(IqParser.extractErrorMessage(packet)); fail(IqParser.extractErrorMessage(response));
}
} }
}); });
@ -544,7 +541,7 @@ public class JingleConnection implements Transferable {
private void sendHash() { private void sendHash() {
JinglePacket packet = this.bootstrapPacket("session-info"); JinglePacket packet = this.bootstrapPacket("session-info");
packet.addChecksum(file.getSha1Sum(),ftVersion.getNamespace()); packet.addChecksum(file.getSha1Sum(), ftVersion.getNamespace());
this.sendJinglePacket(packet); this.sendJinglePacket(packet);
} }
@ -570,23 +567,19 @@ public class JingleConnection implements Transferable {
} }
private void sendAcceptSocks() { private void sendAcceptSocks() {
this.mJingleConnectionManager.getPrimaryCandidate(this.account, new OnPrimaryCandidateFound() { this.mJingleConnectionManager.getPrimaryCandidate(this.account, (success, candidate) -> {
@Override
public void onPrimaryCandidateFound(boolean success, final JingleCandidate candidate) {
final JinglePacket packet = bootstrapPacket("session-accept"); final JinglePacket packet = bootstrapPacket("session-accept");
final Content content = new Content(contentCreator,contentName); final Content content = new Content(contentCreator, contentName);
content.setFileOffer(fileOffer, ftVersion); content.setFileOffer(fileOffer, ftVersion);
content.setTransportId(transportId); content.setTransportId(transportId);
if (success && candidate != null && !equalCandidateExists(candidate)) { if (success && candidate != null && !equalCandidateExists(candidate)) {
final JingleSocks5Transport socksConnection = new JingleSocks5Transport( final JingleSocks5Transport socksConnection = new JingleSocks5Transport(this, candidate);
JingleConnection.this,
candidate);
connections.put(candidate.getCid(), socksConnection); connections.put(candidate.getCid(), socksConnection);
socksConnection.connect(new OnTransportConnected() { socksConnection.connect(new OnTransportConnected() {
@Override @Override
public void failed() { public void failed() {
Log.d(Config.LOGTAG,"connection to our own primary candidate failed"); Log.d(Config.LOGTAG, "connection to our own primary candidate failed");
content.socks5transport().setChildren(getCandidatesAsElements()); content.socks5transport().setChildren(getCandidatesAsElements());
packet.setContent(content); packet.setContent(content);
sendJinglePacket(packet); sendJinglePacket(packet);
@ -604,24 +597,24 @@ public class JingleConnection implements Transferable {
} }
}); });
} else { } else {
Log.d(Config.LOGTAG,"did not find a primary candidate for ourself"); Log.d(Config.LOGTAG, "did not find a primary candidate for ourself");
content.socks5transport().setChildren(getCandidatesAsElements()); content.socks5transport().setChildren(getCandidatesAsElements());
packet.setContent(content); packet.setContent(content);
sendJinglePacket(packet); sendJinglePacket(packet);
connectNextCandidate(); connectNextCandidate();
} }
}
}); });
} }
private void sendAcceptIbb() { private void sendAcceptIbb() {
this.transport = new JingleInbandTransport(this, this.transportId, this.ibbBlockSize); this.transport = new JingleInbandTransport(this, this.transportId, this.ibbBlockSize);
final JinglePacket packet = bootstrapPacket("session-accept"); final JinglePacket packet = bootstrapPacket("session-accept");
final Content content = new Content(contentCreator,contentName); final Content content = new Content(contentCreator, contentName);
content.setFileOffer(fileOffer, ftVersion); content.setFileOffer(fileOffer, ftVersion);
content.setTransportId(transportId); content.setTransportId(transportId);
content.ibbTransport().setAttribute("block-size",this.ibbBlockSize); content.ibbTransport().setAttribute("block-size", this.ibbBlockSize);
packet.setContent(content); packet.setContent(content);
this.transport.receive(file, onFileTransmissionStatusChanged);
this.sendJinglePacket(packet); this.sendJinglePacket(packet);
} }
@ -636,20 +629,31 @@ public class JingleConnection implements Transferable {
} }
private void sendJinglePacket(JinglePacket packet) { private void sendJinglePacket(JinglePacket packet) {
mXmppConnectionService.sendIqPacket(account,packet,responseListener); mXmppConnectionService.sendIqPacket(account, packet, responseListener);
} }
private void sendJinglePacket(JinglePacket packet, OnIqPacketReceived callback) { private void sendJinglePacket(JinglePacket packet, OnIqPacketReceived callback) {
mXmppConnectionService.sendIqPacket(account,packet,callback); mXmppConnectionService.sendIqPacket(account, packet, callback);
} }
private boolean receiveAccept(JinglePacket packet) { private boolean receiveAccept(JinglePacket packet) {
Content content = packet.getJingleContent();
mergeCandidates(JingleCandidate.parse(content.socks5transport()
.getChildren()));
this.mJingleStatus = JINGLE_STATUS_ACCEPTED; this.mJingleStatus = JINGLE_STATUS_ACCEPTED;
mXmppConnectionService.markMessage(message, Message.STATUS_UNSEND); mXmppConnectionService.markMessage(message, Message.STATUS_UNSEND);
Content content = packet.getJingleContent();
if (content.hasSocks5Transport()) {
mergeCandidates(JingleCandidate.parse(content.socks5transport().getChildren()));
this.connectNextCandidate(); this.connectNextCandidate();
} else if (content.hasIbbTransport()) {
String receivedBlockSize = packet.getJingleContent().ibbTransport().getAttribute("block-size");
if (receivedBlockSize != null) {
int bs = Integer.parseInt(receivedBlockSize);
if (bs > this.ibbBlockSize) {
this.ibbBlockSize = bs;
}
}
this.transport = new JingleInbandTransport(this, this.transportId, this.ibbBlockSize);
this.transport.connect(onIbbTransportConnected);
}
return true; return true;
} }
@ -684,13 +688,12 @@ public class JingleConnection implements Transferable {
} }
return true; return true;
} else if (content.socks5transport().hasChild("candidate-used")) { } else if (content.socks5transport().hasChild("candidate-used")) {
String cid = content.socks5transport() String cid = content.socks5transport().findChild("candidate-used").getAttribute("cid");
.findChild("candidate-used").getAttribute("cid");
if (cid != null) { if (cid != null) {
Log.d(Config.LOGTAG, "candidate used by counterpart:" + cid); Log.d(Config.LOGTAG, "candidate used by counterpart:" + cid);
JingleCandidate candidate = getCandidate(cid); JingleCandidate candidate = getCandidate(cid);
if (candidate == null) { if (candidate == null) {
Log.d(Config.LOGTAG,"could not find candidate with cid="+cid); Log.d(Config.LOGTAG, "could not find candidate with cid=" + cid);
return false; return false;
} }
candidate.flagAsUsedByCounterpart(); candidate.flagAsUsedByCounterpart();
@ -698,7 +701,7 @@ public class JingleConnection implements Transferable {
if (mJingleStatus == JINGLE_STATUS_ACCEPTED && this.sentCandidate) { if (mJingleStatus == JINGLE_STATUS_ACCEPTED && this.sentCandidate) {
this.connect(); this.connect();
} else { } else {
Log.d(Config.LOGTAG, "ignoring because file is already in transmission or we haven't sent our candidate yet status="+mJingleStatus+" sentCandidate="+Boolean.toString(sentCandidate)); Log.d(Config.LOGTAG, "ignoring because file is already in transmission or we haven't sent our candidate yet status=" + mJingleStatus + " sentCandidate=" + sentCandidate);
} }
return true; return true;
} else { } else {
@ -727,7 +730,7 @@ public class JingleConnection implements Transferable {
if (connection.getCandidate().isOurs()) { if (connection.getCandidate().isOurs()) {
final String sid; final String sid;
if (ftVersion == Content.Version.FT_3) { if (ftVersion == Content.Version.FT_3) {
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": use session ID instead of transport ID to activate proxy"); Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": use session ID instead of transport ID to activate proxy");
sid = getSessionId(); sid = getSessionId();
} else { } else {
sid = getTransportId(); sid = getTransportId();
@ -741,19 +744,13 @@ public class JingleConnection implements Transferable {
.setAttribute("sid", sid); .setAttribute("sid", sid);
activation.query().addChild("activate") activation.query().addChild("activate")
.setContent(this.getCounterPart().toString()); .setContent(this.getCounterPart().toString());
mXmppConnectionService.sendIqPacket(account,activation, mXmppConnectionService.sendIqPacket(account, activation, (account, response) -> {
new OnIqPacketReceived() { if (response.getType() != IqPacket.TYPE.RESULT) {
@Override
public void onIqPacketReceived(Account account,
IqPacket packet) {
if (packet.getType() != IqPacket.TYPE.RESULT) {
onProxyActivated.failed(); onProxyActivated.failed();
} else { } else {
onProxyActivated.success(); onProxyActivated.success();
sendProxyActivated(connection.getCandidate().getCid()); sendProxyActivated(connection.getCandidate().getCid());
} }
}
}); });
} else { } else {
Log.d(Config.LOGTAG, Log.d(Config.LOGTAG,
@ -823,7 +820,7 @@ public class JingleConnection implements Transferable {
} }
private void sendFallbackToIbb() { private void sendFallbackToIbb() {
Log.d(Config.LOGTAG, account.getJid().asBareJid()+": sending fallback to ibb"); Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": sending fallback to ibb");
JinglePacket packet = this.bootstrapPacket("transport-replace"); JinglePacket packet = this.bootstrapPacket("transport-replace");
Content content = new Content(this.contentCreator, this.contentName); Content content = new Content(this.contentCreator, this.contentName);
this.transportId = this.mJingleConnectionManager.nextRandomId(); this.transportId = this.mJingleConnectionManager.nextRandomId();
@ -850,21 +847,18 @@ public class JingleConnection implements Transferable {
JinglePacket answer = bootstrapPacket("transport-accept"); JinglePacket answer = bootstrapPacket("transport-accept");
final Content content = new Content(contentCreator,contentName); final Content content = new Content(contentCreator, contentName);
content.setFileOffer(fileOffer, ftVersion); content.setFileOffer(fileOffer, ftVersion);
content.ibbTransport().setAttribute("block-size",this.ibbBlockSize); content.ibbTransport().setAttribute("block-size", this.ibbBlockSize);
answer.setContent(content); answer.setContent(content);
if (initiating()) { if (initiating()) {
this.sendJinglePacket(answer, new OnIqPacketReceived() { this.sendJinglePacket(answer, (account, response) -> {
@Override if (response.getType() == IqPacket.TYPE.RESULT) {
public void onIqPacketReceived(Account account, IqPacket packet) {
if (packet.getType() == IqPacket.TYPE.RESULT) {
Log.d(Config.LOGTAG, account.getJid().asBareJid() + " recipient ACKed our transport-accept. creating ibb"); Log.d(Config.LOGTAG, account.getJid().asBareJid() + " recipient ACKed our transport-accept. creating ibb");
transport.connect(onIbbTransportConnected); transport.connect(onIbbTransportConnected);
} }
}
}); });
} else { } else {
this.transport.receive(file, onFileTransmissionStatusChanged); this.transport.receive(file, onFileTransmissionStatusChanged);
@ -908,9 +902,10 @@ public class JingleConnection implements Transferable {
this.message.setTransferable(null); this.message.setTransferable(null);
this.mJingleConnectionManager.finishConnection(this); this.mJingleConnectionManager.finishConnection(this);
} else { } else {
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": received session-terminate/success while responding"); Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received session-terminate/success while responding");
} }
} }
@Override @Override
public void cancel() { public void cancel() {
this.cancelled = true; this.cancelled = true;
@ -926,7 +921,7 @@ public class JingleConnection implements Transferable {
this.mJingleConnectionManager.finishConnection(this); this.mJingleConnectionManager.finishConnection(this);
if (responding()) { if (responding()) {
this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_FAILED)); this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_FAILED));
if (this.file!=null) { if (this.file != null) {
file.delete(); file.delete();
} }
this.mJingleConnectionManager.updateConversationUi(true); this.mJingleConnectionManager.updateConversationUi(true);
@ -951,7 +946,7 @@ public class JingleConnection implements Transferable {
if (this.message != null) { if (this.message != null) {
if (responding()) { if (responding()) {
this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_FAILED)); this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_FAILED));
if (this.file!=null) { if (this.file != null) {
file.delete(); file.delete();
} }
this.mJingleConnectionManager.updateConversationUi(true); this.mJingleConnectionManager.updateConversationUi(true);
@ -1022,8 +1017,7 @@ public class JingleConnection implements Transferable {
JinglePacket packet = bootstrapPacket("transport-info"); JinglePacket packet = bootstrapPacket("transport-info");
Content content = new Content(this.contentCreator, this.contentName); Content content = new Content(this.contentCreator, this.contentName);
content.setTransportId(this.transportId); content.setTransportId(this.transportId);
content.socks5transport().addChild("activated") content.socks5transport().addChild("activated").setAttribute("cid", cid);
.setAttribute("cid", cid);
packet.setContent(content); packet.setContent(content);
this.sendJinglePacket(packet); this.sendJinglePacket(packet);
} }
@ -1042,7 +1036,7 @@ public class JingleConnection implements Transferable {
} }
private void sendCandidateError() { private void sendCandidateError() {
Log.d(Config.LOGTAG,"sending canditate error"); Log.d(Config.LOGTAG, "sending candidate error");
JinglePacket packet = bootstrapPacket("transport-info"); JinglePacket packet = bootstrapPacket("transport-info");
Content content = new Content(this.contentCreator, this.contentName); Content content = new Content(this.contentCreator, this.contentName);
content.setTransportId(this.transportId); content.setTransportId(this.transportId);
@ -1092,7 +1086,7 @@ public class JingleConnection implements Transferable {
return null; return null;
} }
public void updateProgress(int i) { void updateProgress(int i) {
this.mProgress = i; this.mProgress = i;
mJingleConnectionManager.updateConversationUi(false); mJingleConnectionManager.updateConversationUi(false);
} }
@ -1105,12 +1099,6 @@ public class JingleConnection implements Transferable {
return this.ftVersion; return this.ftVersion;
} }
interface OnProxyActivated {
void success();
void failed();
}
public boolean hasTransportId(String sid) { public boolean hasTransportId(String sid) {
return sid.equals(this.transportId); return sid.equals(this.transportId);
} }
@ -1158,4 +1146,10 @@ public class JingleConnection implements Transferable {
public AbstractConnectionManager getConnectionManager() { public AbstractConnectionManager getConnectionManager() {
return this.mJingleConnectionManager; return this.mJingleConnectionManager;
} }
interface OnProxyActivated {
void success();
void failed();
}
} }

3
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
View file

@ -154,6 +154,7 @@ public class JingleInbandTransport extends JingleTransport {
if (count == -1) { if (count == -1) {
sendClose(); sendClose();
file.setSha1Sum(digest.digest()); file.setSha1Sum(digest.digest());
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": sendNextBlock() count was -1");
this.onFileTransmissionStatusChanged.onFileTransmitted(file); this.onFileTransmissionStatusChanged.onFileTransmitted(file);
fileInputStream.close(); fileInputStream.close();
return; return;
@ -181,6 +182,7 @@ public class JingleInbandTransport extends JingleTransport {
} else { } else {
sendClose(); sendClose();
file.setSha1Sum(digest.digest()); file.setSha1Sum(digest.digest());
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": sendNextBlock() remaining size");
this.onFileTransmissionStatusChanged.onFileTransmitted(file); this.onFileTransmissionStatusChanged.onFileTransmitted(file);
fileInputStream.close(); fileInputStream.close();
} }
@ -204,6 +206,7 @@ public class JingleInbandTransport extends JingleTransport {
file.setSha1Sum(digest.digest()); file.setSha1Sum(digest.digest());
fileOutputStream.flush(); fileOutputStream.flush();
fileOutputStream.close(); fileOutputStream.close();
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": receive next block nothing remaining");
this.onFileTransmissionStatusChanged.onFileTransmitted(file); this.onFileTransmissionStatusChanged.onFileTransmitted(file);
} else { } else {
connection.updateProgress((int) ((((double) (this.fileSize - this.remainingSize)) / this.fileSize) * 100)); connection.updateProgress((int) ((((double) (this.fileSize - this.remainingSize)) / this.fileSize) * 100));

21
src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
View file

@ -2,6 +2,7 @@ package eu.siacs.conversations.xmpp.jingle.stanzas;
import eu.siacs.conversations.entities.DownloadableFile; import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.xml.Element; import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xml.Namespace;
public class Content extends Element { public class Content extends Element {
@ -37,9 +38,9 @@ public class Content extends Element {
public Version getVersion() { public Version getVersion() {
if (hasChild("description", Version.FT_3.namespace)) { if (hasChild("description", Version.FT_3.namespace)) {
return Version.FT_3; return Version.FT_3;
} else if (hasChild("description" , Version.FT_4.namespace)) { } else if (hasChild("description", Version.FT_4.namespace)) {
return Version.FT_4; return Version.FT_4;
} else if (hasChild("description" , Version.FT_5.namespace)) { } else if (hasChild("description", Version.FT_5.namespace)) {
return Version.FT_5; return Version.FT_5;
} }
return null; return null;
@ -102,32 +103,28 @@ public class Content extends Element {
} }
public Element socks5transport() { public Element socks5transport() {
Element transport = this.findChild("transport", Element transport = this.findChild("transport", Namespace.JINGLE_TRANSPORTS_S5B);
"urn:xmpp:jingle:transports:s5b:1");
if (transport == null) { if (transport == null) {
transport = this.addChild("transport", transport = this.addChild("transport", Namespace.JINGLE_TRANSPORTS_S5B);
"urn:xmpp:jingle:transports:s5b:1");
transport.setAttribute("sid", this.transportId); transport.setAttribute("sid", this.transportId);
} }
return transport; return transport;
} }
public Element ibbTransport() { public Element ibbTransport() {
Element transport = this.findChild("transport", Element transport = this.findChild("transport", Namespace.JINGLE_TRANSPORTS_IBB);
"urn:xmpp:jingle:transports:ibb:1");
if (transport == null) { if (transport == null) {
transport = this.addChild("transport", transport = this.addChild("transport", Namespace.JINGLE_TRANSPORTS_IBB);
"urn:xmpp:jingle:transports:ibb:1");
transport.setAttribute("sid", this.transportId); transport.setAttribute("sid", this.transportId);
} }
return transport; return transport;
} }
public boolean hasSocks5Transport() { public boolean hasSocks5Transport() {
return this.hasChild("transport", "urn:xmpp:jingle:transports:s5b:1"); return this.hasChild("transport", Namespace.JINGLE_TRANSPORTS_S5B);
} }
public boolean hasIbbTransport() { public boolean hasIbbTransport() {
return this.hasChild("transport", "urn:xmpp:jingle:transports:ibb:1"); return this.hasChild("transport", Namespace.JINGLE_TRANSPORTS_IBB);
} }
} }