#include "portab.h"
-static char UNUSED id[] = "$Id: client.c,v 1.68 2002/12/26 16:25:43 alex Exp $";
+static char UNUSED id[] = "$Id: client.c,v 1.76 2004/03/11 22:16:31 alex Exp $";
#include "imp.h"
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <netdb.h>
#include "conn.h"
LOCAL VOID Generate_MyToken PARAMS(( CLIENT *Client ));
LOCAL VOID Adjust_Counters PARAMS(( CLIENT *Client ));
+#ifndef Client_DestroyNow
+GLOBAL VOID Client_DestroyNow PARAMS((CLIENT *Client ));
+#endif
+
LONG Max_Users = 0, My_Max_Users = 0;
if( ! This_Server )
{
Log( LOG_EMERG, "Can't allocate client structure for server! Going down." );
- Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+ Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
exit( 1 );
}
gethostname( This_Server->host, CLIENT_HOST_LEN );
h = gethostbyname( This_Server->host );
- if( h ) strcpy( This_Server->host, h->h_name );
+ 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 );
if( Type == CLIENT_SERVER ) Generate_MyToken( client );
/* ist der User away? */
- if( strchr( client->modes, 'a' )) strcpy( client->away, DEFAULT_AWAY_MSG );
+ if( strchr( client->modes, 'a' )) strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away ));
/* Verketten */
client->next = (POINTER *)My_Clients;
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 );
+ if( Client->type == CLIENT_SERVER ) snprintf( msg, sizeof( msg ), "%s: lost server %s", This_Server->id, Client->id );
last = NULL;
c = My_Clients;
} /* 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 )
{
GLOBAL VOID
Client_SetAway( CLIENT *Client, CHAR *Txt )
{
- /* Von einem Client gelieferte AWAY-Nachricht */
+ /* Set AWAY reason of client */
assert( Client != NULL );
+ assert( Txt != NULL );
- if( Txt )
- {
- /* Client AWAY setzen */
- strlcpy( Client->away, Txt, sizeof( Client->away ));
- Client_ModeAdd( Client, 'a' );
- Log( LOG_DEBUG, "User \"%s\" is away: %s", Client_Mask( Client ), Txt );
- }
- else
- {
- /* AWAY loeschen */
- Client_ModeDel( Client, 'a' );
- Log( LOG_DEBUG, "User \"%s\" is no longer away.", Client_Mask( Client ));
- }
+ strlcpy( Client->away, Txt, sizeof( Client->away ));
+ Log( LOG_DEBUG, "User \"%s\" is away: %s", Client_Mask( Client ), Txt );
} /* Client_SetAway */
if( ! strchr( Client->modes, x[0] ))
{
/* Client hat den Mode noch nicht -> setzen */
- strcat( Client->modes, x );
+ strlcat( Client->modes, x, sizeof( Client->modes ));
return TRUE;
}
else return FALSE;
if( strcasecmp( c->id, ID ) == 0 )
{
/* die Server-ID gibt es bereits */
- sprintf( str, "ID \"%s\" already registered", ID );
+ snprintf( str, sizeof( 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 );
CLIENT *c;
- c = malloc( sizeof( CLIENT ));
+ c = (CLIENT *)malloc( sizeof( CLIENT ));
if( ! c )
{
Log( LOG_EMERG, "Can't allocate memory! [New_Client_Struct]" );