Added peon channel.

diff --git a/trojanscan/trojanscan.c b/trojanscan/trojanscan.c
index ba60984fa06ac1ce33cb8e8e0b97f9b649e02238..8d61284cd284cf348a6f268a74c513f500763ae3 100644 (file)
--- a/trojanscan/trojanscan.c
+++ b/trojanscan/trojanscan.c
@@ -204,6 +204,14 @@ void trojanscan_connect(void *arg) {
     if(!localjoinchannel(trojanscan_nick, cp))
       localgetops(trojanscan_nick, cp);
   }
+
+  cp = findchannel(TROJANSCAN_PEONCHANNEL);
+  if (!cp) {
+    localcreatechannel(trojanscan_nick, TROJANSCAN_PEONCHANNEL);
+  } else {
+    if(!localjoinchannel(trojanscan_nick, cp))
+      localgetops(trojanscan_nick, cp);
+  }
   
   freesstring(mnick);
   freesstring(myident);
@@ -1776,6 +1784,7 @@ void trojanscan_clonehandlemessages(nick *target, int messagetype, void **args)
                   matchbuf[0] = 0;
               
               trojanscan_mainchanmsg("m: t: %c u: %s!%s@%s%s%s w: %s %s%s", mt, sender->nick, sender->ident, sender->host->name->content, mt=='N'||mt=='M'?" #: ":"", mt=='N'||mt=='M'?chp->index->name->content:"", worm->name->content, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:"");
+              trojanscan_peonchanmsg("m: t: %c u: %s!%s@%s%s%s%s w: %s %s%s", mt, sender->nick, sender->ident, (IsHideHost(sender)&&IsAccount(sender))?sender->authname:sender->host->name->content, (IsHideHost(sender)&&IsAccount(sender))?"."HIS_HIDDENHOST:"", mt=='N'||mt=='M'?" #: ":"", mt=='N'||mt=='M'?chp->index->name->content:"", worm->name->content, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:"");
             } else {
               int glinetime = TROJANSCAN_FIRST_OFFENSE * frequency * (worm->epidemic?TROJANSCAN_EPIDEMIC_MULTIPLIER:1);
               if(glinetime > 7 * 24)
@@ -1951,6 +1960,23 @@ void trojanscan_mainchanmsg(char *message, ...) {
   sendmessagetochannel(trojanscan_nick, cp, "%s", buf);
 }
 
+void trojanscan_peonchanmsg(char *message, ...) {
+  char buf[513];
+  va_list va;
+  channel *cp;
+  
+  if (!trojanscan_nick)
+    return;
+  if (!(cp = findchannel(TROJANSCAN_PEONCHANNEL)))
+    return;
+    
+  va_start(va, message);
+  vsnprintf(buf, sizeof(buf) - 1, message, va);
+  va_end(va);
+  
+  sendmessagetochannel(trojanscan_nick, cp, "%s", buf);
+}
+
 int trojanscan_minmaxrand(float min, float max) {
   return (int)((max-min+1)*rand()/(RAND_MAX+min))+min;
 }

diff --git a/trojanscan/trojanscan.h b/trojanscan/trojanscan.h
index 2a5f9374c35a09c2fbc6b08ccf64d8aeab906283..66c2c12abed42e6603c9494b672750be7f017814 100644 (file)
--- a/trojanscan/trojanscan.h
+++ b/trojanscan/trojanscan.h
@@ -53,6 +53,7 @@
 
 #define TROJANSCAN_CHANNEL "#qnet.sec.trj"
 #define TROJANSCAN_OPERCHANNEL "#twilightzone"
+#define TROJANSCAN_PEONCHANNEL "#qnet.trj"
 
 #define TROJANSCAN_URL_PREFIX "http://trojanscan.quakenet.org/?"
 
@@ -207,6 +208,7 @@ char trojanscan_getmtfrommessagetype(int input);
 void trojanscan_handlemessages(nick *target, int messagetype, void **args);
 void trojanscan_clonehandlemessages(nick *target, int messagetype, void **args);
 void trojanscan_mainchanmsg(char *message, ...);
+void trojanscan_peonchanmsg(char *message, ...);
 void trojanscan_reply(nick *target, char *message, ... );
 void trojanscan_privmsg_chan_or_nick(channel *cp, nick *np, char *text, ...);