#include "s_conf.h"
#include "s_serv.h"
#include "packet.h"
+#include "s_assert.h"
static struct Dictionary *cmd_dict = NULL;
struct Dictionary *alias_dict = NULL;
-/*
- * NOTE: parse() should not be called recursively by other functions!
- */
-static char *sender;
-
-/* parv[0] == source, and parv[LAST] == NULL */
+/* parv[0] is not used, and parv[LAST] == NULL */
static char *para[MAXPARA + 2];
-static void cancel_clients(struct Client *, struct Client *, char *);
+static void cancel_clients(struct Client *, struct Client *);
static void remove_unknown(struct Client *, char *, char *);
static void do_numeric(char[], struct Client *, struct Client *, int, char **);
if(*buf == '\0')
return x;
}
- /* we can go upto parv[MAXPARA], as parv[0] is taken by source */
+ /* we can go upto parv[MAXPARA], as parv[0] is skipped */
while (x < MAXPARA);
if(*p == ':')
/* parse()
*
- * given a raw buffer, parses it and generates parv, parc and sender
+ * given a raw buffer, parses it and generates parv and parc
*/
void
parse(struct Client *client_p, char *pbuffer, char *bufend)
{
struct Client *from = client_p;
+ char *sender;
char *ch;
char *s;
char *end;
struct Message *mptr;
s_assert(MyConnect(client_p));
- s_assert(client_p->localClient->F->fd >= 0);
+ s_assert(client_p->localClient->F != NULL);
if(IsAnyDead(client_p))
return;
if(from->from != client_p)
{
ServerStats.is_wrdi++;
- cancel_clients(client_p, from, pbuffer);
+ cancel_clients(client_p, from);
return;
}
}
return;
}
- if(handle_command(mptr, client_p, from, i, /* XXX discards const!!! */ (const char **)para) < -1)
+ if(handle_command(mptr, client_p, from, i, /* XXX discards const!!! */ (const char **)(void *)para) < -1)
{
char *p;
for (p = pbuffer; p <= end; p += 8)
handler = ehandler.handler;
/* check right amount of params is passed... --is */
- if(i < ehandler.min_para ||
+ if(i < ehandler.min_para ||
(ehandler.min_para && EmptyString(hpara[ehandler.min_para - 1])))
{
if(!IsServer(client_p))
{
sendto_one(client_p, form_str(ERR_NEEDMOREPARAMS),
- me.name,
- EmptyString(client_p->name) ? "*" : client_p->name,
+ me.name,
+ EmptyString(client_p->name) ? "*" : client_p->name,
mptr->cmd);
if(MyClient(client_p))
return (1);
struct MessageEntry ehandler;
MessageHandler handler = 0;
- parv[0] = source_p->name;
-
mptr = irc_dictionary_retrieve(cmd_dict, command);
if(mptr == NULL || mptr->cmd == NULL)
ehandler = mptr->handlers[ENCAP_HANDLER];
handler = ehandler.handler;
- if(parc < ehandler.min_para ||
+ if(parc < ehandler.min_para ||
(ehandler.min_para && EmptyString(parv[ehandler.min_para - 1])))
return;
DICTIONARY_FOREACH(msg, &iter, cmd_dict)
{
s_assert(msg->cmd != NULL);
- sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
+ sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
form_str(RPL_STATSCOMMANDS),
- msg->cmd, msg->count,
+ msg->cmd, msg->count,
msg->bytes, msg->rcount);
}
s_assert(amsg->name != NULL);
sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
form_str(RPL_STATSCOMMANDS),
- amsg->name, amsg->hits, 0, 0);
+ amsg->name, amsg->hits, 0L, 0);
}
}
/* cancel_clients()
*
* inputs - client who sent us the message, client with fake
- * direction, command
+ * direction
* outputs - a given warning about the fake direction
* side effects -
*/
static void
-cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
+cancel_clients(struct Client *client_p, struct Client *source_p)
{
/* ok, fake prefix happens naturally during a burst on a nick
* collision with TS5, we cant kill them because one client has to
/* remove_unknown()
*
* inputs - client who gave us message, supposed sender, buffer
- * output -
+ * output -
* side effects - kills issued for clients, squits for servers
*/
static void
remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
{
int slen = strlen(lsender);
+ char sid[4];
+ struct Client *server;
/* meepfoo is a nickname (ignore)
* #XXXXXXXX is a UID (KILL)
* #XX is a SID (SQUIT)
* meep.foo is a server (SQUIT)
*/
- if((IsDigit(lsender[0]) && slen == 3) ||
+ if((IsDigit(lsender[0]) && slen == 3) ||
(strchr(lsender, '.') != NULL))
{
sendto_realops_snomask(SNO_DEBUG, L_ALL,
sendto_one(client_p,
":%s SQUIT %s :(Unknown prefix (%s) from %s)",
- get_id(&me, client_p), lsender,
+ get_id(&me, client_p), lsender,
lbuffer, client_p->name);
}
- else if(IsDigit(lsender[0]))
- sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
- get_id(&me, client_p), lsender, me.name);
+ else if(!IsDigit(lsender[0]))
+ ;
+ else if(slen != 9)
+ sendto_realops_snomask(SNO_DEBUG, L_ALL,
+ "Invalid prefix (%s) from %s",
+ lbuffer, client_p->name);
+ else
+ {
+ memcpy(sid, lsender, 3);
+ sid[3] = '\0';
+ server = find_server(NULL, sid);
+ if (server != NULL && server->from == client_p)
+ sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
+ get_id(&me, client_p), lsender, me.name);
+ }
}
/*
*
* parc number of arguments ('sender' counted as one!)
- * parv[0] pointer to 'sender' (may point to empty string) (not used)
* parv[1]..parv[parc-1]
* pointers to additional parameters, this is a NULL
* terminated list (parv[parc] == NULL).
* because it will have been already killed by the local server.
*
* unfortunately, as we cant guarantee other servers will do the
- * "right thing" on a nick collision, we have to keep both kills.
+ * "right thing" on a nick collision, we have to keep both kills.
* ergo we need to ignore ERR_NOSUCHNICK. --fl_
*/
/* quick comment. This _was_ tried. i.e. assume the other servers
return;
/* Fake it for server hiding, if its our client */
- sendto_one(target_p, ":%s %s %s%s",
- get_id(source_p, target_p), numeric,
+ sendto_one(target_p, ":%s %s %s%s",
+ get_id(source_p, target_p), numeric,
get_id(target_p, target_p), buffer);
return;
}