- Logging bei Timeout von Verbindungen geaendert.

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

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 385ce8e680c4bbca9f80dea191a5aba5be55d292..871aa1d49d98ff0426c24fb33c3323364f1115bd 100644 (file)
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: client.c,v 1.31 2002/01/21 00:08:50 alex Exp $
+ * $Id: client.c,v 1.37 2002/02/17 19:02:49 alex Exp $
  *
  * client.c: Management aller Clients
  *
@@ -21,6 +21,24 @@
  * Server gewesen, so existiert eine entsprechende CONNECTION-Struktur.
  *
  * $Log: client.c,v $
+ * Revision 1.37  2002/02/17 19:02:49  alex
+ * - Client_CheckNick() und Client_CheckID() lieferten u.U. falsche Ergebnisse.
+ *
+ * Revision 1.36  2002/02/06 16:49:41  alex
+ * - neue Funktion Client_IsValidNick(), Nicknames werden besser validiert.
+ *
+ * Revision 1.35  2002/01/29 00:14:49  alex
+ * - neue Funktion Client_TopServer(), Client_NewXXX() angepasst.
+ *
+ * Revision 1.34  2002/01/27 22:07:36  alex
+ * - Client_GetFromID() besser dokumentiert, kleinere Aenderungen.
+ *
+ * Revision 1.33  2002/01/27 21:56:54  alex
+ * - weitere Anpassungen an Chennals, v.a. ueber Server-Links.
+ *
+ * Revision 1.32  2002/01/27 18:27:12  alex
+ * - Client_GetFromID() kommt nun auch mit Host-Masken zurecht.
+ *
  * Revision 1.31  2002/01/21 00:08:50  alex
  * - wird ein Client entfernt, so wird er auch aus allen Channels geloescht.
  *
@@ -223,25 +241,25 @@ GLOBAL CLIENT *Client_ThisServer( VOID )
 GLOBAL CLIENT *Client_NewLocal( CONN_ID Idx, CHAR *Hostname, INT Type, BOOLEAN Idented )
 {
        /* Neuen lokalen Client erzeugen: Wrapper-Funktion fuer Client_New(). */
-       return Client_New( Idx, This_Server, Type, NULL, NULL, Hostname, NULL, 0, 0, NULL, Idented );
+       return Client_New( Idx, This_Server, NULL, Type, NULL, NULL, Hostname, NULL, 0, 0, NULL, Idented );
 } /* Client_NewLocal */
 
 
-GLOBAL CLIENT *Client_NewRemoteServer( CLIENT *Introducer, CHAR *Hostname, INT Hops, INT Token, CHAR *Info, BOOLEAN Idented )
+GLOBAL CLIENT *Client_NewRemoteServer( CLIENT *Introducer, CHAR *Hostname, CLIENT *TopServer, INT Hops, INT Token, CHAR *Info, BOOLEAN Idented )
 {
        /* Neuen Remote-Client erzeugen: Wrapper-Funktion fuer Client_New (). */
-       return Client_New( NONE, Introducer, CLIENT_SERVER, Hostname, NULL, Hostname, Info, Hops, Token, NULL, Idented );
+       return Client_New( NONE, Introducer, TopServer, CLIENT_SERVER, Hostname, NULL, Hostname, Info, Hops, Token, NULL, Idented );
 } /* Client_NewRemoteServer */
 
 
 GLOBAL CLIENT *Client_NewRemoteUser( CLIENT *Introducer, CHAR *Nick, INT Hops, CHAR *User, CHAR *Hostname, INT Token, CHAR *Modes, CHAR *Info, BOOLEAN Idented )
 {
        /* Neuen Remote-Client erzeugen: Wrapper-Funktion fuer Client_New (). */
-       return Client_New( NONE, Introducer, CLIENT_USER, Nick, User, Hostname, Info, Hops, Token, Modes, Idented );
+       return Client_New( NONE, Introducer, NULL, CLIENT_USER, Nick, User, Hostname, Info, Hops, Token, Modes, Idented );
 } /* Client_NewRemoteUser */
 
 
