* 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.7 2001/12/25 23:25:18 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".
+ *
+ * Revision 1.8 2001/12/26 03:21:46 alex
+ * - PING/PONG-Befehle implementiert,
+ * - Meldungen ueberarbeitet: enthalten nun (fast) immer den Nick.
+ *
* Revision 1.7 2001/12/25 23:25:18 alex
* - und nochmal Aenderungen am Logging ;-)
*
#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"
} /* IRC_Exit */
-GLOBAL BOOLEAN IRC_WriteStr_Client( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... )
+GLOBAL BOOLEAN IRC_WriteStrClient( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... )
{
/* Text an Clients, lokal bzw. remote, senden. */
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_WriteStr_Client()" );
- }
+ 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 );
+
+ 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_WriteStr_Client */
+} /* IRC_WriteStrRelated */
GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req )
if( Client->type == CLIENT_UNKNOWN )
{
Log( LOG_DEBUG, "Connection %d: got PASS command ...", Client->conn_id );
- return IRC_WriteStr_Client( Client, This_Server, ERR_UNKNOWNCOMMAND_MSG, Req->command );
+ return IRC_WriteStrClient( Client, This_Server, ERR_UNKNOWNCOMMAND_MSG, Client_Name( Client ), Req->command );
}
- else return IRC_WriteStr_Client( Client, This_Server, ERR_ALREADYREGISTRED_MSG );
+ else return IRC_WriteStrClient( Client, This_Server, ERR_ALREADYREGISTRED_MSG, Client_Name( Client ));
} /* IRC_PASS */
GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
{
- CLIENT *c;
-
assert( Client != NULL );
assert( Req != NULL );
if( Client->type != CLIENT_SERVER && Client->type != CLIENT_SERVICE )
{
/* Falsche Anzahl Parameter? */
- if( Req->argc != 1 ) return IRC_WriteStr_Client( Client, This_Server, ERR_NEEDMOREPARAMS_MSG );
-
- /* Nick zu lang? */
- if( strlen( Req->argv[0] ) > CLIENT_NICK_LEN ) return IRC_WriteStr_Client( Client, This_Server, ERR_ERRONEUSNICKNAME_MSG, Req->argv[0] );
+ if( Req->argc != 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command );
/* pruefen, ob Nick bereits vergeben */
- c = My_Clients;
- while( c )
+ if( ! Client_CheckNick( Client, Req->argv[0] )) return CONNECTED;
+
+ if( Client->type == CLIENT_USER )
{
- if( strcasecmp( c->nick, Req->argv[0] ) == 0 )
- {
- /* den Nick gibt es bereits */
- return IRC_WriteStr_Client( Client, This_Server, ERR_NICKNAMEINUSE_MSG, Req->argv[0] );
- }
- c = c->next;
+ /* Nick-Aenderung: allen mitteilen! */
+ IRC_WriteStrRelated( Client, "NICK :%s", Req->argv[0] );
}
-
+
/* Client-Nick registrieren */
strcpy( Client->nick, Req->argv[0] );
}
return CONNECTED;
}
- else return IRC_WriteStr_Client( Client, This_Server, ERR_ALREADYREGISTRED_MSG );
+ else return IRC_WriteStrClient( Client, This_Server, ERR_ALREADYREGISTRED_MSG, Client_Name( Client ));
} /* IRC_NICK */
if( Client->type == CLIENT_UNKNOWN || Client->type == CLIENT_GOTNICK || Client->type == CLIENT_GOTPASS )
{
/* Falsche Anzahl Parameter? */
- if( Req->argc != 4 ) return IRC_WriteStr_Client( Client, This_Server, ERR_NEEDMOREPARAMS_MSG );
+ if( Req->argc != 4 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command );
strncpy( Client->user, Req->argv[0], CLIENT_USER_LEN );
Client->user[CLIENT_USER_LEN] = '\0';
}
else if( Client->type == CLIENT_USER || Client->type == CLIENT_SERVER || Client->type == CLIENT_SERVICE )
{
- return IRC_WriteStr_Client( Client, This_Server, ERR_ALREADYREGISTRED_MSG );
+ return IRC_WriteStrClient( Client, This_Server, ERR_ALREADYREGISTRED_MSG, Client_Name( Client ));
}
- else return IRC_WriteStr_Client( Client, This_Server, ERR_NOTREGISTERED_MSG );
+ else return IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Name( Client ));
} /* IRC_USER */
if( Client->type != CLIENT_SERVER && Client->type != CLIENT_SERVICE )
{
/* Falsche Anzahl Parameter? */
- if( Req->argc > 1 ) return IRC_WriteStr_Client( Client, This_Server, ERR_NEEDMOREPARAMS_MSG );
+ if( Req->argc > 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command );
Conn_Close( Client->conn_id, "Client wants to quit." );
return DISCONNECTED;
}
- else return IRC_WriteStr_Client( Client, This_Server, ERR_NOTREGISTERED_MSG );
+ else return IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Name( Client ));
} /* IRC_QUIT */
+GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req )
+{
+ assert( Client != NULL );
+ assert( Req != NULL );
+
+ return IRC_WriteStrClient( Client, This_Server, ERR_UNKNOWNCOMMAND_MSG, Client_Name( Client ), Req->command );
+} /* IRC_PING */
+
+
+GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req )
+{
+ assert( Client != NULL );
+ assert( Req != NULL );
+
+ if( ! Check_Valid_User( Client )) return CONNECTED;
+
+ /* Falsche Anzahl Parameter? */
+ if( Req->argc < 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NOORIGIN_MSG, Client_Name( Client ));
+ if( Req->argc > 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command );
+
+ /* Der Connection-Timestamp wurde schon beim Lesen aus dem Socket
+ * aktualisiert, daher muss das hier nicht mehr gemacht werden. */
+
+ Log( LOG_DEBUG, "Connection %d: received PONG.", Client->conn_id );
+ return CONNECTED;
+} /* IRC_PONG */
+
+
GLOBAL BOOLEAN IRC_MOTD( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
if( ! Check_Valid_User( Client )) return CONNECTED;
/* Falsche Anzahl Parameter? */
- if( Req->argc != 0 ) return IRC_WriteStr_Client( Client, This_Server, ERR_NEEDMOREPARAMS_MSG );
+ if( Req->argc != 0 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command );
return Show_MOTD( Client );
} /* IRC_MOTD */
if( Client->type != CLIENT_USER )
{
- IRC_WriteStr_Client( Client, This_Server, ERR_NOTREGISTERED_MSG );
+ IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Name( Client ));
return FALSE;
}
else return TRUE;
LOCAL BOOLEAN Hello_User( CLIENT *Client )
{
+ assert( Client != NULL );
+ assert( Client->nick[0] );
+
Log( LOG_NOTICE, "User \"%s!%s@%s\" (%s) registered.", Client->nick, Client->user, Client->host, Client->name );
- IRC_WriteStr_Client( Client, This_Server, RPL_WELCOME_MSG, Client->nick, Client->nick, Client->user, Client->host );
- IRC_WriteStr_Client( Client, This_Server, RPL_YOURHOST_MSG, Client->nick, This_Server->host );
- IRC_WriteStr_Client( Client, This_Server, RPL_CREATED_MSG, Client->nick );
- IRC_WriteStr_Client( Client, This_Server, RPL_MYINFO_MSG, Client->nick, This_Server->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 );
Client->type = CLIENT_USER;
LOCAL BOOLEAN Show_MOTD( CLIENT *Client )
{
- IRC_WriteStr_Client( Client, This_Server, RPL_MOTDSTART_MSG, Client->nick, This_Server->host );
- IRC_WriteStr_Client( Client, This_Server, RPL_MOTD_MSG, Client->nick, "Some cool IRC server welcome message ;-)" );
- return IRC_WriteStr_Client( Client, This_Server, RPL_ENDOFMOTD_MSG, Client->nick );
+ 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 );
+ 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 */
projects / ngircd-alex.git / blobdiff