* ngIRCd -- The Next Generation IRC Daemon
* Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
*
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
*
- * $Id: irc-login.c,v 1.17 2002/09/02 19:31:26 alex Exp $
- *
- * irc-login.c: Anmeldung und Abmeldung im IRC
+ * Login and logout
*/
#include "portab.h"
+static char UNUSED id[] = "$Id: irc-login.c,v 1.41 2005/03/19 18:43:48 fw Exp $";
+
#include "imp.h"
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include "ngircd.h"
#include "resolve.h"
+#include "conn-func.h"
#include "conf.h"
-#include "conn.h"
#include "client.h"
#include "channel.h"
#include "log.h"
#include "messages.h"
#include "parse.h"
#include "irc.h"
+#include "irc-info.h"
#include "irc-write.h"
+#include "cvs-version.h"
#include "exp.h"
#include "irc-login.h"
-LOCAL BOOLEAN Hello_User PARAMS(( CLIENT *Client ));
-LOCAL VOID Kill_Nick PARAMS(( CHAR *Nick, CHAR *Reason ));
+LOCAL bool Hello_User PARAMS(( CLIENT *Client ));
+LOCAL void Kill_Nick PARAMS(( char *Nick, char *Reason ));
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_PASS( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
}
else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 )))
{
- CHAR *impl, *serverver, *flags, *ptr;
- INT protohigh, protolow;
+ char c2, c4, *type, *impl, *serverver, *flags, *ptr, *ircflags;
+ int protohigh, protolow;
/* noch nicht registrierte Server-Verbindung */
Log( LOG_DEBUG, "Connection %d: got PASS command (new server link) ...", Client_Conn( Client ));
/* Passwort speichern */
Client_SetPassword( Client, Req->argv[0] );
- /* Protokollversion ueberpruefen */
- if( strlen( Req->argv[1] ) > 4 ) Req->argv[1][4] = '\0';
- if( strlen( Req->argv[1] ) != 4 ) protohigh = protolow = 0;
- else
+ /* Protokollversion ermitteln */
+ if( strlen( Req->argv[1] ) >= 4 )
{
+ c2 = Req->argv[1][2];
+ c4 = Req->argv[1][4];
+
+ Req->argv[1][4] = '\0';
protolow = atoi( &Req->argv[1][2] );
Req->argv[1][2] = '\0';
protohigh = atoi( Req->argv[1] );
- }
+
+ Req->argv[1][2] = c2;
+ Req->argv[1][4] = c4;
+ }
+ else protohigh = protolow = 0;
+
+ /* Protokoll-Typ */
+ if( strlen( Req->argv[1] ) > 4 ) type = &Req->argv[1][4];
+ else type = NULL;
+
+ /* IRC-Flags (nach RFC 2813) */
+ if( Req->argc >= 4 ) ircflags = Req->argv[3];
+ else ircflags = "";
/* Implementation, Version und ngIRCd-Flags */
impl = Req->argv[2];
ptr = strchr( impl, '|' );
if( ptr ) *ptr = '\0';
- if( strcmp( impl, PACKAGE ) == 0 )
+ if( type && ( strcmp( type, PROTOIRCPLUS ) == 0 ))
{
- /* auf der anderen Seite laeuft auch ein ngIRCd */
+ /* auf der anderen Seite laeuft ein Server, der
+ * ebenfalls das IRC+-Protokoll versteht */
serverver = ptr + 1;
flags = strchr( serverver, ':' );
if( flags )
flags++;
}
else flags = "";
- Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s (flags: \"%s\") using protocol version %d.%d.", Client_Conn( Client ), impl, serverver, flags, protohigh, protolow );
+ Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags );
}
else
{
- serverver = flags = "";
- Log( LOG_INFO, "Connection %d: Peer announces itself as server of type \"%s\" usinf protocol version %d.%d.", Client_Conn( Client ), impl, protohigh, protolow );
+ /* auf der anderen Seite laeuft ein Server, der
+ * nur das Originalprotokoll unterstuetzt */
+ serverver = "";
+ if( strchr( ircflags, 'Z' )) flags = "Z";
+ else flags = "";
+ Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags );
}
Client_SetType( Client, CLIENT_GOTPASSSERVER );
+ Client_SetFlags( Client, flags );
+
return CONNECTED;
}
else if(( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER ))
} /* IRC_PASS */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_NICK( CLIENT *Client, REQUEST *Req )
{
CLIENT *intr_c, *target, *c;
- CHAR *modes;
+ char *modes;
assert( Client != NULL );
assert( Req != NULL );
/* alle betroffenen User und Server ueber Nick-Aenderung informieren */
if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClientPrefix( Client, Client, "NICK :%s", Req->argv[0] );
IRC_WriteStrServersPrefix( Client, target, "NICK :%s", Req->argv[0] );
- IRC_WriteStrRelatedPrefix( target, target, FALSE, "NICK :%s", Req->argv[0] );
+ IRC_WriteStrRelatedPrefix( target, target, false, "NICK :%s", Req->argv[0] );
/* neuen Client-Nick speichern */
Client_SetID( target, Req->argv[0] );
+ IRC_SetPenalty( target, 2 );
}
return CONNECTED;
}
/* Neue Client-Struktur anlegen */
- c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5] + 1, Req->argv[6], TRUE );
+ c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5] + 1, Req->argv[6], true);
if( ! c )
{
/* Eine neue Client-Struktur konnte nicht angelegt werden.
} /* IRC_NICK */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_USER( CLIENT *Client, REQUEST *Req )
{
+#ifdef IDENTAUTH
+ char *ptr;
+#endif
+
assert( Client != NULL );
assert( Req != NULL );
if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS )
#endif
{
- /* Falsche Anzahl Parameter? */
+ /* Wrong number of parameters? */
if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- Client_SetUser( Client, Req->argv[0], FALSE );
- Client_SetInfo( Client, Req->argv[3] );
+ /* User name */
+#ifdef IDENTAUTH
+ ptr = Client_User( Client );
+ if( ! ptr || ! *ptr || *ptr == '~' ) Client_SetUser( Client, Req->argv[0], false );
+#else
+ Client_SetUser( Client, Req->argv[0], false );
+#endif
+
+ /* "Real name" or user info text: Don't set it to the empty string, the original ircd
+ * can't deal with such "real names" (e. g. "USER user * * :") ... */
+ if( *Req->argv[3] ) Client_SetInfo( Client, Req->argv[3] );
+ else Client_SetInfo( Client, "-" );
Log( LOG_DEBUG, "Connection %d: got valid USER command ...", Client_Conn( Client ));
if( Client_Type( Client ) == CLIENT_GOTNICK ) return Hello_User( Client );
} /* IRC_USER */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_QUIT( CLIENT *Client, REQUEST *Req )
{
CLIENT *target;
return CONNECTED;
}
- if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL, TRUE );
- else Client_Destroy( target, "Got QUIT command.", Req->argv[0], TRUE );
+ if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL, true);
+ else Client_Destroy( target, "Got QUIT command.", Req->argv[0], true);
return CONNECTED;
}
/* Falsche Anzahl Parameter? */
if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, TRUE );
- else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], TRUE );
+ if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, true);
+ else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], true);
return DISCONNECTED;
}
} /* IRC_QUIT */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_PING( CLIENT *Client, REQUEST *Req )
{
CLIENT *target, *from;
assert( Client != NULL );
assert( Req != NULL );
- if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
-
/* Falsche Anzahl Parameter? */
if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
#ifdef STRICT_RFC
{
/* es wurde ein Ziel-Client angegeben */
target = Client_Search( Req->argv[1] );
- if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+ if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
if( target != Client_ThisServer( ))
{
/* ok, forwarden */
} /* IRC_PING */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_PONG( CLIENT *Client, REQUEST *Req )
{
CLIENT *target, *from;
assert( Client != NULL );
assert( Req != NULL );
- if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
-
/* Falsche Anzahl Parameter? */
if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
if( Req->argc == 2 )
{
target = Client_Search( Req->argv[1] );
- if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+ if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
if( target != Client_ThisServer( ))
{
/* ok, forwarden */
} /* IRC_PONG */
-LOCAL BOOLEAN
+LOCAL bool
Hello_User( CLIENT *Client )
{
+#ifdef CVSDATE
+ char ver[12], vertxt[30];
+#endif
+
assert( Client != NULL );
- /* Passwort ueberpruefen */
+ /* Check password ... */
if( strcmp( Client_Password( Client ), Conf_ServerPwd ) != 0 )
{
- /* Falsches Passwort */
+ /* Bad password! */
Log( LOG_ERR, "User \"%s\" rejected (connection %d): Bad password!", Client_Mask( Client ), Client_Conn( Client ));
- Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE );
+ Conn_Close( Client_Conn( Client ), NULL, "Bad password", true);
return DISCONNECTED;
}
Log( LOG_NOTICE, "User \"%s\" registered (connection %d).", Client_Mask( Client ), Client_Conn( Client ));
- /* Andere Server informieren */
+ /* Inform other servers */
IRC_WriteStrServers( NULL, "NICK %s 1 %s %s 1 +%s :%s", Client_ID( Client ), Client_User( Client ), Client_Hostname( Client ), Client_Modes( Client ), Client_Info( Client ));
- if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return FALSE;
- if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, TARGET_CPU, TARGET_CPU, TARGET_OS )) return FALSE;
- if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return FALSE;
- if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, USERMODES, CHANMODES )) return FALSE;
+ /* Welcome :-) */
+ if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return false;
+
+ /* Version and system type */
+#ifdef CVSDATE
+ strlcpy( ver, CVSDATE, sizeof( ver ));
+ strncpy( ver + 4, ver + 5, 2 );
+ strncpy( ver + 6, ver + 8, 3 );
+ snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver );
+ if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return false;
+#else
+ if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return false;
+#endif
+
+ if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return false;
+#ifdef CVSDATE
+ if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, USERMODES, CHANMODES )) return false;
+#else
+ if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, USERMODES, CHANMODES )) return false;
+#endif
+
+ /* Features */
+ if( ! IRC_WriteStrClient( Client, RPL_ISUPPORT_MSG, Client_ID( Client ), CLIENT_NICK_LEN - 1, CHANNEL_TOPIC_LEN - 1, CLIENT_AWAY_LEN - 1, Conf_MaxJoins )) return DISCONNECTED;
Client_SetType( Client, CLIENT_USER );
if( ! IRC_Send_LUSERS( Client )) return DISCONNECTED;
if( ! IRC_Show_MOTD( Client )) return DISCONNECTED;
+ /* Suspend the client for a second ... */
+ IRC_SetPenalty( Client, 1 );
+
return CONNECTED;
} /* Hello_User */
-LOCAL VOID
-Kill_Nick( CHAR *Nick, CHAR *Reason )
+LOCAL void
+Kill_Nick( char *Nick, char *Reason )
{
- CLIENT *c;
+ REQUEST r;
assert( Nick != NULL );
assert( Reason != NULL );
- Log( LOG_ERR, "User(s) with nick \"%s\" will be disconnected: %s", Nick, Reason );
-
- /* andere Server benachrichtigen */
- IRC_WriteStrServers( NULL, "KILL %s :%s", Nick, Reason );
+ r.prefix = (char *)Client_ThisServer( );
+ r.argv[0] = Nick;
+ r.argv[1] = Reason;
+ r.argc = 2;
- /* Ggf. einen eigenen Client toeten */
- c = Client_Search( Nick );
- if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Reason, TRUE );
+ Log( LOG_ERR, "User(s) with nick \"%s\" will be disconnected: %s", Nick, Reason );
+ IRC_KILL( Client_ThisServer( ), &r );
} /* Kill_Nick */
projects / ngircd-alex.git / blobdiff