-GLOBAL CLIENT *Client_New( CONN_ID Idx, CLIENT *Introducer, INT Type, CHAR *ID, CHAR *User, CHAR *Hostname, CHAR *Info, INT Hops, INT Token, CHAR *Modes, BOOLEAN Idented )
+GLOBAL CLIENT *Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, INT Type, CHAR *ID, CHAR *User, CHAR *Hostname, CHAR *Info, INT Hops, INT Token, CHAR *Modes, BOOLEAN Idented )
 {
        CLIENT *client;
 
@@ -255,6 +273,7 @@ GLOBAL CLIENT *Client_New( CONN_ID Idx, CLIENT *Introducer, INT Type, CHAR *ID,
        /* Initialisieren */
        client->conn_id = Idx;
        client->introducer = Introducer;
+       client->topserver = TopServer;
        client->type = Type;
        if( ID ) Client_SetID( client, ID );
        if( User ) Client_SetUser( client, User, Idented );
@@ -515,16 +534,23 @@ GLOBAL CLIENT *Client_GetFromConn( CONN_ID Idx )
 GLOBAL CLIENT *Client_GetFromID( CHAR *Nick )
 {
        /* Client-Struktur, die den entsprechenden Nick hat,
-       * liefern. Wird keine gefunden, so wird NULL geliefert. */
+        * liefern. Wird keine gefunden, so wird NULL geliefert. */
 
-       CLIENT *c;
+       CHAR n[CLIENT_ID_LEN + 1], *ptr;
+       CLIENT *c = NULL;
 
        assert( Nick != NULL );
 
+       /* Nick kopieren und ggf. Host-Mask abschneiden */
+       strncpy( n, Nick, CLIENT_ID_LEN );
+       n[CLIENT_ID_LEN] = '\0';
+       ptr = strchr( n, '!' );
+       if( ptr ) *ptr = '\0';
+
        c = My_Clients;
        while( c )
        {
-               if( strcasecmp( c->id, Nick ) == 0 ) return c;
+               if( strcasecmp( c->id, n ) == 0 ) return c;
                c = c->next;
        }
        return NULL;
@@ -672,6 +698,13 @@ GLOBAL CLIENT *Client_Introducer( CLIENT *Client )
 } /* Client_Introducer */
 
 
+GLOBAL CLIENT *Client_TopServer( CLIENT *Client )
+{
+       assert( Client != NULL );
+       return Client->topserver;
+} /* Client_TopServer */
+
+
 GLOBAL BOOLEAN Client_HasMode( CLIENT *Client, CHAR Mode )
 {
        assert( Client != NULL );
@@ -688,8 +721,12 @@ GLOBAL BOOLEAN Client_CheckNick( CLIENT *Client, CHAR *Nick )
        assert( Client != NULL );
        assert( Nick != NULL );
        
-       /* Nick zu lang? */
-       if( strlen( Nick ) > CLIENT_NICK_LEN ) return IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick );
+       /* Nick ungueltig? */
+       if( ! Client_IsValidNick( Nick ))
+       {
+               IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick );
+               return FALSE;
+       }
 
        /* Nick bereits vergeben? */
        c = My_Clients;
@@ -720,7 +757,11 @@ GLOBAL BOOLEAN Client_CheckID( CLIENT *Client, CHAR *ID )
        assert( ID != NULL );
 
        /* Nick zu lang? */
-       if( strlen( ID ) > CLIENT_ID_LEN ) return IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), ID );
+       if( strlen( ID ) > CLIENT_ID_LEN )
+       {
+               IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), ID );
+               return FALSE;
+       }
 
        /* ID bereits vergeben? */
        c = My_Clients;
@@ -846,6 +887,18 @@ GLOBAL INT Client_UnknownCount( VOID )
 } /* Client_UnknownCount */
 
 
+GLOBAL BOOLEAN Client_IsValidNick( CHAR *Nick )
+{
+       /* Ist der Nick gueltig? */
+       
+       assert( Nick != NULL );
+
+       if( Nick[0] == '#' ) return FALSE;
+       if( strlen( Nick ) > CLIENT_NICK_LEN ) return FALSE;
+       return TRUE;
+} /* Client_IsValidNick */
+
+
 LOCAL INT Count( CLIENT_TYPE Type )
 {
        CLIENT *c;
@@ -895,6 +948,7 @@ LOCAL CLIENT *New_Client_Struct( VOID )
        c->type = CLIENT_UNKNOWN;
        c->conn_id = NONE;
        c->introducer = NULL;
+       c->topserver = NULL;
        strcpy( c->id, "" );
        strcpy( c->pwd, "" );
        strcpy( c->host, "" );