diff options
| author | Lance Stout <lancestout@gmail.com> | 2014-08-18 13:34:15 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2014-08-18 13:34:15 -0700 |
| commit | e5e2fbb16b4d9c11fc676925c6a13943282a3c66 (patch) | |
| tree | 5dc018384ad03253608ff79c9fdbb577b84d2d2f /sleekxmpp/thirdparty/socks.py | |
| parent | a20582aba4de85f5a193395df2d0ed8c75220bfb (diff) | |
| parent | 3dd379cdf12d885e26f8ec26c54879a95d5f0b84 (diff) | |
| download | slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.tar.gz slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.tar.bz2 slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.tar.xz slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.zip | |
Merge pull request #311 from Mayflower/develop
Revert "cleanup semicolons, whitespace and mutable default arguments"
Diffstat (limited to 'sleekxmpp/thirdparty/socks.py')
| -rw-r--r-- | sleekxmpp/thirdparty/socks.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/thirdparty/socks.py b/sleekxmpp/thirdparty/socks.py index 0c1f6eba..9239a7b9 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 += struct.pack(">H", destport) + req = 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 += chr(0x00).encode() + req = 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. |