copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[Santiago Gala] IPv6 filetransfert. see #1969

Browse source
This commit is contained in:
Yann Leboulanger 2007-06-09 07:07:05 +00:00
parent ea83642afc
commit 9f3fe8490b
1 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/common/socks5.py
View file

@ -348,9 +348,10 @@ class Socks5:
def __init__(self, idlequeue, host, port, initiator, target, sid): def __init__(self, idlequeue, host, port, initiator, target, sid):
if host is not None: if host is not None:
try: try:
self.host = socket.gethostbyname(host) self.host = host
self.ais = socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket.SOCK_STREAM)
except socket.gaierror: except socket.gaierror:
self.host = None self.ais = None
self.idlequeue = idlequeue self.idlequeue = idlequeue
self.fd = -1 self.fd = -1
self.port = port self.port = port
@ -793,6 +794,8 @@ class Socks5Listener(IdleObject):
only pollin events though only pollin events though
''' '''
self.port = port self.port = port
self.ais = socket.getaddrinfo(None, port, socket.AF_UNSPEC,
socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_PASSIVE)
self.queue_idx = -1 self.queue_idx = -1
self.idlequeue = idlequeue self.idlequeue = idlequeue
self.queue = None self.queue = None
@ -801,14 +804,21 @@ class Socks5Listener(IdleObject):
self.fd = -1 self.fd = -1
def bind(self): def bind(self):
self._serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM) for ai in self.ais:
self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) #try the different possibilities (ipv6, ipv4, etc.)
self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) self._serv = socket.socket(*ai[:3])
self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
# will fail when port as busy, or we don't have rights to bind self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
try: self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
self._serv.bind(('0.0.0.0', self.port)) # will fail when port as busy, or we don't have rights to bind
except Exception, e: try:
self._serv.bind(ai[4])
self.ai = ai
break
except:
self.ai = None
continue
if not self.ai:
# unable to bind, show error dialog # unable to bind, show error dialog
return None return None
self._serv.listen(socket.SOMAXCONN) self._serv.listen(socket.SOMAXCONN)
@ -884,9 +894,18 @@ class Socks5Receiver(Socks5, IdleObject):
def connect(self): def connect(self):
''' create the socket and plug it to the idlequeue ''' ''' create the socket and plug it to the idlequeue '''
self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) for ai in self.ais:
# this will not block the GUI try:
self._sock.setblocking(False) self._sock=socket.socket(*ai[:3])
# this will not block the GUI
self._sock.setblocking(False)
self._server=ai[4]
break
except:
if sys.exc_value[0] == errno.EINPROGRESS:
break
#for all errors, we try other addresses
continue
self.fd = self._sock.fileno() self.fd = self._sock.fileno()
self.state = 0 # about to be connected self.state = 0 # about to be connected
self.idlequeue.plug_idle(self, True, False) self.idlequeue.plug_idle(self, True, False)
@ -950,7 +969,7 @@ class Socks5Receiver(Socks5, IdleObject):
def do_connect(self): def do_connect(self):
try: try:
self._sock.connect((self.host, self.port)) self._sock.connect(self._server)
self._sock.setblocking(False) self._sock.setblocking(False)
self._send=self._sock.send self._send=self._sock.send
self._recv=self._sock.recv self._recv=self._sock.recv