- ein paar assert()-Tests ergaenzt.

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

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index cdb4f185a9744458a7c428bcdb4a66d2f706e49d..e36dafd5678c30c268189774ff81ddb060ce5d0b 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.40 2002/02/27 23:23:53 alex Exp $
+ * $Id: client.c,v 1.44 2002/03/06 14:30:43 alex Exp $
  *
  * client.c: Management aller Clients
  *
@@ -21,6 +21,18 @@
  * Server gewesen, so existiert eine entsprechende CONNECTION-Struktur.
  *
  * $Log: client.c,v $
+ * Revision 1.44  2002/03/06 14:30:43  alex
+ * - ein paar assert()-Tests ergaenzt.
+ *
+ * Revision 1.43  2002/03/04 01:04:46  alex
+ * - neuen Clients mit Mode "a" wird nun auch der Default-Away-Text gesetzt.
+ *
+ * Revision 1.42  2002/03/03 17:17:01  alex
+ * - strncpy() und vsnprintf() kopieren nun etwas "optimierter" (1 Byte weniger) :-)
+ *
+ * Revision 1.41  2002/03/02 01:35:50  alex
+ * - Channel- und Nicknames werden nun ordentlich validiert.
+ *
  * Revision 1.40  2002/02/27 23:23:53  alex
  * - Includes fuer einige Header bereinigt.
  *
@@ -293,6 +305,9 @@ GLOBAL CLIENT *Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, I
        if( Modes ) Client_SetModes( client, Modes );
        if( Type == CLIENT_SERVER ) Generate_MyToken( client );
 
+       /* ist der User away? */
+       if( strchr( client->modes, 'a' )) strcpy( client->away, DEFAULT_AWAY_MSG );
+
        /* Verketten */
        client->next = My_Clients;
        My_Clients = client;
@@ -395,7 +410,9 @@ GLOBAL VOID Client_SetHostname( CLIENT *Client, CHAR *Hostname )
        /* Hostname eines Clients setzen */
        
        assert( Client != NULL );
-       strncpy( Client->host, Hostname, CLIENT_HOST_LEN );
+       assert( Hostname != NULL );
+       
+       strncpy( Client->host, Hostname, CLIENT_HOST_LEN - 1 );
        Client->host[CLIENT_HOST_LEN - 1] = '\0';
 } /* Client_SetHostname */
 
@@ -405,7 +422,9 @@ GLOBAL VOID Client_SetID( CLIENT *Client, CHAR *ID )
        /* Hostname eines Clients setzen */
 
        assert( Client != NULL );
-       strncpy( Client->id, ID, CLIENT_ID_LEN );
+       assert( ID != NULL );
+       
+       strncpy( Client->id, ID, CLIENT_ID_LEN - 1 );
        Client->id[CLIENT_ID_LEN - 1] = '\0';
 } /* Client_SetID */
 
@@ -415,11 +434,13 @@ GLOBAL VOID Client_SetUser( CLIENT *Client, CHAR *User, BOOLEAN Idented )
        /* Username eines Clients setzen */
 
        assert( Client != NULL );
-       if( Idented ) strncpy( Client->user, User, CLIENT_USER_LEN );
+       assert( User != NULL );
+       
+       if( Idented ) strncpy( Client->user, User, CLIENT_USER_LEN - 1 );
        else
        {
                Client->user[0] = '~';
-               strncpy( Client->user + 1, User, CLIENT_USER_LEN - 1 );
+               strncpy( Client->user + 1, User, CLIENT_USER_LEN - 2 );
        }
        Client->user[CLIENT_USER_LEN - 1] = '\0';
 } /* Client_SetUser */
@@ -430,7 +451,9 @@ GLOBAL VOID Client_SetInfo( CLIENT *Client, CHAR *Info )
        /* Hostname eines Clients setzen */
 
        assert( Client != NULL );
-       strncpy( Client->info, Info, CLIENT_INFO_LEN );
+       assert( Info != NULL );
+       
+       strncpy( Client->info, Info, CLIENT_INFO_LEN - 1 );
        Client->info[CLIENT_INFO_LEN - 1] = '\0';
 } /* Client_SetInfo */
 
