X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fclient.c;h=a383e89783e02717b65e874b77820fb09d22a230;hp=c38c386b936fc46fe1227e59dfbb4b2f4f71447f;hb=902ad91212f3d756fa898239108128d2230bdc0c;hpb=e6d1bcdf82875c5ad1780d7b5903eb6daa43f32a diff --git a/src/ngircd/client.c b/src/ngircd/client.c index c38c386b..a383e897 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -2,23 +2,13 @@ * ngIRCd -- The Next Generation IRC Daemon * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: client.c,v 1.59 2002/06/10 21:09:39 alex Exp $ - * - * client.c: Management aller Clients - * - * Der Begriff "Client" ist in diesem Fall evtl. etwas verwirrend: Clients sind - * alle Verbindungen, die im gesamten(!) IRC-Netzwerk bekannt sind. Das sind IRC- - * Clients (User), andere Server und IRC-Services. - * Ueber welchen IRC-Server die Verbindung nun tatsaechlich in das Netzwerk her- - * gestellt wurde, muss der jeweiligen Struktur entnommen werden. Ist es dieser - * Server gewesen, so existiert eine entsprechende CONNECTION-Struktur. + * Client management. */ @@ -27,6 +17,8 @@ #include "portab.h" +static char UNUSED id[] = "$Id: client.c,v 1.65 2002/12/12 12:24:18 alex Exp $"; + #include "imp.h" #include #include @@ -53,12 +45,15 @@ #include +#define GETID_LEN (CLIENT_NICK_LEN-1) + 1 + (CLIENT_USER_LEN-1) + 1 + (CLIENT_HOST_LEN-1) + 1 + + LOCAL CLIENT *This_Server, *My_Clients; -LOCAL CHAR GetID_Buffer[CLIENT_ID_LEN]; +LOCAL CHAR GetID_Buffer[GETID_LEN]; -LOCAL INT Count PARAMS(( CLIENT_TYPE Type )); -LOCAL INT MyCount PARAMS(( CLIENT_TYPE Type )); +LOCAL LONG Count PARAMS(( CLIENT_TYPE Type )); +LOCAL LONG MyCount PARAMS(( CLIENT_TYPE Type )); LOCAL CLIENT *New_Client_Struct PARAMS(( VOID )); LOCAL VOID Generate_MyToken PARAMS(( CLIENT *Client )); @@ -353,7 +348,7 @@ Client_SetInfo( CLIENT *Client, CHAR *Info ) GLOBAL VOID Client_SetModes( CLIENT *Client, CHAR *Modes ) { - /* Hostname eines Clients setzen */ + /* Modes eines Clients setzen */ assert( Client != NULL ); assert( Modes != NULL ); @@ -363,6 +358,19 @@ Client_SetModes( CLIENT *Client, CHAR *Modes ) } /* Client_SetModes */ +GLOBAL VOID +Client_SetFlags( CLIENT *Client, CHAR *Flags ) +{ + /* Flags eines Clients setzen */ + + assert( Client != NULL ); + assert( Flags != NULL ); + + strncpy( Client->flags, Flags, CLIENT_FLAGS_LEN - 1 ); + Client->flags[CLIENT_FLAGS_LEN - 1] = '\0'; +} /* Client_SetFlags */ + + GLOBAL VOID Client_SetPassword( CLIENT *Client, CHAR *Pwd ) { @@ -637,6 +645,14 @@ Client_Modes( CLIENT *Client ) } /* Client_Modes */ +GLOBAL CHAR * +Client_Flags( CLIENT *Client ) +{ + assert( Client != NULL ); + return Client->flags; +} /* Client_Flags */ + + GLOBAL BOOLEAN Client_OperByMe( CLIENT *Client ) { @@ -692,7 +708,7 @@ Client_Mask( CLIENT *Client ) if( Client->type == CLIENT_SERVER ) return Client->id; - sprintf( GetID_Buffer, "%s!%s@%s", Client->id, Client->user, Client->host ); + snprintf( GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host ); return GetID_Buffer; } /* Client_Mask */ @@ -784,8 +800,9 @@ Client_CheckID( CLIENT *Client, CHAR *ID ) if( strcasecmp( c->id, ID ) == 0 ) { /* die Server-ID gibt es bereits */ - sprintf( str, "ID \"%s\" already registered!", ID ); - Log( LOG_ERR, "%s (on connection %d)", str, Client->conn_id ); + sprintf( str, "ID \"%s\" already registered", ID ); + if( Client->conn_id != c->conn_id ) Log( LOG_ERR, "%s (on connection %d)!", str, c->conn_id ); + else Log( LOG_ERR, "%s (via network)!", str ); Conn_Close( Client->conn_id, str, str, TRUE ); return FALSE; } @@ -816,46 +833,46 @@ Client_Next( CLIENT *c ) } /* Client_Next */ -GLOBAL INT +GLOBAL LONG Client_UserCount( VOID ) { return Count( CLIENT_USER ); } /* Client_UserCount */ -GLOBAL INT +GLOBAL LONG Client_ServiceCount( VOID ) { return Count( CLIENT_SERVICE );; } /* Client_ServiceCount */ -GLOBAL INT +GLOBAL LONG Client_ServerCount( VOID ) { return Count( CLIENT_SERVER ); } /* Client_ServerCount */ -GLOBAL INT +GLOBAL LONG Client_MyUserCount( VOID ) { return MyCount( CLIENT_USER ); } /* Client_MyUserCount */ -GLOBAL INT +GLOBAL LONG Client_MyServiceCount( VOID ) { return MyCount( CLIENT_SERVICE ); } /* Client_MyServiceCount */ -GLOBAL INT +GLOBAL LONG Client_MyServerCount( VOID ) { CLIENT *c; - INT cnt; + LONG cnt; cnt = 0; c = My_Clients; @@ -868,11 +885,11 @@ Client_MyServerCount( VOID ) } /* Client_MyServerCount */ -GLOBAL INT +GLOBAL LONG Client_OperCount( VOID ) { CLIENT *c; - INT cnt; + LONG cnt; cnt = 0; c = My_Clients; @@ -885,11 +902,11 @@ Client_OperCount( VOID ) } /* Client_OperCount */ -GLOBAL INT +GLOBAL LONG Client_UnknownCount( VOID ) { CLIENT *c; - INT cnt; + LONG cnt; cnt = 0; c = My_Clients; @@ -929,11 +946,11 @@ Client_IsValidNick( CHAR *Nick ) } /* Client_IsValidNick */ -LOCAL INT +LOCAL LONG Count( CLIENT_TYPE Type ) { CLIENT *c; - INT cnt; + LONG cnt; cnt = 0; c = My_Clients; @@ -946,11 +963,11 @@ Count( CLIENT_TYPE Type ) } /* Count */ -LOCAL INT +LOCAL LONG MyCount( CLIENT_TYPE Type ) { CLIENT *c; - INT cnt; + LONG cnt; cnt = 0; c = My_Clients; @@ -994,6 +1011,7 @@ New_Client_Struct( VOID ) c->token = -1; c->mytoken = -1; strcpy( c->away, "" ); + strcpy( c->flags, "" ); return c; } /* New_Client */