Commit Graph

467 Commits

Author SHA1 Message Date
vanitasvitae 064af388b4
Temp 2017-06-16 20:24:01 +02:00
vanitasvitae 366dbf66d6
Prevent NPE in JingleManager 2017-06-15 10:21:45 +02:00
vanitasvitae e6e2a6cd08
SOCKS5 WERKSgit add . 2017-06-14 18:25:46 +02:00
vanitasvitae f3c1eebd05
Should work, but doesnt 2017-06-14 17:56:46 +02:00
vanitasvitae 7320d01997
So close to working socks... 2017-06-13 21:59:40 +02:00
vanitasvitae 4feda2ffa9
Progress 2017-06-12 14:44:00 +02:00
vanitasvitae 7a9b819b18
Proper Statemachine 2017-06-11 02:52:34 +02:00
vanitasvitae 4d11422335
Temp 2017-06-10 21:45:00 +02:00
vanitasvitae a4454aa8b5
Towards S5B! 2017-06-10 18:27:41 +02:00
vanitasvitae 830b2deb2e
Fix IBB 2017-06-10 17:16:22 +02:00
vanitasvitae 4728aa4452
Temp 2017-06-10 15:09:30 +02:00
vanitasvitae eda7859aa7
S5B session-initiate and -accept 2017-06-10 00:07:27 +02:00
vanitasvitae a8f172c66b
Rename classes and reuse Socks5Utils class 2017-06-09 23:25:59 +02:00
vanitasvitae 327e63f52d
Fix checkstyle 2017-06-09 23:16:15 +02:00
vanitasvitae df69c8a81c
Rewrote Jingle code 2017-06-09 21:35:49 +02:00
vanitasvitae db294f3f1b
Add functionality to create TransportElements 2017-06-08 17:32:37 +02:00
vanitasvitae 6c0162c341
Reuse S5B-Managers discovery methods 2017-06-08 16:46:39 +02:00
vanitasvitae 1775c691af
Create JingleTransportManager framework 2017-06-08 01:59:38 +02:00
vanitasvitae 05b0e3650e
Introduce JingleSocks5TransportInfo class 2017-06-08 00:48:23 +02:00
vanitasvitae f528e4dd9d Merge branch 'TransportInfo' into jingle 2017-06-07 23:29:03 +02:00
vanitasvitae 9eba23c733
Add JingleContentTransportInfo class 2017-06-07 23:26:38 +02:00
vanitasvitae 8240e92c3e
Add S5B providers 2017-06-07 21:08:08 +02:00
vanitasvitae 2686fc1ccb
Proper(er) implementation 2017-06-06 16:51:45 +02:00
Florian Schmaus 349d1ba2ae Merge pull request #136 from vanitasvitae/jingleManagerFixes
Fix typos and xml issues in jingle package
2017-06-05 11:04:52 +02:00
vanitasvitae 3a4f758b6a
Fix jingle ft 2017-06-05 00:27:03 +02:00
vanitasvitae 23190604bd
Fix typos and xml issues 2017-06-04 20:41:27 +02:00
vanitasvitae 491db53f89
Send/recv works 2017-06-04 20:33:44 +02:00
vanitasvitae 598c193408
Progress 2017-06-04 17:18:40 +02:00
vanitasvitae e6d365fb92 Merge branch 'jingleManagerFixes' into jingle 2017-06-04 15:51:07 +02:00
vanitasvitae 37c6961bb0
Fix typos and xml issues 2017-06-04 15:49:06 +02:00
vanitasvitae d231024547
Fix errors 2017-06-04 00:06:37 +02:00
vanitasvitae efdf6d7db8
Merge fixes (wip) 2017-06-03 23:38:46 +02:00
vanitasvitae ea3b1cbccc
Fix typos and xml issues 2017-06-03 23:30:37 +02:00
vanitasvitae 23ed0bdbce
Add missing security-info in JingleAction
Also fix typo
2017-06-03 23:23:23 +02:00
vanitasvitae 1bf8cf9a12
Add missing jingle action, some comments 2017-06-02 21:47:20 +02:00
vanitasvitae df216b2141
More progress 2017-06-02 18:45:11 +02:00
vanitasvitae 306a7bc0ff
Add Jingle Tests 2017-06-01 01:25:39 +02:00
vanitasvitae cf875ef414
Fix xml of JingleContent 2017-05-31 20:49:40 +02:00
vanitasvitae 0b28e8b467
Add first dirty send test 2017-05-31 19:12:38 +02:00
vanitasvitae 2cbbfd1048
Add JingleInBandByteStream classes 2017-05-31 17:26:51 +02:00
vanitasvitae b99c277736
Fix typo 2017-05-31 13:31:37 +02:00
vanitasvitae f0e6521360
Add JingleContentDescriptionFileTransfer and tests 2017-05-31 13:27:23 +02:00
vanitasvitae 7319998bb9
Add and test RangeElement 2017-05-30 23:42:31 +02:00
vanitasvitae 47f800be3b
Fix typo 2017-05-30 21:17:10 +02:00
vanitasvitae 53861fa9de
Add HashManager 2017-05-30 20:48:00 +02:00
vanitasvitae 282df8c789
Add first Jingle File Transfer classes 2017-05-30 18:20:54 +02:00
Florian Schmaus 6bb001d274 New Jingle API groundwork
A start for the new Jingle API. Since Jingle is a single IQ with many
plugable extensions, there are some particularities we need to deal
with, e.g. jingle users have to register with JingleManager.

This is untested code. There may be drangons.
2017-05-30 08:45:27 +02:00
Florian Schmaus 7a5f9e6a03 Merge branch '4.2' 2017-05-25 11:25:36 +02:00
Florian Schmaus ce1cddc722 More checkstyle whitespace related checks 2017-05-24 14:42:38 +02:00
Alexander Tovstonozhenko b636883ce6 Fix NPE in hashCode() in Occupant when jid is null
Fixes SMACK-764.
2017-05-19 14:09:19 +03:00