* 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.30 2002/01/18 15:32:01 alex Exp $
+ * $Id: client.c,v 1.47 2002/03/11 22:04:10 alex Exp $
*
* client.c: Management aller Clients
*
* Server gewesen, so existiert eine entsprechende CONNECTION-Struktur.
*
* $Log: client.c,v $
+ * Revision 1.47 2002/03/11 22:04:10 alex
+ * - Client_Destroy() hat neuen Paramter: QUITs fuer Clients verschicken?
+ *
+ * Revision 1.46 2002/03/10 22:03:20 alex
+ * - Netz-Splits werden nun als soche ausgegeben.
+ *
+ * Revision 1.45 2002/03/10 17:15:20 alex
+ * - der Bindestrich ("-") ist nun auch in Nicknames erlaubt.
+ *
+ * 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 ;-)
+ *
+ * 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.
+ *
* Revision 1.30 2002/01/18 15:32:01 alex
* - bei Client_SetModes() wurde das NULL-Byte falsch gesetzt. Opsa.
*
#include "channel.h"
#include "conf.h"
#include "conn.h"
-#include "irc.h"
+#include "irc-write.h"
#include "log.h"
#include "messages.h"
CLIENT *c, *next;
INT cnt;
- Client_Destroy( This_Server, "Server going down.", NULL );
+ Client_Destroy( This_Server, "Server going down.", NULL, FALSE );
cnt = 0;
c = My_Clients;
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;
/* 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 );
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;
} /* Client_New */
-GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg )
+GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit )
{
/* Client entfernen. */
CLIENT *last, *c;
- CHAR *txt;
+ CHAR msg[LINE_LEN], *txt;
assert( Client != NULL );
else txt = FwdMsg;
if( ! txt ) txt = "Reason unknown.";
+ if( Client->type == CLIENT_SERVER )
+ {
+ /* Netz-Split-Nachricht vorbereiten */
+ sprintf( msg, "%s | %s", Client_ID( Client ), Client_ID( Client_TopServer( Client ) ? Client_TopServer( Client ) : Client_ThisServer( )));
+ }
+
last = NULL;
c = My_Clients;
while( c )
{
if(( Client->type == CLIENT_SERVER ) && ( c->introducer == Client ) && ( c != Client ))
{
- Client_Destroy( c, LogMsg, FwdMsg );
+ /* der Client, der geloescht wird ist ein Server. Der Client, den wir gerade
+ * pruefen, ist ein Child von diesem und muss daher auch entfernt werden */
+ Client_Destroy( c, NULL, msg, FALSE );
last = NULL;
c = My_Clients;
continue;
}
if( c == Client )
{
+ /* Wir haben den Client gefunden: entfernen */
if( last ) last->next = c->next;
else My_Clients = c->next;
{
if( c->conn_id != NONE )
{
- /* Ein lokaler User. Alle andere Server informieren! */
+ /* Ein lokaler User */
Log( LOG_NOTICE, "User \"%s\" unregistered (connection %d): %s", Client_Mask( c ), c->conn_id, txt );
- if( FwdMsg ) IRC_WriteStrServersPrefix( NULL, c, "QUIT :%s", FwdMsg );
- else IRC_WriteStrServersPrefix( NULL, c, "QUIT :" );
+ if( SendQuit )
+ {
+ /* Alle andere Server informieren! */
+ if( FwdMsg ) IRC_WriteStrServersPrefix( NULL, c, "QUIT :%s", FwdMsg );
+ else IRC_WriteStrServersPrefix( NULL, c, "QUIT :" );
+ }
}
else
{
- /* Remote User. Andere Server informieren, ausser denen,
- * die "in Richtung dem liegen", auf dem der User registriert
- * ist. Von denen haben wir das QUIT ja wohl bekommen. */
+ /* Remote User */
Log( LOG_DEBUG, "User \"%s\" unregistered: %s", Client_Mask( c ), txt );
-
- if( FwdMsg ) IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "QUIT :%s", FwdMsg );
- else IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "QUIT :" );
+
+ if( SendQuit )
+ {
+ /* Andere Server informieren, ausser denen, die "in
+ * Richtung dem liegen", auf dem der User registriert
+ * ist. Von denen haben wir das QUIT ja wohl bekommen. */
+ if( FwdMsg ) IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "QUIT :%s", FwdMsg );
+ else IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "QUIT :" );
+ }
}
+ Channel_RemoveClient( c, FwdMsg ? FwdMsg : c->id );
}
else if( c->type == CLIENT_SERVER )
{
- if( c != This_Server ) Log( LOG_NOTICE, "Server \"%s\" unregistered: %s", c->id, txt );
+ if( c != This_Server )
+ {
+ if( c->conn_id != NONE ) Log( LOG_NOTICE, "Server \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt );
+ else Log( LOG_NOTICE, "Server \"%s\" unregistered: %s", c->id, txt );
+ }
/* andere Server informieren */
if( ! NGIRCd_Quit )
else IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "SQUIT %s :", c->id );
}
}
- else Log( LOG_NOTICE, "Unknown client \"%s\" unregistered: %s", c->id, txt );
+ else
+ {
+ if( c->conn_id != NONE )
+ {
+ if( c->id[0] ) Log( LOG_NOTICE, "Client \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt );
+ else Log( LOG_NOTICE, "Client unregistered (connection %d): %s", c->conn_id, txt );
+ }
+ else
+ {
+ if( c->id[0] ) Log( LOG_WARNING, "Unregistered unknown client \"%s\": %s", c->id, txt );
+ else Log( LOG_WARNING, "Unregistered unknown client: %s", c->id, txt );
+ }
+ }
free( c );
break;
/* 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 */
/* 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 */
/* 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 */
/* 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 */
/* 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 */
/* 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 );
GLOBAL VOID Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer )
{
assert( Client != NULL );
+ assert( Introducer != NULL );
Client->introducer = Introducer;
} /* Client_SetIntroducer */
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. */
- CLIENT *c;
+ 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 - 1 );
+ n[CLIENT_ID_LEN - 1] = '\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;
{
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 */
} /* 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 );
} /* 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 */
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;
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;
} /* Client_UnknownCount */
+GLOBAL BOOLEAN Client_IsValidNick( CHAR *Nick )
+{
+ /* Ist der Nick gueltig? */
+
+ CHAR *ptr, goodchars[] = ";0123456789-";
+
+ assert( Nick != NULL );
+
+ if( Nick[0] == '#' ) 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 */
+
+
LOCAL INT Count( CLIENT_TYPE Type )
{
CLIENT *c;
/* Neue CLIENT-Struktur pre-initialisieren */
CLIENT *c;
- INT i;
c = malloc( sizeof( CLIENT ));
if( ! c )
c->type = CLIENT_UNKNOWN;
c->conn_id = NONE;
c->introducer = NULL;
+ c->topserver = NULL;
strcpy( c->id, "" );
strcpy( c->pwd, "" );
strcpy( c->host, "" );
strcpy( c->user, "" );
strcpy( c->info, "" );
- for( i = 0; i < MAX_CHANNELS; c->channels[i++] = NULL );
strcpy( c->modes, "" );
c->oper_by_me = FALSE;
c->hops = -1;
c->token = -1;
c->mytoken = -1;
+ strcpy( c->away, "" );
return c;
} /* New_Client */
projects / ngircd-alex.git / blobdiff