X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fclient.c;h=871aa1d49d98ff0426c24fb33c3323364f1115bd;hb=d1382fab5c956e65f35021366f1dbeeb5508a190;hp=768445dc8f738c2de08ae03c6a067ef09913e453;hpb=b9d701dbeb5566a6d8f54ec15aaf0b2a4670edad;p=ngircd-alex.git diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 768445dc..871aa1d4 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.29 2002/01/16 22:10:35 alex Exp $ + * $Id: client.c,v 1.37 2002/02/17 19:02:49 alex Exp $ * * client.c: Management aller Clients * @@ -21,6 +21,30 @@ * 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. + * + * Revision 1.30 2002/01/18 15:32:01 alex + * - bei Client_SetModes() wurde das NULL-Byte falsch gesetzt. Opsa. + * * Revision 1.29 2002/01/16 22:10:35 alex * - neue Funktionen Client_xxxCount(). * @@ -217,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; @@ -249,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 ); @@ -316,6 +341,7 @@ GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg ) 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 ) { @@ -390,7 +416,7 @@ GLOBAL VOID Client_SetModes( CLIENT *Client, CHAR *Modes ) assert( Client != NULL ); strncpy( Client->modes, Modes, CLIENT_MODE_LEN ); - Client->info[CLIENT_MODE_LEN - 1] = '\0'; + Client->modes[CLIENT_MODE_LEN - 1] = '\0'; } /* Client_SetModes */ @@ -508,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; @@ -665,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 ); @@ -681,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; @@ -713,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; @@ -839,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; @@ -876,7 +936,6 @@ LOCAL CLIENT *New_Client_Struct( VOID ) /* Neue CLIENT-Struktur pre-initialisieren */ CLIENT *c; - INT i; c = malloc( sizeof( CLIENT )); if( ! c ) @@ -889,12 +948,12 @@ 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, "" ); 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;