ircd: rewrite SOCKET_ERROR as I_SOCKET_ERROR

[solanum.git] / include / ircd_defs.h

diff --git a/include/ircd_defs.h b/include/ircd_defs.h
index cea2978a52a8ca75638414f439fa740394e61824..64245cd7c7c2b252f2da718e400170ffae74bf32 100644 (file)
--- a/include/ircd_defs.h
+++ b/include/ircd_defs.h
@@ -21,14 +21,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: ircd_defs.h 3512 2007-06-06 16:20:40Z nenolod $
  */
 
 /*
  * NOTE: NICKLEN and TOPICLEN do not live here anymore. Set it with configure
- * Otherwise there are no user servicable part here. 
- *
+ * Otherwise there are no user servicable part here.
  */
 
 /* ircd_defs.h - Global size definitions for record entries used
@@ -38,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
@@ -59,52 +56,14 @@
 #define IRC_DEPRECATED
 #endif
 
-#include "logger.h"
-#include "send.h"
-
-#ifdef SOFT_ASSERT
-#ifdef __GNUC__
-#define s_assert(expr) do                                                              \
-                       if(!(expr)) {                                                   \
-                               ilog(L_MAIN,                                            \
-                               "file: %s line: %d (%s): Assertion failed: (%s)",       \
-                               __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr);        \
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,                      \
-                               "file: %s line: %d (%s): Assertion failed: (%s)",       \
-                               __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr);        \
-                       }                                                               \
-                       while(0)
-#else
-#define s_assert(expr) do                                                              \
-                       if(!(expr)) {                                                   \
-                               ilog(L_MAIN,                                            \
-                               "file: %s line: %d: Assertion failed: (%s)",            \
-                               __FILE__, __LINE__, #expr);                             \
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,                      \
-                               "file: %s line: %d: Assertion failed: (%s)"             \
-                               __FILE__, __LINE__, #expr);                             \
-                       }                                                               \
-                       while(0)
-#endif
-#else
-#define s_assert(expr) assert(expr)
-#endif
-
-#if !defined(CONFIG_RATBOX_LEVEL_1)
-#  error Incorrect config.h for this revision of ircd.
-#endif
-
-/*
- * This defines the version of the data structures used in the ircd.
- * In the event of a mismatch (i.e. this is incremented due to a major
- * change that cannot be accomidated for in the ircd), then a hard
- * restart occurs.
- */
-#define CHARYBDIS_DV   0x00010200      /* 1.2.0 */
-
 #define HOSTLEN         63     /* Length of hostname.  Updated to         */
                                /* comply with RFC1123                     */
 
+/* Longest hostname we're willing to work with.
+ * Due to DNSBLs this is more than HOSTLEN.
+ */
+#define IRCD_RES_HOSTLEN 255
+
 #define USERLEN         10
 #define REALLEN         50
 #define CHANNELLEN      200
@@ -116,24 +75,22 @@
  * takes at most 246 bytes (including CRLF and '\0') and together with the
  * quit reason should fit in 512 */
 #define REASONLEN      260     /* kick/part/quit */
-#define BANREASONLEN   390     /* kline/dline/gline */
+#define BANREASONLEN   390     /* kline/dline */
 #define AWAYLEN                TOPICLEN
 #define KILLLEN         200    /* with Killed (nick ()) added this should fit in quit */
 
 /* 23+1 for \0 */
 #define KEYLEN          24
 #define BUFSIZE         512    /* WARNING: *DONT* CHANGE THIS!!!! */
-#define MAXRECIPIENTS   20
-#define MAXBANLENGTH    1024
-#define OPERNICKLEN     NICKLEN*2      /* Length of OPERNICKs. */
+#define OPERNICKLEN     (NICKLEN*2)    /* Length of OPERNICKs. */
 
 #define USERHOST_REPLYLEN       (NICKLEN+HOSTLEN+USERLEN+5)
 #define MAX_DATE_STRING 32     /* maximum string length for a date string */
 
 #define HELPLEN         400
 
-/* 
- * message return values 
+/*
+ * message return values
  */
 #define CLIENT_EXITED    -2
 #define CLIENT_PARSE_ERROR -1