github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-12-22 19:17:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
237 commits 6 branches 14 tags 3 MiB
Commit graph

197 commits

Author SHA1 Message Date
Brian Beggs
e0c32b6d9b Fixes for disconnection problems detailed in http://github.com/fritzy/SleekXMPP/issues/#issue/20 
Fixes to both ClientXMPP & xmlstream.  ClientXMPP was not tracking the changes to authenticated and sessionstarted after the client was disconnected.

xmlstream had some funkyness with state in the _process method that was cleaned up and hopefully made a little cleaner.

Also changed a DNS issue that was occuring that rendered me unable to disconnect.  I would recieve the following error upon reconnect.
Exception in thread process:
Exception in thread process:
Traceback (most recent call last):
  File "/usr/local/lib/python2.6/threading.py", line 532, in __bootstrap_inner
    self.run()
  File "/usr/local/lib/python2.6/threading.py", line 484, in run
    self.__target(*self.__args, **self.__kwargs)
  File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/xmlstream/xmlstream.py", line 202, in _process
    self.reconnect()
  File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/__init__.py", line 134, in reconnect
    XMLStream.reconnect(self)
  File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/xmlstream/xmlstream.py", line 289, in reconnect
    self.connect()
  File "/home/macdiesel/tmp/workspace/SleekXMPP/sleekxmpp/__init__.py", line 99, in connect
    answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.server, "SRV")
  File "/usr/local/lib/python2.6/site-packages/dns/resolver.py", line 732, in query
    return get_default_resolver().query(qname, rdtype, rdclass, tcp, source)
  File "/usr/local/lib/python2.6/site-packages/dns/resolver.py", line 617, in query
    source=source)
  File "/usr/local/lib/python2.6/site-packages/dns/query.py", line 113, in udp
    wire = q.to_wire()
  File "/usr/local/lib/python2.6/site-packages/dns/message.py", line 404, in to_wire
    r.add_question(rrset.name, rrset.rdtype, rrset.rdclass)
  File "/usr/local/lib/python2.6/site-packages/dns/renderer.py", line 152, in add_question
    self.output.write(struct.pack("!HH", rdtype, rdclass))
TypeError: unsupported operand type(s) for &: 'unicode' and 'long'

Seems I was getting this error when calling line 99 in ClientXMPP.  You can't bit-shift a 1 and a string and this is why this error is coming up. I removed the "SRV" argument and used the default of 1.  not sure exactly what this should be so it may need to be fixed back before it's merged back to trunk.

The line in question:
answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.server, "SRV")
 2010-05-13 04:43:25 +08:00
Nathan Fritz
8515cef117 refactored presence tracking and fixed jidInRoom 2010-05-11 15:12:13 -07:00
Nathan Fritz
c4fa3ab654 pubsub test work 2010-04-23 01:34:28 -07:00
Nathan Fritz
602a6d8491 bugfixes and continuing to work on pubsub tests 2010-04-22 21:24:28 -07:00
Nathan Fritz
37b571c55a added pubsub#event stanzas, multi-subtypes iterable stanzas, pubsub#event test coverage 2010-04-21 23:51:37 -07:00
Nathan Fritz
2a30e3fe0c started work on pubsub#event stanzas 2010-04-20 00:53:13 -07:00
Nathan Fritz
212660091f added pubsub tests and fixed match on iterator error 2010-04-19 01:03:27 -07:00
Nathan Fritz
35c157f9d8 changed_status event now happens with got_offline/got_online events 2010-04-18 21:16:47 -07:00
Nathan Fritz
80e7e0d0ee adding tests, fixed stanzapath matching to match keys, fixed pubsub#owner stanzas 2010-04-14 01:23:17 -07:00
Nathan Fritz
2f9f649d98 bugfix for .disconnect() hanging 2010-04-13 19:48:35 -07:00
Nathan Fritz
fef511fd51 bugfix for .disconnect() hanging 2010-04-13 19:35:47 -07:00
Matthias Rieber
85c3d97d2a fixed presence stanza. priority can be set. 2010-04-08 15:15:15 +08:00
Nathan Fritz
2384858f5e fixed html-im stanza plugin 2010-04-07 23:56:44 -07:00
Nathan Fritz
dd77d2165d added missing docstrings to tests and added deprecated warning to basexmpp.send when using xml mask waiting 2010-04-07 23:32:15 -07:00
Nathan Fritz
ecd5a172ed replaced usage of deprecated iq result on send. Fixed old send result to use stanzas instead of ElementTree 2010-04-07 23:10:32 -07:00
Nathan Fritz
935ee4d14e changed license to MIT 2010-03-26 14:32:16 -07:00
Nathan Fritz
bf5dc0f7b8 closed bug #8 -- double auth response 2010-03-26 14:02:10 -07:00
Nathan Fritz
ec97c351de fixed bug #7 -- muc roster leak 2010-03-26 13:59:29 -07:00
Nathan Fritz
0fc9072e5d fixed bug #16 Roster not updating 2010-03-26 13:55:03 -07:00
Nathan Fritz
0659ddeff0 added memleak test and attempted to fix presence leak 2010-03-26 13:27:13 -07:00
Nathan Fritz
7383f72367 stanzabase indent fix 2010-03-24 17:18:39 -07:00
Nathan Fritz
95d2614f21 fix for bug #18 2010-03-24 16:03:16 -07:00
Nathan Fritz
d4a490e3f0 fixed xmlstream filesocket issue 2010-03-15 10:19:45 -07:00
Nathan Fritz
c239fb1f90 added muc functionality 2010-03-04 09:47:42 -08:00
Nathan Fritz
8d5dbfa691 fixed some presence bugs 2010-02-27 02:02:08 +00:00
Nathan Fritz
e06cdec81a fixed some unicode problems for 2.6 2010-02-25 01:12:15 +00:00
Nathan Fritz
ed60867a63 Merge branch 'develop' 2010-02-15 21:44:50 -08:00
Nathan Fritz
0dcbe92d1e got rid of stupid iq set/get/error/result methods 2010-02-15 21:42:27 -08:00
Nathan Fritz
ac1d76b23d tweaked presence handler 2010-02-15 15:45:57 -08:00
Nathan Fritz
58375955a9 added send queueing to avoid mixed sending 2010-02-15 02:13:44 -08:00
Nathan Fritz
06fa1fcf33 Merge branch 'develop' 2010-01-29 23:58:14 -08:00
Nathan Fritz
5e736f4b97 fixed setup.py issue with unicode in 3.x 2010-01-29 23:57:57 -08:00
Nathan Fritz
4d87098590 Merge branch 'develop' 2010-01-29 02:12:45 -08:00
Nathan Fritz
23b9930c44 added separate tostring files 2010-01-29 02:11:45 -08:00
Nathan Fritz
395618d3d3 fixed unicode problems in 2.6 2010-01-29 02:04:15 -08:00
Nathan Fritz
8ad32d2065 Merge branch 'master' of git@github.com:fritzy/SleekXMPP 2010-01-27 19:38:31 -08:00
Nathan Fritz
167bf70e0b fixed status change issue 2010-01-27 19:37:26 -08:00
Nathan Fritz
f159328dc4 Merge branch 'master' of github.com:fritzy/SleekXMPP 2010-01-27 15:09:45 -08:00
Nathan Fritz
a4ec7413e4 fixed 2.6 compatibility for componentxmpp 2010-01-27 15:09:23 -08:00
Nathan Fritz
65dd83d4e1 Merge branch 'master' of github.com:fritzy/SleekXMPP 2010-01-25 10:40:50 -08:00
Nathan Fritz
6e4c1128ec removed stupid monkeypatch for filesocket 2010-01-25 10:40:44 -08:00
Nathan Fritz
3dbd496de8 fixed presence['type'] w/ show value bug and added test to prove 2010-01-23 01:08:21 -08:00
Nathan Fritz
6b130eb947 unhandled iq's should only respond to errors when type=get/set 2010-01-20 01:42:53 -08:00
Nathan Fritz
7a9a86af3d fixed matcher bug introduced with stanza matching 2010-01-15 21:36:53 -08:00
Nathan Fritz
e39a2395d7 xep 30 and 50 always reply from jid iq sent to 2010-01-15 21:07:28 -08:00
Nathan Fritz
5345e9a46b fixed bug from duplicate append methods in stanzabase 2010-01-14 07:37:44 -08:00
Nathan Fritz
6e1aa0690f Completed basic test coverage of xmlns http://jabber.org/protocol/pubsub stanzas 2010-01-13 09:04:05 -08:00
Nathan Fritz
d14045f5a6 added stanza.get(key, defaultvalue) 2010-01-09 13:17:08 -08:00
Nathan Fritz
2193d5c962 added filesocket.py for 2.6 compatibility 2010-01-08 07:45:26 -08:00
Nathan Fritz
13d7328886 muc message stanza enhancements 2010-01-08 23:08:12 +00:00
Nathan Fritz
218c7318e0 * added tests 2010-01-08 07:01:19 +00:00
Nathan Fritz
137ef61523 * fix to xep 78 2010-01-08 06:06:44 +00:00
Nathan Fritz
a8ff3586d3 * python 2.6 compatibility 2010-01-08 06:03:02 +00:00
Nathan Fritz
0af468b435 * fixed stanza.keys() 2010-01-08 05:26:37 +00:00
Nathan Fritz
8e3168e145 * added first stanza tests 
* added stanza.keys()
* stanza.getValues() now return substanzas and plugins
* stanza.setValues() now can read substanzas and plugins
* stanzas can now be iterable if stanza.subitem is set to a class
 2010-01-08 01:45:11 +00:00
Nathan Fritz
b54221f2a9 * pubsub#owner and pubsub namespace stanzas written 2010-01-07 23:52:52 +00:00
Nathan Fritz
093644ffbd * major stanza improvements 
* raise XMPPError in handler to reply with error stanza
* started work on pubsub stanzas
 2010-01-05 21:56:48 +00:00
Nathan Fritz
805afa4bc1 * fixed unhandled iqs 2009-12-22 10:05:53 +00:00
Nathan Fritz
07018c0afa * fixed many stanza bugs 
* added stanza unhandled (unhandled iqs now reply with feature-not-implemented)
* added stanza exceptions (stanzas may now reply with exceptions when their handler raises an exception)
 2009-12-17 01:54:22 +00:00
Nathan Fritz
6897a0b57c * added error, htmlim, roster, and nick stanza plugins 2009-12-15 04:37:10 +00:00
Nathan Fritz
ca044a4934 makeMessage and makePresence now use new stanza classes 
fixed component usage of stanzas
 2009-12-15 04:31:46 +00:00
Nathan Fritz
8854509ccd * started converstion to stanza objects 2009-12-11 01:29:46 +00:00
Nathan Fritz
a031dd24a6 tweaked stanzas for easy use 2009-12-10 07:33:59 +00:00
Nathan Fritz
007b04dd30 * added proper message and iq stanzas. presence left to do 2009-12-10 01:23:03 +00:00
Nathan Fritz
6be17ebbe2 * clean up offline contacts 2009-11-11 03:14:16 +00:00
Nathan Fritz
1fa1f7dcc6 * added init option for component namespace 2009-10-29 03:22:50 +00:00
Nathan Fritz
a22100bb38 * namespace tweak for components 2009-10-29 03:12:32 +00:00
Nathan Fritz
44aa526635 * fixed bugs with XEP 50 for components 
* configuration-less nodes
 2009-10-29 02:34:23 +00:00
Nathan Fritz
8dbf53594b * fixed bug with setting boolean values in forms 
* added setValues to forms
 2009-10-27 01:05:30 +00:00
Nathan Fritz
f84f02acff x:data form improvements 2009-10-19 08:35:15 +00:00
Nathan Fritz
e3a5211b6d * fixes 2009-10-19 05:27:00 +00:00
Nathan Fritz
14331e2c96 * added form update 2009-10-19 05:18:36 +00:00
Nathan Fritz
349b1c0b28 * added form merging 2009-10-19 05:16:43 +00:00
Nathan Fritz
a18051c164 * fixed type-o 2009-10-05 18:18:37 +00:00
Nathan Fritz
5dc967a360 removed apply()s from xep 50 2009-10-05 17:44:59 +00:00
Nathan Fritz
2349f849e3 bugfixes 2009-09-25 17:35:10 +00:00
Nathan Fritz
e59d43ff3e * fixed unavailable status in sendPresence 
* fixed jabber:client filtering for components
 2009-09-15 18:42:47 +00:00
Nathan Fritz
cb360c9479 * fixes 2009-09-05 07:38:29 +00:00
Nathan Fritz
5593848490 * gmail plugin now works in python3 2009-09-01 17:27:39 +00:00
Nathan Fritz
b9f7af885c * fixed some python3 transition bugs 
* added status options to muc joining
 2009-09-01 17:24:52 +00:00
Nathan Fritz
32ef496502 added module config for number of threads 2009-09-01 00:06:46 +00:00
Nathan Fritz
436841fa6f brought components over to python 3.x 2009-08-31 23:02:19 +00:00
Nathan Fritz
05c9ea5c1d * converted sleekxmpp to Python 3.x 
* sleekxmpp no longer spawns threads for callback handlers -- there are now two threads: one for handlers and one for reading. callback handlers can get results from the read queue directly with the "wait" handler which is used in .send() for the reply catching argument.
 2009-08-31 22:46:31 +00:00
Nathan Fritz
00d46ee2b0 * fixed xmlstream bugs with unexpected disconnect 2009-08-21 00:26:57 +00:00
Nathan Fritz
9cbc29149f fixed typo 2009-07-11 22:17:49 +00:00
Nathan Fritz
7a15d14c93 added incoming_filter 2009-07-11 21:46:31 +00:00
Nathan Fritz
171bb30e83 base message and presence events detect xmlns being used 2009-07-11 20:47:03 +00:00
Nathan Fritz
a280e3c140 xmlmask now ignores namespace on subdomains properly if ignore_ns is set 2009-07-11 20:34:27 +00:00
Nathan Fritz
d9b812a73b fixed relative import 2009-07-11 19:51:04 +00:00
Nathan Fritz
a3b94d51fb fixed import bug in component 2009-07-11 19:41:24 +00:00
Nathan Fritz
226f719597 components now ignore namespaces in matching completely for server compatibility 2009-07-11 19:31:20 +00:00
Remko Tronçon
a1ece44368 Fixed typo. 2009-07-11 18:20:47 +00:00
Nathan Fritz
ce8bf4a367 made disconnect cleaner 2009-06-25 06:49:58 +00:00
Nathan Fritz
94f58ec3cb 2009-06-24 06:09:20 +00:00
Nathan Fritz
a9262c4e0a * bugfixes 2009-06-16 11:59:55 +00:00
Nathan Fritz
5fbf0f84d7 fixed pubsub test 2009-06-12 19:27:29 +00:00
Nathan Fritz
96b103b275 moved seesmic branch to trunk 2009-06-03 22:56:51 +00:00