Merge branch 'fix-sha256-crypt' of https://github.com/grawity/charybdis

[solanum.git] / include / numeric.h

diff --git a/include/numeric.h b/include/numeric.h
index 8ff4d96dcf6857d4383a6c7128216a4115c0fd1a..88b5c09687969229f0666b3b5692c967a5b04d7b 100644 (file)
--- 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
 
@@ -120,6 +115,8 @@ extern const char *form_str(int);
 
 #define RPL_PRIVS            270 /* from ircu */
 
+#define RPL_WHOISCERTFP      276 /* from oftc-hybrid */
+
 #define RPL_ACCEPTLIST      281
 #define RPL_ENDOFACCEPT      282
 
@@ -153,6 +150,7 @@ extern const char *form_str(int);
 #define RPL_LIST             322
 #define RPL_LISTEND          323
 #define RPL_CHANNELMODEIS    324
+#define RPL_CHANNELMLOCK     325 /* from sorircd 1.3 --nenolod */
 
 #define RPL_CHANNELURL       328 /* to be sent by services */
 
@@ -162,6 +160,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
@@ -294,6 +293,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
 
@@ -310,8 +311,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
 
@@ -347,6 +351,9 @@ extern const char *form_str(int);
 #define RPL_NOTESTLINE         726
 #define RPL_TESTMASKGECOS      727
 
+#define RPL_QUIETLIST          728
+#define RPL_ENDOFQUIETLIST     729
+
 #define RPL_MONONLINE          730
 #define RPL_MONOFFLINE         731
 #define RPL_MONLIST            732
@@ -356,14 +363,14 @@ 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
 
-#define RPL_METADATASET                790
-#define RPL_METADATAREM                791
-#define RPL_METADATACHG                792
-#define RPL_WHOISMETADATA      793
-
 #define RPL_LOGGEDIN           900
 #define RPL_LOGGEDOUT          901
 #define ERR_NICKLOCKED         902
@@ -373,6 +380,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