X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fnet.c;h=00bc4659c131a0ff3bb1f02f766d6abeeff94fe9;hb=b5010caaa4606ea37df9cd1334dc99fff05a8bd3;hp=4147031c2048794da9a107a16d2f22c9a43ec863;hpb=d9f89ef5daa6375fc4ff257826fa39562fbe3ac3;p=doldaconnect.git

diff --git a/daemon/net.c b/daemon/net.c
index 4147031..00bc465 100644
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -33,6 +33,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <sys/signal.h>
+#include <sys/stat.h>       /* For rebindunix() */
 #ifdef HAVE_LINUX_SOCKIOS_H
 #include <linux/sockios.h>
 #endif
@@ -288,8 +289,7 @@ void putsock(struct socket *sk)
 	    }
 	    break;
 	}
-	if(sk->fd >= 0)
-	    close(sk->fd);
+	closesock(sk);
 	if(sk->remote != NULL)
 	    free(sk->remote);
 	free(sk);
@@ -487,6 +487,16 @@ static void sockflush(struct socket *sk)
 
 void closesock(struct socket *sk)
 {
+    struct sockaddr_un *un;
+    
+    if((sk->family == AF_UNIX) && !sockgetlocalname(sk, (struct sockaddr **)&un, NULL) && (un->sun_family == PF_UNIX))
+    {
+	if((sk->state == SOCK_LST) && strchr(un->sun_path, '/'))
+	{
+	    if(unlink(un->sun_path))
+		flog(LOG_WARNING, "could not unlink Unix socket %s: %s", un->sun_path, strerror(errno));
+	}
+    }
     sk->state = SOCK_STL;
     close(sk->fd);
     sk->fd = -1;
@@ -563,6 +573,29 @@ size_t sockqueuesize(struct socket *sk)
 }
 
 /*
+ * Seriously, I don't know if it's naughty or not to remove
+ * pre-existing Unix sockets.
+ */
+static int rebindunix(struct socket *sk, struct sockaddr *name, socklen_t namelen)
+{
+    struct sockaddr_un *un;
+    struct stat sb;
+    
+    if((sk->family != AF_UNIX) || (name->sa_family != PF_UNIX))
+	return(-1);
+    un = (struct sockaddr_un *)name;
+    if(stat(un->sun_path, &sb))
+	return(-1);
+    if(!S_ISSOCK(sb.st_mode))
+	return(-1);
+    if(unlink(un->sun_path))
+	return(-1);
+    if(bind(sk->fd, name, namelen) < 0)
+	return(-1);
+    return(0);
+}
+
+/*
  * The difference between netcslisten() and netcslistenlocal() is that
  * netcslistenlocal() always listens on the local host, instead of
  * following proxy/passive mode directions. It is suitable for eg. the
@@ -589,7 +622,7 @@ struct socket *netcslistenlocal(int type, struct sockaddr *name, socklen_t namel
 	intbuf = 1;
 	setsockopt(sk->fd, SOL_SOCKET, SO_REUSEADDR, &intbuf, sizeof(intbuf));
     }
-    if(bind(sk->fd, name, namelen) < 0)
+    if((bind(sk->fd, name, namelen) < 0) && ((errno != EADDRINUSE) || (rebindunix(sk, name, namelen) < 0)))
     {
 	putsock(sk);
 	return(NULL);
@@ -881,6 +914,8 @@ int socksettos(struct socket *sk, int tos)
 {
     int buf;
     
+    if(sk->family == AF_UNIX)
+	return(0); /* Unix sockets are always perfect. :) */
     if(sk->family == AF_INET)
     {
 	switch(tos)
@@ -1061,7 +1096,8 @@ int sockgetlocalname(struct socket *sk, struct sockaddr **namebuf, socklen_t *le
 	return(-1);
     }
     *namebuf = memcpy(smalloc(len), &name, len);
-    *lenbuf = len;
+    if(lenbuf != NULL)
+	*lenbuf = len;
     return(0);
 }