Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-09-19 12:04:42 -04:00
Code Issues Projects Releases Packages Wiki Activity

pep8: no space after {[ or before ]}, reindent

Browse source
This commit is contained in:
Thomas Waldmann 2014-11-18 18:41:45 +01:00
parent aa2b59ec5d
commit 152bc32ba7
2 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
onionshare/socks.py
View file

@ -105,24 +105,27 @@ class HTTPError(ProxyError):
pass pass
SOCKS4_ERRORS = { 0x5B: "Request rejected or failed", SOCKS4_ERRORS = {
0x5B: "Request rejected or failed",
0x5C: "Request rejected because SOCKS server cannot connect to identd on the client", 0x5C: "Request rejected because SOCKS server cannot connect to identd on the client",
0x5D: "Request rejected because the client program and identd report different user-ids" 0x5D: "Request rejected because the client program and identd report different user-ids",
} }
SOCKS5_ERRORS = { 0x01: "General SOCKS server failure", SOCKS5_ERRORS = {
0x01: "General SOCKS server failure",
0x02: "Connection not allowed by ruleset", 0x02: "Connection not allowed by ruleset",
0x03: "Network unreachable", 0x03: "Network unreachable",
0x04: "Host unreachable", 0x04: "Host unreachable",
0x05: "Connection refused", 0x05: "Connection refused",
0x06: "TTL expired", 0x06: "TTL expired",
0x07: "Command not supported, or protocol error", 0x07: "Command not supported, or protocol error",
0x08: "Address type not supported" 0x08: "Address type not supported",
} }
DEFAULT_PORTS = { SOCKS4: 1080, DEFAULT_PORTS = {
SOCKS4: 1080,
SOCKS5: 1080, SOCKS5: 1080,
HTTP: 8080 HTTP: 8080,
} }
@ -205,9 +208,10 @@ class socksocket(socket.socket):
self.proxy_sockname = None self.proxy_sockname = None
self.proxy_peername = None self.proxy_peername = None
self.proxy_negotiators = { SOCKS4: self._negotiate_SOCKS4, self.proxy_negotiators = {
SOCKS4: self._negotiate_SOCKS4,
SOCKS5: self._negotiate_SOCKS5, SOCKS5: self._negotiate_SOCKS5,
HTTP: self._negotiate_HTTP HTTP: self._negotiate_HTTP,
} }
def _recvall(self, count): def _recvall(self, count):