Adding missing protocols from libzmq, in the same order.

Author: fbacchella

src/main/java/zmq/io/net/NetProtocol.java

@@ -28,15 +28,15 @@
 public enum NetProtocol
 {
     inproc(false, false),
-    ipc(false, false)
+    tcp(false, false)
     {
         @Override
         public void resolve(Address paddr, boolean ipv6)
         {
             paddr.resolve(ipv6);
         }
     },
-    tcp(false, false)
+    udp(true, true)
     {
         @Override
         public void resolve(Address paddr, boolean ipv6)
@@ -48,6 +48,17 @@ public void resolve(Address paddr, boolean ipv6)
     //  sent to this pipe. (same for NORM, currently?)
     pgm(true, true, Sockets.PUB, Sockets.SUB, Sockets.XPUB, Sockets.XPUB),
     epgm(true, true, Sockets.PUB, Sockets.SUB, Sockets.XPUB, Sockets.XPUB),
+    norm(true, true),
+    ws(true, true),
+    wss(true, true),
+    ipc(false, false)
+    {
+        @Override
+        public void resolve(Address paddr, boolean ipv6)
+        {
+            paddr.resolve(ipv6);
+        }
+    },
     tipc(false, false)
     {
         @Override
@@ -56,7 +67,7 @@ public void resolve(Address paddr, boolean ipv6)
             paddr.resolve(ipv6);
         }
     },
-    norm(true, true),
+    vmci(true, true),
     ;
 
     private static final Map<NetProtocol,NetworkProtocolProvider > providers;
@@ -75,13 +86,13 @@ public void resolve(Address paddr, boolean ipv6)
     public final boolean  isMulticast;
     private final Set<Integer> compatibles;
 
-    private NetProtocol(boolean subscribe2all, boolean isMulticast, Sockets... compatibles)
+    NetProtocol(boolean subscribe2all, boolean isMulticast, Sockets... compatibles)
     {
         this.compatibles = Arrays.stream(compatibles).map(Sockets::ordinal).collect(Collectors.toSet());
         this.subscribe2all = subscribe2all;
         this.isMulticast = isMulticast;
     }
-    
+
     public boolean isValid() {
         return providers.containsKey(this) && providers.get(this).isValid();
     }

src/main/java/zmq/io/net/NetworkProtocolProvider.java

@@ -13,11 +13,10 @@
 
 public interface NetworkProtocolProvider {
     boolean handleProtocol(NetProtocol protocol);
-    public Listener getListener(IOThread ioThread, SocketBase socket,
-                                Options options);
-    public IZAddress zresolve(String addr, boolean ipv6);
-    public abstract void startConnecting(Options options, IOThread ioThread, SessionBase session, Address addr,
-                                         boolean delayedStart, Consumer<Own> launchChild, BiConsumer<SessionBase, IEngine> sendAttach);
+    Listener getListener(IOThread ioThread, SocketBase socket, Options options);
+    IZAddress zresolve(String addr, boolean ipv6);
+    void startConnecting(Options options, IOThread ioThread, SessionBase session, Address addr, boolean delayedStart,
+            Consumer<Own> launchChild, BiConsumer<SessionBase, IEngine> sendAttach);
     boolean isValid();
 
 }

src/main/java/zmq/io/net/tcp/TcpConnecter.java

@@ -176,14 +176,13 @@ private void startConnecting()
         try {
             boolean rc = open();
 
+            handle = ioObject.addFd(fd);
             //  Connect may succeed in synchronous manner.
             if (rc) {
-                handle = ioObject.addFd(fd);
                 connectEvent();
             }
             //  Connection establishment may be delayed. Poll for its completion.
             else {
-                handle = ioObject.addFd(fd);
                 ioObject.setPollConnect(handle);
                 socket.eventConnectDelayed(addr.toString(), -1);
             }
@@ -295,10 +294,7 @@ private boolean open() throws IOException
         boolean rc;
         try {
             rc = fd.connect(sa);
-            if (rc) {
-                //  Connect was successful immediately.
-            }
-            else {
+            if (! rc) {
                 //  Translate error codes indicating asynchronous connect has been
                 //  launched to a uniform EINPROGRESS.
                 errno.set(ZError.EINPROGRESS);