#include "channel.h"
#include "common.h"
#include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
#include "s_stats.h"
#include "send.h"
#include "msg.h"
#include "s_conf.h"
-#include "memory.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 *);
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;
/* didnt find any matching client, issue a kill */
if(from == NULL)
{
- ServerStats->is_unpf++;
+ ServerStats.is_unpf++;
remove_unknown(client_p, sender, pbuffer);
return;
}
/* fake direction, hmm. */
if(from->from != client_p)
{
- ServerStats->is_wrdi++;
+ ServerStats.is_wrdi++;
cancel_clients(client_p, from, pbuffer);
return;
}
if(*ch == '\0')
{
- ServerStats->is_empt++;
+ ServerStats.is_empt++;
return;
}
{
mptr = NULL;
numeric = ch;
- ServerStats->is_num++;
+ ServerStats.is_num++;
s = ch + 3; /* I know this is ' ' from above if */
*s++ = '\0'; /* blow away the ' ', and point s to next part */
}
me.name, from->name, ch);
}
}
- ServerStats->is_unco++;
+ ServerStats.is_unco++;
return;
}
ilog(L_SERVER,
"Insufficient parameters (%d < %d) for command '%s' from %s.",
i, ehandler.min_para, mptr->cmd, client_p->name);
- snprintf(squitreason, sizeof squitreason,
+ rb_snprintf(squitreason, sizeof squitreason,
"Insufficient parameters (%d < %d) for command '%s'",
i, ehandler.min_para, mptr->cmd);
exit_client(client_p, client_p, client_p, squitreason);
sendto_realops_snomask(SNO_DEBUG, L_ALL,
"Message for %s[%s] from %s",
source_p->name, source_p->from->name,
- get_server_name(client_p, SHOW_IP));
+ client_p->name);
}
else
{
source_p->username,
source_p->host,
source_p->from->name,
- get_server_name(client_p, SHOW_IP));
+ client_p->name);
}
}
remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
{
int slen = strlen(lsender);
+ char sid[4];
+ struct Client *server;
- /* meepfoo is a nickname (KILL)
+ /* meepfoo is a nickname (ignore)
* #XXXXXXXX is a UID (KILL)
* #XX is a SID (SQUIT)
* meep.foo is a server (SQUIT)
{
sendto_realops_snomask(SNO_DEBUG, L_ALL,
"Unknown prefix (%s) from %s, Squitting %s",
- lbuffer, get_server_name(client_p, SHOW_IP), lsender);
+ lbuffer, client_p->name, lsender);
sendto_one(client_p,
":%s SQUIT %s :(Unknown prefix (%s) from %s)",
get_id(&me, client_p), lsender,
lbuffer, client_p->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
- sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
- get_id(&me, client_p), lsender, me.name);
+ {
+ 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).