- Falsche Variable korrigiert ...

[ngircd-alex.git] / src / ngircd / client.c

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 3c6d3aebfbc596cd7a38cfe202a15c354e9bec6f..46736cc01be35eff1f307c563b380d70eff76133 100644 (file)
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -9,7 +9,7 @@
  * 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.55 2002/05/27 13:09:26 alex Exp $
+ * $Id: client.c,v 1.63 2002/11/26 08:36:34 alex Exp $
  *
  * client.c: Management aller Clients
  *
@@ -53,12 +53,15 @@
 #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 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 ));
@@ -73,7 +76,7 @@ Client_Init( VOID )
        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 );
        }
 
@@ -102,7 +105,8 @@ Client_Exit( VOID )
        CLIENT *c, *next;
        INT cnt;
 
-       Client_Destroy( This_Server, "Server going down.", NULL, FALSE );
+       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;
@@ -249,7 +253,7 @@ Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit )
                                                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 )
                        {
@@ -352,7 +356,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 );
@@ -362,6 +366,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 )
 {
@@ -636,6 +653,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 )
 {
@@ -691,7 +716,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 */
 
@@ -815,46 +840,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;
@@ -867,11 +892,11 @@ Client_MyServerCount( VOID )
 } /* Client_MyServerCount */
 
 
-GLOBAL INT
+GLOBAL LONG
 Client_OperCount( VOID )
 {
        CLIENT *c;
-       INT cnt;
+       LONG cnt;
 
        cnt = 0;
        c = My_Clients;
@@ -884,11 +909,11 @@ Client_OperCount( VOID )
 } /* Client_OperCount */
 
 
-GLOBAL INT
+GLOBAL LONG
 Client_UnknownCount( VOID )
 {
        CLIENT *c;
-       INT cnt;
+       LONG cnt;
 
        cnt = 0;
        c = My_Clients;
@@ -906,10 +931,12 @@ Client_IsValidNick( CHAR *Nick )
 {
        /* Ist der Nick gueltig? */
 
-       CHAR *ptr, goodchars[] = ";0123456789-";
+       CHAR *ptr, goodchars[20];
        
        assert( Nick != NULL );
 
+       strcpy( goodchars, ";0123456789-" );
+
        if( Nick[0] == '#' ) return FALSE;
        if( strchr( goodchars, Nick[0] )) return FALSE;
        if( strlen( Nick ) >= CLIENT_NICK_LEN ) return FALSE;
@@ -926,11 +953,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;
@@ -943,11 +970,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;
@@ -970,7 +997,7 @@ New_Client_Struct( VOID )
        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;
        }
 
@@ -991,6 +1018,7 @@ New_Client_Struct( VOID )
        c->token = -1;
        c->mytoken = -1;
        strcpy( c->away, "" );
+       strcpy( c->flags, "" );
 
        return c;
 } /* New_Client */