Revert "Fixed typo in vtx.c, and added preproc test for ENOTUNIQ (not…

… available on BSD)"

This reverts commit 4280646.

.gitignore

@@ -1,5 +1,4 @@
 *.o
-*.lst
 core
 client
 server

v3/build

@@ -1,2 +1,2 @@
-c -l -lzmq -lczmq vtx_test*.c
+c -l vtx_test*.c
 

v3/vtx.c

@@ -26,6 +26,7 @@
 
 #include "vtx.h"
 
+
 //  ---------------------------------------------------------------------
 //  Structure of our class
 //  Not threadsafe, do not access from multiple threads
@@ -116,11 +117,7 @@ vtx_register (vtx_t *self, char *scheme, zthread_attached_fn *driver_fn, Bool ve
         driver = s_driver_new (self, scheme, driver_fn, verbose);
     else {
         rc = -1;
-#ifdef ENOTUNIQ
         errno = ENOTUNIQ;
-		// BSD and hence darwin doesn't support ENOTUNIQ, with no logical replacement
-		// Leaving this blank for now
-#endif
     }
     return rc;
 }

v3/vtx.h

@@ -28,7 +28,6 @@
 #define __VTX_INCLUDED__
 
 #include "czmq.h"
-#include <sys/errno.h>
 
 //  Types of routing per driver socket
 #define VTX_ROUTING_NONE        0       //  No output routing allowed

v3/vtx_tcp.c

@@ -1235,7 +1235,7 @@ s_handle_io_error (char *reason)
     ||  errno == EPROTO
     ||  errno == ENOPROTOOPT
     ||  errno == EHOSTDOWN
-    ||  errno == ENOENT
+    ||  errno == ENONET
     ||  errno == EHOSTUNREACH
     ||  errno == EOPNOTSUPP
     ||  errno == ENETUNREACH

v3/vtx_udp.c

@@ -476,37 +476,19 @@ binding_require (vocket_t *vocket, char *address)
             zclock_log ("E: bind failed: invalid address '%s'", address);
             self->exception = TRUE;
         }
-<<<<<<< HEAD
         if (!self->exception) {
             if (bind (self->handle,
                 (const struct sockaddr *) &addr, IN_ADDR_SIZE) == -1) {
-=======
-
-
-		// Case external address (1)
-		// Try binding to address with bind(2), and if that fails, 
-		// set the exception flag (skipping case (2))
-        if (!self->exception) {
-			if (bind (self->handle, // http://beej.us/guide/bgnet/output/html/multipage/bindman.html
-					  (const struct sockaddr *) &addr, IN_ADDR_SIZE) == -1) {
->>>>>>> 43a2dec... Fixed typo in vtx.c, and added preproc test for ENOTUNIQ (not available on BSD)
                 zclock_log ("E: bind failed: '%s'", strerror (errno));
                 self->exception = TRUE;
             }
         }
-<<<<<<< HEAD
-=======
-
-		// Case local address (2) 
->>>>>>> 43a2dec... Fixed typo in vtx.c, and added preproc test for ENOTUNIQ (not available on BSD)
         if (!self->exception) {
             //  Catch input on handle
             zmq_pollitem_t item = { NULL, self->handle, ZMQ_POLLIN, 0 };
             zloop_poller (self->driver->loop, &item, s_binding_input, vocket);
         }
         //* End transport-specific work
-
-		// If cannot bind after both attempts, free binding
         if (self->exception) {
             free (self->address);
             free (self);
@@ -640,10 +622,7 @@ peering_send_msg (peering_t *self, zmsg_t *msg, int flags)
     assert (self);
     byte *data;
     size_t size = zmsg_encode (msg, &data);
-	// note and NOM refers to a payload
     int rc = peering_send (self, VTX_UDP_NOM, data, size, flags);
-
-	// Update counter and clean
     self->vocket->outgoing++;
     free (data);
     return rc;
@@ -1296,7 +1275,7 @@ s_handle_io_error (char *reason)
     ||  errno == EPROTO
     ||  errno == ENOPROTOOPT
     ||  errno == EHOSTDOWN
-	||  errno == ENOENT
+    ||  errno == ENONET
     ||  errno == EHOSTUNREACH
     ||  errno == EOPNOTSUPP
     ||  errno == ENETUNREACH