1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-25 21:04:50 +02:00
Commit graph

36 commits

Author SHA1 Message Date
vanitasvitae 71486ab68e
Merge moreJingleTests 2017-06-30 18:56:56 +02:00
vanitasvitae 322587c0b5
More jingle related tests 2017-06-30 18:49:34 +02:00
vanitasvitae ff899d05e7
Merge js5btbFixes 2017-06-30 16:33:27 +02:00
vanitasvitae 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
vanitasvitae dec275aa4d
Add methods to enable/disable proxy types 2017-06-30 15:19:36 +02:00
vanitasvitae 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
vanitasvitae a395b11ee9
S5B Works now in both directions and with external proxy 2017-06-28 14:48:39 +02:00
vanitasvitae d537463a42
SOCKS5 works again :) 2017-06-28 11:40:27 +02:00
vanitasvitae 9d6a858b23
So close... 2017-06-26 23:18:34 +02:00
vanitasvitae 69b3f5837e
Rewrote S5BTransportSession 2017-06-26 18:05:17 +02:00
vanitasvitae 0952c20a5c
Coming closer... 2017-06-25 23:19:35 +02:00
vanitasvitae daa6b6b999
Some bugfixes 2017-06-25 22:18:19 +02:00
vanitasvitae 04e898083c
Much progress, such wow 2017-06-25 16:59:09 +02:00
vanitasvitae d7cf19aca7
Add createCandidateUsed 2017-06-25 16:39:02 +02:00
vanitasvitae a3d6562791
Even more progress 2017-06-25 16:28:59 +02:00
vanitasvitae 5ebd07ac3c
More progress 2017-06-25 15:13:56 +02:00
vanitasvitae 09548855dd
Progess 2017-06-25 14:25:17 +02:00
vanitasvitae 699a19d3c2
Add S5B candidate accept/error 2017-06-24 17:46:03 +02:00
vanitasvitae a101de29fd
JIBB works 2017-06-24 12:14:05 +02:00
vanitasvitae c4ef2c9552
Temp 2017-06-23 23:41:40 +02:00
vanitasvitae 136af25342
Add JingleTransportSession classes 2017-06-23 22:48:28 +02:00
vanitasvitae 5dc37ab239
Fixed some sending issues 2017-06-21 18:03:31 +02:00
vanitasvitae ecd29a1ea8
s5b createTransport 2017-06-21 15:42:00 +02:00
vanitasvitae 4c1ee37ea7
Reuse S5B methods 2017-06-21 15:28:32 +02:00
vanitasvitae 6023350364
Progress 2017-06-21 14:11:42 +02:00
vanitasvitae 16a7f31a46
Add sendingThread 2017-06-21 00:16:47 +02:00
vanitasvitae 2bac6297ee
Split JingleFileTransferSession in incoming and outgoing 2017-06-19 17:55:04 +02:00
vanitasvitae 73f9af474e
Send session-accept/decline 2017-06-19 15:26:10 +02:00
vanitasvitae b14aca744f
Add Jingle SOCKS5Bytestream transport method 2017-06-19 10:11:08 +02:00
vanitasvitae 3c4441af4f
Reorder imports 2017-06-18 12:08:47 +02:00
vanitasvitae 93a363377e Merge remote-tracking branch 'upstream/master' into jingleS5B 2017-06-18 12:05:15 +02:00
Florian Schmaus 2b11074950 Merge branch '4.2' 2017-06-17 15:55:38 +02:00
vanitasvitae f80472e082
Fix reviewed points 2017-06-16 23:45:00 +02:00
vanitasvitae 287976e0e0
Add Jingle InBandBytestream transports 2017-06-16 22:43:50 +02:00
vanitasvitae 8488831ddc
Add Jingle SOCKS5Bytestream transport 2017-06-16 22:14:42 +02:00