Added support of ipv6 address (boolean "use_v6" parameter in TelegramClient constructor) #425

heffcodex · 2017-11-12T09:47:30Z

Hello! Well, I did that:)
With this mod the library can work with my PySocks fork to use IPv6 address.

…Client constructor)

Lonami · 2017-11-12T11:01:20Z

telethon/telegram_bare_client.py

@@ -69,6 +69,7 @@ class TelegramBareClient:

    def __init__(self, session, api_id, api_hash,
                 connection_mode=ConnectionMode.TCP_FULL,
+                 use_v6=False,


v6 sounds like "version six". Version six of what? Maybe something more explicit like use_ipv6 would make more sense.

Yea, I also think that it will be better.

Lonami · 2017-11-12T11:02:08Z

telethon/tl/session.py

        """Loads a saved session_user_id.session or creates a new one.
           If session_user_id=None, later .save()'s will have no effect.
        """
        if session_user_id is None:
-            return Session(None)
+            return Session(None, use_v6)


I'm not too sure about this, having to pass use_v6 around everywhere. I will change this to have None IP address, and if this is the case, get the right IP from somewhere else.

Lonami · 2017-11-12T11:02:45Z

telethon/tl/session.py

@@ -64,7 +64,10 @@ def __init__(self, session_user_id):
        self._last_msg_id = 0  # Long

        # These values will be saved
-        self.server_address = '91.108.56.165'
+        if use_v6:
+            self.server_address = '[2001:67c:4e8:f002::a]'


So maybe the problem was the address wasn't enclosed with square braces? Why are these needed?

AFAIK, ipv6 address must be enclosed in square brackets if it used with port or within URL. But I'm not exactly sure, that these brackets are needed also there.

Lonami · 2017-11-12T11:04:16Z

Thank you! However I've noticed you don't use the use_v6 information when a reconnection occurs, which is likely. See this method:

Telethon/telethon/telegram_bare_client.py

Line 290 in 5a57a8a

def _get_dc(self, dc_id, ipv6=False, cdn=False):

heffcodex · 2017-11-12T11:21:10Z

I missed this place in the code. Do you have any suggestions on how best to throw a flag from the class constructor into this function?

Lonami · 2017-11-12T11:22:07Z

I've made some changes to your code so it's a bit cleaner. Please review them and let me know if this is enough to help you do that final change I requested.

heffcodex · 2017-11-12T11:28:00Z

I see that ipv6 parameter is used only in the same function:

Telethon/telethon/telegram_bare_client.py

Line 311 in 5a57a8a

return self._get_dc(dc_id, ipv6=ipv6, cdn=cdn)

So, maybe the best way will be to store use_ipv6 in class field and check it within this function?

Lonami · 2017-11-12T11:29:32Z

Yeah, best option in my opinion is to have TelegramBareClient._use_ipv6 so we can use self._use_ipv6 instead passing ipv6= as a parameter. We also need to think about this case: what if an user is using IPv4 but decides to use IPv6 at some point? It can happen, overall if you're testing. Make the attribute private so we don't need to worry about the user changing it at any time, only on creation.

heffcodex · 2017-11-12T11:38:18Z

Anyway, the originally selected server IP is saved in the session, so I think we can make the field private and fill it only when creating an instance of the class (or restoring the session from the file).

Better flag argument name (use_v6 -> use_ipv6). The flag is now stored into private classfield. _get_dc ipv6 fix.

Lonami · 2017-11-12T12:52:47Z

telethon/telegram_bare_client.py

@@ -300,15 +313,15 @@ def _get_dc(self, dc_id, ipv6=False, cdn=False):

            return next(
                dc for dc in TelegramBareClient._config.dc_options
-                if dc.id == dc_id and bool(dc.ipv6) == ipv6 and bool(dc.cdn) == cdn
+                if dc.id == dc_id and bool(dc.ipv6) == self._use_ipv6 and bool(dc.cdn) == cdn


Here again, I noticed you use '[2001:67c:4e8:f002::a]' as the IPv6 string (notice the square braces '[]'). Why are these needed? Telegram's dc.ipv6 don't have these braces. Will it still work?

OK, I will test it today/tomorrow and let you know.

Easiest way is to manually set a different datacenter on the session file so when you connect the library will need to change to your closest one.

Well, as I've just tested, in case of ipv6 connection, the server address MUST be in '[]' and the port MUST be 80, or server/proxy will return an Bad Gateway or Timeout error.

Lonami · 2017-11-13T08:19:32Z

I'm testing this pull request now and while I can't connect I found this:

socket.has_ipv6
This constant contains a boolean value which indicates if IPv6 is supported on this platform.

So maybe we should check if use_ipv6 and not socket.has_ipv6: raise.

On a different line, my problem when trying to connect with square braces around the IP I get:

    self._socket.connect(address)
socket.gaierror: [Errno -2] Name or service not known

And if I remove the braces:

    self._socket.connect(address)
OSError: [Errno 101] Network is unreachable

socket.has_ipv6 is True on my Linux machine.

Lonami · 2017-11-13T08:28:21Z

Even better (and this is one of the reasons why I gave up on adding IPv6 support myself):

>>> socket.has_ipv6
True
>>> socket.getaddrinfo("example.org", 80, proto=socket.IPPROTO_TCP)[1]
(<AddressFamily.AF_INET6: 10>, <SocketKind.SOCK_STREAM: 1>, 6, '', ('2606:2800:220:1:248:1893:25c8:1946', 80, 0, 0))
>>> a = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
>>> a.connect(('2606:2800:220:1:248:1893:25c8:1946', 80, 0, 0))
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
OSError: [Errno 101] Network is unreachable
>>>
>>> socket.getaddrinfo("example.org", 80, proto=socket.IPPROTO_TCP)[0]
(<AddressFamily.AF_INET: 2>, <SocketKind.SOCK_STREAM: 1>, 6, '', ('93.184.216.34', 80))
>>> a = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
>>> a.connect(('93.184.216.34', 80))
>>> a.close()

heffcodex · 2017-11-13T08:42:10Z

AFAIK, even if ipv6 is supported on the target platform, the machine may not connect via ipv6 without having an ipv6 address. It depends on the ISP. An alternative way is to use the ipv6 proxy, for which all these changes were started.
socket.has_ipv6 does not provide reliable information, and it seems to me that there is no difference that it will cause an exception - Telethon or socket module. Therefore, I think check socket.has_ipv6 is superfluous.

Lonami · 2017-11-13T08:45:57Z

Alright, thanks for the info. Despite this though, ifconfig does show an IPv6 address on the network adapter I'm using so I think it's safe to assume that I do have IPv6 (also, I can create an IPv6 socket without trouble).

heffcodex · 2017-11-13T08:52:49Z

Your network adapter can have an ipv6 address, so socket.has_ipv6 also returns True. But does your ISP network have ipv6 addresses? Most likely, all use of ipv6 ends on your network adapter :)

Lonami · 2017-11-16T12:30:44Z

Thanks, I will add support for switching between IPv4 to IPv6 and vice versa if a previous connection was made now.

heffcodex · 2017-11-16T12:33:05Z

Thank you so much! Many people have already asked me to do pull request, finally they will be happy :)

