Release v1.4.11

Add MultiAddress.isPublic()

Author: ianopolous

build.xml

@@ -40,7 +40,7 @@
         <attribute name="Class-Path" value="${manifest_cp}"/>
         <attribute name="Implementation-Vendor" value="io.ipfs"/>
         <attribute name="Implementation-Title" value="multiaddr"/>
-        <attribute name="Implementation-Version" value="1.4.10"/>
+        <attribute name="Implementation-Version" value="1.4.11"/>
       </manifest>
     </jar>
   </target>

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.github.multiformats</groupId>
     <artifactId>java-multiaddr</artifactId>
-	<version>v1.4.10</version>
+	<version>v1.4.11</version>
 
 	<name>multiaddr</name>
 	<url>https://github.com/multiformats/java-multiaddr</url>

src/main/java/io/ipfs/multiaddr/MultiAddress.java

@@ -3,6 +3,7 @@
 import io.ipfs.multihash.*;
 
 import java.io.*;
+import java.net.*;
 import java.util.*;
 import java.util.stream.*;
 
@@ -27,6 +28,29 @@ public byte[] getBytes() {
         return Arrays.copyOfRange(raw, 0, raw.length);
     }
 
+    public boolean isRelayed() {
+        String[] parts = toString().substring(1).split("/");
+        return Arrays.asList(parts).contains("/p2p-circuit");
+    }
+
+    public boolean isPublic(boolean testReachable) {
+        String[] parts = toString().substring(1).split("/");
+        try {
+            for (int i = 0; i < parts.length; i++) {
+                if (parts[i].equals(Protocol.Type.IP6ZONE.name))
+                    return true;
+                if (parts[i].equals(Protocol.Type.IP4.name) || parts[i].equals(Protocol.Type.IP6.name)) {
+                    InetAddress ip = InetAddress.getByName(parts[i + 1]);
+                    if (ip.isLoopbackAddress() || ip.isSiteLocalAddress() || ip.isLinkLocalAddress() || ip.isAnyLocalAddress())
+                        return false;
+                    return !testReachable || ip.isReachable(1000);
+                }
+            }
+        } catch (UnknownHostException e) {}
+        catch (IOException e) {}
+        return false;
+    }
+    
     public boolean isTCPIP() {
         String[] parts = toString().substring(1).split("/");
         if (parts.length != 4)
@@ -72,7 +96,7 @@ private static byte[] decodeFromString(String addr) {
                         Stream.of(Arrays.copyOfRange(parts, i, parts.length)).reduce("", (a, b) -> a + "/" + b) :
                         parts[i++];
                 if (component.length() == 0)
-                    throw new IllegalStateException("Protocol requires address, but non provided!");
+                    throw new IllegalStateException("Protocol requires address, but none provided!");
 
                 bout.write(p.addressToBytes(component));
                 if (p.isTerminal())

src/test/java/io/ipfs/api/MultiAddressTest.java

@@ -73,6 +73,42 @@ public void fails() {
             throw new IllegalStateException("Parsed invalid MultiAddresses: "+parsed);
     }
 
+    @Test
+    public void publicIps() {
+        List<MultiAddress> pub = Stream.of("/ip4/8.8.8.8")
+                .map(MultiAddress::new)
+                .collect(Collectors.toList());
+        for (MultiAddress addr : pub) {
+            Assert.assertTrue(addr.toString() + " is public", addr.isPublic(false));
+        }
+        List<MultiAddress> priv = Stream.of(
+//                "/ip4/100.64.0.0",
+                        "/ip4/172.16.0.0",
+                        "/ip4/10.0.0.0",
+                        "/ip4/169.254.0.0",
+                        "/ip4/192.168.0.0",
+                        "/ip4/127.0.0.1",
+                        "/ip4/0.0.0.0",
+//                        "/ip4/192.0.0.0",
+//                        "/ip4/192.0.2.0",
+//                        "/ip4/192.88.99.0",
+//                        "/ip4/198.18.0.0",
+//                        "/ip4/198.51.100.0",
+//                        "/ip4/203.0.113.0",
+//                        "/ip4/224.0.0.0",
+//                        "/ip4/240.0.0.0",
+//                        "/ip4/255.255.255.255",
+                        "/ip6/::1",
+//                        "/ip6/fc00::",
+//                        "/ip6/ff00::",
+                        "/ip6/fe80::"
+                ).map(MultiAddress::new)
+                .collect(Collectors.toList());
+        for (MultiAddress addr : priv) {
+            Assert.assertTrue(addr.toString() + " is private", ! addr.isPublic(false));
+        }
+    }
+
     @Test
     public void succeeds() {
         List<String> failed = Stream.of(