494 commits

Author	SHA1	Message	Date
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
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
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	5eba48b7d8	Merge branch 'singleJingleTransport' into jingle2	2017-06-26 15:05:40 +02:00
vanitasvitae	20eabca1b3	Also replace list with single transport-info info	2017-06-26 15:04:22 +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	cb3583e510	IBB sending works using worker thread	2017-06-22 14:47:39 +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	9da555f57e	Merge branch 'singleJingleTransport' into jingle2	2017-06-21 13:44:27 +02:00
vanitasvitae	e2b8ffdf22	Switch to single transport instead of list	2017-06-21 13:42:02 +02:00
vanitasvitae	16a7f31a46	Add sendingThread	2017-06-21 00:16:47 +02:00
vanitasvitae	96197d4092	Add transport replace actions	2017-06-19 19:22:59 +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	e0a54c19d6	First state representing stuff	2017-06-19 14:44:35 +02:00
vanitasvitae	1912ebb8d0	Join JingleSession and Handler in JingleFT	2017-06-19 10:47:24 +02:00
vanitasvitae	b14aca744f	Add Jingle SOCKS5Bytestream transport method	2017-06-19 10:11:08 +02:00
vanitasvitae	b91a9c120f	More ground work	2017-06-18 16:47:49 +02:00
vanitasvitae	dcb5da76d6	Merge branch 'jingleFTElements' into jingle2	2017-06-18 14:12:04 +02:00
vanitasvitae	e5502564b1	Add more errors	2017-06-18 14:11:37 +02:00
vanitasvitae	49868ecdaf	Merge branch 'jingleFTElements' into jingle2	2017-06-18 13:08:56 +02:00
vanitasvitae	d3af7cd9c1	Add creating methods to JingleUtil	2017-06-18 13:08:09 +02:00
vanitasvitae	d0701f8fd1	Merge branch 'jingleS5B' into jingle2	2017-06-18 12:32:08 +02:00
vanitasvitae	21435a72c5	Reorder imports	2017-06-18 12:29:44 +02:00
vanitasvitae	20e6580469	Merge remote-tracking branch 'upstream/master' into jingleFTElements	2017-06-18 12:11:17 +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
vanitasvitae	d34539126b	Fix import order	2017-06-18 11:52:56 +02:00
vanitasvitae	1e6b9b8257	Merge remote-tracking branch 'upstream/master' into jingle2	2017-06-18 11:28:39 +02:00
Florian Schmaus	2b11074950	Merge branch '4.2'	2017-06-17 15:55:38 +02:00