Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Allow IQ timeouts to be asynchronous #203

Merged
merged 90 commits into from Apr 12, 2015

Conversation

Projects
None yet
4 participants
Collaborator

hildjj commented Oct 29, 2012

Pass a timeout_callback parameter to send(). An example modification of disco is included. If this approach is approved, I'll go through and update the other plugins.

Sandro Munda and others added some commits Jun 3, 2012

Sandro Munda Updated the .gitignore to add .ropeproject/ folder 40ef4a1
Sandro Munda Added a partial support of the XEP 0065 - Socks5 Bytestreams a149793
Sandro Munda Used the namespace in all stanzas 69cffce
Sandro Munda Registered stanza plugin in the stanza module cf24b87
Sandro Munda Added some comments to the get_network_address method b52d276
Sandro Munda Renamed the _handle_on_recv to the on_recv method.
Renamed requester_thread and target_thread to proxy. The send method is now simpler.
44ee063
Sandro Munda The xep_0065 plugin supports now multiple stream (multiple connected
sockets).

To send data over a stream, we need to pass the SID in order to
retrieve the good proxy thread (and so, the good socket).
39505ae
Sandro Munda Changed the description of the xep_0065 plugin 2f38857
Sandro Munda Improved the close of the proxy thread (and the socket) in the xep_00…
…65 plugin.
2cd9363
Sandro Munda Sent a socks_closed when the socket is closed in the xep_0065 plugin. c59a6d0
Sandro Munda Added the Socksipy module in the thirdparty of SleekXMPP.
Updated the LICENSE file with the license of the Socksipy
module (New-BSD).
dcdf5dc
Sandro Munda Fixed the callback names of the xep_0065:
In-Band bytestreams -> Socks5 bytestreams
ae01f10
Sandro Munda Added a top level field to the xep_0065 class:
name = 'xep_0065'
26147f5
Sandro Munda Renamed Query to Socks5 in the xep_0065.
Renamed the 'q' plugin_attrib of the Socks5 stanza to 'socks'.
289b052
Sandro Munda Added the SID in the socks_recv xmpp event in the xep_0065 plugin. 1851ab6
Sandro Munda Added the get_socket(sid) method to the xep_0065 plugin to retrieve
the socket of the Proxy thread.
8def375
@legastero legastero Merge pull request #169 from SeyZ/develop
xep_0065 plugin (Socks5 Bytestreams)
7247efe
@legastero legastero Ensure that all SSL cert error handling is overridable using event ha…
…ndlers.

Relevant events:

    ssl_invalid_cert
    ssl_invalid_chain
    ssl_expired_cert
48dd01b
Sandro Munda Added the xep_0065 plugin in the setup.py cf9e89d
@legastero legastero Fix SSL handshake handling when not using legacy SSL.
Fixes issue #172
0953896
@legastero legastero Merge pull request #170 from SeyZ/develop
Added the xep_0065 plugin in the setup.py
c012208
@legastero legastero Default use_tls to False for components.
Issue #171
10664d7
@legastero legastero Use False for use_tls for components.
A log message is shown for those who try to set it to True.

Fixes issue #171
2b29876
@legastero legastero Add extra check for the cert in the expiration handler. 0b51afe
@legastero legastero Merge branch 'master' into develop daa73a3
@legastero legastero Fix Python3 exception handling.
Fixes issue #173
a7b092a
@legastero legastero Fix XEP-0065 imports and naming for Python3. f70b498
@legastero legastero Simplify send_presence_subscription.
It is technically obsolete now, but remains because it set a default
subscription type of 'subscribe'.
19f65c8
@legastero legastero Properly handle certs with no extensions. 250d28e
@legastero legastero Merge branch 'master' into develop f89df6e
@legastero legastero Merge branch 'master' into develop 55d332b
@legastero legastero Add examples for using IBB. aab2682
@legastero legastero Add example for dealing with GTalk custom domain certificates. 1ab66e5
@legastero legastero Merge branch 'master' into develop
Conflicts:
	sleekxmpp/basexmpp.py
