/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2007 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
*
* 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
#include "conn-zip.h"
#include "conf.h"
#include "channel.h"
-#include "irc-write.h"
#include "lists.h"
#include "log.h"
#include "messages.h"
#include "numeric.h"
#include "ngircd.h"
#include "irc-info.h"
+#include "irc-macros.h"
+#include "irc-write.h"
#include "op.h"
#include "exp.h"
#include "irc-server.h"
-
/**
- * Handler for the IRC command "SERVER".
- * See RFC 2813 section 4.1.2.
+ * Handler for the IRC "SERVER" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
*/
GLOBAL bool
IRC_SERVER( CLIENT *Client, REQUEST *Req )
char str[LINE_LEN];
CLIENT *from, *c;
int i;
- CONN_ID con;
assert( Client != NULL );
assert( Req != NULL );
LogDebug("Connection %d: got SERVER command (new server link) ...",
Client_Conn(Client));
- if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
- /* Ist this server configured on out side? */
- for( i = 0; i < MAX_SERVERS; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break;
- if( i >= MAX_SERVERS )
- {
- Log( LOG_ERR, "Connection %d: Server \"%s\" not configured here!", Client_Conn( Client ), Req->argv[0] );
- Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", true);
+ if (Req->argc != 2 && Req->argc != 3)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client),
+ Req->command);
+
+ /* Get configuration index of new remote server ... */
+ for (i = 0; i < MAX_SERVERS; i++)
+ if (strcasecmp(Req->argv[0], Conf_Server[i].name) == 0)
+ break;
+
+ /* Makre sure the remote server is configured here */
+ if (i >= MAX_SERVERS) {
+ Log(LOG_ERR,
+ "Connection %d: Server \"%s\" not configured here!",
+ Client_Conn(Client), Req->argv[0]);
+ Conn_Close(Client_Conn(Client), NULL,
+ "Server not configured here", true);
return DISCONNECTED;
}
- if( strcmp( Conn_Password( Client_Conn( Client ) ),
- Conf_Server[i].pwd_in ) != 0 )
- {
- /* wrong password */
- Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] );
- Conn_Close( Client_Conn( Client ), NULL, "Bad password", true);
+
+ /* Check server password */
+ if (strcmp(Conn_Password(Client_Conn(Client)),
+ Conf_Server[i].pwd_in) != 0) {
+ Log(LOG_ERR,
+ "Connection %d: Got bad password from server \"%s\"!",
+ Client_Conn(Client), Req->argv[0]);
+ Conn_Close(Client_Conn(Client), NULL,
+ "Bad password", true);
return DISCONNECTED;
}
/* Is there a registered server with this ID? */
- if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED;
+ if (!Client_CheckID(Client, Req->argv[0]))
+ return DISCONNECTED;
+
+ /* Mark this connection as belonging to an configured server */
+ if (!Conf_SetServer(i, Client_Conn(Client)))
+ return DISCONNECTED;
Client_SetID( Client, Req->argv[0] );
Client_SetHops( Client, 1 );
/* Is this server registering on our side, or are we connecting to
* a remote server? */
- con = Client_Conn(Client);
if (Client_Token(Client) != TOKEN_OUTBOUND) {
/* Incoming connection, send user/pass */
if (!IRC_WriteStrClient(Client, "PASS %s %s",
|| !IRC_WriteStrClient(Client, "SERVER %s 1 :%s",
Conf_ServerName,
Conf_ServerInfo)) {
- Conn_Close(con, "Unexpected server behavior!",
+ Conn_Close(Client_Conn(Client),
+ "Unexpected server behavior!",
NULL, false);
return DISCONNECTED;
}
Client_SetToken(Client, atoi(Req->argv[1]));
}
- /* Mark this connection as belonging to an configured server */
- Conf_SetServer(i, con);
-
/* Check protocol level */
if (Client_Type(Client) == CLIENT_GOTPASS) {
/* We got a "simple" PASS command, so the peer is
* using the protocol as defined in RFC 1459. */
- if (! (Conn_Options(con) & CONN_RFC1459))
+ if (! (Conn_Options(Client_Conn(Client)) & CONN_RFC1459))
Log(LOG_INFO,
"Switching connection %d (\"%s\") to RFC 1459 compatibility mode.",
- con, Client_ID(Client));
- Conn_SetOption(con, CONN_RFC1459);
+ Client_Conn(Client), Client_ID(Client));
+ Conn_SetOption(Client_Conn(Client), CONN_RFC1459);
}
Client_SetType(Client, CLIENT_UNKNOWNSERVER);
#ifdef ZLIB
- if (strchr(Client_Flags(Client), 'Z') && !Zip_InitConn(con)) {
- Conn_Close( con, "Can't inizialize compression (zlib)!", NULL, false );
+ if (Client_HasFlag(Client, 'Z')
+ && !Zip_InitConn(Client_Conn(Client))) {
+ Conn_Close(Client_Conn(Client),
+ "Can't initialize compression (zlib)!",
+ NULL, false );
return DISCONNECTED;
}
#endif
#ifdef IRCPLUS
- if (strchr(Client_Flags(Client), 'H')) {
+ if (Client_HasFlag(Client, 'H')) {
LogDebug("Peer supports IRC+ extended server handshake ...");
if (!IRC_Send_ISUPPORT(Client))
return DISCONNECTED;
Client_ID(Client), Req->command);
} /* IRC_SERVER */
-
+/*
+ * Handler for the IRC "NJOIN" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
GLOBAL bool
IRC_NJOIN( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
assert( Req != NULL );
- if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2)
strlcpy( nick_in, Req->argv[1], sizeof( nick_in ));
strcpy( nick_out, "" );
}
/* forward to other servers */
- if( nick_out[0] != '\0' ) IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], nick_out );
+ if (nick_out[0] != '\0')
+ IRC_WriteStrServersPrefix(Client, Client_ThisServer(),
+ "NJOIN %s :%s", Req->argv[0], nick_out);
return CONNECTED;
} /* IRC_NJOIN */
-
/**
- * Handler for the IRC command "SQUIT".
- * See RFC 2813 section 4.1.2 and RFC 2812 section 3.1.8.
+ * Handler for the IRC "SQUIT" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
*/
GLOBAL bool
IRC_SQUIT(CLIENT * Client, REQUEST * Req)
&& !Client_HasMode(Client, 'o'))
return Op_NoPrivileges(Client, Req);
- /* Bad number of arguments? */
- if (Req->argc != 2)
- return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
- Client_ID(Client), Req->command);
+ _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2)
if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) {
from = Client_Search(Req->prefix);
if (Req->argv[1][0])
if (Client_NextHop(from) != Client || con > NONE)
- snprintf(msg, sizeof(msg), "%s (SQUIT from %s)",
+ snprintf(msg, sizeof(msg), "\"%s\" (SQUIT from %s)",
Req->argv[1], Client_ID(from));
else
strlcpy(msg, Req->argv[1], sizeof(msg));
logmsg[0] = '\0';
if (!strchr(msg, '('))
snprintf(logmsg, sizeof(logmsg),
- "%s (SQUIT from %s)", Req->argv[1],
+ "\"%s\" (SQUIT from %s)", Req->argv[1],
Client_ID(from));
Client_Destroy(target, logmsg[0] ? logmsg : msg,
msg, false);