/*
* Trojanscan version 2
*
- * Trojanscan copyright (C) Chris Porter 2002-2007
+ * Trojanscan copyright (C) Chris Porter 2002-2009
* Newserv bits copyright (C) David Mansell 2002-2003
*
* TODO: CHECK::
#include "../lib/strlfunc.h"
#include "../lib/version.h"
#include "../core/nsmalloc.h"
+#include <stdint.h>
#define tmalloc(x) nsmalloc(POOL_TROJANSCAN, x)
#define tfree(x) nsfree(POOL_TROJANSCAN, x)
mnick = getcopyconfigitem("trojanscan", "nick", "T", NICKLEN);
myident = getcopyconfigitem("trojanscan", "ident", "trojanscan", NICKLEN);
- myhost = getcopyconfigitem("trojanscan", "hostname", "trojanscan.slug.netsplit.net", HOSTLEN);
+ myhost = getcopyconfigitem("trojanscan", "hostname", "trojanscan.quakenet.org", HOSTLEN);
myrealname = getcopyconfigitem("trojanscan", "realname", "Trojanscan v" TROJANSCAN_VERSION, REALLEN);
myauthname = getcopyconfigitem("trojanscan", "authname", "T", ACCOUNTLEN);
trojanscan_database.glines = 0;
trojanscan_database.detections = 0;
- dbhost = getcopyconfigitem("trojanscan", "dbhost", "localhost", HOSTLEN);
- dbuser = getcopyconfigitem("trojanscan", "dbuser", "", NICKLEN);
- dbpass = getcopyconfigitem("trojanscan", "dbpass", "", REALLEN);
- db = getcopyconfigitem("trojanscan", "db", "", NICKLEN);
+ dbhost = getcopyconfigitem("trojanscan", "dbhost", "localhost", 100);
+ dbuser = getcopyconfigitem("trojanscan", "dbuser", "moo", 100);
+ dbpass = getcopyconfigitem("trojanscan", "dbpass", "changeme", 100);
+ db = getcopyconfigitem("trojanscan", "db", "moo", 100);
- dbport = getcopyconfigitem("trojanscan", "dbport", "3306", ACCOUNTLEN);
+ dbport = getcopyconfigitem("trojanscan", "dbport", "3306", 10);
length = snprintf(buf, sizeof(buf) - 1, "%d", TROJANSCAN_DEFAULT_MAXCHANS);
temp = getcopyconfigitem("trojanscan", "maxchans", buf, length);
if ((trojanscan_cycletime / trojanscan_maxchans) < 1) {
Error("trojanscan", ERR_FATAL, "Cycletime / maxchans < 1, increase cycletime or decrease maxchans else cycling breaks.");
+ freesstring(dbhost);
+ freesstring(dbuser);
+ freesstring(dbpass);
+ freesstring(db);
+ freesstring(dbport);
return; /* PPA: module failed to load */
}
if (trojanscan_database_connect(dbhost->content, dbuser->content, dbpass->content, db->content, atoi(dbport->content)) < 0) {
Error("trojanscan", ERR_FATAL, "Cannot connect to database host!");
+ freesstring(dbhost);
+ freesstring(dbuser);
+ freesstring(dbpass);
+ freesstring(db);
+ freesstring(dbport);
return; /* PPA: module failed to load */
}
trojanscan_database.total_channels = 0;
trojanscan_database.total_phrases = 0;
trojanscan_database.total_worms = 0;
-
+ trojanscan_database.channels = NULL;
+ trojanscan_database.phrases = NULL;
+ trojanscan_database.worms = NULL;
}
char *trojanscan_sanitise(char *input) {
for(i=0;i<TROJANSCAN_CLONE_TOTAL;i++) {
if(trojanscan_swarm[i].clone->nick && !ircd_strcmp(trojanscan_swarm[i].clone->nick, np2->nick)) {
trojanscan_reply(np, "Nickname : %s", np2->nick);
- trojanscan_reply(np, "Swarm : yes", trojanscan_swarm[i].clone->nick);
+ trojanscan_reply(np, "Swarm : yes");
return CMD_OK;
}
}
np->clone->ipnode = np->fakeipnode;
- ret = nickbanned(np->clone, cp);
+ ret = nickbanned(np->clone, cp, 0);
np->clone->ipnode = realipnode;
nick *np = NULL; /* sigh at warnings */
if(hostmode)
- for (j=0;j<NICKHASHSIZE;j++)
- for (np=nicktable[j];np;np=np->next)
- if (np->ipnode==sender->ipnode)
- usercount++;
+ usercount = sender->ipnode->usercount;
if(usercount > TROJANSCAN_MAX_HOST_GLINE) {
hostmode = 0;
usercount = 0;
}
+ /* should really go through the ipnode I guess */
if(!hostmode)
for (j=0;j<NICKHASHSIZE;j++)
for (np=nicktable[j];np;np=np->next)
trojanscan_database_query("INSERT INTO hits (nickname, ident, host, phrase, messagetype, glined) VALUES ('%s', '%s', '%s', %d, '%c', %d)", enick, eident, ehost, phrase->id, messagetype, glining);
trojanscan_database.glines++;
- irc_send("%s GL * +%s %d :You (%s!%s@%s) are infected with a trojan (%s/%d), see %s%d for details - banned for %d hours\r\n", mynumeric->content, glinemask, glinetime * 3600, sender->nick, sender->ident, sender->host->name->content, worm->name->content, phrase->id, TROJANSCAN_URL_PREFIX, worm->id, glinetime);
+ irc_send("%s GL * +%s %d %jd :You (%s!%s@%s) are infected with a trojan (%s/%d), see %s%d for details - banned for %d hours\r\n", mynumeric->content, glinemask, glinetime * 3600, (intmax_t)time(NULL), sender->nick, sender->ident, sender->host->name->content, worm->name->content, phrase->id, TROJANSCAN_URL_PREFIX, worm->id, glinetime);
trojanscan_mainchanmsg("g: *!%s t: %c u: %s!%s@%s%s%s c: %d w: %s%s p: %d f: %d%s%s", glinemask, messagetype, sender->nick, sender->ident, sender->host->name->content, messagetype=='N'||messagetype=='M'||messagetype=='P'?" #: ":"", messagetype=='N'||messagetype=='M'||messagetype=='P'?chp->index->name->content:"", usercount, worm->name->content, worm->epidemic?"(E)":"", phrase->id, frequency, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:"");
}
return NULL;
}
+static int specialuseronhost(host *hp) {
+ nick *np;
+
+ for(np=hp->nicks;np;np=np->nextbyhost)
+ if(IsOper(np) || IsService(np) || IsXOper(np) || NickOnServiceServer(np))
+ return 1;
+
+ return 0;
+}
+
void trojanscan_generatehost(char *buf, int maxsize, patricia_node_t **fakeip) {
struct irc_in_addr ipaddress;
do {
hp = trojanscan_selecthost();
- if(hp && (hp->clonecount <= TROJANSCAN_MAX_CLONE_COUNT) && !trojanscan_isip(hp->name->content)) {
+ if(hp && (hp->clonecount <= TROJANSCAN_MAX_CLONE_COUNT) && !trojanscan_isip(hp->name->content) && !specialuseronhost(hp)) {
strlcpy(buf, hp->name->content, maxsize + 1);
if(hp->nicks) {
*fakeip = hp->nicks->ipnode;