anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improve logging on jingle file transfer failure

Browse source
This commit is contained in:
fiaxh 2021-08-19 15:39:58 +02:00
parent c77d80d7b5
commit 863d66b16e
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xmpp-vala/src/module/xep/0166_jingle/session.vala
View file

@ -407,6 +407,7 @@ public class Xmpp.Xep.Jingle.Session : Object {
public void terminate(string? reason_name, string? reason_text, string? local_reason) { public void terminate(string? reason_name, string? reason_text, string? local_reason) {
if (state == State.ENDED) return; if (state == State.ENDED) return;
debug("Jingle session %s terminated: %s; %s; %s", this.sid, reason_name ?? "-", reason_text ?? "-", local_reason ?? "-");
if (state == State.ACTIVE) { if (state == State.ACTIVE) {
string reason_str; string reason_str;

8
xmpp-vala/src/module/xep/0234_jingle_file_transfer.vala
View file

@ -105,9 +105,11 @@ public class Module : Jingle.ContentType, XmppStreamModule {
yield io_stream.input_stream.close_async(); yield io_stream.input_stream.close_async();
yield io_stream.output_stream.splice_async(input_stream, OutputStreamSpliceFlags.CLOSE_SOURCE|OutputStreamSpliceFlags.CLOSE_TARGET); yield io_stream.output_stream.splice_async(input_stream, OutputStreamSpliceFlags.CLOSE_SOURCE|OutputStreamSpliceFlags.CLOSE_TARGET);
yield connection.terminate(true); yield connection.terminate(true);
} catch (Jingle.Error e) { } catch (Error e) {
session.terminate(Jingle.ReasonElement.FAILED_TRANSPORT, e.message, e.message); if (session != null) {
throw new Jingle.Error.GENERAL(@"couldn't create Jingle session: $(e.message)"); session.terminate(Jingle.ReasonElement.FAILED_TRANSPORT, e.message, e.message);
}
throw new Jingle.Error.GENERAL("Couldn't send file via Jingle: %s", e.message);
} }
} }