X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/dd0f1f5b8817b1eef2d9e70163b6da034be38ce3..8ace0906ada0bb92a752462e8be1881da33a9415:/include/numeric.h

diff --git a/include/numeric.h b/include/numeric.h
index 9a17db1c..7f55249d 100644
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -28,23 +28,18 @@
 #define INCLUDED_numeric_h
 
 #include "config.h"
-
-/*
- * form_str - return a format string for a message number
- * messages are defined below
- */
-extern const char *form_str(int);
+#include "messages.h"
 
 /*
  * Reserve numerics 000-099 for server-client connections where the client
  * is local to the server. If any server is passed a numeric in this range
  * from another server then it is remapped to 100-199. -avalon
  */
-#define RPL_WELCOME          001
-#define RPL_YOURHOST         002
-#define RPL_CREATED          003
-#define RPL_MYINFO           004
-#define RPL_ISUPPORT         005
+#define RPL_WELCOME          1
+#define RPL_YOURHOST         2
+#define RPL_CREATED          3
+#define RPL_MYINFO           4
+#define RPL_ISUPPORT         5
 
 #define RPL_SNOMASK	     8
 
@@ -78,7 +73,7 @@ extern const char *form_str(int);
 #define RPL_STATSYLINE       218
 #define RPL_ENDOFSTATS       219
 /* note ircu uses 217 for STATSPLINE frip. conflict
- * as RPL_STATSQLINE was used in old 2.8 for Q line 
+ * as RPL_STATSQLINE was used in old 2.8 for Q line
  * I'm going to steal 220 for now *sigh*
  * -Dianora
  */
@@ -137,6 +132,7 @@ extern const char *form_str(int);
 
 /*      RPL_WHOISADMIN       308 -- hybrid */
 
+#define RPL_WHOISHELPOP      310
 #define RPL_WHOISUSER        311
 #define RPL_WHOISSERVER      312
 #define RPL_WHOISOPERATOR    313
@@ -150,6 +146,7 @@ extern const char *form_str(int);
 
 #define RPL_ENDOFWHOIS       318
 #define RPL_WHOISCHANNELS    319
+#define RPL_WHOISSPECIAL     320
 
 #define RPL_LISTSTART        321
 #define RPL_LIST             322
@@ -165,6 +162,7 @@ extern const char *form_str(int);
 #define RPL_NOTOPIC          331
 #define RPL_TOPIC            332
 #define RPL_TOPICWHOTIME     333
+#define RPL_WHOISTEXT        337
 #define RPL_WHOISACTUALLY    338
 
 #define RPL_INVITING         341
@@ -297,6 +295,8 @@ extern const char *form_str(int);
 
 #define ERR_NOOPERHOST       491
 
+#define ERR_OWNMODE          494 /* from bahamut -- jilles */
+
 #define ERR_UMODEUNKNOWNFLAG 501
 #define ERR_USERSDONTMATCH   502
 
@@ -304,7 +304,7 @@ extern const char *form_str(int);
 
 #define ERR_USERNOTONSERV    504
 
-/* #define ERR_LAST_ERR_MSG 505 
+/* #define ERR_LAST_ERR_MSG 505
  * moved to 999
  */
 #define ERR_WRONGPONG	     513
@@ -313,8 +313,11 @@ extern const char *form_str(int);
 
 #define ERR_HELPNOTFOUND     524
 
+#define RPL_STARTTLS         670 /* ircv3.atheme.org tls-3.1 */
 #define RPL_WHOISSECURE      671 /* Unreal3.2 --nenolod */
 
+#define ERR_STARTTLS         691 /* ircv3.atheme.org tls-3.2 */
+
 #define RPL_MODLIST          702
 #define RPL_ENDOFMODLIST     703
 
@@ -362,6 +365,11 @@ extern const char *form_str(int);
 #define RPL_RSACHALLENGE2       740
 #define RPL_ENDOFRSACHALLENGE2  741
 
+#define ERR_MLOCKRESTRICTED	742
+#define ERR_INVALIDBAN		743
+
+#define ERR_TOPICLOCK		744 /* inspircd */
+
 #define RPL_SCANMATCHED		750
 #define RPL_SCANUMODES		751
 
@@ -374,6 +382,7 @@ extern const char *form_str(int);
 #define ERR_SASLTOOLONG		905
 #define ERR_SASLABORTED		906
 #define ERR_SASLALREADY		907
+#define RPL_SASLMECHS		908
 
 #define ERR_LAST_ERR_MSG     999