hoelee/Telethon
1
0
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-08-08 21:10:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt at supporting IPv6 (#211 and #112)

Browse Source
This commit is contained in:
Lonami Exo
2017-08-29 13:49:41 +02:00
parent 592e107f52
commit 82304b18eb
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
telethon/extensions/tcp_client.py
View File

@@ -19,12 +19,12 @@ class TcpClient:
self.delay = 0.1 # Read delay when there was no data available
self._lock = Lock()
def _recreate_socket(self):
def _recreate_socket(self, mode):
if self._proxy is None:
self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self._socket = socket.socket(mode, socket.SOCK_STREAM)
else:
import socks
self._socket = socks.socksocket(socket.AF_INET, socket.SOCK_STREAM)
self._socket = socks.socksocket(mode, socket.SOCK_STREAM)
if type(self._proxy) is dict:
self._socket.set_proxy(**self._proxy)
else: # tuple, list, etc.
@@ -35,9 +35,14 @@ class TcpClient:
'timeout' must be given in seconds
"""
if not self.connected:
self._recreate_socket()
self._socket.settimeout(timeout)
self._socket.connect((ip, port))
if ':' in ip: # IPv6
self._recreate_socket(socket.AF_INET6)
self._socket.settimeout(timeout)
self._socket.connect((ip, port, 0, 0))
else:
self._recreate_socket(socket.AF_INET)
self._socket.settimeout(timeout)
self._socket.connect((ip, port))
self._socket.setblocking(False)
def _get_connected(self):