/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2004 Alexander Barton <alex@barton.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "portab.h"
-static char UNUSED id[] = "$Id: irc.c,v 1.123 2003/12/26 15:55:07 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.125 2005/03/19 18:43:49 fw Exp $";
#include "imp.h"
#include <assert.h>
#include "irc.h"
-LOCAL CHAR *Option_String PARAMS(( CONN_ID Idx ));
+LOCAL char *Option_String PARAMS(( CONN_ID Idx ));
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_ERROR( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
} /* IRC_ERROR */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_KILL( CLIENT *Client, REQUEST *Req )
{
CLIENT *prefix, *c;
- CHAR reason[COMMAND_LEN];
+ char reason[COMMAND_LEN];
CONN_ID my_conn, conn;
assert( Client != NULL );
Log( LOG_ERR, "Can't KILL server \"%s\"!", Req->argv[0] );
conn = Client_Conn( Client_NextHop( c ));
assert( conn > NONE );
- Conn_Close( conn, NULL, "Nick collision for server!?", TRUE );
+ Conn_Close( conn, NULL, "Nick collision for server!?", true);
}
}
else if( Client_Type( c ) != CLIENT_USER )
Log( LOG_ERR, "Can't KILL \"%s\": invalid client type!", Req->argv[0] );
conn = Client_Conn( Client_NextHop( c ));
assert( conn > NONE );
- Conn_Close( conn, NULL, "Collision for invalid client type!?", TRUE );
+ Conn_Close( conn, NULL, "Collision for invalid client type!?", true);
}
}
else
{
/* Kill user NOW! */
conn = Client_Conn( c );
- Client_Destroy( c, NULL, reason, FALSE );
- if( conn != NONE ) Conn_Close( conn, NULL, reason, TRUE );
+ Client_Destroy( c, NULL, reason, false );
+ if( conn != NONE ) Conn_Close( conn, NULL, reason, true);
}
}
else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
} /* IRC_KILL */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_NOTICE( CLIENT *Client, REQUEST *Req )
{
CLIENT *to, *from;
} /* IRC_NOTICE */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
{
CLIENT *cl, *from;
} /* IRC_PRIVMSG */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_TRACE( CLIENT *Client, REQUEST *Req )
{
CLIENT *from, *target, *c;
CONN_ID idx, idx2;
+ char user[CLIENT_USER_LEN];
assert( Client != NULL );
assert( Req != NULL );
if( Client_Type( c ) == CLIENT_SERVER )
{
/* Server link */
- if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Client_ID( c ), Client_Mask( c ), Option_String( Client_Conn( c )))) return DISCONNECTED;
+ strlcpy( user, Client_User( c ), sizeof( user ));
+ if( user[0] == '~' ) strlcpy( user, "unknown", sizeof( user ));
+ if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Client_ID( c ), user, Client_Hostname( c ), Client_Mask( Client_ThisServer( )), Option_String( Client_Conn( c )))) return DISCONNECTED;
}
if(( Client_Type( c ) == CLIENT_USER ) && ( strchr( Client_Modes( c ), 'o' )))
{
c = Client_Next( c );
}
- /* Some information about us */
- if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Conf_ServerName, Client_Mask( Client_ThisServer( )), Option_String( Client_Conn( Client )))) return DISCONNECTED;
-
IRC_SetPenalty( Client, 3 );
return IRC_WriteStrClient( from, RPL_TRACEEND_MSG, Client_ID( from ), Conf_ServerName, PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel );
} /* IRC_TRACE */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_HELP( CLIENT *Client, REQUEST *Req )
{
COMMAND *cmd;
} /* IRC_HELP */
-LOCAL CHAR *
+LOCAL char *
Option_String( CONN_ID Idx )
{
- STATIC CHAR option_txt[8];
- INT options;
+ static char option_txt[8];
+ int options;
options = Conn_Options( Idx );