* 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.
- *
- * IRC commands for server links
*/
-
#include "portab.h"
+/**
+ * @file
+ * IRC commands for server links
+ */
+
#include "imp.h"
#include <assert.h>
#include <stdio.h>
#include <strings.h>
#include "defines.h"
-#include "resolve.h"
#include "conn.h"
#include "conn-func.h"
#include "conn-zip.h"
#include "conf.h"
-#include "client.h"
#include "channel.h"
#include "irc-write.h"
#include "lists.h"
#include "numeric.h"
#include "ngircd.h"
#include "irc-info.h"
+#include "op.h"
#include "exp.h"
#include "irc-server.h"
Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", true);
return DISCONNECTED;
}
- if( strcmp( Client_Password( Client ), Conf_Server[i].pwd_in ) != 0 )
+ 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] );
IRC_NJOIN( CLIENT *Client, REQUEST *Req )
{
char nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8];
- bool is_op, is_voiced;
+ bool is_owner, is_chanadmin, is_op, is_halfop, is_voiced;
CHANNEL *chan;
CLIENT *c;
is_op = is_voiced = false;
/* cut off prefixes */
- while(( *ptr == '@' ) || ( *ptr == '+' ))
- {
+ while(( *ptr == '~') || ( *ptr == '&' ) || ( *ptr == '@' ) ||
+ ( *ptr == '%') || ( *ptr == '+' ))
+ {
+ if( *ptr == '~' ) is_owner = true;
+ if( *ptr == '&' ) is_chanadmin = true;
if( *ptr == '@' ) is_op = true;
+ if( *ptr == 'h' ) is_halfop = true;
if( *ptr == '+' ) is_voiced = true;
ptr++;
}
chan = Channel_Search( channame );
assert( chan != NULL );
+ if( is_owner ) Channel_UserModeAdd( chan, c, 'q' );
+ if( is_chanadmin ) Channel_UserModeAdd( chan, c, 'a' );
if( is_op ) Channel_UserModeAdd( chan, c, 'o' );
+ if( is_halfop ) Channel_UserModeAdd( chan, c, 'h' );
if( is_voiced ) Channel_UserModeAdd( chan, c, 'v' );
/* announce to channel... */
}
if( nick_out[0] != '\0' ) strlcat( nick_out, ",", sizeof( nick_out ));
+ if( is_owner ) strlcat( nick_out, "~", sizeof( nick_out ));
+ if( is_chanadmin ) strlcat( nick_out, "&", sizeof( nick_out ));
if( is_op ) strlcat( nick_out, "@", sizeof( nick_out ));
+ if( is_halfop ) strlcat( nick_out, "%", sizeof( nick_out ));
if( is_voiced ) strlcat( nick_out, "+", sizeof( nick_out ));
strlcat( nick_out, ptr, sizeof( nick_out ));
}
GLOBAL bool
IRC_SQUIT(CLIENT * Client, REQUEST * Req)
{
- CLIENT *target;
- char msg[LINE_LEN + 64];
+ char msg[COMMAND_LEN], logmsg[COMMAND_LEN];
+ CLIENT *from, *target;
+ CONN_ID con;
+ int loglevel;
assert(Client != NULL);
assert(Req != NULL);
+ if (Client_Type(Client) != CLIENT_SERVER
+ && !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);
- Log(LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...",
- Client_ID(Client), Req->argv[0], Req->argv[1]);
+ if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) {
+ from = Client_Search(Req->prefix);
+ if (Client_Type(from) != CLIENT_SERVER
+ && !Op_Check(Client, Req))
+ return Op_NoPrivileges(Client, Req);
+ } else
+ from = Client;
+ if (!from)
+ return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+ Client_ID(Client), Req->prefix);
+
+ if (Client_Type(Client) == CLIENT_USER)
+ loglevel = LOG_NOTICE | LOG_snotice;
+ else
+ loglevel = LOG_DEBUG;
+ Log(loglevel, "Got SQUIT from %s for \"%s\": \"%s\" ...",
+ Client_ID(from), Req->argv[0], Req->argv[1]);
target = Client_Search(Req->argv[0]);
+ if (Client_Type(Client) != CLIENT_SERVER &&
+ target == Client_ThisServer())
+ return Op_NoPrivileges(Client, Req);
if (!target) {
/* The server is (already) unknown */
Log(LOG_WARNING,
return CONNECTED;
}
- if (Req->argv[1][0]) {
- if (strlen(Req->argv[1]) > LINE_LEN)
- Req->argv[1][LINE_LEN] = '\0';
- snprintf(msg, sizeof(msg), "%s (SQUIT from %s).", Req->argv[1],
- Client_ID(Client));
- } else
- snprintf(msg, sizeof(msg), "Got SQUIT from %s.",
- Client_ID(Client));
-
- if (Client_Conn(target) > NONE) {
- /* We are directly connected to this server */
- if (Req->argv[1][0])
- Conn_Close(Client_Conn(target), msg, Req->argv[1],
- true);
+ con = Client_Conn(target);
+
+ if (Req->argv[1][0])
+ if (Client_NextHop(from) != Client || con > NONE)
+ snprintf(msg, sizeof(msg), "%s (SQUIT from %s)",
+ Req->argv[1], Client_ID(from));
else
- Conn_Close(Client_Conn(target), msg, NULL, true);
- return DISCONNECTED;
+ strlcpy(msg, Req->argv[1], sizeof(msg));
+ else
+ snprintf(msg, sizeof(msg), "Got SQUIT from %s",
+ Client_ID(from));
+
+ if (con > NONE) {
+ /* We are directly connected to the target server, so we
+ * have to tear down the connection and to inform all the
+ * other remaining servers in the network */
+ IRC_SendWallops(Client_ThisServer(), Client_ThisServer(),
+ "Received SQUIT %s from %s: %s",
+ Req->argv[0], Client_ID(from),
+ Req->argv[1][0] ? Req->argv[1] : "-");
+ Conn_Close(con, NULL, msg, true);
+ if (con == Client_Conn(Client))
+ return DISCONNECTED;
} else {
- Client_Destroy(target, msg, Req->argv[1], false);
- return CONNECTED;
+ /* This server is not directly connected, so the SQUIT must
+ * be forwarded ... */
+ if (Client_Type(from) != CLIENT_SERVER) {
+ /* The origin is not an IRC server, so don't evaluate
+ * this SQUIT but simply forward it */
+ IRC_WriteStrClientPrefix(Client_NextHop(target),
+ from, "SQUIT %s :%s", Req->argv[0], Req->argv[1]);
+ } else {
+ /* SQUIT has been generated by another server, so
+ * remove the target server from the network! */
+ logmsg[0] = '\0';
+ if (!strchr(msg, '('))
+ snprintf(logmsg, sizeof(logmsg),
+ "%s (SQUIT from %s)", Req->argv[1],
+ Client_ID(from));
+ Client_Destroy(target, logmsg[0] ? logmsg : msg,
+ msg, false);
+ }
}
+ return CONNECTED;
} /* IRC_SQUIT */
/* -eof- */
projects / ngircd-alex.git / blobdiff