Add IPv6 support for push-to-my-ouya

diff --git a/src/push-to-my-ouya-helpers.php b/src/push-to-my-ouya-helpers.php
index a0209881bf376d8dc056b4a18a816fc0ac0dc18c..11c742027769b81570947b3158fd36fe31cf2821 100644 (file)
--- a/src/push-to-my-ouya-helpers.php
+++ b/src/push-to-my-ouya-helpers.php
@@ -11,6 +11,10 @@
  */
 function mapIp($ip)
 {
+    if (strpos($ip, ':') !== false) {
+        return mapIpv6($ip);
+    }
+
     $private = substr($ip, 0, 3) == '10.'
         || substr($ip, 0, 7) == '172.16.'
         || substr($ip, 0, 7) == '172.17.'
@@ -37,3 +41,40 @@ function mapIp($ip)
     }
     return $ip;
 }
+
+/**
+ * Map IPv6 addresses to their 64bit prefix, assuming that the PC and the OUYA
+ * share the same prefix.
+ * Map local IPs to a single IP so that this the queue can be used
+ * in the home network.
+ *
+ * @see  RFC 6890: Special-Purpose IP Address Registries
+ * @see  RFC 4291: IP Version 6 Addressing Architecture
+ * @link https://en.wikipedia.org/wiki/Link-local_address
+ */
+function mapIpv6($ip)
+{
+    $ip = strtolower(expandIpv6($ip));
+    if ($ip == '0000:0000:0000:0000:0000:0000:0000:0001') {
+        //localhost
+        return 'local';
+    } else if (substr($ip, 0, 2) == 'fc' || substr($ip, 0, 2) == 'fd') {
+        // fc00::/7 = Unique Local Unicast
+        return 'local';
+    } else if (substr($ip, 0, 3) == 'fe8'
+        || substr($ip, 0, 3) == 'fe9'
+        || substr($ip, 0, 3) == 'fea'
+        || substr($ip, 0, 3) == 'feb'
+    ) {
+        // fe80::/10 = Link-Local unicast
+        return 'local';
+    }
+
+    return substr($ip, 0, 19);
+}
+
+function expandIpv6($ip)
+{
+    $hex = unpack("H*hex", inet_pton($ip));
+    return implode(':', str_split($hex['hex'], 4));
+}

diff --git a/www/push-to-my-ouya.php b/www/push-to-my-ouya.php
index fd39043234ac4f37d876b86a0f854eeb87215c3c..12c9077b249109f4d0a3a5277d26eac862aa6348 100644 (file)
--- a/www/push-to-my-ouya.php
+++ b/www/push-to-my-ouya.php
@@ -56,15 +56,6 @@ if ($ip == '') {
     echo 'Cannot detect your IP address' . "\n";
     exit(1);
 }
-if (strpos($ip, ':') !== false) {
-    header('HTTP/1.0 400 Bad Request');
-    header('Content-type: text/plain');
-    echo 'Sorry, IPv6 is not supported' . "\n";
-    echo 'This here only works if the OUYA and your PC have the same IP address,'
-        . "\n";
-    echo 'and this is definitely not the case when using IPv6' . "\n";
-    exit(1);
-}
 $ip = mapIp($ip);
 
 try {