5820d49
@legastero legastero Merge branch 'master' into develop 3234596
@legastero legastero Merge branch 'master' into develop 546066d
@legastero legastero Merge branch 'master' into develop eb5df1a
@legastero legastero Merge branch 'master' into develop 5d6019a
Jay Farrimond only log cert errors if not handled by user b210870
@legastero legastero Merge pull request #179 from jay-instaedu/develop
only log cert errors if not handled by user
c7594b3
Jay Farrimond dereference iq stanza only once for roster processing 2393148
@legastero legastero Merge pull request #180 from jay-instaedu/develop
dereference iq stanza only once for roster processing
1efe049
@legastero legastero Merge branch 'master' into develop 78f0325
@legastero legastero Merge branch 'master' into develop 060c9ab
@legastero legastero Merge branch 'master' into develop 5492e90
@legastero legastero Merge branch 'master' into develop 2e58030
@legastero legastero Merge branch 'master' into develop a3ec1af
@legastero legastero Merge branch 'master' into develop c42f1ad
@legastero legastero Merge branch 'master' into develop 16ec0f1
@legastero legastero Merge branch 'master' into develop c9b2cf6
@legastero legastero Merge branch 'master' into develop c2189b4
@legastero legastero Merge branch 'master' into develop 44ce01a
@legastero legastero Merge branch 'master' into develop
Conflicts:
	sleekxmpp/thirdparty/__init__.py
06a9d9f
@legastero legastero Merge branch 'master' into develop fb42756
@legastero legastero Merge branch 'master' into develop 2f4149c
@legastero legastero Merge branch 'master' into develop 2f65fdb
@legastero legastero Merge branch 'master' into develop f81d5e4
@legastero legastero Merge branch 'master' into develop 75d904e
@legastero legastero Merge branch 'master' into develop 14aa831
@legastero legastero Merge branch 'master' into develop 962dfad
@legastero legastero Merge branch 'master' into develop 5c25208
@legastero legastero Merge branch 'master' into develop 04dc68f
@legastero legastero Merge branch 'master' into develop f09adf0
@legastero legastero Merge branch 'master' into develop a249f87
@legastero legastero Merge branch 'master' into develop ff28b0a
@FlorianFieber FlorianFieber Fix certificate expiration scheduler
timedelta.seconds does not store the total seconds of a time span.
Internally, seconds is the next smaller unit to days, hence
timedelta.seconds will never exceed (or reach) the number of seconds
in a day (60*60*24=86400)
09bec1c
@legastero legastero Merge pull request #195 from FlorianFieber/develop
Fix certificate expiration scheduler
7d382a2
@FlorianFieber FlorianFieber Fix get_blocked() in XEP-0191 f52a10b
@legastero legastero Merge pull request #197 from FlorianFieber/develop
Fix get_blocked() in XEP-0191
e20610a
@legastero legastero Merge branch 'master' into develop 19a78f6
@legastero legastero Merge branch 'master' into develop df9ac58
@legastero legastero Merge branch 'master' into develop 6714757
@legastero legastero Merge branch 'master' into develop d385b9e
@legastero legastero Merge branch 'master' into develop 73ce9a5
@legastero legastero Merge branch 'master' into develop a2c60a4
@legastero legastero Merge branch 'master' into develop 44e7585
@legastero legastero Merge branch 'master' into develop 84a2fc3
@legastero legastero Merge branch 'master' into develop fc07e23
@legastero legastero Merge branch 'master' into develop 7c485c6
@legastero legastero Merge branch 'master' into develop 77f2a33
@legastero legastero Merge branch 'master' into develop 0d448b8
@legastero legastero Merge branch 'master' into develop 12e0e1a
@legastero legastero Merge branch 'master' into develop 3655827
@legastero legastero Merge branch 'master' into develop 931d495
@legastero legastero Merge branch 'master' into develop 14c9e9a
@legastero legastero Merge branch 'master' into develop 06a690a
@hildjj hildjj Allow IQ timeouts to be asynchronous, by passing a timeout_callback p…
…arameter to send(). An example modification of disco is included. If this approach is approved, I'll go through and update the other plugins.
75a18b5
@hildjj hildjj update JID_CACHE logic again. c8c20ff
@hildjj hildjj Merge branch 'master' of git://github.com/fritzy/SleekXMPP into develop
# By Lance Stout
# Via Lance Stout
* 'master' of git://github.com/fritzy/SleekXMPP:
  Turns out not all data is UTF-8, so don't try to decode it.
48def71
@hildjj hildjj Merge branch 'master' of git://github.com/fritzy/SleekXMPP into develop
# By Joe Hildebrand (2) and Lance Stout (1)
# Via Lance Stout
* 'master' of git://github.com/fritzy/SleekXMPP:
  Relax timing issues in Iq timeout callback test.
  update JID_CACHE logic again.
  Allow IQ timeouts to be asynchronous, by passing a timeout_callback parameter to send().  An example modification of disco is included.  If this approach is approved, I'll go through and update the other plugins.

Conflicts:
	tests/test_stream_handlers.py
ef1c436

@bear bear merged commit ef1c436 into fritzy:develop Apr 12, 2015

@bear bear modified the milestone: spring_cleaning_2015 Apr 12, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment