summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorSandro Munda <sandro.munda@guardis.com>2012-11-01 10:58:54 +0100
committerSandro Munda <sandro.munda@guardis.com>2012-11-01 11:17:05 +0100
commitd4449304940688b0fb6db09042ce4292cfc57859 (patch)
tree07b7342205c92d51d33885e64220079c77a9057a /sleekxmpp/plugins
parent6045a6bfb3f5dc6172346601fab7e37713ca264f (diff)
downloadslixmpp-d4449304940688b0fb6db09042ce4292cfc57859.tar.gz
slixmpp-d4449304940688b0fb6db09042ce4292cfc57859.tar.bz2
slixmpp-d4449304940688b0fb6db09042ce4292cfc57859.tar.xz
slixmpp-d4449304940688b0fb6db09042ce4292cfc57859.zip
Improved the gitignore files (vim temp file, .pyo file and .baboon directory).
Automatically pack & unpack data through the socket. Added some comments to the pack method. Handled possible error during the unpacking of data.
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0065/proxy.py37
1 files changed, 34 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0065/proxy.py b/sleekxmpp/plugins/xep_0065/proxy.py
index b027e4e0..b8e199ac 100644
--- a/sleekxmpp/plugins/xep_0065/proxy.py
+++ b/sleekxmpp/plugins/xep_0065/proxy.py
@@ -1,6 +1,7 @@
import sys
import logging
import struct
+import pickle
from threading import Thread, Event
from hashlib import sha1
@@ -217,7 +218,7 @@ class XEP_0065(base_plugin):
proxy = self.proxy_threads.get(sid)
if proxy:
- proxy.s.sendall(data)
+ proxy.send(data)
def on_recv(self, sid, data):
""" Calls when data is recv from the Proxy socket associated
@@ -306,6 +307,34 @@ class Proxy(Thread):
self.s.close()
log.info('Socket closed.')
+ def send(self, data):
+ """ Send data through the socket.
+ """
+
+ try:
+ packed_data = self._pack(data)
+ self.s.sendall(packed_data)
+ except pickle.PickleError as err:
+ log.error(err)
+
+ def _pack(self, data):
+ """ Packs the data.
+ """
+
+ # The data format is: `len_data`+`data`. Useful to receive all the data
+ # at once (avoid splitted data) thanks to the recv_size method.
+ data = pickle.dumps(data)
+ return struct.pack('>i', len(data)) + data
+
+ def _unpack(self, data):
+ """ Unpacks the data. On error, log an error message and returns None.
+ """
+
+ try:
+ return pickle.loads(data)
+ except Exception as err:
+ log.error(err)
+
def listen(self):
""" Listen for data on the socket. When receiving data, call
the callback on_recv callable.
@@ -328,8 +357,10 @@ class Proxy(Thread):
data = self.recv_size(self.s)
if not data:
socket_open = False
-
- self.on_recv(self.sid, data)
+ else:
+ unpacked_data = self._unpack(data)
+ if unpacked_data:
+ self.on_recv(self.sid, unpacked_data)
def recv_size(self, the_socket):
total_len = 0