X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fclient.c;h=e36dafd5678c30c268189774ff81ddb060ce5d0b;hb=fe2bc90e45fec65ece7e31e442177284f29f6d3b;hp=3ab547630fcd5cc2f34c65a24d70d7bf80f9700c;hpb=28d5898617b7a9372e6c9244dc74881e68940b26;p=ngircd-alex.git

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 3ab54763..e36dafd5 100644
--- 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.38 2002/02/27 14:47: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,24 @@
  * 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.
+ *
+ * Revision 1.39  2002/02/27 18:22:09  alex
+ * - neue Funktion Client_SetAway() und Client_Away() implementiert.
+ *
  * Revision 1.38  2002/02/27 14:47:53  alex
  * - Logging beim Abmelden von Clients (erneut) geaendert: nun ist's aber gut ;-)
  *
@@ -166,7 +184,7 @@
 #include "channel.h"
 #include "conf.h"
 #include "conn.h"
-#include "irc.h"
+#include "irc-write.h"
 #include "log.h"
 #include "messages.h"
 
@@ -287,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;
@@ -389,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 */
 
@@ -399,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 */
 
@@ -409,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 */
@@ -424,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 */
 
@@ -434,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 */
 
@@ -444,11 +475,36 @@ 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 */
 
 
+GLOBAL VOID Client_SetAway( CLIENT *Client, CHAR *Txt )
+{
+	/* Von einem Client gelieferte AWAY-Nachricht */
+
+	assert( Client != NULL );
+
+	if( Txt )
+	{
+		/* Client AWAY setzen */
+		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 );
+	}
+	else
+	{
+		/* AWAY loeschen */
+		Client_ModeDel( Client, 'a' );
+		Log( LOG_DEBUG, "User \"%s\" is no longer away.", Client_Mask( Client ));
+	}
+} /* Client_SetAway */
+
+
 GLOBAL VOID Client_SetType( CLIENT *Client, INT Type )
 {
 	assert( Client != NULL );
@@ -474,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 */
 
@@ -552,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';
 
@@ -615,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 */
@@ -731,6 +792,15 @@ GLOBAL BOOLEAN Client_HasMode( CLIENT *Client, CHAR Mode )
 } /* Client_HasMode */
 
 
+GLOBAL CHAR *Client_Away( CLIENT *Client )
+{
+	/* AWAY-Text liefern */
+
+	assert( Client != NULL );
+	return Client->away;
+} /* Client_Away */
+
+
 GLOBAL BOOLEAN Client_CheckNick( CLIENT *Client, CHAR *Nick )
 {
 	/* Nick ueberpruefen */
@@ -909,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 */
 
@@ -978,6 +1060,7 @@ LOCAL CLIENT *New_Client_Struct( VOID )
 	c->hops = -1;
 	c->token = -1;
 	c->mytoken = -1;
+	strcpy( c->away, "" );
 
 	return c;
 } /* New_Client */