+ add 6to4 to the ipv6 tunnel decoding.

git-svn-id: https://ipaddr-py.googlecode.com/svn/trunk@201 09200d28-7f98-11dd-ad27-0f66e57d2035

1 files changed, 18 insertions, 3 deletions

diff --git a/ipaddr.py b/ipaddr.py
index dff40d3..261f3e2 100644
--- a/ipaddr.py
+++ b/ipaddr.py
@@ -1753,15 +1753,30 @@ class _BaseV6(object):
         """Tuple of embedded teredo IPs.
 
         Returns:
-            Tuple of the (server, client) IPs.
+            Tuple of the (server, client) IPs or False if the address
+            doesn't appear to be a teredo address (doesn't start with
+            2001)
 
-        Note:
-            This doesn't try to verify that the address is a teredo address
         """
         bits = self._explode_shorthand_ip_string().split(':')
+        if not bits[0] == '2001':
+            return False
         return (IPv4Address(int(''.join(bits[2:4]), 16)),
                 IPv4Address(int(''.join(bits[6:]), 16) ^ 0xFFFFFFFF))
 
+    def sixtofour(self):
+        """Return the IPv4 6to4 embedded address.
+
+        Returns:
+            The IPv4 6to4-embedded address if present or False if the
+            address doesn't appear to contain a 6to4 embedded address.
+
+        """
+        bits = self._explode_shorthand_ip_string().split(':')
+        if not bits[0] == '2002':
+            return False
+        return IPv4Address(int(''.join(bits[1:3]), 16))
+
 
 class IPv6Address(_BaseV6, _BaseIP):