X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=8c5fda59af0731b290b09ab8b89d23a56d4e0245;hb=f28c467e95f68f7a1767ebb0bc6f6f12ae407f3a;hp=60ee0b449c0d24ef3c1b1452a78f7c23009aa3e3;hpb=97a1d6429a735eb279496df010d04e3f42aa4e22;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 60ee0b449..8c5fda59a 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -1,7 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2016-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009-2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -29,9 +38,17 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 	: bind_tag(tag)
 	, bind_sa(bind_to)
 {
-	fd = socket(bind_to.family(), SOCK_STREAM, 0);
+	// Are we creating a UNIX socket?
+	if (bind_to.family() == AF_UNIX)
+	{
+		// Is 'replace' enabled?
+		const bool replace = tag->getBool("replace");
+		if (replace && irc::sockets::isunix(bind_to.str()))
+			unlink(bind_to.str().c_str());
+	}
 
-	if (this->fd == -1)
+	fd = socket(bind_to.family(), SOCK_STREAM, 0);
+	if (!HasFd())
 		return;
 
 #ifdef IPV6_V6ONLY
@@ -66,6 +83,14 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 #endif
 	}
 
+	if (bind_to.family() == AF_UNIX)
+	{
+		const std::string permissionstr = tag->getString("permissions");
+		unsigned int permissions = strtoul(permissionstr.c_str(), NULL, 8);
+		if (permissions && permissions <= 07777)
+			chmod(bind_to.str().c_str(), permissions);
+	}
+
 	SocketEngine::SetReuse(fd);
 	int rv = SocketEngine::Bind(this->fd, bind_to);
 	if (rv >= 0)
@@ -104,7 +129,7 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 
 ListenSocket::~ListenSocket()
 {
-	if (this->GetFd() > -1)
+	if (this->HasFd())
 	{
 		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Shut down listener on fd %d", this->fd);
 		SocketEngine::Shutdown(this, 2);