- Adjusted includes for new "conn-func.h" header.

[ngircd-alex.git] / src / ngircd / irc-login.c

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 87ccbcdb502c2888e52428d7714904ed61886981..04e6ef392d8aa7ce059b041932d9ad54eedc37d6 100644 (file)
--- 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.24 2002/11/30 15:04:57 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"
@@ -115,7 +114,7 @@ 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
                {
@@ -124,7 +123,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
                        serverver = "";
                        if( strchr( ircflags, 'Z' )) flags = "Z";
                        else flags = "";
-                       Log( LOG_INFO, "Connection %d: Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", Client_Conn( Client ), impl, protohigh, protolow, flags );
+                       Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags );
                }
 
                Client_SetType( Client, CLIENT_GOTPASSSERVER );
@@ -449,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;