Lonami · 2017-11-16T12:44:06Z

One last note, Telegram as I said returns this for IPv6 addresses:

dc_options=[
    DcOption(
        ipv6=False,
        media_only=False,
        tcpo_only=False,
        cdn=False,
        static=False,
        id=1,
        ip_address='149.154.175.50',
        port=443
    ),
    DcOption(
        ipv6=True,
        media_only=False,
        tcpo_only=False,
        cdn=False,
        static=False,
        id=1,
        ip_address='2001:0b28:f23d:f001:0000:0000:0000:000a',
        port=443
    ),
    ...
],

So I'll add the square braces to surround the IP address if IPv6 is enabled, as you told me it needs to be.

Added support of ipv6 address (boolean "use_v6" parameter in Telegram…

237583e

…Client constructor)

Lonami reviewed Nov 12, 2017

View reviewed changes

Clean-up use_v6 usage

f5c5110

Man197 added 2 commits November 12, 2017 14:59

Fix

07a36cf

Better flag argument name (use_v6 -> use_ipv6). The flag is now stored into private classfield. _get_dc ipv6 fix.

telegram_client.py argument name fix

36773c0

Lonami reviewed Nov 12, 2017

View reviewed changes

Lonami merged commit ee5915e into LonamiWebs:master Nov 16, 2017

