Bläddra i källkod

* Add set 'rbl-servers' with defaults

Bryan Drewery 16 år sedan
förälder
incheckning
c5c74db6a6
4 ändrade filer med 19 tillägg och 5 borttagningar
  1. 6 4
      doc/help.txt
  2. 10 0
      doc/settings.txt
  3. 2 0
      src/set.c
  4. 1 1
      src/set.h

+ 6 - 4
doc/help.txt

@@ -1530,12 +1530,12 @@ See also: reload, backup
    $uB$u:    Boolean (0/1/true/on/false/off)
    $uS$u:    String
    $uN$u:    Number
-   $uL$u:    List capable
+   $uL$u:    List
    $uR$u:    Rate. Set as 'number:interval', ie, '1:5'
    $uD$u:    Detected vars have the folloing options: $bignore$b/0, $bwarn$b/1, $breject$b/2, 
                                                       $bdie$b/3, $bsuicide$b/4
  
-[SL] $balias$b           List of dcc aliases in format '<alias> <cmd> [parms]'. First
+[L] $balias$b            List of dcc aliases in format '<alias> <cmd> [parms]'. First
                           matching alias is used. Normal flag checking is done
                           after the alias is expanded. 
                           $bAliases may not reference other aliases.$b
@@ -1571,8 +1571,10 @@ See also: reload, backup
 [D]  $bpromisc$b         How to handle when an interface is set to promiscuous mode.
 [D]  $bhijack$b          How to handle when a commonly used hijack method attempt is detected. 
  
-[SL] $bservers$b         Comma-separated list of servers the bot will use.
-[SL] $bservers6$b        Comma-separated list of servers the bot will use (FOR IPv6).
+[L]  $bservers$b         Comma-separated list of servers the bot will use.
+[L]  $bservers6$b        Comma-separated list of servers the bot will use (FOR IPv6).
+
+[L]  $brbl-servers$b     Servers to use for RBL checking in channels that are +rbl.
  
 [S]  $brealname$b        The bot's "real name" when connecting. (supports '$n' expansion)
 [S]  $busermode$b        The bot's usermode on IRC. (Set on connect/rehash)

+ 10 - 0
doc/settings.txt

@@ -62,4 +62,14 @@ irc.ipv6.homelien.no
 irc.ipv6.inter.net.il
 irc.paraphysics.net
 
+:rbl
+cbl.abuseat.org
+dnsbl.ahbl.org
+dnsbl.proxybl.org
+rbl.efnetrbl.org
+tor.efnet.org
+dnsbl.swiftbl.net
+xbl.spamhaus.org
+rbl.efnetpro.com
+
 :end

+ 2 - 0
src/set.c

@@ -27,6 +27,7 @@ static bool parsing_botset = 0;
 
 char altchars[50] = "";
 char alias[1024] = "";
+char rbl_servers[1024] = "";
 bool auth_chan;
 char auth_key[51] = "";
 char auth_prefix[2] = "";
@@ -104,6 +105,7 @@ static variable_t vars[] = {
  VAR("op-requests",	&op_requests,		VAR_RATE|VAR_NOLOC,				0, 0, "2:5"),
  VAR("promisc",		&promisc,		VAR_INT|VAR_DETECTED,				0, 4, "warn"),
  VAR("realname",	botrealname,		VAR_STRING|VAR_NOLHUB,				0, 0, "* I'm too lame to read BitchX.doc *"),
+ VAR("rbl-servers",	rbl_servers,		VAR_STRING|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB,	0, 0, DEFAULT_RBL),
  VAR("server-port",	&default_port,		VAR_INT|VAR_SHORT|VAR_NOLHUB,			0, 65535, "6667"),
  VAR("servers",		&serverlist,		VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB|VAR_NOLDEF,	0, 0, DEFAULT_SERVERS),
  VAR("servers6",	&serverlist,		VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB|VAR_NOLDEF,	0, 0, DEFAULT_SERVERS6),

+ 1 - 1
src/set.h

@@ -67,7 +67,7 @@ typedef struct rate_b {
  interval_t time;
 } rate_t;
 
-extern char		auth_key[], auth_prefix[2], motd[], *def_chanset, alias[],
+extern char		auth_key[], auth_prefix[2], motd[], *def_chanset, alias[], rbl_servers[1024],
 			msgident[], msginvite[], msgop[], msgpass[],
                         homechan[], altchars[];
 extern bool		dccauth, auth_obscure, manop_warn, auth_chan, oidentd, ident_botnick, irc_autoaway, link_cleartext;