X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-login.c;h=04e6ef392d8aa7ce059b041932d9ad54eedc37d6;hp=86b22e14ba284b4fda123aab2787b04d7ed99753;hb=b8d7dcec7739aab840fc1ccae8e4dfaa8db330a1;hpb=2b6dbb07e8379888cce62fc51205b0c98a5aeb9f

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 86b22e14..04e6ef39 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -2,21 +2,20 @@
  * 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.22 2002/09/22 21:40:33 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.30 2002/12/30 17:15:42 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <stdio.h>
@@ -25,14 +24,14 @@
 
 #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 "exp.h"
@@ -65,7 +64,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 	}
 	else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 )))
 	{
-		CHAR c2, c4, *type, *impl, *serverver, *flags, *ptr;
+		CHAR c2, c4, *type, *impl, *serverver, *flags, *ptr, *ircflags;
 		INT protohigh, protolow;
 
 		/* noch nicht registrierte Server-Verbindung */
@@ -94,6 +93,10 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 		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, '|' );
@@ -111,12 +114,16 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 				flags++;
 			}
 			else flags = "";
-			Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", Client_Conn( Client ), impl, serverver, protohigh, protolow, flags );
+			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 \"%s\" using protocol %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 );
@@ -354,8 +361,6 @@ IRC_PING( CLIENT *Client, REQUEST *Req )
 	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
@@ -390,8 +395,6 @@ IRC_PONG( CLIENT *Client, REQUEST *Req )
 	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 );
@@ -445,6 +448,9 @@ Hello_User( CLIENT *Client )
 	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;
 
+	/* Features */
+	if( ! IRC_WriteStrClient( Client, RPL_FEATURE_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;