Commit Diff
Diff:
0eccdbc137e968062cb928cf33226dabf3e371ec
e2aacff7d4f126ce6a577ea4df7b49dd83b7355b
Commit:
e2aacff7d4f126ce6a577ea4df7b49dd83b7355b
Tree:
e17be966919940de6440f3c46fc27c4f8ef16b8b
Author:
Florian Westphal <fw@strlen.de>
Committer:
Florian Westphal <fw@strlen.de>
Date:
Sat Aug 12 11:58:21 2006 UTC
Message:
s/Log(LOG_DEBUG/LogDebug(/ , translated comments, etc.
blob - 922b308337bb310d8ce8f2471df5a04e81cc1597
blob + 2d656c8684c720e207dd744576160caff130b3f2
--- src/ngircd/channel.c
+++ src/ngircd/channel.c
@@ -17,7 +17,7 @@
#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.57 2006/08/12 11:58:21 fw Exp $";
#include "imp.h"
#include <assert.h>
@@ -114,7 +114,7 @@ Channel_InitPredefined( void )
c = Conf_Channel[i].modes;
while (*c)
Channel_ModeAdd(chan, *c++);
-
+
Log(LOG_INFO, "Created pre-defined channel \"%s\".",
Conf_Channel[i].name );
}
@@ -173,7 +173,7 @@ Channel_Join( CLIENT *Client, char *Name )
{
/* Gibt es noch nicht? Dann neu anlegen: */
chan = Channel_Create( Name );
- if( ! chan ) return false;
+ if (!chan) return false;
}
/* User dem Channel hinzufuegen */
@@ -214,7 +214,6 @@ Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Na
assert( Name != NULL );
assert( Reason != NULL );
- /* Channel suchen */
chan = Channel_Search( Name );
if( ! chan )
{
@@ -548,7 +547,7 @@ Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, ch
cl2chan = Get_Cl2Chan( Chan, Client );
assert( cl2chan != NULL );
-
+
x[0] = Mode; x[1] = '\0';
if( ! strchr( cl2chan->modes, x[0] ))
{
@@ -594,7 +593,7 @@ GLOBAL char *
Channel_UserModes( CHANNEL *Chan, CLIENT *Client )
{
/* return Users' Channel-Modes */
-
+
CL2CHAN *cl2chan;
assert( Chan != NULL );
@@ -661,12 +660,9 @@ Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, char *
if (len < array_bytes(&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",
Topic, Chan->name, strerror(errno));
-
- array_cat0(&Chan->topic);
-
#ifndef STRICT_RFC
Chan->topic_time = time(NULL);
if (Client != NULL && Client_Type(Client) != CLIENT_SERVER)
@@ -698,7 +694,7 @@ Channel_SetKey( CHANNEL *Chan, char *Key )
assert( Key != NULL );
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 */
@@ -708,7 +704,7 @@ Channel_SetMaxUsers( CHANNEL *Chan, long Count )
assert( Chan != NULL );
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 */
@@ -753,7 +749,7 @@ Channel_Create( char *Name )
CHANNEL *c;
assert( Name != NULL );
-
+
c = (CHANNEL *)malloc( sizeof( CHANNEL ));
if( ! c )
{
@@ -765,9 +761,7 @@ Channel_Create( char *Name )
c->hash = Hash( c->name );
c->next = My_Channels;
My_Channels = c;
-#ifdef DEBUG
- Log( LOG_DEBUG, "Created new channel structure for \"%s\".", Name );
-#endif
+ LogDebug("Created new channel structure for \"%s\".", Name);
return c;
} /* Channel_Create */
@@ -851,25 +845,42 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client
switch( Type )
{
case REMOVE_QUIT:
- /* QUIT: andere Server wurden bereits informiert, vgl. Client_Destroy();
- * hier also "nur" noch alle User in betroffenen Channeln infomieren */
+ /* QUIT: other servers have already been notified, see Client_Destroy();
+ * so only inform other clients in same channel. */
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;
case REMOVE_KICK:
- /* User wurde geKICKed: ggf. andere Server sowie alle betroffenen User
- * im entsprechenden Channel informieren */
- if( InformServer ) IRC_WriteStrServersPrefix( Client_NextHop( Origin ), Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason );
- IRC_WriteStrChannelPrefix( Client, c, Origin, false, "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 );
- Log( LOG_DEBUG, "User \"%s\" has been kicked of \"%s\" by \"%s\": %s.", Client_Mask( Client ), c->name, Client_ID( Origin ), Reason );
+ /* User was KICKed: inform other servers and all users in channel */
+ if( InformServer )
+ IRC_WriteStrServersPrefix( Client_NextHop( Origin ),
+ Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason);
+ IRC_WriteStrChannelPrefix(Client, c, Origin, false, "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);
+ }
+ LogDebug("User \"%s\" has been kicked of \"%s\" by \"%s\": %s.",
+ Client_Mask( Client ), c->name, Client_ID(Origin), Reason);
break;
- default:
- /* PART */
- if( InformServer ) 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 );
- Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason );
+ default: /* PART */
+ if (InformServer)
+ 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);
+ LogDebug("User \"%s\" left channel \"%s\" (%s).",
+ Client_Mask(Client), c->name, Reason);
+ }
}
/* Wenn Channel nun leer und nicht pre-defined: loeschen */
blob - 587c4c606b987c199098e3fd6e2d1ab2b4fcf8ac
blob + e3744a272b5da168ce8fb225cf981d043167a660
--- src/ngircd/irc-op.c
+++ src/ngircd/irc-op.c
@@ -14,7 +14,7 @@
#include "portab.h"
-static char UNUSED id[] = "$Id: irc-op.c,v 1.15 2005/04/27 07:39:18 alex Exp $";
+static char UNUSED id[] = "$Id: irc-op.c,v 1.16 2006/08/12 11:58:21 fw Exp $";
#include "imp.h"
#include <assert.h>
@@ -101,15 +101,14 @@ IRC_INVITE( CLIENT *Client, REQUEST *Req )
/* If the target user is banned on that channel: remember invite */
if( Lists_CheckBanned( target, chan )) remember = true;
- if( remember )
- {
- /* We must memember this invite */
+ if (remember) {
+ /* We must remember this invite */
if( ! Lists_AddInvited( Client_Mask( target ), chan, true)) return CONNECTED;
}
}
- Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] );
-
+ LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), Req->argv[0], Req->argv[1]);
+
/* Inform target client */
IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] );
IRCNow