* Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
* der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
*
- * $Id: irc-server.c,v 1.13 2002/08/26 23:39:22 alex Exp $
+ * $Id: irc-server.c,v 1.18 2002/10/04 11:21:46 alex Exp $
*
* irc-server.c: IRC-Befehle fuer Server-Links
*/
#include "log.h"
#include "messages.h"
#include "parse.h"
+#include "ngircd.h"
#include "exp.h"
#include "irc-server.h"
{
/* Eingehende Verbindung: Unseren SERVER- und PASS-Befehl senden */
ok = TRUE;
- if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd, PASSSERVERADD )) ok = FALSE;
+ if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd, NGIRCd_ProtoID )) ok = FALSE;
else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo );
if( ! ok )
{
chan = Channel_First( );
while( chan )
{
+#ifdef IRCPLUS
+ /* Wenn unterstuetzt, CHANINFO senden */
+ if( strchr( Client_Flags( Client ), 'C' ))
+ {
+ /* CHANINFO senden */
+ if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s :%s", Channel_Name( chan ), Channel_Modes( chan ), Channel_Topic( chan ))) return DISCONNECTED;
+ }
+#endif
+
/* alle Member suchen */
cl2chan = Channel_FirstMember( chan );
sprintf( str, "NJOIN %s :", Channel_Name( chan ));
if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 8 ))
{
/* Zeile senden */
- if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
sprintf( str, "NJOIN %s :", Channel_Name( chan ));
}
if( str[strlen( str ) - 1] != ':')
{
/* Ja; Also senden ... */
- if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
}
/* naechsten Channel suchen */
IRC_WriteStrChannelPrefix( Client, chan, Client, FALSE, "MODE %s +%s %s", channame, modes, Client_ID( c ));
}
}
- else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\", channel \"%s\"!", ptr, channame );
+ else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame );
/* naechsten Nick suchen */
ptr = strtok( NULL, "," );