Forward port r9946: make SVSHOLD silent to avoid useless irritation to opers

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

diff --git a/include/socket.h b/include/socket.h
index 7ff40794c7928574f6e15af9555164466d461297..a26c1256d2db4f2967aa209dc442ed4827acf3cf 100644 (file)
--- a/include/socket.h
+++ b/include/socket.h
@@ -33,7 +33,7 @@
 
 #endif
 
-#include <errno.h>
+#include <cerrno>
 #include "socketengine.h"
 
 /* Contains irc-specific definitions */
@@ -69,7 +69,7 @@ namespace irc
 
 #endif
                /** Match raw binary data using CIDR rules.
-                * 
+                *
                 * This function will use binary comparison to compare the
                 * two bit sequences, address and mask, up to mask_bits
                 * bits in size. If they match, it will return true.
@@ -81,7 +81,7 @@ namespace irc
                 * @returns True if the first mask_bits of address matches the first
                 * mask_bits of mask.
                 */
-               CoreExport bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits);
+               CoreExport bool MatchCIDRBits(const unsigned char* address, const unsigned char* mask, unsigned int mask_bits);
 
                /** Match CIDR, without matching username/nickname parts.
                 *
@@ -92,7 +92,7 @@ namespace irc
                 * @param cidr_mask The human readable mask, e.g. 1.2.0.0/16
                 * @return True if the mask matches the address
                 */
-               CoreExport bool MatchCIDR(const char* address, const char* cidr_mask);
+               CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask);
 
                /** Match CIDR, including an optional username/nickname part.
                 *
@@ -105,10 +105,10 @@ namespace irc
                 * @param cidr_mask The human readable mask, e.g. *\@1.2.0.0/16
                 * @return True if the mask matches the address
                 */
-               CoreExport bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username);
+               CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask, bool match_with_username);
 
                /** Convert an insp_inaddr into human readable form.
-                * 
+                *
                 * @param n An insp_inaddr (IP address) structure
                 * @return A human-readable address. IPV6 addresses
                 * will be shortened to remove fields which are 0.
@@ -116,7 +116,7 @@ namespace irc
                CoreExport const char* insp_ntoa(insp_inaddr n);
 
                /** Convert a human-readable address into an insp_inaddr.
-                * 
+                *
                 * @param a A human-readable address
                 * @param n An insp_inaddr struct which the result
                 * will be copied into on success.