CL2CHAN *cl2chan;
CHANNEL *chan;
char *currentTarget = Req->argv[0];
- char *lastCurrentTarget = NULL;
+ char *strtok_last = NULL;
char *message = NULL;
+ char *targets[MAX_HNDL_TARGETS];
+ int i, target_nr = 0;
assert(Client != NULL);
assert(Req != NULL);
message = Req->argv[1];
/* handle msgtarget = msgto *("," msgto) */
- currentTarget = strtok_r(currentTarget, ",", &lastCurrentTarget);
+ currentTarget = strtok_r(currentTarget, ",", &strtok_last);
ngt_UpperStr(Req->command);
- while (currentTarget) {
+ while (true) {
+ /* Make sure that there hasn't been such a target already: */
+ targets[target_nr++] = currentTarget;
+ for(i = 0; i < target_nr - 1; i++) {
+ if (strcasecmp(currentTarget, targets[i]) == 0)
+ goto send_next_target;
+ }
+
/* Check for and handle valid <msgto> of form:
* RFC 2812 2.3.1:
* msgto = channel / ( user [ "%" host ] "@" servername )
}
send_next_target:
- currentTarget = strtok_r(NULL, ",", &lastCurrentTarget);
- if (currentTarget)
- Conn_SetPenalty(Client_Conn(Client), 1);
+ currentTarget = strtok_r(NULL, ",", &strtok_last);
+ if (!currentTarget)
+ break;
+
+ Conn_SetPenalty(Client_Conn(Client), 1);
+
+ if (target_nr >= MAX_HNDL_TARGETS) {
+ /* Too many targets given! */
+ return IRC_WriteErrClient(Client,
+ ERR_TOOMANYTARGETS_MSG,
+ currentTarget);
+ }
}
return CONNECTED;
#define ERR_CANNOTSENDTOCHAN_MSG "404 %s %s :Cannot send to channel"
#define ERR_TOOMANYCHANNELS_MSG "405 %s %s :You have joined too many channels"
#define ERR_WASNOSUCHNICK_MSG "406 %s %s :There was no such nickname"
+#define ERR_TOOMANYTARGETS_MSG "407 %s :Too many recipients"
#define ERR_NOORIGIN_MSG "409 %s :No origin specified"
#define ERR_INVALIDCAP_MSG "410 %s %s :Invalid CAP subcommand"
#define ERR_NORECIPIENT_MSG "411 %s :No recipient given (%s)"
send "privmsg nick,nick :test\r"
expect {
timeout { exit 1 }
- "@* PRIVMSG nick :test\r*@* PRIVMSG nick :test"
+ "@* PRIVMSG nick :test"
}
send "privmsg Nick,#testChannel,nick :test\r"
expect {
timeout { exit 1 }
- "@* PRIVMSG nick :test\r*401*@* PRIVMSG nick :test"
+ "@* PRIVMSG nick :test\r*401"
}
send "privmsg doesnotexist :test\r"