extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-01-20 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't "import * from socket".

Browse Source
This commit is contained in:
Avery Pennarun 2010-05-01 20:26:16 -04:00
parent 651b945299
commit 3766d4d506
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client.py
View File

@ -1,12 +1,11 @@
import struct, select, errno import struct, socket, select, errno
from socket import *
from helpers import * from helpers import *
def _nb_clean(func, *args): def _nb_clean(func, *args):
try: try:
return func(*args) return func(*args)
except error, e: except socket.error, e:
if e.args[0] in (errno.EWOULDBLOCK, errno.EAGAIN): if e.args[0] in (errno.EWOULDBLOCK, errno.EAGAIN):
return None return None
raise raise
@ -29,13 +28,13 @@ class SockWrapper:
if not self.shut_read: if not self.shut_read:
log('%r: done reading\n' % self) log('%r: done reading\n' % self)
self.shut_read = True self.shut_read = True
#self.sock.shutdown(SHUT_RD) # doesn't do anything anyway #self.sock.shutdown(socket.SHUT_RD) # doesn't do anything anyway
def nowrite(self): def nowrite(self):
if not self.shut_write: if not self.shut_write:
log('%r: done writing\n' % self) log('%r: done writing\n' % self)
self.shut_write = True self.shut_write = True
self.sock.shutdown(SHUT_WR) self.sock.shutdown(socket.SHUT_WR)
def write(self, buf): def write(self, buf):
assert(buf) assert(buf)
@ -49,7 +48,7 @@ class SockWrapper:
rb = _nb_clean(self.sock.recv, 65536) rb = _nb_clean(self.sock.recv, 65536)
if rb: if rb:
self.buf.append(rb) self.buf.append(rb)
if rb == '': # empty string means EOF; None means nothing available if rb == '': # empty string means EOF; None means temporarily empty
self.noread() self.noread()
def maybe_fill(self): def maybe_fill(self):
@ -116,17 +115,17 @@ class Proxy(Handler):
def original_dst(sock): def original_dst(sock):
SO_ORIGINAL_DST = 80 SO_ORIGINAL_DST = 80
SOCKADDR_MIN = 16 SOCKADDR_MIN = 16
sockaddr_in = sock.getsockopt(SOL_IP, SO_ORIGINAL_DST, SOCKADDR_MIN) sockaddr_in = sock.getsockopt(socket.SOL_IP, SO_ORIGINAL_DST, SOCKADDR_MIN)
(proto, port, a,b,c,d) = struct.unpack('!hhBBBB', sockaddr_in[:8]) (proto, port, a,b,c,d) = struct.unpack('!hhBBBB', sockaddr_in[:8])
assert(htons(proto) == AF_INET) assert(socket.htons(proto) == socket.AF_INET)
ip = '%d.%d.%d.%d' % (a,b,c,d) ip = '%d.%d.%d.%d' % (a,b,c,d)
return (ip,port) return (ip,port)
def main(remotename, subnets): def main(remotename, subnets):
log('Starting sshuttle proxy.\n') log('Starting sshuttle proxy.\n')
listener = socket() listener = socket.socket()
listener.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1) listener.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
listener.bind(('0.0.0.0',1234)) listener.bind(('0.0.0.0',1234))
listener.listen(10) listener.listen(10)
log('Listening on %r.\n' % (listener.getsockname(),)) log('Listening on %r.\n' % (listener.getsockname(),))
@ -140,8 +139,8 @@ def main(remotename, subnets):
log("-- ignored: that's my address!\n") log("-- ignored: that's my address!\n")
sock.close() sock.close()
return return
outsock = socket() outsock = socket.socket()
outsock.setsockopt(SOL_IP, IP_TTL, 42) outsock.setsockopt(socket.SOL_IP, socket.IP_TTL, 42)
outsock.connect(dstip) outsock.connect(dstip)
handlers.append(Proxy(sock, outsock)) handlers.append(Proxy(sock, outsock))
handlers.append(Handler([listener], onaccept)) handlers.append(Handler([listener], onaccept))