* 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.21 2002/01/05 19:15:03 alex Exp $
+ * $Id: client.c,v 1.25 2002/01/07 15:31:00 alex Exp $
*
* client.c: Management aller Clients
*
* Server gewesen, so existiert eine entsprechende CONNECTION-Struktur.
*
* $Log: client.c,v $
+ * 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.
*
#include "client.h"
#include <imp.h>
+#include "ngircd.h"
#include "channel.h"
#include "conf.h"
#include "conn.h"
CLIENT *c, *next;
INT cnt;
- Client_Destroy( This_Server );
+ Client_Destroy( This_Server, "Server going down.", NULL );
cnt = 0;
c = My_Clients;
c = next;
}
if( cnt ) Log( LOG_INFO, "Freed %d client structure%s.", cnt, cnt == 1 ? "" : "s" );
-} /* Client Exit */
+} /* Client_Exit */
GLOBAL CLIENT *Client_ThisServer( VOID )
} /* Client_ThisServer */
-GLOBAL CLIENT *Client_NewLocal( CONN_ID Idx, CHAR *Hostname, INT Type )
+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 );
+ return Client_New( Idx, This_Server, 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 )
+GLOBAL CLIENT *Client_NewRemoteServer( CLIENT *Introducer, CHAR *Hostname, 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 );
+ return Client_New( NONE, Introducer, 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 )
+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 );
+ return Client_New( NONE, Introducer, CLIENT_USER, Nick, User, Hostname, Info, Hops, Token, NULL, 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 )
+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 )
{
CLIENT *client;
client->introducer = Introducer;
client->type = Type;
if( ID ) Client_SetID( client, ID );
- if( User ) Client_SetUser( client, User );
+ if( User ) Client_SetUser( client, User, Idented );
if( Hostname ) Client_SetHostname( client, Hostname );
if( Info ) Client_SetInfo( client, Info );
client->hops = Hops;
} /* Client_New */
-GLOBAL VOID Client_Destroy( CLIENT *Client )
+GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg )
{
/* Client entfernen. */
CLIENT *last, *c;
+ CHAR *txt;
assert( Client != NULL );
+ if( LogMsg ) txt = LogMsg;
+ else txt = FwdMsg;
+ if( ! txt ) txt = "Reason unknown.";
+
last = NULL;
c = My_Clients;
while( c )
{
if(( Client->type == CLIENT_SERVER ) && ( c->introducer == Client ) && ( c != Client ))
{
- Client_Destroy( c );
+ Client_Destroy( c, LogMsg, FwdMsg );
last = NULL;
c = My_Clients;
continue;
if( c->conn_id != NONE )
{
/* Ein lokaler User. Andere Server informieren! */
- Log( LOG_NOTICE, "User \"%s!%s@%s\" exited (connection %d).", c->id, c->user, c->host, c->conn_id );
- IRC_WriteStrServersPrefix( NULL, c, "QUIT :" );
+ 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 :" );
+ }
+ else
+ {
+ Log( LOG_DEBUG, "User \"%s\" unregistered: %s", Client_Mask( c ), txt );
}
- else Log( LOG_DEBUG, "User \"%s!%s@%s\" exited.", c->id, c->user, c->host );
}
- else if( c->type == CLIENT_SERVER ) Log( LOG_NOTICE, "Server \"%s\" exited.", c->id );
- else Log( LOG_NOTICE, "Unknown client \"%s\" exited.", c->id );
+ else if( c->type == CLIENT_SERVER )
+ {
+ if( c != This_Server ) Log( LOG_NOTICE, "Server \"%s\" unregistered: %s", c->id, txt );
+ }
+ else Log( LOG_NOTICE, "Unknown client \"%s\" unregistered: %s", c->id, txt );
free( c );
break;
} /* Client_SetID */
-GLOBAL VOID Client_SetUser( CLIENT *Client, CHAR *User )
+GLOBAL VOID Client_SetUser( CLIENT *Client, CHAR *User, BOOLEAN Idented )
{
/* Username eines Clients setzen */
assert( Client != NULL );
- strncpy( Client->user, User, CLIENT_USER_LEN );
+ if( Idented ) strncpy( Client->user, User, CLIENT_USER_LEN );
+ else
+ {
+ Client->user[0] = '~';
+ strncpy( Client->user + 1, User, CLIENT_USER_LEN - 1 );
+ }
Client->user[CLIENT_USER_LEN - 1] = '\0';
} /* Client_SetUser */
} /* Client_Token */
+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;
+ return c;
+} /* Client_NextHop */
+
+
GLOBAL CHAR *Client_Mask( CLIENT *Client )
{
/* Client-"ID" liefern, wie sie z.B. fuer
{
/* die Server-ID gibt es bereits */
sprintf( str, "ID \"%s\" already registered!", ID );
- Log( LOG_ALERT, "%s (on connection %d)", str, Client->conn_id );
- Conn_Close( Client->conn_id, str );
+ Log( LOG_ERR, "%s (on connection %d)", str, Client->conn_id );
+ Conn_Close( Client->conn_id, str, str, TRUE );
return FALSE;
}
c = c->next;
projects / ngircd-alex.git / blobdiff