X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=a6bfcdb2e33a1b9d651b22ecd78d45e7c4b81351;hb=d494fa6e094e85cd29235e995fb2b447d6e1f168;hp=2daa6a8212dd72f108ff192b3deae36159d06348;hpb=33932b95e4b886aec8ac1bf3e3e1665826bcd0ea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 2daa6a821..a6bfcdb2e 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -1,11 +1,17 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2011 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007 John Brooks <special@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -41,7 +47,7 @@ bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::
 	}
 
 	ListenSocket* ll = new ListenSocket(tag, sa);
-	if (ll->GetFd() < 0)
+	if (!ll->HasFd())
 	{
 		ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Failed to listen on %s from tag at %s: %s",
 			sa.str().c_str(), tag->getTagLocation().c_str(), strerror(errno));
@@ -54,9 +60,9 @@ bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::
 	return true;
 }
 
-int InspIRCd::BindPorts(FailedPortList& failed_ports)
+size_t InspIRCd::BindPorts(FailedPortList& failed_ports)
 {
-	int bound = 0;
+	size_t bound = 0;
 	std::vector<ListenSocket*> old_ports(ports.begin(), ports.end());
 
 	ConfigTagList tags = ServerInstance->Config->ConfTags("bind");
@@ -86,7 +92,7 @@ int InspIRCd::BindPorts(FailedPortList& failed_ports)
 					continue;
 
 				if (!BindPort(tag, bindspec, old_ports))
-					failed_ports.push_back(std::make_pair(bindspec, errno));
+					failed_ports.push_back(FailedPort(errno, bindspec, tag));
 				else
 					bound++;
 			}
@@ -98,26 +104,29 @@ int InspIRCd::BindPorts(FailedPortList& failed_ports)
 		const std::string path = tag->getString("path");
 		if (!path.empty())
 		{
+			// Expand the path relative to the config directory.
+			const std::string fullpath = ServerInstance->Config->Paths.PrependRuntime(path);
+
 			// UNIX socket paths are length limited to less than PATH_MAX.
 			irc::sockets::sockaddrs bindspec;
-			if (path.length() > std::min(ServerInstance->Config->Limits.MaxHost, sizeof(bindspec.un.sun_path) - 1))
+			if (fullpath.length() > std::min(ServerInstance->Config->Limits.MaxHost, sizeof(bindspec.un.sun_path) - 1))
 			{
 				this->Logs->Log("SOCKET", LOG_DEFAULT, "UNIX listener on %s at %s specified a path that is too long!",
-					path.c_str(), tag->getTagLocation().c_str());
+					fullpath.c_str(), tag->getTagLocation().c_str());
 				continue;
 			}
 
 			// Check for characters which are problematic in the IRC message format.
-			if (path.find_first_of("\n\r\t!@: ") != std::string::npos)
+			if (fullpath.find_first_of("\n\r\t!@: ") != std::string::npos)
 			{
 				this->Logs->Log("SOCKET", LOG_DEFAULT, "UNIX listener on %s at %s specified a path containing invalid characters!",
-					path.c_str(), tag->getTagLocation().c_str());
+					fullpath.c_str(), tag->getTagLocation().c_str());
 				continue;
 			}
 
-			irc::sockets::untosa(path, bindspec);
+			irc::sockets::untosa(fullpath, bindspec);
 			if (!BindPort(tag, bindspec, old_ports))
-				failed_ports.push_back(std::make_pair(bindspec, errno));
+				failed_ports.push_back(FailedPort(errno, bindspec, tag));
 			else
 				bound++;
 		}