* Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
* der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS.
*
- * $Id: irc.c,v 1.9 2001/12/26 14:45:37 alex Exp $
+ * $Id: irc.c,v 1.11 2001/12/27 16:55:41 alex Exp $
*
* irc.c: IRC-Befehle
*
* $Log: irc.c,v $
+ * Revision 1.11 2001/12/27 16:55:41 alex
+ * - neu: IRC_WriteStrRelated(), Aenderungen auch in IRC_WriteStrClient().
+ *
+ * Revision 1.10 2001/12/26 22:48:53 alex
+ * - MOTD-Datei ist nun konfigurierbar und wird gelesen.
+ *
* Revision 1.9 2001/12/26 14:45:37 alex
* - "Code Cleanups".
*
#include <imp.h>
#include <assert.h>
+#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "client.h"
+#include "conf.h"
#include "log.h"
#include "messages.h"
#include "parse.h"
CHAR buffer[1000];
BOOLEAN ok = CONNECTED;
+ CONN_ID send_to;
va_list ap;
assert( Client != NULL );
assert( Format != NULL );
va_start( ap, Format );
+ vsnprintf( buffer, 1000, Format, ap );
+ va_end( ap );
- if( Client->conn_id != NONE )
- {
- /* Lokaler Client */
- vsnprintf( buffer, 1000, Format, ap );
- if( Prefix ) ok = Conn_WriteStr( Client->conn_id, ":%s %s", Prefix->host, buffer );
- else ok = Conn_WriteStr( Client->conn_id, buffer );
- }
- else
- {
- /* Remote-Client */
- Log( LOG_EMERG, "not implemented: IRC_WriteStrClient()" );
- }
+ if( Client->conn_id != NONE ) send_to = Client->conn_id;
+ else send_to = Client->introducer->conn_id;
+
+ if( Prefix ) ok = Conn_WriteStr( Client->conn_id, ":%s %s", Client_GetID( Prefix ), buffer );
+ else ok = Conn_WriteStr( Client->conn_id, buffer );
- va_end( ap );
return ok;
} /* IRC_WriteStrClient */
+GLOBAL BOOLEAN IRC_WriteStrRelated( CLIENT *Client, CHAR *Format, ... )
+{
+ CHAR buffer[1000];
+ BOOLEAN ok = CONNECTED;
+ va_list ap;
+
+ assert( Client != NULL );
+ assert( Format != NULL );
+
+ va_start( ap, Format );
+ vsnprintf( buffer, 1000, Format, ap );
+ va_end( ap );
+
+ /* an den Client selber */
+ ok = IRC_WriteStrClient( Client, Client, buffer );
+
+ return ok;
+} /* IRC_WriteStrRelated */
+
+
GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
/* pruefen, ob Nick bereits vergeben */
if( ! Client_CheckNick( Client, Req->argv[0] )) return CONNECTED;
+ if( Client->type == CLIENT_USER )
+ {
+ /* Nick-Aenderung: allen mitteilen! */
+ IRC_WriteStrRelated( Client, "NICK :%s", Req->argv[0] );
+ }
+
/* Client-Nick registrieren */
strcpy( Client->nick, Req->argv[0] );
Log( LOG_NOTICE, "User \"%s!%s@%s\" (%s) registered.", Client->nick, Client->user, Client->host, Client->name );
- IRC_WriteStrClient( Client, This_Server, RPL_WELCOME_MSG, Client->nick, Client->nick, Client->user, Client->host );
+ IRC_WriteStrClient( Client, This_Server, RPL_WELCOME_MSG, Client->nick, Client_GetID( Client ));
IRC_WriteStrClient( Client, This_Server, RPL_YOURHOST_MSG, Client->nick, This_Server->host );
IRC_WriteStrClient( Client, This_Server, RPL_CREATED_MSG, Client->nick );
IRC_WriteStrClient( Client, This_Server, RPL_MYINFO_MSG, Client->nick, This_Server->host );
LOCAL BOOLEAN Show_MOTD( CLIENT *Client )
{
+ BOOLEAN ok;
+ CHAR line[127];
+ FILE *fd;
+
assert( Client != NULL );
assert( Client->nick[0] );
+
+ fd = fopen( Conf_MotdFile, "r" );
+ if( ! fd )
+ {
+ Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno ));
+ return IRC_WriteStrClient( Client, This_Server, ERR_NOMOTD_MSG, Client->nick );
+ }
IRC_WriteStrClient( Client, This_Server, RPL_MOTDSTART_MSG, Client->nick, This_Server->host );
- IRC_WriteStrClient( Client, This_Server, RPL_MOTD_MSG, Client->nick, "Some cool IRC server welcome message ;-)" );
- return IRC_WriteStrClient( Client, This_Server, RPL_ENDOFMOTD_MSG, Client->nick );
+ while( TRUE )
+ {
+ if( ! fgets( line, 126, fd )) break;
+ if( line[strlen( line ) - 1] == '\n' ) line[strlen( line ) - 1] = '\0';
+ IRC_WriteStrClient( Client, This_Server, RPL_MOTD_MSG, Client->nick, line );
+ }
+ ok = IRC_WriteStrClient( Client, This_Server, RPL_ENDOFMOTD_MSG, Client->nick );
+
+ fclose( fd );
+
+ return ok;
} /* Show_MOTD */