Commit graph

78 commits

Author SHA1 Message Date
Jefry Lagrange
2af1af2011 file_props refactoring 2012-06-14 12:27:23 -04:00
Jefry Lagrange
b6b44cb328 make werequest an optional argument in JingleSession 2012-06-10 17:08:54 -04:00
Jefry Lagrange
e8df81ab31 sends file request after hash mismatch 2012-05-27 21:05:43 -04:00
Yann Leboulanger
0c36f50196 merge from trunk 2012-04-12 22:07:30 +02:00
Yann Leboulanger
e1808fd550 [Olivier Crete] port Gajim to use Farstream instead of Farsight2. Fixes #7113 2012-04-01 19:49:52 +02:00
Jefry Lagrange
48524a60c0 fix handling file transfer cancel properly 2012-03-22 00:56:11 -04:00
Jefry Lagrange
5142ebd626 check file integrity when transfer is completed 2012-01-23 22:28:07 -05:00
Jefry Lagrange
c51fb07d09 merge 2012-01-15 19:53:40 -05:00
Jefry Lagrange
376777091e support for xep-300 2012-01-15 19:37:00 -05:00
Yann Leboulanger
07cb125303 send file using IBB directly if receiver don't support socks5 2012-01-08 20:57:05 +01:00
Yann Leboulanger
8bbca8a0a7 coding standards 2012-01-08 20:48:03 +01:00
Yann Leboulanger
49bc202421 merge from trunk 2011-12-29 11:39:02 +01:00
Jefry Lagrange
c491bd3f59 create a new session for every new file transfer; enable OpenSSL 2011-12-27 23:47:00 -05:00
Yann Leboulanger
197d85e563 ability to use jingle negociation even if we don't have farsight. Fixes #7044 2011-11-06 21:42:04 +01:00
Yann Leboulanger
f7b0659c04 fix some bad merge 2011-06-24 16:35:10 +02:00
Yann Leboulanger
b47248f09d merge from trunk 2011-06-20 23:03:06 +02:00
Yann Leboulanger
8dcbf3e73e e NEC to handle jingle-connected events 2010-10-27 19:37:14 +02:00
Yann Leboulanger
ffa7cbda9c rename __sessions to _session 2010-10-27 01:16:05 +02:00
Yann Leboulanger
286d788da0 Name of filetransfer content is now random to be able to have 2 transfer in the same session. send and handle content-add in filetranfer 2010-08-26 10:36:58 +02:00
Yann Leboulanger
833983eab8 - use transport sid to compute hash sent to proxies
- Don't use XTLS when using proxies
2010-08-25 12:05:14 +02:00
Zhenchao Li
797b3fe6a9 remove unnecessary branch 2010-07-24 10:12:54 +08:00
Zhenchao Li
30cbdce234 if the peer supports jingle XTLS, send session-initiate with security element 2010-07-22 15:05:06 +08:00
Zhenchao Li
d55ba9269e fix bug: assign jingle session id as sid in file_props, so that file transfer window gets updated correctly for the sender. 2010-07-08 16:05:19 +08:00
Zhenchao Li
d0adcb1a05 dispatch iq-result for a jingle iq stanza, start listener after iq-result on session-initiate. 2010-07-03 16:22:47 +08:00
Zhenchao Li
182a448630 receive jingle file transfer session initiate message, shout 'FILE-REQUEST' event to connection object. 2010-06-08 21:24:41 +08:00
Zhenchao Li
048feb5528 added JingleFileTransfer for managing jingle ft content
code added to trigger jingle ft session when needed
2010-06-06 23:22:52 +08:00
Thibaut GIRKA
fbf9a769d8 Delete invalid jingle sessions. Kick audio/video availability from jingle states.
Fixes #5668, #5651
2010-03-21 21:45:45 +01:00
Thibaut GIRKA
ab0f7899ad Refuse multiple sessions and implement alternative-session; make jingle GUI a bit more reliable. 2010-03-15 21:34:28 +01:00
Thibaut GIRKA
6e5d8c4ce0 Change ConnectionJingle.__sessions keys from (jid, sid) to sid. 2010-03-14 21:51:04 +01:00
Éric Araujo
fedd7dc8e2 convert tabs to spaces in source code thanks to reindent.py
holy diff batman!
2010-02-08 15:08:40 +01:00
Stephan Erb
f128391189 One more vim config entry. 2009-12-01 22:31:42 +01:00
Thibaut GIRKA
d295f9261d [Jingle] a bit of documentation/clarification ; added make_bin_from_config 2009-11-30 22:29:32 +01:00
Thibaut GIRKA
ee452a57a2 [Jingle] Renamed callbacks to match name conventions 2009-11-26 22:09:34 +01:00
Thibaut GIRKA
0edb624fec Renamed a few methods, refactor on_*_button_toggled, use getattr/setattr instead of eval/self.__dict__ 2009-11-26 21:53:44 +01:00
Alexander Cherniuk
6bf2246de5 A big portion of doc-string refactoring 2009-11-26 13:58:12 +02:00
Thibaut GIRKA
b2c5810869 Refactorize a bit jingle.py and split it into different files.
There is still room for improvement, but it should be better.
2009-11-15 20:47:06 +01:00
Thibaut GIRKA
e5062f77ea [Jingle] User can send DTMF tones using the /dtmf command 2009-11-13 22:58:02 +01:00
Thibaut GIRKA
bc90bc1157 Destroy session when remote signs off 2009-10-16 19:04:04 +02:00
Thibaut GIRKA
b2b8ac4b76 Connect only if user accepts, move jingle detection to 'update_toolbar'
This allows jingle availability to be updated if contact sign in/out.
This patch will also wait for user acceptance before connecting.
This will, among other things, ensure that audio/video state won't be set to
JINGLE_STATE_CONNECTING while the connection is already up.
2009-10-03 22:40:12 +02:00
Thibaut GIRKA
10a6b0683c Second typo corrected... I need to sleep... 2009-09-28 22:31:28 +02:00
Thibaut GIRKA
b4d2227662 Fixed a typo ; Prepared tie breaking and content-info handling 2009-09-28 22:23:48 +02:00
Thibaut GIRKA
85195e99ad workaround for psi, little fixes... 2009-09-27 22:56:09 +02:00
Thibaut GIRKA
e141d7875a Don't send audio/video data before session acceptance. 2009-09-26 23:07:09 +02:00
Thibaut GIRKA
5a1a36e348 Fix somes issues with content-add/content-accept/session-accept, and other things. 2009-09-26 21:55:43 +02:00
Thibaut GIRKA
b5c7519740 A little fix with content acceptance ; modified a bit JINGLE_DISCONNECTED 2009-09-26 14:14:58 +02:00
Thibaut GIRKA
08b7f18f50 Fix content reject 2009-09-26 12:31:56 +02:00
Thibaut GIRKA
62d6f408c2 Merge the commits I've made yesterday with asterik's ones 2009-09-26 12:25:36 +02:00
Thibaut GIRKA
193f2613a9 Rewritten contentAddCB in order to ask the user about new contents 2009-09-26 12:22:41 +02:00
Yann Leboulanger
a8eedfc781 ability to accept contents and not only session 2009-09-26 10:29:08 +02:00
Thibaut GIRKA
011f4fe142 Auto-accept contents we have created (it would make no sense to refuse it...) 2009-09-25 23:52:39 +02:00