mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-05-18 23:24:09 +00:00
Code Issues Releases Wiki Activity

make several counters unsigned [from HEAD]

Browse Source
This commit is contained in:
Florian Westphal 2006-12-02 13:08:02 +00:00
parent 83c14a6383
commit a0e0da74f8
2 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/ngircd/channel.c
View File

@ -17,7 +17,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: channel.c,v 1.56 2006/07/24 22:54:09 alex Exp $"; static char UNUSED id[] = "$Id: channel.c,v 1.56.2.1 2006/12/02 13:08:02 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -173,7 +173,7 @@ Channel_Join( CLIENT *Client, char *Name )
{ {
/* Gibt es noch nicht? Dann neu anlegen: */ /* Gibt es noch nicht? Dann neu anlegen: */
chan = Channel_Create( Name ); chan = Channel_Create( Name );
if( ! chan ) return false; if (!chan) return false;
} }
/* User dem Channel hinzufuegen */ /* User dem Channel hinzufuegen */
@ -214,7 +214,6 @@ Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )
assert( Name != NULL ); assert( Name != NULL );
assert( Reason != NULL ); assert( Reason != NULL );
/* Channel suchen */
chan = Channel_Search( Name ); chan = Channel_Search( Name );
if( ! chan ) if( ! chan )
{ {
@ -266,11 +265,11 @@ Channel_Quit( CLIENT *Client, char *Reason )
} /* Channel_Quit */ } /* Channel_Quit */
GLOBAL long GLOBAL unsigned long
Channel_Count( void ) Channel_Count( void )
{ {
CHANNEL *c; CHANNEL *c;
long count = 0; unsigned long count = 0;
c = My_Channels; c = My_Channels;
while( c ) while( c )
@ -282,11 +281,11 @@ Channel_Count( void )
} /* Channel_Count */ } /* Channel_Count */
GLOBAL long GLOBAL unsigned long
Channel_MemberCount( CHANNEL *Chan ) Channel_MemberCount( CHANNEL *Chan )
{ {
CL2CHAN *cl2chan; CL2CHAN *cl2chan;
long count = 0; unsigned long count = 0;
assert( Chan != NULL ); assert( Chan != NULL );
@ -340,8 +339,8 @@ Channel_PCount( void )
} /* Channel_PCount */ } /* Channel_PCount */
GLOBAL char * GLOBAL const char *
Channel_Name( CHANNEL *Chan ) Channel_Name( const CHANNEL *Chan )
{ {
assert( Chan != NULL ); assert( Chan != NULL );
return Chan->name; return Chan->name;
@ -364,7 +363,7 @@ Channel_Key( CHANNEL *Chan )
} /* Channel_Key */ } /* Channel_Key */
GLOBAL long GLOBAL unsigned long
Channel_MaxUsers( CHANNEL *Chan ) Channel_MaxUsers( CHANNEL *Chan )
{ {
assert( Chan != NULL ); assert( Chan != NULL );
@ -463,25 +462,13 @@ Channel_GetChannel( CL2CHAN *Cl2Chan )
GLOBAL bool GLOBAL bool
Channel_IsValidName( char *Name ) Channel_IsValidName( const char *Name )
{ {
/* Pruefen, ob Name als Channelname gueltig */
char *ptr, badchars[10];
assert( Name != NULL ); assert( Name != NULL );
if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return false; if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return false;
ptr = Name; return Name[strcspn(Name, " ,:\007")] == 0;
strcpy( badchars, " ,:\007" );
while( *ptr )
{
if( strchr( badchars, *ptr )) return false;
ptr++;
}
return true;
} /* Channel_IsValidName */ } /* Channel_IsValidName */
@ -661,12 +648,9 @@ Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, char *Topic)
if (len < array_bytes(&Chan->topic)) if (len < array_bytes(&Chan->topic))
array_free(&Chan->topic); array_free(&Chan->topic);
if (!array_copyb(&Chan->topic, Topic, len)) if (len >= COMMAND_LEN || !array_copyb(&Chan->topic, Topic, len+1))
Log(LOG_WARNING, "could not set new Topic \"%s\" on %s: %s", Log(LOG_WARNING, "could not set new Topic \"%s\" on %s: %s",
Topic, Chan->name, strerror(errno)); Topic, Chan->name, strerror(errno));
array_cat0(&Chan->topic);
#ifndef STRICT_RFC #ifndef STRICT_RFC
Chan->topic_time = time(NULL); Chan->topic_time = time(NULL);
if (Client != NULL && Client_Type(Client) != CLIENT_SERVER) if (Client != NULL && Client_Type(Client) != CLIENT_SERVER)
@ -698,17 +682,17 @@ Channel_SetKey( CHANNEL *Chan, char *Key )
assert( Key != NULL ); assert( Key != NULL );
strlcpy( Chan->key, Key, sizeof( Chan->key )); strlcpy( Chan->key, Key, sizeof( Chan->key ));
Log( LOG_DEBUG, "Channel %s: Key is now \"%s\".", Chan->name, Chan->key ); LogDebug("Channel %s: Key is now \"%s\".", Chan->name, Chan->key );
} /* Channel_SetKey */ } /* Channel_SetKey */
GLOBAL void GLOBAL void
Channel_SetMaxUsers( CHANNEL *Chan, long Count ) Channel_SetMaxUsers(CHANNEL *Chan, unsigned long Count)
{ {
assert( Chan != NULL ); assert( Chan != NULL );
Chan->maxusers = Count; Chan->maxusers = Count;
Log( LOG_DEBUG, "Channel %s: Member limit is now %ld.", Chan->name, Chan->maxusers ); LogDebug("Channel %s: Member limit is now %lu.", Chan->name, Chan->maxusers );
} /* Channel_SetMaxUsers */ } /* Channel_SetMaxUsers */
@ -765,9 +749,7 @@ Channel_Create( char *Name )
c->hash = Hash( c->name ); c->hash = Hash( c->name );
c->next = My_Channels; c->next = My_Channels;
My_Channels = c; My_Channels = c;
#ifdef DEBUG LogDebug("Created new channel structure for \"%s\".", Name);
Log( LOG_DEBUG, "Created new channel structure for \"%s\".", Name );
#endif
return c; return c;
} /* Channel_Create */ } /* Channel_Create */
@ -851,25 +833,42 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Re
switch( Type ) switch( Type )
{ {
case REMOVE_QUIT: case REMOVE_QUIT:
/* QUIT: andere Server wurden bereits informiert, vgl. Client_Destroy(); /* QUIT: other servers have already been notified, see Client_Destroy();
* hier also "nur" noch alle User in betroffenen Channeln infomieren */ * so only inform other clients in same channel. */
assert( InformServer == false ); assert( InformServer == false );
Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason ); LogDebug("User \"%s\" left channel \"%s\" (%s).",
Client_Mask( Client ), c->name, Reason );
break; break;
case REMOVE_KICK: case REMOVE_KICK:
/* User wurde geKICKed: ggf. andere Server sowie alle betroffenen User /* User was KICKed: inform other servers and all users in channel */
* im entsprechenden Channel informieren */ if( InformServer )
if( InformServer ) IRC_WriteStrServersPrefix( Client_NextHop( Origin ), Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason ); IRC_WriteStrServersPrefix( Client_NextHop( Origin ),
IRC_WriteStrChannelPrefix( Client, c, Origin, false, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason ); Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason);
if(( Client_Conn( Client ) > NONE ) && ( Client_Type( Client ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Client, Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason ); IRC_WriteStrChannelPrefix(Client, c, Origin, false, "KICK %s %s :%s",
Log( LOG_DEBUG, "User \"%s\" has been kicked of \"%s\" by \"%s\": %s.", Client_Mask( Client ), c->name, Client_ID( Origin ), Reason ); c->name, Client_ID( Client ), Reason );
if ((Client_Conn(Client) > NONE) &&
(Client_Type(Client) == CLIENT_USER))
{
IRC_WriteStrClientPrefix(Client, Origin, "KICK %s %s :%s",
c->name, Client_ID( Client ), Reason);
}
LogDebug("User \"%s\" has been kicked of \"%s\" by \"%s\": %s.",
Client_Mask( Client ), c->name, Client_ID(Origin), Reason);
break; break;
default: default: /* PART */
/* PART */ if (InformServer)
if( InformServer ) IRC_WriteStrServersPrefix( Origin, Client, "PART %s :%s", c->name, Reason ); IRC_WriteStrServersPrefix(Origin, Client, "PART %s :%s", c->name, Reason);
IRC_WriteStrChannelPrefix( Origin, c, Client, false, "PART %s :%s", c->name, Reason );
if(( Client_Conn( Origin ) > NONE ) && ( Client_Type( Origin ) == CLIENT_USER )) IRC_WriteStrClientPrefix( Origin, Client, "PART %s :%s", c->name, Reason ); IRC_WriteStrChannelPrefix(Origin, c, Client, false, "PART %s :%s",
Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason ); c->name, Reason);
if ((Client_Conn(Origin) > NONE) &&
(Client_Type(Origin) == CLIENT_USER))
{
IRC_WriteStrClientPrefix( Origin, Client, "PART %s :%s", c->name, Reason);
LogDebug("User \"%s\" left channel \"%s\" (%s).",
Client_Mask(Client), c->name, Reason);
}
} }
/* Wenn Channel nun leer und nicht pre-defined: loeschen */ /* Wenn Channel nun leer und nicht pre-defined: loeschen */

