X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fclient.c;h=1d01f784387bac124925d41c01844ebc7ae1a991;hp=624ff1e17f4c965f85f1743a820ca0e447dbce60;hb=0e4e22a7a671d1e8efbc44bffd80062191f75c38;hpb=29ad5e0d9490f05de5b0e13542d9970330175597 diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 624ff1e1..1d01f784 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2008 Alexander Barton (alex@barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,8 +17,6 @@ #include "portab.h" -static char UNUSED id[] = "$Id: client.c,v 1.87 2006/03/11 01:37:31 alex Exp $"; - #include "imp.h" #include #include @@ -55,25 +53,24 @@ static char GetID_Buffer[GETID_LEN]; static WHOWAS My_Whowas[MAX_WHOWAS]; static int Last_Whowas = -1; +static long Max_Users, My_Max_Users; -static long Count PARAMS(( CLIENT_TYPE Type )); -static long MyCount PARAMS(( CLIENT_TYPE Type )); +static unsigned long Count PARAMS(( CLIENT_TYPE Type )); +static unsigned long MyCount PARAMS(( CLIENT_TYPE Type )); static CLIENT *New_Client_Struct PARAMS(( void )); static void Generate_MyToken PARAMS(( CLIENT *Client )); static void Adjust_Counters PARAMS(( CLIENT *Client )); static CLIENT *Init_New_Client PARAMS((CONN_ID Idx, CLIENT *Introducer, - CLIENT *TopServer, int Type, char *ID, char *User, char *Hostname, - char *Info, int Hops, int Token, char *Modes, bool Idented)); - -#ifndef Client_DestroyNow -GLOBAL void Client_DestroyNow PARAMS((CLIENT *Client )); -#endif - + CLIENT *TopServer, int Type, char *ID, + char *User, char *Hostname, char *Info, + int Hops, int Token, char *Modes, + bool Idented)); -long Max_Users = 0, My_Max_Users = 0; +static void Destroy_UserOrService PARAMS((CLIENT *Client, char *Txt, char *FwdMsg, + bool SendQuit)); GLOBAL void @@ -98,9 +95,10 @@ Client_Init( void ) This_Server->hops = 0; gethostname( This_Server->host, CLIENT_HOST_LEN ); - h = gethostbyname( This_Server->host ); - if( h ) strlcpy( This_Server->host, h->h_name, sizeof( This_Server->host )); - + if (!Conf_NoDNS) { + h = gethostbyname( This_Server->host ); + if (h) strlcpy(This_Server->host, h->h_name, sizeof(This_Server->host)); + } Client_SetID( This_Server, Conf_ServerName ); Client_SetInfo( This_Server, Conf_ServerInfo ); @@ -211,8 +209,8 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, if( Modes ) Client_SetModes( client, Modes ); if( Type == CLIENT_SERVER ) Generate_MyToken( client ); - /* ist der User away? */ - if( strchr( client->modes, 'a' )) strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away )); + if( strchr( client->modes, 'a' )) + strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away )); /* Verketten */ client->next = (POINTER *)My_Clients; @@ -265,41 +263,8 @@ Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit ) if( last ) last->next = c->next; else My_Clients = (CLIENT *)c->next; - if( c->type == CLIENT_USER ) - { - if( c->conn_id != NONE ) - { - /* Ein lokaler User */ - Log( LOG_NOTICE, "User \"%s\" unregistered (connection %d): %s", Client_Mask( c ), c->conn_id, txt ); - - if( SendQuit ) - { - /* Alle andere Server informieren! */ - if( FwdMsg ) IRC_WriteStrServersPrefix( NULL, c, "QUIT :%s", FwdMsg ); - else IRC_WriteStrServersPrefix( NULL, c, "QUIT :" ); - } - } - else - { - /* Remote User */ - Log( LOG_DEBUG, "User \"%s\" unregistered: %s", Client_Mask( c ), txt ); - - 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 :" ); - } - } - - /* Unregister client from channels */ - Channel_Quit( c, FwdMsg ? FwdMsg : c->id ); - - /* Register client in My_Whowas structure */ - Client_RegisterWhowas( c ); - } + if(c->type == CLIENT_USER || c->type == CLIENT_SERVICE) + Destroy_UserOrService(c, txt, FwdMsg, SendQuit); else if( c->type == CLIENT_SERVER ) { if( c != This_Server ) @@ -321,11 +286,9 @@ Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit ) { 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 ); + } else { + Log(LOG_WARNING, "Unregistered unknown client \"%s\": %s", + c->id[0] ? c->id : "(No Nick)", txt ); } } @@ -338,43 +301,14 @@ Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit ) } /* Client_Destroy */ -GLOBAL void -Client_DestroyNow( CLIENT *Client ) -{ - /* Destroy client structure immediately. This function is only - * intended for the connection layer to remove client structures - * of connections that can't be established! */ - - CLIENT *last, *c; - - assert( Client != NULL ); - - last = NULL; - c = My_Clients; - while( c ) - { - if( c == Client ) - { - /* Wir haben den Client gefunden: entfernen */ - if( last ) last->next = c->next; - else My_Clients = (CLIENT *)c->next; - free( c ); - break; - } - last = c; - c = (CLIENT *)c->next; - } -} /* Client_DestroyNow */ - - GLOBAL void Client_SetHostname( CLIENT *Client, char *Hostname ) { /* Hostname eines Clients setzen */ - + assert( Client != NULL ); assert( Hostname != NULL ); - + strlcpy( Client->host, Hostname, sizeof( Client->host )); } /* Client_SetHostname */ @@ -401,7 +335,7 @@ Client_SetUser( CLIENT *Client, char *User, bool Idented ) assert( Client != NULL ); assert( User != NULL ); - + if( Idented ) strlcpy( Client->user, User, sizeof( Client->user )); else { @@ -418,7 +352,7 @@ Client_SetInfo( CLIENT *Client, char *Info ) assert( Client != NULL ); assert( Info != NULL ); - + strlcpy( Client->info, Info, sizeof( Client->info )); } /* Client_SetInfo */ @@ -454,7 +388,7 @@ Client_SetPassword( CLIENT *Client, char *Pwd ) assert( Client != NULL ); assert( Pwd != NULL ); - + strlcpy( Client->pwd, Pwd, sizeof( Client->pwd )); } /* Client_SetPassword */ @@ -468,7 +402,8 @@ Client_SetAway( CLIENT *Client, char *Txt ) assert( Txt != NULL ); strlcpy( Client->away, Txt, sizeof( Client->away )); - Log( LOG_DEBUG, "User \"%s\" is away: %s", Client_Mask( Client ), Txt ); + LogDebug("%s \"%s\" is away: %s", Client_TypeText(Client), + Client_Mask(Client), Txt); } /* Client_SetAway */ @@ -524,7 +459,7 @@ Client_ModeAdd( CLIENT *Client, char Mode ) */ char x[2]; - + assert( Client != NULL ); x[0] = Mode; x[1] = '\0'; @@ -566,28 +501,7 @@ Client_ModeDel( CLIENT *Client, char Mode ) GLOBAL CLIENT * -Client_GetFromConn( CONN_ID Idx ) -{ - /* return Client-Structure that belongs to the local Connection Idx gehoert. - * If none is found, return NULL. - */ - - CLIENT *c; - - assert( Idx >= 0 ); - - c = My_Clients; - while( c ) - { - if( c->conn_id == Idx ) return c; - c = (CLIENT *)c->next; - } - return NULL; -} /* Client_GetFromConn */ - - -GLOBAL CLIENT * -Client_Search( char *Nick ) +Client_Search( const char *Nick ) { /* return Client-Structure that has the corresponding Nick. * If none is found, return NULL. @@ -664,7 +578,8 @@ Client_ID( CLIENT *Client ) assert( Client != NULL ); #ifdef DEBUG - if( Client->type == CLIENT_USER ) assert( strlen( Client->id ) < CLIENT_NICK_LEN ); + if(Client->type == CLIENT_USER) + assert(strlen(Client->id) < Conf_MaxNickLength); #endif if( Client->id[0] ) return Client->id; @@ -684,8 +599,7 @@ GLOBAL char * Client_User( CLIENT *Client ) { assert( Client != NULL ); - if( Client->user[0] ) return Client->user; - else return "~"; + return Client->user[0] ? Client->user : "~"; } /* Client_User */ @@ -757,11 +671,13 @@ GLOBAL CLIENT * Client_NextHop( CLIENT *Client ) { CLIENT *c; - + assert( Client != NULL ); c = Client; - while( c->introducer && ( c->introducer != c ) && ( c->introducer != This_Server )) c = c->introducer; + while( c->introducer && ( c->introducer != c ) && ( c->introducer != This_Server )) + c = c->introducer; + return c; } /* Client_NextHop */ @@ -773,7 +689,7 @@ Client_Mask( CLIENT *Client ) * Prefixe benoetigt wird. */ assert( Client != NULL ); - + if( Client->type == CLIENT_SERVER ) return Client->id; snprintf( GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host ); @@ -818,12 +734,9 @@ Client_Away( CLIENT *Client ) GLOBAL bool Client_CheckNick( CLIENT *Client, char *Nick ) { - /* Nick ueberpruefen */ - assert( Client != NULL ); assert( Nick != NULL ); - - /* Nick ungueltig? */ + if( ! Client_IsValidNick( Nick )) { IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick ); @@ -936,13 +849,12 @@ Client_MyServiceCount( void ) } /* Client_MyServiceCount */ -GLOBAL long +GLOBAL unsigned long Client_MyServerCount( void ) { CLIENT *c; - long cnt; + unsigned long cnt = 0; - cnt = 0; c = My_Clients; while( c ) { @@ -953,13 +865,12 @@ Client_MyServerCount( void ) } /* Client_MyServerCount */ -GLOBAL long +GLOBAL unsigned long Client_OperCount( void ) { CLIENT *c; - long cnt; + unsigned long cnt = 0; - cnt = 0; c = My_Clients; while( c ) { @@ -970,19 +881,19 @@ Client_OperCount( void ) } /* Client_OperCount */ -GLOBAL long +GLOBAL unsigned long Client_UnknownCount( void ) { CLIENT *c; - long cnt; + unsigned long cnt = 0; - cnt = 0; c = My_Clients; while( c ) { if( c && ( c->type != CLIENT_USER ) && ( c->type != CLIENT_SERVICE ) && ( c->type != CLIENT_SERVER )) cnt++; c = (CLIENT *)c->next; } + return cnt; } /* Client_UnknownCount */ @@ -1002,28 +913,25 @@ Client_MyMaxUserCount( void ) GLOBAL bool -Client_IsValidNick( char *Nick ) +Client_IsValidNick( const char *Nick ) { - /* Ist der Nick gueltig? */ + const char *ptr; + static const char goodchars[] = ";0123456789-"; - char *ptr, goodchars[20]; - assert( Nick != NULL ); - strcpy( goodchars, ";0123456789-" ); - if( Nick[0] == '#' ) return false; if( strchr( goodchars, Nick[0] )) return false; - if( strlen( Nick ) >= CLIENT_NICK_LEN ) return false; + if( strlen( Nick ) >= Conf_MaxNickLength) return false; ptr = Nick; while( *ptr ) { - if(( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return false; - if(( *ptr > '}' ) && ( ! strchr( goodchars, *ptr ))) return false; + if (( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return false; + if ( *ptr > '}' ) return false; ptr++; } - + return true; } /* Client_IsValidNick */ @@ -1060,13 +968,12 @@ Client_StartTime(CLIENT *Client) } /* Client_Uptime */ -static long +static unsigned long Count( CLIENT_TYPE Type ) { CLIENT *c; - long cnt; + unsigned long cnt = 0; - cnt = 0; c = My_Clients; while( c ) { @@ -1077,13 +984,12 @@ Count( CLIENT_TYPE Type ) } /* Count */ -static long +static unsigned long MyCount( CLIENT_TYPE Type ) { CLIENT *c; - long cnt; + unsigned long cnt = 0; - cnt = 0; c = My_Clients; while( c ) { @@ -1098,9 +1004,9 @@ static CLIENT * New_Client_Struct( void ) { /* Neue CLIENT-Struktur pre-initialisieren */ - + CLIENT *c; - + c = (CLIENT *)malloc( sizeof( CLIENT )); if( ! c ) { @@ -1153,7 +1059,7 @@ Adjust_Counters( CLIENT *Client ) assert( Client != NULL ); if( Client->type != CLIENT_USER ) return; - + if( Client->conn_id != NONE ) { /* Local connection */ @@ -1175,11 +1081,13 @@ GLOBAL void Client_RegisterWhowas( CLIENT *Client ) { int slot; - + time_t now; + assert( Client != NULL ); + now = time(NULL); /* Don't register clients that were connected less than 30 seconds. */ - if( time(NULL) - Client->starttime < 30 ) + if( now - Client->starttime < 30 ) return; slot = Last_Whowas + 1; @@ -1188,8 +1096,8 @@ Client_RegisterWhowas( CLIENT *Client ) #ifdef DEBUG Log( LOG_DEBUG, "Saving WHOWAS information to slot %d ...", slot ); #endif - - My_Whowas[slot].time = time( NULL ); + + My_Whowas[slot].time = now; strlcpy( My_Whowas[slot].id, Client_ID( Client ), sizeof( My_Whowas[slot].id )); strlcpy( My_Whowas[slot].user, Client_User( Client ), @@ -1200,9 +1108,76 @@ Client_RegisterWhowas( CLIENT *Client ) sizeof( My_Whowas[slot].info )); strlcpy( My_Whowas[slot].server, Client_ID( Client_Introducer( Client )), sizeof( My_Whowas[slot].server )); - + Last_Whowas = slot; } /* Client_RegisterWhowas */ +GLOBAL char * +Client_TypeText(CLIENT *Client) +{ + assert(Client != NULL); + switch (Client_Type(Client)) { + case CLIENT_USER: + return "User"; + break; + case CLIENT_SERVICE: + return "Service"; + break; + case CLIENT_SERVER: + return "Server"; + break; + default: + return "Client"; + } +} /* Client_TypeText */ + + +/** + * Destroy user or service client. + */ +static void +Destroy_UserOrService(CLIENT *Client, char *Txt, char *FwdMsg, bool SendQuit) +{ + if(Client->conn_id != NONE) { + /* Local (directly connected) client */ + Log(LOG_NOTICE, + "%s \"%s\" unregistered (connection %d): %s", + Client_TypeText(Client), Client_Mask(Client), + Client->conn_id, Txt); + + if (SendQuit) { + /* Inforam all the other servers */ + if (FwdMsg) + IRC_WriteStrServersPrefix(NULL, + Client, "QUIT :%s", FwdMsg ); + else + IRC_WriteStrServersPrefix(NULL, + Client, "QUIT :"); + } + } else { + /* Remote client */ + LogDebug("%s \"%s\" unregistered: %s", + Client_TypeText(Client), Client_Mask(Client), Txt); + + if(SendQuit) { + /* Inform all the other servers, but the ones in the + * direction we got the QUIT from */ + if(FwdMsg) + IRC_WriteStrServersPrefix(Client_NextHop(Client), + Client, "QUIT :%s", FwdMsg ); + else + IRC_WriteStrServersPrefix(Client_NextHop(Client), + Client, "QUIT :" ); + } + } + + /* Unregister client from channels */ + Channel_Quit(Client, FwdMsg ? FwdMsg : Client->id); + + /* Register client in My_Whowas structure */ + Client_RegisterWhowas(Client); +} /* Destroy_UserOrService */ + + /* -eof- */