* 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.25 2002/01/07 15:31:00 alex Exp $
+ * $Id: client.c,v 1.37 2002/02/17 19:02:49 alex Exp $
*
* client.c: Management aller Clients
*
* 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().
+ *
+ * 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.
*
LOCAL CHAR GetID_Buffer[CLIENT_ID_LEN];
+LOCAL INT Count( CLIENT_TYPE Type );
+LOCAL INT MyCount( CLIENT_TYPE Type );
+
LOCAL CLIENT *New_Client_Struct( VOID );
+LOCAL VOID Generate_MyToken( CLIENT *Client );
GLOBAL VOID Client_Init( VOID )
This_Server->type = CLIENT_SERVER;
This_Server->conn_id = NONE;
This_Server->introducer = This_Server;
+ This_Server->mytoken = 1;
+ This_Server->hops = 0;
gethostname( This_Server->host, CLIENT_HOST_LEN );
h = gethostbyname( This_Server->host );
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, NULL, 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 );
client->hops = Hops;
client->token = Token;
if( Modes ) Client_SetModes( client, Modes );
+ if( Type == CLIENT_SERVER ) Generate_MyToken( client );
/* Verketten */
client->next = My_Clients;
{
if( c->conn_id != NONE )
{
- /* Ein lokaler User. Andere Server informieren! */
+ /* Ein lokaler User. Alle andere Server informieren! */
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
{
+ /* 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. */
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 :" );
}
+ 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 );
+
+ /* andere Server informieren */
+ if( ! NGIRCd_Quit )
+ {
+ if( FwdMsg ) IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "SQUIT %s :%s", c->id, FwdMsg );
+ else IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "SQUIT %s :", c->id );
+ }
}
else Log( LOG_NOTICE, "Unknown client \"%s\" unregistered: %s", c->id, txt );
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 */
{
assert( Client != NULL );
Client->type = Type;
+ if( Type == CLIENT_SERVER ) Generate_MyToken( Client );
} /* Client_SetType */
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;
} /* Client_Token */
+GLOBAL INT Client_MyToken( CLIENT *Client )
+{
+ assert( Client != NULL );
+ return Client->mytoken;
+} /* Client_MyToken */
+
+
GLOBAL CLIENT *Client_NextHop( CLIENT *Client )
{
CLIENT *c;
} /* 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 );
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_Next */
+GLOBAL INT Client_UserCount( VOID )
+{
+ return Count( CLIENT_USER );
+} /* Client_UserCount */
+
+
+GLOBAL INT Client_ServiceCount( VOID )
+{
+ return Count( CLIENT_SERVICE );;
+} /* Client_ServiceCount */
+
+
+GLOBAL INT Client_ServerCount( VOID )
+{
+ return Count( CLIENT_SERVER );
+} /* Client_ServerCount */
+
+
+GLOBAL INT Client_MyUserCount( VOID )
+{
+ return MyCount( CLIENT_USER );
+} /* Client_MyUserCount */
+
+
+GLOBAL INT Client_MyServiceCount( VOID )
+{
+ return MyCount( CLIENT_SERVICE );
+} /* Client_MyServiceCount */
+
+
+GLOBAL INT Client_MyServerCount( VOID )
+{
+ return MyCount( CLIENT_SERVER );
+} /* Client_MyServerCount */
+
+
+GLOBAL INT Client_OperCount( VOID )
+{
+ CLIENT *c;
+ INT cnt;
+
+ cnt = 0;
+ c = My_Clients;
+ while( c )
+ {
+ if( c && ( c->type == CLIENT_USER ) && ( strchr( c->modes, 'o' ))) cnt++;
+ c = c->next;
+ }
+ return cnt;
+} /* Client_OperCount */
+
+
+GLOBAL INT Client_UnknownCount( VOID )
+{
+ CLIENT *c;
+ INT cnt;
+
+ cnt = 0;
+ c = My_Clients;
+ while( c )
+ {
+ if( c && ( c->type != CLIENT_USER ) && ( c->type != CLIENT_SERVICE ) && ( c->type != CLIENT_SERVER )) cnt++;
+ c = c->next;
+ }
+ return cnt;
+} /* 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;
+ INT cnt;
+
+ cnt = 0;
+ c = My_Clients;
+ while( c )
+ {
+ if( c && ( c->type == Type )) cnt++;
+ c = c->next;
+ }
+ return cnt;
+} /* Count */
+
+
+LOCAL INT MyCount( CLIENT_TYPE Type )
+{
+ CLIENT *c;
+ INT cnt;
+
+ cnt = 0;
+ c = My_Clients;
+ while( c )
+ {
+ if( c && ( c->introducer == This_Server ) && ( c->type == Type )) cnt++;
+ c = c->next;
+ }
+ return cnt;
+} /* MyCount */
+
+
LOCAL CLIENT *New_Client_Struct( VOID )
{
/* 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;
return c;
} /* New_Client */
+LOCAL VOID Generate_MyToken( CLIENT *Client )
+{
+ CLIENT *c;
+ INT token;
+
+ c = My_Clients;
+ token = 2;
+ while( c )
+ {
+ if( c->mytoken == token )
+ {
+ /* Das Token wurde bereits vergeben */
+ token++;
+ c = My_Clients;
+ continue;
+ }
+ else c = c->next;
+ }
+ Client->mytoken = token;
+ Log( LOG_DEBUG, "Assigned token %d to server \"%s\".", token, Client->id );
+} /* Generate_MyToken */
+
+
/* -eof- */
projects / ngircd-alex.git / blobdiff