* 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.39 2002/02/27 18:22:09 alex Exp $
+ * $Id: client.c,v 1.61 2002/10/04 12:39:58 alex Exp $
*
* client.c: Management aller Clients
*
* 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.
- *
- * $Log: client.c,v $
- * 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.
- *
- * Revision 1.29 2002/01/16 22:10:35 alex
- * - neue Funktionen Client_xxxCount().
- *
- * Revision 1.28 2002/01/11 23:50:40 alex
- * - Hop-Count fuer den Server selber (0) wird korrekt initialisiert.
- *
- * Revision 1.27 2002/01/09 01:08:08 alex
- * - wird ein Server abgemeldet, so wird anderen Server ein SQUIT geschickt.
- *
- * Revision 1.26 2002/01/07 23:42:12 alex
- * - Es werden fuer alle Server eigene Token generiert,
- * - QUIT von einem Server fuer einen User wird an andere Server geforwarded,
- * - ebenso NICK-Befehle, die "fremde" User einfuehren.
- *
- * Revision 1.25 2002/01/07 15:31:00 alex
- * - Bei Log-Meldungen ueber Clients wird nun immer die "Client Mask" verwendet.
- *
- * Revision 1.24 2002/01/06 15:18:14 alex
- * - Loglevel und Meldungen nochmals geaendert. Level passen nun besser.
- *
- * Revision 1.23 2002/01/05 23:26:05 alex
- * - Vorbereitungen fuer Ident-Abfragen in Client-Strukturen.
- *
- * Revision 1.22 2002/01/05 20:08:17 alex
- * - neue Funktion Client_NextHop().
- *
- * Revision 1.21 2002/01/05 19:15:03 alex
- * - Fehlerpruefung bei select() in der "Hauptschleife" korrigiert.
- *
- * Revision 1.20 2002/01/04 17:57:08 alex
- * - Client_Destroy() an Server-Links angepasst.
- *
- * Revision 1.19 2002/01/04 01:21:22 alex
- * - Client-Strukturen koennen von anderen Modulen nun nur noch ueber die
- * enstprechenden (zum Teil neuen) Funktionen angesprochen werden.
- *
- * Revision 1.18 2002/01/03 02:28:06 alex
- * - neue Funktion Client_CheckID(), diverse Aenderungen fuer Server-Links.
- *
- * Revision 1.17 2002/01/02 02:42:58 alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.16 2002/01/01 18:25:44 alex
- * - #include's fuer stdlib.h ergaenzt.
- *
- * Revision 1.15 2001/12/31 15:33:13 alex
- * - neuer Befehl NAMES, kleinere Bugfixes.
- * - Bug bei PING behoben: war zu restriktiv implementiert :-)
- *
- * Revision 1.14 2001/12/31 02:18:51 alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.13 2001/12/30 19:26:11 alex
- * - Unterstuetzung fuer die Konfigurationsdatei eingebaut.
- *
- * Revision 1.12 2001/12/29 20:18:18 alex
- * - neue Funktion Client_SetHostname().
- *
- * Revision 1.11 2001/12/29 03:10:47 alex
- * - Client-Modes implementiert; Loglevel mal wieder angepasst.
- *
- * Revision 1.10 2001/12/27 19:13:47 alex
- * - neue Funktion Client_Search(), besseres Logging.
- *
- * Revision 1.9 2001/12/27 17:15:29 alex
- * - der eigene Hostname wird nun komplet (als FQDN) ermittelt.
- *
- * Revision 1.8 2001/12/27 16:54:51 alex
- * - neue Funktion Client_GetID(), liefert die "Client ID".
- *
- * Revision 1.7 2001/12/26 14:45:37 alex
- * - "Code Cleanups".
- *
- * Revision 1.6 2001/12/26 03:19:16 alex
- * - neue Funktion Client_Nick().
- *
- * Revision 1.5 2001/12/25 22:04:26 alex
- * - Aenderungen an den Debug- und Logging-Funktionen.
- *
- * Revision 1.4 2001/12/25 19:21:26 alex
- * - Client-Typ ("Status") besser unterteilt, My_Clients ist zudem nun global.
- *
- * Revision 1.3 2001/12/24 01:31:14 alex
- * - einige assert()'s eingestraeut.
- *
- * Revision 1.2 2001/12/23 22:04:37 alex
- * - einige neue Funktionen,
- * - CLIENT-Struktur erweitert.
- *
- * Revision 1.1 2001/12/14 08:13:43 alex
- * - neues Modul begonnen :-)
*/
#define __client_c__
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
-#include <imp.h>
+#include "imp.h"
#include <assert.h>
#include <unistd.h>
#include <stdio.h>
#include <string.h>
#include <netdb.h>
-#include <exp.h>
+#include "conn.h"
+
+#include "exp.h"
#include "client.h"
#include <imp.h>
#include "ngircd.h"
#include "channel.h"
+#include "resolve.h"
#include "conf.h"
-#include "conn.h"
-#include "irc.h"
+#include "hash.h"
+#include "irc-write.h"
#include "log.h"
#include "messages.h"
#include <exp.h>
+#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( CLIENT_TYPE Type );
-LOCAL INT MyCount( CLIENT_TYPE Type );
+LOCAL INT Count PARAMS(( CLIENT_TYPE Type ));
+LOCAL INT MyCount PARAMS(( CLIENT_TYPE Type ));
-LOCAL CLIENT *New_Client_Struct( VOID );
-LOCAL VOID Generate_MyToken( CLIENT *Client );
+LOCAL CLIENT *New_Client_Struct PARAMS(( VOID ));
+LOCAL VOID Generate_MyToken PARAMS(( CLIENT *Client ));
-GLOBAL VOID Client_Init( VOID )
+GLOBAL VOID
+Client_Init( VOID )
{
struct hostent *h;
if( ! This_Server )
{
Log( LOG_EMERG, "Can't allocate client structure for server! Going down." );
- Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" );
+ Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
exit( 1 );
}
h = gethostbyname( This_Server->host );
if( h ) strcpy( This_Server->host, h->h_name );
- strcpy( This_Server->id, Conf_ServerName );
- strcpy( This_Server->info, Conf_ServerInfo );
+ Client_SetID( This_Server, Conf_ServerName );
+ Client_SetInfo( This_Server, Conf_ServerInfo );
My_Clients = This_Server;
} /* Client_Init */
-GLOBAL VOID Client_Exit( VOID )
+GLOBAL VOID
+Client_Exit( VOID )
{
CLIENT *c, *next;
INT cnt;
- Client_Destroy( This_Server, "Server going down.", NULL );
+ if( NGIRCd_Restart ) Client_Destroy( This_Server, "Server going down (restarting).", NULL, FALSE );
+ else Client_Destroy( This_Server, "Server going down.", NULL, FALSE );
cnt = 0;
c = My_Clients;
while( c )
{
cnt++;
- next = c->next;
+ next = (CLIENT *)c->next;
free( c );
c = next;
}
} /* Client_Exit */
-GLOBAL CLIENT *Client_ThisServer( VOID )
+GLOBAL CLIENT *
+Client_ThisServer( VOID )
{
return This_Server;
} /* Client_ThisServer */
-GLOBAL CLIENT *Client_NewLocal( CONN_ID Idx, CHAR *Hostname, INT Type, BOOLEAN Idented )
+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, NULL, Type, NULL, NULL, Hostname, NULL, 0, 0, NULL, Idented );
} /* Client_NewLocal */
-GLOBAL CLIENT *Client_NewRemoteServer( CLIENT *Introducer, CHAR *Hostname, CLIENT *TopServer, 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, 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 )
+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, NULL, CLIENT_USER, Nick, User, Hostname, Info, Hops, Token, Modes, Idented );
} /* Client_NewRemoteUser */
-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 )
+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;
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;
+ client->next = (POINTER *)My_Clients;
My_Clients = client;
return 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.";
+ /* Netz-Split-Nachricht vorbereiten (noch nicht optimal) */
+ if( Client->type == CLIENT_SERVER ) sprintf( msg, "%s: lost server %s", This_Server->id, Client->id );
+
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;
+ else My_Clients = (CLIENT *)c->next;
if( c->type == CLIENT_USER )
{
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 );
+ Channel_Quit( c, FwdMsg ? FwdMsg : c->id );
}
else if( c->type == CLIENT_SERVER )
{
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 );
+ if( c->conn_id != NONE ) Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt );
+ else Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" unregistered: %s", c->id, txt );
}
/* andere Server informieren */
break;
}
last = c;
- c = c->next;
+ c = (CLIENT *)c->next;
}
} /* Client_Destroy */
-GLOBAL VOID Client_SetHostname( CLIENT *Client, CHAR *Hostname )
+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 */
-GLOBAL VOID Client_SetID( CLIENT *Client, CHAR *ID )
+GLOBAL VOID
+Client_SetID( CLIENT *Client, CHAR *ID )
{
- /* Hostname eines Clients setzen */
+ /* Hostname eines Clients setzen, Hash-Wert berechnen */
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';
+
+ /* Hash */
+ Client->hash = Hash( Client->id );
} /* Client_SetID */
-GLOBAL VOID Client_SetUser( CLIENT *Client, CHAR *User, BOOLEAN Idented )
+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 */
-GLOBAL VOID Client_SetInfo( CLIENT *Client, CHAR *Info )
+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 */
-GLOBAL VOID Client_SetModes( CLIENT *Client, CHAR *Modes )
+GLOBAL VOID
+Client_SetModes( CLIENT *Client, CHAR *Modes )
{
- /* Hostname eines Clients setzen */
+ /* Modes 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 */
-GLOBAL VOID Client_SetPassword( CLIENT *Client, CHAR *Pwd )
+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->modes[CLIENT_FLAGS_LEN - 1] = '\0';
+} /* Client_SetFlags */
+
+
+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 )
+GLOBAL VOID
+Client_SetAway( CLIENT *Client, CHAR *Txt )
{
/* Von einem Client gelieferte AWAY-Nachricht */
if( Txt )
{
/* Client AWAY setzen */
- strncpy( Client->away, Txt, CLIENT_AWAY_LEN );
+ 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 );
} /* Client_SetAway */
-GLOBAL VOID Client_SetType( CLIENT *Client, INT Type )
+GLOBAL VOID
+Client_SetType( CLIENT *Client, INT Type )
{
assert( Client != NULL );
Client->type = Type;
} /* Client_SetType */
-GLOBAL VOID Client_SetHops( CLIENT *Client, INT Hops )
+GLOBAL VOID
+Client_SetHops( CLIENT *Client, INT Hops )
{
assert( Client != NULL );
Client->hops = Hops;
} /* Client_SetHops */
-GLOBAL VOID Client_SetToken( CLIENT *Client, INT Token )
+GLOBAL VOID
+Client_SetToken( CLIENT *Client, INT Token )
{
assert( Client != NULL );
Client->token = Token;
} /* Client_SetToken */
-GLOBAL VOID Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer )
+GLOBAL VOID
+Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer )
{
assert( Client != NULL );
+ assert( Introducer != NULL );
Client->introducer = Introducer;
} /* Client_SetIntroducer */
-GLOBAL VOID Client_SetOperByMe( CLIENT *Client, BOOLEAN OperByMe )
+GLOBAL VOID
+Client_SetOperByMe( CLIENT *Client, BOOLEAN OperByMe )
{
assert( Client != NULL );
Client->oper_by_me = OperByMe;
} /* Client_SetOperByMe */
-GLOBAL BOOLEAN Client_ModeAdd( CLIENT *Client, CHAR Mode )
+GLOBAL BOOLEAN
+Client_ModeAdd( CLIENT *Client, CHAR Mode )
{
/* Mode soll gesetzt werden. TRUE wird geliefert, wenn der
* Mode neu gesetzt wurde, FALSE, wenn der Client den Mode
} /* Client_ModeAdd */
-GLOBAL BOOLEAN Client_ModeDel( CLIENT *Client, CHAR Mode )
+GLOBAL BOOLEAN
+Client_ModeDel( CLIENT *Client, CHAR Mode )
{
/* Mode soll geloescht werden. TRUE wird geliefert, wenn der
* Mode entfernt wurde, FALSE, wenn der Client den Mode
} /* Client_ModeDel */
-GLOBAL CLIENT *Client_GetFromConn( CONN_ID Idx )
+GLOBAL CLIENT *
+Client_GetFromConn( CONN_ID Idx )
{
/* Client-Struktur, die zur lokalen Verbindung Idx gehoert,
* liefern. Wird keine gefunden, so wird NULL geliefert. */
while( c )
{
if( c->conn_id == Idx ) return c;
- c = c->next;
+ c = (CLIENT *)c->next;
}
return NULL;
} /* Client_GetFromConn */
-GLOBAL CLIENT *Client_GetFromID( CHAR *Nick )
+GLOBAL CLIENT *
+Client_Search( 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 search_id[CLIENT_ID_LEN], *ptr;
CLIENT *c = NULL;
+ UINT32 search_hash;
assert( Nick != NULL );
/* Nick kopieren und ggf. Host-Mask abschneiden */
- strncpy( n, Nick, CLIENT_ID_LEN );
- n[CLIENT_ID_LEN] = '\0';
- ptr = strchr( n, '!' );
+ strncpy( search_id, Nick, CLIENT_ID_LEN - 1 );
+ search_id[CLIENT_ID_LEN - 1] = '\0';
+ ptr = strchr( search_id, '!' );
if( ptr ) *ptr = '\0';
+ search_hash = Hash( search_id );
+
c = My_Clients;
while( c )
{
- if( strcasecmp( c->id, n ) == 0 ) return c;
- c = c->next;
+ if( c->hash == search_hash )
+ {
+ /* lt. Hash-Wert: Treffer! */
+ if( strcasecmp( c->id, search_id ) == 0 ) return c;
+ }
+ c = (CLIENT *)c->next;
}
return NULL;
-} /* Client_GetFromID */
+} /* Client_Search */
-GLOBAL CLIENT *Client_GetFromToken( CLIENT *Client, INT Token )
+GLOBAL CLIENT *
+Client_GetFromToken( CLIENT *Client, INT Token )
{
/* Client-Struktur, die den entsprechenden Introducer (=Client)
* und das gegebene Token hat, liefern. Wird keine gefunden,
while( c )
{
if(( c->type == CLIENT_SERVER ) && ( c->introducer == Client ) && ( c->token == Token )) return c;
- c = c->next;
+ c = (CLIENT *)c->next;
}
return NULL;
} /* Client_GetFromToken */
-GLOBAL INT Client_Type( CLIENT *Client )
+GLOBAL INT
+Client_Type( CLIENT *Client )
{
assert( Client != NULL );
return Client->type;
} /* Client_Type */
-GLOBAL CONN_ID Client_Conn( CLIENT *Client )
+GLOBAL CONN_ID
+Client_Conn( CLIENT *Client )
{
assert( Client != NULL );
return Client->conn_id;
} /* Client_Conn */
-GLOBAL CHAR *Client_ID( CLIENT *Client )
+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 */
-GLOBAL CHAR *Client_Info( CLIENT *Client )
+GLOBAL CHAR *
+Client_Info( CLIENT *Client )
{
assert( Client != NULL );
return Client->info;
} /* Client_Info */
-GLOBAL CHAR *Client_User( CLIENT *Client )
+GLOBAL CHAR *
+Client_User( CLIENT *Client )
{
assert( Client != NULL );
- if( Client->user ) return Client->user;
+ if( Client->user[0] ) return Client->user;
else return "~";
} /* Client_User */
-GLOBAL CHAR *Client_Hostname( CLIENT *Client )
+GLOBAL CHAR *
+Client_Hostname( CLIENT *Client )
{
assert( Client != NULL );
return Client->host;
} /* Client_Hostname */
-GLOBAL CHAR *Client_Password( CLIENT *Client )
+GLOBAL CHAR *
+Client_Password( CLIENT *Client )
{
assert( Client != NULL );
return Client->pwd;
} /* Client_Password */
-GLOBAL CHAR *Client_Modes( CLIENT *Client )
+GLOBAL CHAR *
+Client_Modes( CLIENT *Client )
{
assert( Client != NULL );
return Client->modes;
} /* Client_Modes */
-GLOBAL BOOLEAN Client_OperByMe( CLIENT *Client )
+GLOBAL CHAR *
+Client_Flags( CLIENT *Client )
+{
+ assert( Client != NULL );
+ return Client->flags;
+} /* Client_Flags */
+
+
+GLOBAL BOOLEAN
+Client_OperByMe( CLIENT *Client )
{
assert( Client != NULL );
return Client->oper_by_me;
} /* Client_OperByMe */
-GLOBAL INT Client_Hops( CLIENT *Client )
+GLOBAL INT
+Client_Hops( CLIENT *Client )
{
assert( Client != NULL );
return Client->hops;
} /* Client_Hops */
-GLOBAL INT Client_Token( CLIENT *Client )
+GLOBAL INT
+Client_Token( CLIENT *Client )
{
assert( Client != NULL );
return Client->token;
} /* Client_Token */
-GLOBAL INT Client_MyToken( CLIENT *Client )
+GLOBAL INT
+Client_MyToken( CLIENT *Client )
{
assert( Client != NULL );
return Client->mytoken;
} /* Client_MyToken */
-GLOBAL CLIENT *Client_NextHop( CLIENT *Client )
+GLOBAL CLIENT *
+Client_NextHop( CLIENT *Client )
{
CLIENT *c;
} /* Client_NextHop */
-GLOBAL CHAR *Client_Mask( CLIENT *Client )
+GLOBAL CHAR *
+Client_Mask( CLIENT *Client )
{
/* Client-"ID" liefern, wie sie z.B. fuer
* Prefixe benoetigt wird. */
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 */
-GLOBAL CLIENT *Client_Introducer( CLIENT *Client )
+GLOBAL CLIENT *
+Client_Introducer( CLIENT *Client )
{
assert( Client != NULL );
return Client->introducer;
} /* Client_Introducer */
-GLOBAL CLIENT *Client_TopServer( CLIENT *Client )
+GLOBAL CLIENT *
+Client_TopServer( CLIENT *Client )
{
assert( Client != NULL );
return Client->topserver;
} /* Client_TopServer */
-GLOBAL BOOLEAN Client_HasMode( CLIENT *Client, CHAR Mode )
+GLOBAL BOOLEAN
+Client_HasMode( CLIENT *Client, CHAR Mode )
{
assert( Client != NULL );
return strchr( Client->modes, Mode ) != NULL;
} /* Client_HasMode */
-GLOBAL CHAR *Client_Away( CLIENT *Client )
+GLOBAL CHAR *
+Client_Away( CLIENT *Client )
{
/* AWAY-Text liefern */
} /* Client_Away */
-GLOBAL BOOLEAN Client_CheckNick( CLIENT *Client, CHAR *Nick )
+GLOBAL BOOLEAN
+Client_CheckNick( CLIENT *Client, CHAR *Nick )
{
/* Nick ueberpruefen */
- CLIENT *c;
-
assert( Client != NULL );
assert( Nick != NULL );
}
/* Nick bereits vergeben? */
- c = My_Clients;
- while( c )
+ if( Client_Search( Nick ))
{
- if( strcasecmp( c->id, Nick ) == 0 )
- {
- /* den Nick gibt es bereits */
- IRC_WriteStrClient( Client, ERR_NICKNAMEINUSE_MSG, Client_ID( Client ), Nick );
- return FALSE;
- }
- c = c->next;
+ /* den Nick gibt es bereits */
+ IRC_WriteStrClient( Client, ERR_NICKNAMEINUSE_MSG, Client_ID( Client ), Nick );
+ return FALSE;
}
return TRUE;
} /* Client_CheckNick */
-GLOBAL BOOLEAN Client_CheckID( CLIENT *Client, CHAR *ID )
+GLOBAL BOOLEAN
+Client_CheckID( CLIENT *Client, CHAR *ID )
{
/* Nick ueberpruefen */
Conn_Close( Client->conn_id, str, str, TRUE );
return FALSE;
}
- c = c->next;
+ c = (CLIENT *)c->next;
}
return TRUE;
} /* Client_CheckID */
-GLOBAL CLIENT *Client_Search( CHAR *ID )
-{
- /* Client suchen, auf den ID passt */
-
- CLIENT *c;
-
- assert( ID != NULL );
-
- c = My_Clients;
- while( c )
- {
- if( strcasecmp( c->id, ID ) == 0 ) return c;
- c = c->next;
- }
-
- return NULL;
-} /* Client_Search */
-
-
-GLOBAL CLIENT *Client_First( VOID )
+GLOBAL CLIENT *
+Client_First( VOID )
{
/* Ersten Client liefern. */
} /* Client_First */
-GLOBAL CLIENT *Client_Next( CLIENT *c )
+GLOBAL CLIENT *
+Client_Next( CLIENT *c )
{
/* Naechsten Client liefern. Existiert keiner,
* so wird NULL geliefert. */
assert( c != NULL );
- return c->next;
+ return (CLIENT *)c->next;
} /* Client_Next */
-GLOBAL INT Client_UserCount( VOID )
+GLOBAL INT
+Client_UserCount( VOID )
{
return Count( CLIENT_USER );
} /* Client_UserCount */
-GLOBAL INT Client_ServiceCount( VOID )
+GLOBAL INT
+Client_ServiceCount( VOID )
{
return Count( CLIENT_SERVICE );;
} /* Client_ServiceCount */
-GLOBAL INT Client_ServerCount( VOID )
+GLOBAL INT
+Client_ServerCount( VOID )
{
return Count( CLIENT_SERVER );
} /* Client_ServerCount */
-GLOBAL INT Client_MyUserCount( VOID )
+GLOBAL INT
+Client_MyUserCount( VOID )
{
return MyCount( CLIENT_USER );
} /* Client_MyUserCount */
-GLOBAL INT Client_MyServiceCount( VOID )
+GLOBAL INT
+Client_MyServiceCount( VOID )
{
return MyCount( CLIENT_SERVICE );
} /* Client_MyServiceCount */
-GLOBAL INT Client_MyServerCount( VOID )
+GLOBAL INT
+Client_MyServerCount( VOID )
{
- return MyCount( CLIENT_SERVER );
+ CLIENT *c;
+ INT cnt;
+
+ cnt = 0;
+ c = My_Clients;
+ while( c )
+ {
+ if(( c->type == CLIENT_SERVER ) && ( c->hops == 1 )) cnt++;
+ c = (CLIENT *)c->next;
+ }
+ return cnt;
} /* Client_MyServerCount */
-GLOBAL INT Client_OperCount( VOID )
+GLOBAL INT
+Client_OperCount( VOID )
{
CLIENT *c;
INT cnt;
while( c )
{
if( c && ( c->type == CLIENT_USER ) && ( strchr( c->modes, 'o' ))) cnt++;
- c = c->next;
+ c = (CLIENT *)c->next;
}
return cnt;
} /* Client_OperCount */
-GLOBAL INT Client_UnknownCount( VOID )
+GLOBAL INT
+Client_UnknownCount( VOID )
{
CLIENT *c;
INT cnt;
while( c )
{
if( c && ( c->type != CLIENT_USER ) && ( c->type != CLIENT_SERVICE ) && ( c->type != CLIENT_SERVER )) cnt++;
- c = c->next;
+ c = (CLIENT *)c->next;
}
return cnt;
} /* Client_UnknownCount */
-GLOBAL BOOLEAN Client_IsValidNick( CHAR *Nick )
+GLOBAL BOOLEAN
+Client_IsValidNick( CHAR *Nick )
{
/* Ist der Nick gueltig? */
+
+ CHAR *ptr, goodchars[20];
assert( Nick != NULL );
+ strcpy( goodchars, ";0123456789-" );
+
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 */
-LOCAL INT Count( CLIENT_TYPE Type )
+LOCAL INT
+Count( CLIENT_TYPE Type )
{
CLIENT *c;
INT cnt;
c = My_Clients;
while( c )
{
- if( c && ( c->type == Type )) cnt++;
- c = c->next;
+ if( c->type == Type ) cnt++;
+ c = (CLIENT *)c->next;
}
return cnt;
} /* Count */
-LOCAL INT MyCount( CLIENT_TYPE Type )
+LOCAL INT
+MyCount( CLIENT_TYPE Type )
{
CLIENT *c;
INT cnt;
c = My_Clients;
while( c )
{
- if( c && ( c->introducer == This_Server ) && ( c->type == Type )) cnt++;
- c = c->next;
+ if(( c->introducer == This_Server ) && ( c->type == Type )) cnt++;
+ c = (CLIENT *)c->next;
}
return cnt;
} /* MyCount */
-LOCAL CLIENT *New_Client_Struct( VOID )
+LOCAL CLIENT *
+New_Client_Struct( VOID )
{
/* Neue CLIENT-Struktur pre-initialisieren */
c = malloc( sizeof( CLIENT ));
if( ! c )
{
- Log( LOG_EMERG, "Can't allocate memory!" );
+ Log( LOG_EMERG, "Can't allocate memory! [New_Client_Struct]" );
return NULL;
}
c->next = NULL;
+ c->hash = 0;
c->type = CLIENT_UNKNOWN;
c->conn_id = NONE;
c->introducer = NULL;
c->token = -1;
c->mytoken = -1;
strcpy( c->away, "" );
+ strcpy( c->flags, "" );
return c;
} /* New_Client */
-LOCAL VOID Generate_MyToken( CLIENT *Client )
+LOCAL VOID
+Generate_MyToken( CLIENT *Client )
{
CLIENT *c;
INT token;
c = My_Clients;
continue;
}
- else c = c->next;
+ else c = (CLIENT *)c->next;
}
Client->mytoken = token;
Log( LOG_DEBUG, "Assigned token %d to server \"%s\".", token, Client->id );
projects / ngircd-alex.git / blobdiff