Switch <stdint.h> test to use a test file too.

[user/henk/code/inspircd.git] / include / socket.h

diff --git a/include/socket.h b/include/socket.h
index b012cf62a1fcd0bcc8ed4b3967e2290fa6ef4918..5f67051246d3dbe2017f5cab375632c58b69e016 100644 (file)
--- a/include/socket.h
+++ b/include/socket.h
@@ -1,20 +1,31 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2006 William Pitcock <nenolod@dereferenced.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #ifndef INSPIRCD_SOCKET_H
 #define INSPIRCD_SOCKET_H
 
-#ifndef WIN32
+#ifndef _WIN32
 
 #include <arpa/inet.h>
 #include <sys/time.h>
@@ -34,7 +45,6 @@
 #endif
 
 #include <cerrno>
-#include "socketengine.h"
 
 /* Contains irc-specific definitions */
 namespace irc
@@ -45,7 +55,8 @@ namespace irc
         */
        namespace sockets
        {
-               union CoreExport sockaddrs {
+               union CoreExport sockaddrs
+               {
                        struct sockaddr sa;
                        struct sockaddr_in in4;
                        struct sockaddr_in6 in6;
@@ -57,9 +68,11 @@ namespace irc
                        std::string addr() const;
                        /** Return human-readable IP/port pair */
                        std::string str() const;
+                       bool operator==(const sockaddrs& other) const;
+                       inline bool operator!=(const sockaddrs& other) const { return !(*this == other); }
                };
 
-               struct cidr_mask
+               struct CoreExport cidr_mask
                {
                        /** Type, AF_INET or AF_INET6 */
                        unsigned char type;
@@ -92,17 +105,11 @@ namespace irc
                 * IPV6 addresses.
                 * @param address The human readable address, e.g. fred\@1.2.3.4
                 * @param cidr_mask The human readable mask, e.g. *\@1.2.0.0/16
+                * @param match_with_username Does the  mask include a nickname segment?
                 * @return True if the mask matches the address
                 */
                CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask, bool match_with_username);
 
-               /** Create a new valid file descriptor using socket()
-                * @return On return this function will return a value >= 0 for success,
-                * or a negative value upon failure (negative values are invalid file
-                * descriptors)
-                */
-               CoreExport int OpenTCPSocket(const std::string& addr, int socktype = SOCK_STREAM);
-
                /** Return the size of the structure for syscall passing */
                inline int sa_size(const irc::sockets::sockaddrs& sa) { return sa.sa_size(); }
 
@@ -131,6 +138,7 @@ namespace irc
        }
 }
 
+#include "socketengine.h"
 /** This class handles incoming connections on client ports.
  * It will create a new User for every valid connection
  * and assign it a file descriptor.
@@ -138,14 +146,14 @@ namespace irc
 class CoreExport ListenSocket : public EventHandler
 {
  public:
-       const reference<ConfigTag> bind_tag;
+       reference<ConfigTag> bind_tag;
        std::string bind_addr;
        int bind_port;
        /** Human-readable bind description */
        std::string bind_desc;
        /** Create a new listening socket
         */
-       ListenSocket(ConfigTag* tag, const std::string& addr, int port);
+       ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to);
        /** Handle an I/O event
         */
        void HandleEvent(EventType et, int errornum = 0);