aboutsummaryrefslogtreecommitdiff
path: root/libdino/src
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2019-08-29 00:44:59 +0200
committerGitHub <noreply@github.com>2019-08-29 00:44:59 +0200
commit9f613d5812f1893481f06d3806ef4f03048df2b8 (patch)
treed8d63db8c3cef6d3616fb78be0c50d40673b0d6e /libdino/src
parentf0c2ce0047debe75565877f5033ccdccfbd4b755 (diff)
parent6028fd15a81a084b63311bc61f7b48d9f3d00746 (diff)
downloaddino-9f613d5812f1893481f06d3806ef4f03048df2b8.tar.gz
dino-9f613d5812f1893481f06d3806ef4f03048df2b8.zip
Merge pull request #592 from hrxi/gsoc_1
Add SOCKS5 bytestreams and a couple of other fixes
Diffstat (limited to 'libdino/src')
-rw-r--r--libdino/src/service/file_manager.vala6
-rw-r--r--libdino/src/service/jingle_file_transfers.vala6
-rw-r--r--libdino/src/service/module_manager.vala2
3 files changed, 9 insertions, 5 deletions
diff --git a/libdino/src/service/file_manager.vala b/libdino/src/service/file_manager.vala
index c4a9a393..e0a417ee 100644
--- a/libdino/src/service/file_manager.vala
+++ b/libdino/src/service/file_manager.vala
@@ -269,8 +269,7 @@ public class FileManager : StreamInteractionModule, Object {
}
OutputStream os = file.create(FileCreateFlags.REPLACE_DESTINATION);
- yield os.splice_async(input_stream, 0);
- os.close();
+ yield os.splice_async(input_stream, OutputStreamSpliceFlags.CLOSE_SOURCE|OutputStreamSpliceFlags.CLOSE_TARGET);
file_transfer.size = (int)file_meta.size;
file_transfer.file_name = file_meta.file_name;
file_transfer.path = file.get_basename();
@@ -327,8 +326,7 @@ public class FileManager : StreamInteractionModule, Object {
string filename = Random.next_int().to_string("%x") + "_" + file_transfer.file_name;
File file = File.new_for_path(Path.build_filename(get_storage_dir(), filename));
OutputStream os = file.create(FileCreateFlags.REPLACE_DESTINATION);
- yield os.splice_async(file_transfer.input_stream, 0);
- os.close();
+ yield os.splice_async(file_transfer.input_stream, OutputStreamSpliceFlags.CLOSE_SOURCE|OutputStreamSpliceFlags.CLOSE_TARGET);
file_transfer.state = FileTransfer.State.COMPLETE;
file_transfer.path = filename;
file_transfer.input_stream = yield file.read_async();
diff --git a/libdino/src/service/jingle_file_transfers.vala b/libdino/src/service/jingle_file_transfers.vala
index 5df42a03..0a93979b 100644
--- a/libdino/src/service/jingle_file_transfers.vala
+++ b/libdino/src/service/jingle_file_transfers.vala
@@ -39,7 +39,11 @@ public class JingleFileProvider : FileProvider, Object {
if (jingle_file_transfer == null) {
throw new FileReceiveError.DOWNLOAD_FAILED("Transfer data not available anymore");
}
- jingle_file_transfer.accept(stream);
+ try {
+ jingle_file_transfer.accept(stream);
+ } catch (IOError e) {
+ throw new FileReceiveError.DOWNLOAD_FAILED("Establishing connection did not work");
+ }
return jingle_file_transfer.stream;
}
diff --git a/libdino/src/service/module_manager.vala b/libdino/src/service/module_manager.vala
index 16bf5a60..6a07a146 100644
--- a/libdino/src/service/module_manager.vala
+++ b/libdino/src/service/module_manager.vala
@@ -78,8 +78,10 @@ public class ModuleManager {
module_map[account].add(new StreamError.Module());
module_map[account].add(new Xep.InBandRegistration.Module());
module_map[account].add(new Xep.HttpFileUpload.Module());
+ module_map[account].add(new Xep.Socks5Bytestreams.Module());
module_map[account].add(new Xep.InBandBytestreams.Module());
module_map[account].add(new Xep.Jingle.Module());
+ module_map[account].add(new Xep.JingleSocks5Bytestreams.Module());
module_map[account].add(new Xep.JingleInBandBytestreams.Module());
module_map[account].add(new Xep.JingleFileTransfer.Module());
initialize_account_modules(account, module_map[account]);