X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/32de9f4e677b591367911dab0d471a156382c97c..e575ed5193d7d81b0b961c1188bc39e6cc450ec2:/include/numeric.h

diff --git a/include/numeric.h b/include/numeric.h
index f89015c6..29ea398c 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
  */
@@ -150,6 +145,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 +161,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
@@ -306,7 +303,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
@@ -315,8 +312,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
 
@@ -361,11 +361,14 @@ extern const char *form_str(int);
 #define RPL_ENDOFMONLIST	733
 #define ERR_MONLISTFULL		734
 
-#define ERR_MLOCKRESTRICTED	735
-
 #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
 
@@ -378,6 +381,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