@@ -440,7 +463,9 @@ GLOBAL VOID Client_SetModes( CLIENT *Client, CHAR *Modes )
        /* Hostname eines Clients setzen */
 
        assert( Client != NULL );
-       strncpy( Client->modes, Modes, CLIENT_MODE_LEN );
+       assert( Modes != NULL );
+
+       strncpy( Client->modes, Modes, CLIENT_MODE_LEN - 1 );
        Client->modes[CLIENT_MODE_LEN - 1] = '\0';
 } /* Client_SetModes */
 
@@ -450,7 +475,9 @@ GLOBAL VOID Client_SetPassword( CLIENT *Client, CHAR *Pwd )
        /* Von einem Client geliefertes Passwort */
 
        assert( Client != NULL );
-       strncpy( Client->pwd, Pwd, CLIENT_PASS_LEN );
+       assert( Pwd != NULL );
+       
+       strncpy( Client->pwd, Pwd, CLIENT_PASS_LEN - 1 );
        Client->pwd[CLIENT_PASS_LEN - 1] = '\0';
 } /* Client_SetPassword */
 
@@ -464,7 +491,7 @@ GLOBAL VOID Client_SetAway( CLIENT *Client, CHAR *Txt )
        if( Txt )
        {
                /* Client AWAY setzen */
-               strncpy( Client->away, Txt, CLIENT_AWAY_LEN );
+               strncpy( Client->away, Txt, CLIENT_AWAY_LEN - 1 );
                Client->away[CLIENT_AWAY_LEN - 1] = '\0';
                Client_ModeAdd( Client, 'a' );
                Log( LOG_DEBUG, "User \"%s\" is away: %s", Client_Mask( Client ), Txt );
@@ -503,6 +530,7 @@ GLOBAL VOID Client_SetToken( CLIENT *Client, INT Token )
 GLOBAL VOID Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer )
 {
        assert( Client != NULL );
+       assert( Introducer != NULL );
        Client->introducer = Introducer;
 } /* Client_SetIntroducer */
 
@@ -581,17 +609,17 @@ 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. */
+       /* Client-Struktur, die den entsprechenden Nick hat, liefern.
+        * Wird keine gefunden, so wird NULL geliefert. */
 
-       CHAR n[CLIENT_ID_LEN + 1], *ptr;
+       CHAR n[CLIENT_ID_LEN], *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';
+       strncpy( n, Nick, CLIENT_ID_LEN - 1 );
+       n[CLIENT_ID_LEN - 1] = '\0';
        ptr = strchr( n, '!' );
        if( ptr ) *ptr = '\0';
 
@@ -644,6 +672,10 @@ GLOBAL CHAR *Client_ID( CLIENT *Client )
 {
        assert( Client != NULL );
 
+#ifdef DEBUG
+       if( Client->type == CLIENT_USER ) assert( strlen( Client->id ) < CLIENT_NICK_LEN );
+#endif
+                                                  
        if( Client->id[0] ) return Client->id;
        else return "*";
 } /* Client_ID */
@@ -947,11 +979,23 @@ GLOBAL INT Client_UnknownCount( VOID )
 GLOBAL BOOLEAN Client_IsValidNick( CHAR *Nick )
 {
        /* Ist der Nick gueltig? */
+
+       CHAR *ptr, goodchars[] = ";0123456789";
        
        assert( Nick != NULL );
 
        if( Nick[0] == '#' ) return FALSE;
-       if( strlen( Nick ) > CLIENT_NICK_LEN ) return FALSE;
+       if( strchr( goodchars, Nick[0] )) return FALSE;
+       if( strlen( Nick ) >= CLIENT_NICK_LEN ) return FALSE;
+
+       ptr = Nick;
+       while( *ptr )
+       {
+               if(( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return FALSE;
+               if(( *ptr > '}' ) && ( ! strchr( goodchars, *ptr ))) return FALSE;
+               ptr++;
+       }
+       
        return TRUE;
 } /* Client_IsValidNick */