summaryrefslogtreecommitdiff
path: root/sleekxmpp/thirdparty/socks.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2014-08-17 17:20:26 -0700
committerLance Stout <lancestout@gmail.com>2014-08-17 17:20:26 -0700
commitca306e7cecee4bf7afd9ce44f5f067b305928682 (patch)
tree3641ff7754a221a53d6b5af08ffefa3f6898627d /sleekxmpp/thirdparty/socks.py
parenta5c03b763a6545a214f4f391f7c07582c22150b2 (diff)
parent1bf34f7fe694c2997710e0d23b0784e824df5e5e (diff)
downloadslixmpp-ca306e7cecee4bf7afd9ce44f5f067b305928682.tar.gz
slixmpp-ca306e7cecee4bf7afd9ce44f5f067b305928682.tar.bz2
slixmpp-ca306e7cecee4bf7afd9ce44f5f067b305928682.tar.xz
slixmpp-ca306e7cecee4bf7afd9ce44f5f067b305928682.zip
Merge pull request #310 from Mayflower/cleanup
Cleanup
Diffstat (limited to 'sleekxmpp/thirdparty/socks.py')
-rw-r--r--sleekxmpp/thirdparty/socks.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/thirdparty/socks.py b/sleekxmpp/thirdparty/socks.py
index 9239a7b9..0c1f6eba 100644
--- a/sleekxmpp/thirdparty/socks.py
+++ b/sleekxmpp/thirdparty/socks.py
@@ -213,7 +213,7 @@ class socksocket(socket.socket):
# Resolve locally
ipaddr = socket.inet_aton(socket.gethostbyname(destaddr))
req = req + chr(0x01).encode() + ipaddr
- req = req + struct.pack(">H", destport)
+ req += struct.pack(">H", destport)
self.sendall(req)
# Get the response
resp = self.__recvall(4)
@@ -282,7 +282,7 @@ class socksocket(socket.socket):
# The username parameter is considered userid for SOCKS4
if self.__proxy[4] != None:
req = req + self.__proxy[4]
- req = req + chr(0x00).encode()
+ req += chr(0x00).encode()
# DNS name if remote resolving is required
# NOTE: This is actually an extension to the SOCKS4 protocol
# called SOCKS4A and may not be supported in all cases.