- der Debug-Level wird bei VERSION nicht mehr geliefert. Grund: a) absolut

[ngircd-alex.git] / src / ngircd / irc.c

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 3016287e89e286945a0dd891d40242f36f4c266c..4dc186f73145d9cee605d63b3fdc94fdc6b4c9b3 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,11 +9,24 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc.c,v 1.59 2002/02/17 17:30:21 alex Exp $
+ * $Id: irc.c,v 1.63 2002/02/19 02:21:17 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
+ * Revision 1.63  2002/02/19 02:21:17  alex
+ * - der Debug-Level wird bei VERSION nicht mehr geliefert. Grund: a) absolut
+ *   unnoetig und b) Compiler-Fehler, wenn ohne Debug-Code configure'd ;-))
+ *
+ * Revision 1.62  2002/02/17 23:38:58  alex
+ * - neuer IRC-Befehl VERSION implementiert: IRC_VERSION().
+ *
+ * Revision 1.61  2002/02/17 19:03:12  alex
+ * - NICK-Aenderungen wurden dem User selber mit dem falschen Prefix geliefert.
+ *
+ * Revision 1.60  2002/02/17 17:43:14  alex
+ * - Fehlerhafte Modes werden nun ausfuehrlicher an den Client gemeldet.
+ *
  * Revision 1.59  2002/02/17 17:30:21  alex
  * - NICK-Aenderungen werden an alle Server und betroffene Clients gemeldet.
  * - Neue Funktion IRC_WriteStrRelatedPrefix().
@@ -851,7 +864,7 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
 
                /* Nick-Aenderung: allen mitteilen! */
                Log( LOG_INFO, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] );
-               if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClient( Client, "NICK :%s", Req->argv[0] );
+               if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClientPrefix( Client, Client, "NICK :%s", Req->argv[0] );
                IRC_WriteStrServersPrefix( Client, target, "NICK :%s", Req->argv[0] );
                IRC_WriteStrRelatedPrefix( target, target, FALSE, "NICK :%s", Req->argv[0] );
        
@@ -1307,7 +1320,7 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                                                break;
                                        default:
                                                Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ));
-                                               ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client ));
+                                               ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr );
                                                x[0] = '\0';
                                }
                        }
@@ -1337,7 +1350,7 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                                                        break;
                                                default:
                                                        Log( LOG_DEBUG, "Unknown channel-user-mode \"%c%c\" from \"%s\" on \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Client_ID( chan_cl ), Channel_Name( chan ));
-                                                       ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client ));
+                                                       ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr );
                                                        x[0] = '\0';
                                        }
                                }
@@ -1376,7 +1389,7 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                                                        break;
                                                default:
                                                        Log( LOG_DEBUG, "Unknown channel-mode \"%c%c\" from \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Channel_Name( chan ));
-                                                       ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client ));
+                                                       ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr );
                                                        x[0] = '\0';
                                        }
                                }
@@ -2031,6 +2044,32 @@ GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req )
 } /* IRC_PART */
 
 
+GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req )
+{
+       CLIENT *target;
+       
+       assert( Client != NULL );
+       assert( Req != NULL );
+
+       /* Falsche Anzahl Parameter? */
+       if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+       /* Ziel suchen */
+       if( Req->argc == 1 ) target = Client_GetFromID( Req->argv[0] );
+       else target = Client_ThisServer( );
+
+       /* An anderen Server weiterleiten? */
+       if( target != Client_ThisServer( ))
+       {
+               if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+               IRC_WriteStrClientPrefix( Client_NextHop( target ), Client, "VERSION %s", Req->argv[0] );
+               return CONNECTED;
+       }
+
+       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( Client ), "", Conf_ServerName, NGIRCd_VersionAddition( ));
+} /* IRC_VERSION */
+
+
 LOCAL BOOLEAN Hello_User( CLIENT *Client )
 {
        assert( Client != NULL );