X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsocket.cpp;h=a6bfcdb2e33a1b9d651b22ecd78d45e7c4b81351;hb=b0f16081ccaef527ed4b5434a7264508cf455f39;hp=64dc7ef256c4c152a3afcf59c46949388d83ee53;hpb=ce7979bd7d6278bc1b67cf46a73a3d23e02a6ae5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 64dc7ef25..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));
@@ -99,7 +105,7 @@ size_t InspIRCd::BindPorts(FailedPortList& failed_ports)
 		if (!path.empty())
 		{
 			// Expand the path relative to the config directory.
-			const std::string fullpath = ServerInstance->Config->Paths.PrependData(path);
+			const std::string fullpath = ServerInstance->Config->Paths.PrependRuntime(path);
 
 			// UNIX socket paths are length limited to less than PATH_MAX.
 			irc::sockets::sockaddrs bindspec;