Kline messages now have ?ip= in the URL which will allow our web pages to

be a bit cleverer.

diff --git a/bopchecker.c b/bopchecker.c
index 333cd2d5d3ddd64b9f4d7738ca65da1a69e514a6..cb2d3eb32b0d0f34dcfa8cef8823f634c8cfc85f 100644 (file)
--- a/bopchecker.c
+++ b/bopchecker.c
@@ -127,7 +127,7 @@ void log(char *data,...)
        fprintf(stderr, "%s\n", data2);
 }
 
-void irc_kline(char *addr)
+void irc_kline(char *addr, char *ip)
 {
 }
 

diff --git a/bopchecker.h b/bopchecker.h
index fe41eb0e5a02bdc5b2773fdc8a857823f276b9a0..5f5c56cfd1b057378708f8e2296bc4080b08e2d3 100644 (file)
--- a/bopchecker.h
+++ b/bopchecker.h
@@ -3,7 +3,7 @@
 
 void usage(char **argv);
 void log(char *data,...);
-void irc_kline(char *addr);
+void irc_kline(char *addr, char *ip);
 void dnsbl_report(struct scan_struct *ss);
 void irc_send(char *data, ...);
 int dnsbl_check(const char *addr, const char *irc_nick,

diff --git a/bopm.conf.sample b/bopm.conf.sample
index 72ee8061d7deb091e0a14353161fc2284b04bae6..e041d3f1d383d09e8049e3309ce47de105b41a92 100644 (file)
--- a/bopm.conf.sample
+++ b/bopm.conf.sample
@@ -88,13 +88,15 @@ SCANPORT 6667
 
 
 
-# KLINE_COMMAND <command> : Line used in issuing KLINES. One %s is required
-#                           within the line which will specify the klined host.
+# KLINE_COMMAND <command> : Line used in issuing KLINES. Two %s are required
+#                           within the line which will specify the klined
+#                           host and the IP address which you may find
+#                           useful in a URL.
 #                           Do not add anymore ':' characters after the initial
 #                           : character in the kline (even for a website) as
 #                           the IRCD will reject it.  
 
-KLINE_COMMAND KLINE *@%s :Open Proxy found on your host. Please visit www.blitzed.org/proxy for more information.
+KLINE_COMMAND KLINE *@%s :Open Proxy found on your host. Please visit www.blitzed.org/proxy?ip=%s for more information.
 
 
 

diff --git a/dnsbl.c b/dnsbl.c
index 20491511dcdb821d788235d1f16257ae5e138aa6..b367e74785c414e80d088628e972855562c08f28 100644 (file)
--- a/dnsbl.c
+++ b/dnsbl.c
@@ -107,7 +107,7 @@ int dnsbl_check(const char *addr, const char *irc_nick,
    irc_send("PRIVMSG %s :DNSBL: %s!%s@%s appears in BL zone %s",
            CONF_CHANNELS, irc_nick, irc_user, irc_addr,
            CONF_DNSBL_ZONE);
-   irc_kline(irc_addr);
+   irc_kline(irc_addr, (char *)addr);
    STAT_DNSBL_MATCHES++;
    return(1);
 }

diff --git a/irc.c b/irc.c
index 1ee4514db3614ee9c3b97d884b33c01655cd1083..1f86b9dd074af9ea441d7e241a16c0d47ba895d0 100644 (file)
--- a/irc.c
+++ b/irc.c
@@ -249,9 +249,9 @@ void irc_send(char *data,...)
  * 
  */
 
-void irc_kline(char *addr)
+void irc_kline(char *addr, char *ip)
 {
-     irc_send(CONF_KLINE_COMMAND, addr);
+     irc_send(CONF_KLINE_COMMAND, addr, ip);
 }
 
 /* Create socket and connect to IRC server

diff --git a/irc.h b/irc.h
index 8b7fb7efbc39c45bcfd4b180cd04ef2ef1ab6c91..e39882b5f2bb761a76dadc29bc882539c43f4a01 100644 (file)
--- a/irc.h
+++ b/irc.h
@@ -9,7 +9,7 @@
       void irc_reconnect();
       void irc_read();
       void irc_parse();
-      void irc_kline(char *addr);
+      void irc_kline(char *addr, char *ip);
       void irc_timer();
       void irc_send(char *data, ...);       
 

diff --git a/scan.c b/scan.c
index 9a6746f6bf62faac5ab8d620f02502709dcf453e..c882e8d12fb1be23daf23cd298182bf0d604b1c4 100644 (file)
--- a/scan.c
+++ b/scan.c
@@ -266,7 +266,7 @@ void scan_check()
                     {
                         if((*ss->protocol->r_handler)(ss)) /* If read returns true, flag socket for closed and kline*/
                          {
-                           irc_kline(ss->irc_addr);
+                           irc_kline(ss->irc_addr, ss->addr);
 
                           if(CONF_DNSBL_FROM && CONF_DNSBL_TO &&
                              CONF_SENDMAIL && !ss->verbose)