Merge pull request #286 from edk0/strip-unprintable

[solanum.git] / include / ircd_defs.h

diff --git a/include/ircd_defs.h b/include/ircd_defs.h
index a8ef286e13f6a406fb076cf00bcfd688cc2aba4f..cea850cede7bc2cdad3b5241e380d0ef16b6b2c4 100644 (file)
--- a/include/ircd_defs.h
+++ b/include/ircd_defs.h
@@ -35,7 +35,7 @@
 #ifndef INCLUDED_ircd_defs_h
 #define INCLUDED_ircd_defs_h
 
-#include "config.h"
+#include "defaults.h"
 
 /* For those unfamiliar with GNU format attributes, a is the 1 based
  * argument number of the format string, and b is the 1 based argument
@@ -56,10 +56,16 @@
 #define IRC_DEPRECATED
 #endif
 
-#if !defined(CONFIG_RATBOX_LEVEL_1)
-#  error Incorrect config.h for this revision of ircd.
+#ifndef MAX
+#define MAX(a, b)      ((a) > (b) ? (a) : (b))
 #endif
 
+#ifndef MIN
+#define MIN(a, b)      ((a) < (b) ? (a) : (b))
+#endif
+
+#define ARRAY_SIZE(array)       (sizeof(array) / sizeof((array)[0]))
+
 #define HOSTLEN         63     /* Length of hostname.  Updated to         */
                                /* comply with RFC1123                     */
 
@@ -85,10 +91,15 @@
 
 /* 23+1 for \0 */
 #define KEYLEN          24
+#define TAGSLEN         512    /* IRCv3 message tags */
+#define DATALEN         510    /* RFC1459 message data */
 #define BUFSIZE         512    /* WARNING: *DONT* CHANGE THIS!!!! */
+#define EXT_BUFSIZE     (TAGSLEN + DATALEN + 1)
 #define OPERNICKLEN     (NICKLEN*2)    /* Length of OPERNICKs. */
 
-#define USERHOST_REPLYLEN       (NICKLEN+HOSTLEN+USERLEN+5)
+#define NAMELEN                (MAX(NICKLEN, HOSTLEN))
+
+#define USERHOST_REPLYLEN       (NAMELEN+HOSTLEN+USERLEN+5)
 #define MAX_DATE_STRING 32     /* maximum string length for a date string */
 
 #define HELPLEN         400
@@ -100,23 +111,13 @@
 #define CLIENT_PARSE_ERROR -1
 #define CLIENT_OK      1
 
-#ifdef RB_IPV6
 #ifndef AF_INET6
 #error "AF_INET6 not defined"
 #endif
 
-
-#else /* #ifdef RB_IPV6 */
-
-#ifndef AF_INET6
-#define AF_INET6 AF_MAX                /* Dummy AF_INET6 declaration */
-#endif
-#endif /* #ifdef RB_IPV6 */
-
-#ifdef RB_IPV6
 #define PATRICIA_BITS  128
-#else
-#define PATRICIA_BITS  32
-#endif
+
+/* Read buffer size */
+#define READBUF_SIZE 16384
 
 #endif /* INCLUDED_ircd_defs_h */