From cbb595ba83b91df1bf54b2b6cfa451d37dbd0e0c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 22 Jul 2015 11:01:44 +0200
Subject: event/ServerSocket: use AllocatedSocketAddress to build local socket
 address

---
 src/event/ServerSocket.cxx | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/event/ServerSocket.cxx b/src/event/ServerSocket.cxx
index b1cffcfda..7e279dada 100644
--- a/src/event/ServerSocket.cxx
+++ b/src/event/ServerSocket.cxx
@@ -429,21 +429,12 @@ bool
 ServerSocket::AddPath(AllocatedPath &&path, Error &error)
 {
 #ifdef HAVE_UN
-	struct sockaddr_un s_un;
+	(void)error;
 
-	const size_t path_length = path.length();
-	if (path_length >= sizeof(s_un.sun_path)) {
-		error.Set(server_socket_domain,
-			  "UNIX socket path is too long");
-		return false;
-	}
-
-	RemoveFile(path);
-
-	s_un.sun_family = AF_UNIX;
-	memcpy(s_un.sun_path, path.c_str(), path_length + 1);
+	AllocatedSocketAddress address;
+	address.SetLocal(path.c_str());
 
-	OneServerSocket &s = AddAddress({(const sockaddr *)&s_un, sizeof(s_un)});
+	OneServerSocket &s = AddAddress(std::move(address));
 	s.SetPath(std::move(path));
 
 	return true;
-- 
cgit v1.2.3