mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.13] gh-123409: fix IPv6Address.reverse_pointer for IPv4-mapped addresses (GH-123419) (#123606)

Browse source 
gh-123409: fix `IPv6Address.reverse_pointer` for IPv4-mapped addresses (GH-123419)

Fix functionality that was broken with better textual representation for IPv4-mapped addresses (gh-87799)
(cherry picked from commit 77a2fb4bf1)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2024-09-03 01:19:46 +02:00 • committed by GitHub
parent f8124237e7
commit 7761ddcfed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 53 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/ipaddress.py
View file

@ -1970,12 +1970,21 @@ class IPv6Address(_BaseV6, _BaseAddress):
def _explode_shorthand_ip_string(self):
ipv4_mapped = self.ipv4_mapped
if ipv4_mapped is None:
long_form = super()._explode_shorthand_ip_string()
else:
prefix_len = 30
raw_exploded_str = super()._explode_shorthand_ip_string()
long_form = "%s%s" % (raw_exploded_str[:prefix_len], str(ipv4_mapped))
return long_form
return super()._explode_shorthand_ip_string()
prefix_len = 30
raw_exploded_str = super()._explode_shorthand_ip_string()
return f"{raw_exploded_str[:prefix_len]}{ipv4_mapped!s}"
def _reverse_pointer(self):
ipv4_mapped = self.ipv4_mapped
if ipv4_mapped is None:
return super()._reverse_pointer()
prefix_len = 30
raw_exploded_str = super()._explode_shorthand_ip_string()[:prefix_len]
# ipv4 encoded using hexadecimal nibbles instead of decimals
ipv4_int = ipv4_mapped._ip
reverse_chars = f"{raw_exploded_str}{ipv4_int:008x}"[::-1].replace(':', '')
return '.'.join(reverse_chars) + '.ip6.arpa'
def _ipv4_mapped_ipv6_to_str(self):
"""Return convenient text representation of IPv4-mapped IPv6 address