/*
* 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) 2014 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2013, 2017-2020 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
}
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));
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");
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++;
}
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.PrependData(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)))
+ 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;
}
- // Create the bindspec manually (aptosa doesn't work with AF_UNIX yet).
- memset(&bindspec, 0, sizeof(bindspec));
- bindspec.un.sun_family = AF_UNIX;
- memcpy(&bindspec.un.sun_path, path.c_str(), sizeof(bindspec.un.sun_path));
-
+ 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++;
}
return false;
}
+bool irc::sockets::untosa(const std::string& path, irc::sockets::sockaddrs& sa)
+{
+ memset(&sa, 0, sizeof(sa));
+ if (path.length() >= sizeof(sa.un.sun_path))
+ return false;
+
+ sa.un.sun_family = AF_UNIX;
+ memcpy(&sa.un.sun_path, path.c_str(), path.length() + 1);
+ return true;
+}
+
+bool irc::sockets::isunix(const std::string& file)
+{
+#ifndef _WIN32
+ struct stat sb;
+ if (stat(file.c_str(), &sb) == 0 && S_ISSOCK(sb.st_mode))
+ return true;
+#endif
+ return false;
+}
+
+
int irc::sockets::sockaddrs::family() const
{
return sa.sa_family;