/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 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
* IRC commands for mode changes (like MODE, AWAY, etc.)
*/
-#include "imp.h"
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "defines.h"
#include "conn.h"
#include "channel.h"
#include "irc-macros.h"
#include "messages.h"
#include "conf.h"
-#include "exp.h"
#include "irc-mode.h"
static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin,
_IRC_GET_SENDER_OR_RETURN_(origin, Req, Client)
+ /* Test for "fake" MODE commands injected by this local instance,
+ * for example when handling the "DefaultUserModes" settings.
+ * This doesn't harm real commands, because prefixes of regular
+ * clients are checked in Validate_Prefix() and can't be faked. */
+ if (Req->prefix && Client_Search(Req->prefix) == Client_ThisServer())
+ Client = Client_Search(Req->prefix);
+
/* Channel or user mode? */
cl = NULL; chan = NULL;
if (Client_IsValidNick(Req->argv[0]))
break;
case 'c': /* Receive connect notices */
case 'q': /* KICK-protected user */
+ case 'F': /* disable flood protection */
/* (only settable by IRC operators!) */
if (!set || Client_Type(Client) == CLIENT_SERVER
|| Client_HasMode(Origin, 'o'))
Client_Modes(Target));
}
- IRC_SetPenalty(Client, 1);
return ok;
} /* Client_Mode */
char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], argadd[CLIENT_PASS_LEN];
const char *mode_ptr;
- /* Member or not? -- That's the question! */
- if (!Channel_IsMemberOf(Channel, Origin))
- return IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
- Client_ID(Origin), Channel_Name(Channel), Channel_Modes(Channel));
-
- /* The sender is a member: generate extended reply */
- strlcpy(the_modes, Channel_Modes(Channel), sizeof(the_modes));
- mode_ptr = the_modes;
- the_args[0] = '\0';
-
- while(*mode_ptr) {
- switch(*mode_ptr) {
- case 'l':
- snprintf(argadd, sizeof(argadd), " %lu", Channel_MaxUsers(Channel));
- strlcat(the_args, argadd, sizeof(the_args));
- break;
- case 'k':
- strlcat(the_args, " ", sizeof(the_args));
- strlcat(the_args, Channel_Key(Channel), sizeof(the_args));
- break;
+ if (!Channel_IsMemberOf(Channel, Origin)) {
+ /* Not a member: "simple" mode reply */
+ if (!IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
+ Client_ID(Origin), Channel_Name(Channel),
+ Channel_Modes(Channel)))
+ return DISCONNECTED;
+ } else {
+ /* The sender is a member: generate extended reply */
+ strlcpy(the_modes, Channel_Modes(Channel), sizeof(the_modes));
+ mode_ptr = the_modes;
+ the_args[0] = '\0';
+
+ while(*mode_ptr) {
+ switch(*mode_ptr) {
+ case 'l':
+ snprintf(argadd, sizeof(argadd), " %lu",
+ Channel_MaxUsers(Channel));
+ strlcat(the_args, argadd, sizeof(the_args));
+ break;
+ case 'k':
+ strlcat(the_args, " ", sizeof(the_args));
+ strlcat(the_args, Channel_Key(Channel),
+ sizeof(the_args));
+ break;
+ }
+ mode_ptr++;
}
- mode_ptr++;
+ if (the_args[0])
+ strlcat(the_modes, the_args, sizeof(the_modes));
+
+ if (!IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
+ Client_ID(Origin), Channel_Name(Channel),
+ the_modes))
+ return DISCONNECTED;
}
- if (the_args[0])
- strlcat(the_modes, the_args, sizeof(the_modes));
- if (!IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
- Client_ID(Origin), Channel_Name(Channel),
- the_modes))
- return DISCONNECTED;
#ifndef STRICT_RFC
+ /* Channel creation time */
if (!IRC_WriteStrClient(Origin, RPL_CREATIONTIME_MSG,
Client_ID(Origin), Channel_Name(Channel),
Channel_CreationTime(Channel)))
goto chan_exit;
if (!set) {
if (is_oper || is_machine || is_owner ||
- is_admin || is_op || is_halfop)
+ is_admin || is_op || is_halfop) {
x[0] = *mode_ptr;
- else
+ if (Channel_HasMode(Channel, 'k'))
+ strlcpy(argadd, "*", sizeof(argadd));
+ if (arg_arg > mode_arg)
+ arg_arg++;
+ } else
connected = IRC_WriteErrClient(Origin,
ERR_CHANOPRIVSNEEDED_MSG,
Client_ID(Origin),
#ifdef STRICT_RFC
/* Only send error message in "strict" mode,
* this is how ircd2.11 and others behave ... */
- IRC_SetPenalty(Origin, 2);
connected = IRC_WriteErrClient(Origin,
ERR_NEEDMOREPARAMS_MSG,
Client_ID(Origin), Req->command);
#ifdef STRICT_RFC
/* Only send error message in "strict" mode,
* this is how ircd2.11 and others behave ... */
- IRC_SetPenalty(Origin, 2);
connected = IRC_WriteErrClient(Origin,
ERR_NEEDMOREPARAMS_MSG,
Client_ID(Origin), Req->command);
* mode, because most other servers don't do
* it as well and some clients send "wired"
* MODE commands like "MODE #chan -ooo nick". */
- IRC_SetPenalty(Origin, 2);
connected = IRC_WriteErrClient(Origin,
ERR_NEEDMOREPARAMS_MSG,
Client_ID(Origin), Req->command);
}
}
- IRC_SetPenalty(Client, 1);
return connected;
} /* Channel_Mode */
projects / ngircd-alex.git / blobdiff