a77360d060
Change return value of connectToCandidates
2017-07-21 18:31:42 +02:00
19d334d6bb
Improvements to Socks5
2017-07-21 18:29:27 +02:00
c448d07234
Progress on Transports
2017-07-21 17:58:57 +02:00
f4a910cfa5
Reworking transports WIP
2017-07-19 23:15:17 +02:00
6818a52da7
Heavy reworking in progress
2017-07-19 15:17:12 +02:00
7658369d63
Temp
2017-07-17 20:18:08 +02:00
59e79ef668
Temp
2017-07-14 21:19:03 +02:00
b8a044fc33
Fix checkstyle issues
2017-07-12 19:22:48 +02:00
9827bb4f11
Two more tests
2017-07-12 15:47:39 +02:00
e2d2f67982
Small bugfix and session-initiate test
2017-07-12 14:46:00 +02:00
b08e03af8d
Add more javadoc
2017-07-12 10:39:51 +02:00
e11a4ea9c5
Add comments and more tests
2017-07-11 22:30:41 +02:00
f9086439a8
Use handler to notify on finished file transfer
2017-07-10 12:46:51 +02:00
63d71230cc
More tests
2017-07-08 00:23:18 +02:00
e271532804
More tests
2017-07-06 17:44:02 +02:00
f3244f507e
Merge branch 'fixReason' into jingle2
2017-07-06 16:57:36 +02:00
58c32639b5
Allow parsing of JingleReason.AlternativeSession
...
The JingleReasonProvider was faulty and ignored the
<alternative-session> element.
2017-07-06 16:55:12 +02:00
bbaa367dfb
Better test
2017-07-06 16:54:21 +02:00
a11552eb63
Merge branch 'filetransferTypos' into jingle2
2017-07-06 14:15:33 +02:00
8bd3856fa1
Fix typos in filetransfer package
2017-07-06 14:01:28 +02:00
87949f94b9
Temp
2017-07-06 14:00:36 +02:00
a3bb7e3f59
Merge master
2017-07-05 13:00:21 +02:00
99c1c93c2a
Fix shouldPreserveAddressOrderOnInsertions test
...
The test failed because the ArrayList - in contrast
to the underlying Set - did not check for duplicates
on insert. Under certain circumstances this lead to
an index out of bounds exception because the list in
the test contained duplicated entries which were not
present in the set of the Socks5Proxy.
I fixed the issue by only inserting the address when
it was not in the list before.
2017-07-04 21:50:08 +02:00
55d41e3390
More tests
2017-07-03 15:22:34 +02:00
7e76bc1ae5
More changes to the Jingle package:
...
- Change visibility of some Socks5Bytestreams code.
- Add central ThreadPool
- Move FullJidAndSessionId in own class
- More complete JingleSession class
- More complete JingleUtil class
- Improved tests
2017-07-03 10:35:46 +02:00
4a8251fbe5
Transport Fallback works, but does not save file
2017-07-02 21:25:50 +02:00
f26f3bb503
Use static threadPool and start working on async file transfer method
2017-07-02 15:42:16 +02:00
71486ab68e
Merge moreJingleTests
2017-06-30 18:56:56 +02:00
322587c0b5
More jingle related tests
2017-06-30 18:49:34 +02:00
ff899d05e7
Merge js5btbFixes
2017-06-30 16:33:27 +02:00
bae840ebf7
Enforce jingle s5b transport invariants.
...
There can only either be one info element or
multiple candidates, but not both.
Enforced this in the JingleS5BTransportBuilder
2017-06-30 15:36:02 +02:00
dec275aa4d
Add methods to enable/disable proxy types
2017-06-30 15:19:36 +02:00
5bd01b7385
Add Jingle File Transfer elements and JingleUtil class
2017-06-30 15:03:13 +02:00
59a600a0b6
progress
2017-06-29 21:53:57 +02:00
Florian Schmaus
541c9ecfdd
Fix compile errors in jingle code
...
Which where introduced by merging
20eabca1b3
after
b14aca744f
2017-06-29 18:09:25 +02:00
Florian Schmaus
1d53889874
Merge pull request #145 from vanitasvitae/singleJingleTransport
...
Switch to single transport instead of list
2017-06-28 21:02:52 +02:00
a395b11ee9
S5B Works now in both directions and with external proxy
2017-06-28 14:48:39 +02:00
d537463a42
SOCKS5 works again :)
2017-06-28 11:40:27 +02:00
9d6a858b23
So close...
2017-06-26 23:18:34 +02:00
69b3f5837e
Rewrote S5BTransportSession
2017-06-26 18:05:17 +02:00
5eba48b7d8
Merge branch 'singleJingleTransport' into jingle2
2017-06-26 15:05:40 +02:00
20eabca1b3
Also replace list with single transport-info info
2017-06-26 15:04:22 +02:00
0952c20a5c
Coming closer...
2017-06-25 23:19:35 +02:00
daa6b6b999
Some bugfixes
2017-06-25 22:18:19 +02:00
04e898083c
Much progress, such wow
2017-06-25 16:59:09 +02:00
d7cf19aca7
Add createCandidateUsed
2017-06-25 16:39:02 +02:00
a3d6562791
Even more progress
2017-06-25 16:28:59 +02:00
5ebd07ac3c
More progress
2017-06-25 15:13:56 +02:00
09548855dd
Progess
2017-06-25 14:25:17 +02:00
699a19d3c2
Add S5B candidate accept/error
2017-06-24 17:46:03 +02:00