Merge branch 'move-connection-password' of git://arthur.barton.de/ngircd-alex

[ngircd-alex.git] / src / ngircd / messages.h

diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h
index 6a784fe9eb97a98ebc8194bee63232e7893f6c82..9ad6be1763d569f7af3b486e3620930f15127516 100644 (file)
--- a/src/ngircd/messages.h
+++ b/src/ngircd/messages.h
@@ -21,8 +21,8 @@
 #define RPL_YOURHOST_MSG               "002 %s :Your host is %s, running version ngircd-%s (%s/%s/%s)"
 #define RPL_CREATED_MSG                        "003 %s :This server has been started %s"
 #define RPL_MYINFO_MSG                 "004 %s %s ngircd-%s %s %s"
-#define RPL_ISUPPORT1_MSG              "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=bI,k,l,imnOPRstz CHANLIMIT=#&+:%d :are supported on this server"
-#define RPL_ISUPPORT2_MSG              "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=bI:%d PENALTY :are supported on this server"
+#define RPL_ISUPPORT1_MSG              "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=beI,k,l,imnOPRstz CHANLIMIT=#&+:%d :are supported on this server"
+#define RPL_ISUPPORT2_MSG              "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=beI:%d EXCEPTS=e INVEX=I PENALTY :are supported on this server"
 
 #define RPL_TRACELINK_MSG              "200 %s Link %s-%s %s %s V%s %ld %d %d"
 #define RPL_TRACEOPERATOR_MSG          "204 %s Oper 2 :%s"
@@ -75,6 +75,8 @@
 #define RPL_INVITING_MSG               "341 %s %s %s%s"
 #define RPL_INVITELIST_MSG             "346 %s %s %s"
 #define RPL_ENDOFINVITELIST_MSG                "347 %s %s :End of channel invite list"
+#define RPL_EXCEPTLIST_MSG             "348 %s %s %s"
+#define RPL_ENDOFEXCEPTLIST_MSG                "349 %s %s :End of channel exception list"
 #define RPL_VERSION_MSG                        "351 %s %s-%s.%s %s :%s"
 #define RPL_WHOREPLY_MSG               "352 %s %s %s %s %s %s %s :%d %s"
 #define RPL_NAMREPLY_MSG               "353 %s %s %s :"
@@ -89,6 +91,7 @@
 #define RPL_MOTD_MSG                   "372 %s :- %s"
 #define RPL_MOTDSTART_MSG              "375 %s :- %s message of the day"
 #define RPL_ENDOFMOTD_MSG              "376 %s :End of MOTD command"
+#define RPL_WHOISHOST_MSG              "378 %s %s :is connecting from *@%s %s"
 #define RPL_YOUREOPER_MSG              "381 %s :You are now an IRC Operator"
 #define RPL_YOURESERVICE_MSG           "383 %s :You are service %s"
 #define RPL_TIME_MSG                   "391 %s %s :%s"
@@ -100,6 +103,7 @@
 #define ERR_TOOMANYCHANNELS_MSG                "405 %s %s :You have joined too many channels"
 #define ERR_WASNOSUCHNICK_MSG          "406 %s %s :There was no such nickname"
 #define ERR_NOORIGIN_MSG               "409 %s :No origin specified"
+#define ERR_INVALIDCAP_MSG             "410 %s %s :Invalid CAP subcommand"
 #define ERR_NORECIPIENT_MSG            "411 %s :No recipient given (%s)"
 #define ERR_NOTEXTTOSEND_MSG           "412 %s :No text to send"
 #define ERR_WILDTOPLEVEL               "414 %s :Wildcard in toplevel domain"
@@ -108,12 +112,13 @@
 #define ERR_NONICKNAMEGIVEN_MSG                "431 %s :No nickname given"
 #define ERR_ERRONEUSNICKNAME_MSG       "432 %s %s :Erroneous nickname"
 #define ERR_NICKNAMETOOLONG_MSG                "432 %s %s :Nickname too long, max. %u characters"
+#define ERR_FORBIDDENNICKNAME_MSG      "432 %s %s :Nickname is forbidden/blocked"
 #define ERR_NICKNAMEINUSE_MSG          "433 %s %s :Nickname already in use"
 #define ERR_USERNOTINCHANNEL_MSG       "441 %s %s %s :They aren't on that channel"
 #define ERR_NOTONCHANNEL_MSG           "442 %s %s :You are not on that channel"
 #define ERR_USERONCHANNEL_MSG          "443 %s %s %s :is already on channel"
-#define ERR_SUMMONDISABLED_MSG         "445 %s %s :SUMMON has been disabled"
-#define ERR_USERSDISABLED_MSG          "446 %s %s :USERS has been disabled"
+#define ERR_SUMMONDISABLED_MSG         "445 %s :SUMMON has been disabled"
+#define ERR_USERSDISABLED_MSG          "446 %s :USERS has been disabled"
 #define ERR_NOTREGISTERED_MSG          "451 %s :Connection not registered"
 #define ERR_NOTREGISTEREDSERVER_MSG    "451 %s :Connection not registered as server link"
 #define ERR_NEEDMOREPARAMS_MSG         "461 %s %s :Syntax error"