- RPL_WELCOME an Client_GetID() angepasst.

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

diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h
index 254383440733cedd89c1093f97e380e165807098..76f608ce03431bcae1574be2a00e96d827eaabc4 100644 (file)
--- a/src/ngircd/messages.h
+++ b/src/ngircd/messages.h
@@ -9,11 +9,26 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: messages.h,v 1.2 2001/12/24 01:30:46 alex Exp $
+ * $Id: messages.h,v 1.7 2001/12/27 16:56:06 alex Exp $
  *
  * irc.h: IRC-Befehle (Header)
  *
  * $Log: messages.h,v $
+ * Revision 1.7  2001/12/27 16:56:06  alex
+ * - RPL_WELCOME an Client_GetID() angepasst.
+ *
+ * Revision 1.6  2001/12/26 22:48:53  alex
+ * - MOTD-Datei ist nun konfigurierbar und wird gelesen.
+ *
+ * Revision 1.5  2001/12/26 03:51:13  alex
+ * - in ERR_NOTREGISTERED_MSG fehlte ein "%s" - jetzt steht auch hier der Nick.
+ *
+ * Revision 1.4  2001/12/26 03:22:40  alex
+ * - Format der Meldungen ueberarbeitet: fast immer ist nun der Nick enthalten.
+ *
+ * Revision 1.3  2001/12/25 19:20:11  alex
+ * - neue Message: ERR_NICKNAMEINUSE[_MSG].
+ *
  * Revision 1.2  2001/12/24 01:30:46  alex
  * - einige Messages korrigiert, andere ergaenzt (u.a. fuer MOTD).
  *
@@ -30,7 +45,7 @@
 
 
 #define RPL_WELCOME                    "001"
-#define RPL_WELCOME_MSG                        RPL_WELCOME" %s :Welcome to the Internet Relay Network %s!%s@%s"
+#define RPL_WELCOME_MSG                        RPL_WELCOME" %s :Welcome to the Internet Relay Network %s"
 
 #define RPL_YOURHOST                   "002"
 #define RPL_YOURHOST_MSG               RPL_YOURHOST" %s :Your host is %s, running ngircd "VERSION
@@ -42,7 +57,7 @@
 #define RPL_MYINFO_MSG                 RPL_MYINFO" %s %s ngircd-"VERSION" + +"
 
 #define RPL_MOTDSTART                  "375"
-#define RPL_MOTDSTART_MSG              RPL_MOTDSTART" %s :- %s Message of the day - "
+#define RPL_MOTDSTART_MSG              RPL_MOTDSTART" %s :- %s Message of the day"
 
 #define RPL_MOTD                       "372"
 #define RPL_MOTD_MSG                   RPL_MOTD" %s :- %s"
@@ -51,20 +66,29 @@
 #define RPL_ENDOFMOTD_MSG              RPL_ENDOFMOTD" %s :End of MOTD command."
 
 
+#define ERR_NOORIGIN                   "409"
+#define ERR_NOORIGIN_MSG               ERR_NOORIGIN" %s :No origin specified"
+
 #define ERR_UNKNOWNCOMMAND             "421"
-#define ERR_UNKNOWNCOMMAND_MSG         ERR_UNKNOWNCOMMAND" %s :Unknown command"
+#define ERR_UNKNOWNCOMMAND_MSG         ERR_UNKNOWNCOMMAND" %s %s :Unknown command"
+
+#define ERR_NOMOTD                     "422"
+#define ERR_NOMOTD_MSG                 ERR_NOMOTD" %s :MOTD file is missing"
 
 #define ERR_ERRONEUSNICKNAME           "432"
-#define ERR_ERRONEUSNICKNAME_MSG       ERR_ERRONEUSNICKNAME" %s :Erroneous nickname"
+#define ERR_ERRONEUSNICKNAME_MSG       ERR_ERRONEUSNICKNAME" %s %s :Erroneous nickname"
+
+#define ERR_NICKNAMEINUSE              "433"
+#define ERR_NICKNAMEINUSE_MSG          ERR_NICKNAMEINUSE" %s %s :Nickname already in use"
 
 #define ERR_NEEDMOREPARAMS             "461"
-#define ERR_NEEDMOREPARAMS_MSG         ERR_NEEDMOREPARAMS" :Syntax error"
+#define ERR_NEEDMOREPARAMS_MSG         ERR_NEEDMOREPARAMS" %s %s :Syntax error"
 
 #define ERR_ALREADYREGISTRED           "462"
-#define ERR_ALREADYREGISTRED_MSG       ERR_ALREADYREGISTRED" :Connection already registered"
+#define ERR_ALREADYREGISTRED_MSG       ERR_ALREADYREGISTRED" %s :Connection already registered"
 
 #define ERR_NOTREGISTERED              "451"
-#define ERR_NOTREGISTERED_MSG          ERR_NOTREGISTERED" :Connection not registered"
+#define ERR_NOTREGISTERED_MSG          ERR_NOTREGISTERED" %s :Connection not registered"
 
 
 #endif