Lonami added a commit that referenced this pull request Nov 16, 2017

Ensure IPv6 addresses are surrounded by '[]' (#425)

4ddbc78

Lonami mentioned this pull request Nov 16, 2017

Socket error - timed out for ipv6 proxy #322

Closed

Lonami mentioned this pull request Aug 8, 2020

IPv6 fix #1517

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added support of ipv6 address (boolean "use_v6" parameter in TelegramClient constructor) #425

Added support of ipv6 address (boolean "use_v6" parameter in TelegramClient constructor) #425

heffcodex commented Nov 12, 2017

Lonami Nov 12, 2017 •

edited

heffcodex Nov 12, 2017

Lonami Nov 12, 2017

Lonami Nov 12, 2017 •

edited

heffcodex Nov 12, 2017

Lonami commented Nov 12, 2017

heffcodex commented Nov 12, 2017

Lonami commented Nov 12, 2017

heffcodex commented Nov 12, 2017

Lonami commented Nov 12, 2017 •

edited

heffcodex commented Nov 12, 2017 •

edited

Lonami Nov 12, 2017

heffcodex Nov 12, 2017

Lonami Nov 12, 2017

heffcodex Nov 12, 2017

Lonami commented Nov 13, 2017 •

edited

Lonami commented Nov 13, 2017 •

edited

heffcodex commented Nov 13, 2017

Lonami commented Nov 13, 2017 •

edited

heffcodex commented Nov 13, 2017

Lonami commented Nov 16, 2017

heffcodex commented Nov 16, 2017

Lonami commented Nov 16, 2017

Added support of ipv6 address (boolean "use_v6" parameter in TelegramClient constructor) #425

Added support of ipv6 address (boolean "use_v6" parameter in TelegramClient constructor) #425

Conversation

heffcodex commented Nov 12, 2017

Lonami Nov 12, 2017 • edited

Choose a reason for hiding this comment

heffcodex Nov 12, 2017

Choose a reason for hiding this comment

Lonami Nov 12, 2017

Choose a reason for hiding this comment

Lonami Nov 12, 2017 • edited

Choose a reason for hiding this comment

heffcodex Nov 12, 2017

Choose a reason for hiding this comment

Lonami commented Nov 12, 2017

heffcodex commented Nov 12, 2017

Lonami commented Nov 12, 2017

heffcodex commented Nov 12, 2017

Lonami commented Nov 12, 2017 • edited

heffcodex commented Nov 12, 2017 • edited

Lonami Nov 12, 2017

Choose a reason for hiding this comment

heffcodex Nov 12, 2017

Choose a reason for hiding this comment

Lonami Nov 12, 2017

Choose a reason for hiding this comment

heffcodex Nov 12, 2017

Choose a reason for hiding this comment

Lonami commented Nov 13, 2017 • edited

Lonami commented Nov 13, 2017 • edited

heffcodex commented Nov 13, 2017

Lonami commented Nov 13, 2017 • edited

heffcodex commented Nov 13, 2017

Lonami commented Nov 16, 2017

heffcodex commented Nov 16, 2017

Lonami commented Nov 16, 2017

Lonami Nov 12, 2017 •

edited

Lonami Nov 12, 2017 •

edited

Lonami commented Nov 12, 2017 •

edited

heffcodex commented Nov 12, 2017 •

edited

Lonami commented Nov 13, 2017 •

edited

Lonami commented Nov 13, 2017 •

edited

Lonami commented Nov 13, 2017 •

edited