socket: Rename is_unix to is_converted

While "is_unix" certainly would describe the state after being converted
from an AF_INET/AF_INET6 socket to an AF_UNIX socket, it's not
necessarily true if we pick up an existing AF_UNIX socket. In this case
the "conversion" would be from AF_UNIX to AF_UNIX and the name "is_unix"
would be ambiguous and could apply to the state before the conversion
*and* afterwards.

I stumbled upon this when implementing a way to pick up an existing Unix
domain socket and eg. change its path.

Signed-off-by: aszlig <[email protected]>

src/socket.cc

@@ -108,7 +108,7 @@ void Socket::blackhole(void)
 int Socket::setsockopt(int level, int optname, const void *optval,
                        socklen_t optlen)
 {
-    if (this->is_unix && level != SOL_SOCKET) {
+    if (this->is_converted && level != SOL_SOCKET) {
         LOG(DEBUG) << "Prevented calling setsockopt on fd " << this->fd
                    << " with incompatible level " << level << '.';
         return 0;
@@ -122,7 +122,7 @@ int Socket::setsockopt(int level, int optname, const void *optval,
      * succeeded (and it's using SOL_SOCKET level), otherwise we risk a fatal
      * error while replaying them on our end.
      */
-    if (!this->is_unix && level == SOL_SOCKET) {
+    if (!this->is_converted && level == SOL_SOCKET) {
         if (optname == SO_REUSEADDR && *static_cast<const int*>(optval) > 0)
             this->reuse_addr = true;
 
@@ -141,7 +141,7 @@ int Socket::ioctl(unsigned long request, const void *arg)
     /* Only add the arguments to the queue if the ioctl() has succeeded,
      * otherwise we risk a fatal error while replaying them on our end.
      */
-    if (!this->is_unix)
+    if (!this->is_converted)
         this->sockopts.cache_ioctl(request, arg);
 
     return ret;
@@ -154,7 +154,7 @@ int Socket::epoll_ctl(int epfd, int op, struct epoll_event *event)
     if (ret != 0)
         return ret;
 
-    if (!this->is_unix)
+    if (!this->is_converted)
         this->sockopts.cache_epoll_ctl(epfd, op, event);
 
     return ret;
@@ -217,7 +217,7 @@ bool Socket::make_unix(int oldfd)
     int newfd;
     int old_errno = errno;
 
-    if (this->is_unix)
+    if (this->is_converted)
         return true;
 
     if (oldfd != -1) {
@@ -256,7 +256,7 @@ bool Socket::make_unix(int oldfd)
               << newfd << '.';
 
     errno = old_errno;
-    this->is_unix = true;
+    this->is_converted = true;
     return true;
 }
 
@@ -486,7 +486,7 @@ int Socket::accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
     sock->ports.reserve(local_port.value());
     sock->binding = local_addr;
     sock->connection = peer;
-    sock->is_unix = true;
+    sock->is_converted = true;
     peer.apply_addr(addr, addrlen);
     Socket::registry[sockfd] = sock->getptr();
     LOG(INFO) << "Accepted socket fd " << sockfd

src/socket.hh

@@ -126,7 +126,7 @@ struct Socket : std::enable_shared_from_this<Socket>
         static std::unordered_set<SocketPath> sockpath_registry;
 
         /* Whether the socket has been converted to an AF_UNIX socket. */
-        bool is_unix = false;
+        bool is_converted = false;
 
         /* Set if this socket is bound to an unlinked socket path. */
         bool is_blackhole = false;