16
src/ngircd/channel.h
View File

@ -8,7 +8,7 @@
* (at your option) any later version. * (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information. * Please read the file COPYING, README and AUTHORS for more information.
* *
* $Id: channel.h,v 1.29 2005/09/02 12:50:25 alex Exp $ * $Id: channel.h,v 1.29.2.1 2006/12/02 13:08:02 fw Exp $
* *
* Channel management (header) * Channel management (header)
*/ */
@ -35,7 +35,7 @@ typedef struct _CHANNEL
char topic_who[CLIENT_NICK_LEN];/* Nickname of user that set topic */ char topic_who[CLIENT_NICK_LEN];/* Nickname of user that set topic */
#endif #endif
char key[CLIENT_PASS_LEN]; /* Channel key ("password", mode "k" ) */ char key[CLIENT_PASS_LEN]; /* Channel key ("password", mode "k" ) */
long maxusers; /* Maximum number of members (mode "l") */ unsigned long maxusers; /* Maximum number of members (mode "l") */
} CHANNEL; } CHANNEL;
typedef struct _CLIENT2CHAN typedef struct _CLIENT2CHAN
@ -65,21 +65,21 @@ GLOBAL void Channel_Quit PARAMS(( CLIENT *Client, char *Reason ));
GLOBAL void Channel_Kick PARAMS(( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )); GLOBAL void Channel_Kick PARAMS(( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason ));
GLOBAL long Channel_Count PARAMS(( void )); GLOBAL unsigned long Channel_Count PARAMS(( void ));
GLOBAL long Channel_MemberCount PARAMS(( CHANNEL *Chan )); GLOBAL unsigned long Channel_MemberCount PARAMS(( CHANNEL *Chan ));
GLOBAL int Channel_CountForUser PARAMS(( CLIENT *Client )); GLOBAL int Channel_CountForUser PARAMS(( CLIENT *Client ));
GLOBAL int Channel_PCount PARAMS(( void )); GLOBAL int Channel_PCount PARAMS(( void ));
GLOBAL char *Channel_Name PARAMS(( CHANNEL *Chan )); GLOBAL const char *Channel_Name PARAMS(( const CHANNEL *Chan ));
GLOBAL char *Channel_Modes PARAMS(( CHANNEL *Chan )); GLOBAL char *Channel_Modes PARAMS(( CHANNEL *Chan ));
GLOBAL char *Channel_Topic PARAMS(( CHANNEL *Chan )); GLOBAL char *Channel_Topic PARAMS(( CHANNEL *Chan ));
GLOBAL char *Channel_Key PARAMS(( CHANNEL *Chan )); GLOBAL char *Channel_Key PARAMS(( CHANNEL *Chan ));
GLOBAL long Channel_MaxUsers PARAMS(( CHANNEL *Chan )); GLOBAL unsigned long Channel_MaxUsers PARAMS(( CHANNEL *Chan ));
GLOBAL void Channel_SetTopic PARAMS(( CHANNEL *Chan, CLIENT *Client, char *Topic )); GLOBAL void Channel_SetTopic PARAMS(( CHANNEL *Chan, CLIENT *Client, char *Topic ));
GLOBAL void Channel_SetModes PARAMS(( CHANNEL *Chan, char *Modes )); GLOBAL void Channel_SetModes PARAMS(( CHANNEL *Chan, char *Modes ));
GLOBAL void Channel_SetKey PARAMS(( CHANNEL *Chan, char *Key )); GLOBAL void Channel_SetKey PARAMS(( CHANNEL *Chan, char *Key ));
GLOBAL void Channel_SetMaxUsers PARAMS(( CHANNEL *Chan, long Count )); GLOBAL void Channel_SetMaxUsers PARAMS(( CHANNEL *Chan, unsigned long Count ));
GLOBAL CHANNEL *Channel_Search PARAMS(( char *Name )); GLOBAL CHANNEL *Channel_Search PARAMS(( char *Name ));
@ -94,7 +94,7 @@ GLOBAL CL2CHAN *Channel_NextChannelOf PARAMS(( CLIENT *Client, CL2CHAN *Cl2Chan
GLOBAL CLIENT *Channel_GetClient PARAMS(( CL2CHAN *Cl2Chan )); GLOBAL CLIENT *Channel_GetClient PARAMS(( CL2CHAN *Cl2Chan ));
GLOBAL CHANNEL *Channel_GetChannel PARAMS(( CL2CHAN *Cl2Chan )); GLOBAL CHANNEL *Channel_GetChannel PARAMS(( CL2CHAN *Cl2Chan ));
GLOBAL bool Channel_IsValidName PARAMS(( char *Name )); GLOBAL bool Channel_IsValidName PARAMS(( const char *Name ));
GLOBAL bool Channel_ModeAdd PARAMS(( CHANNEL *Chan, char Mode )); GLOBAL bool Channel_ModeAdd PARAMS(( CHANNEL *Chan, char Mode ));
GLOBAL bool Channel_ModeDel PARAMS(( CHANNEL *Chan, char Mode )); GLOBAL bool Channel_ModeDel PARAMS(( CHANNEL *Chan, char Mode ));