* Port [3934] to 1.2.16

 * Update efnet server list and add new alias 'bs' for botset. (To get new defaults: 'set -YES servers -' and 'set -YES alias -')


svn: 3935

doc/UPDATES

@@ -19,6 +19,7 @@
 * Fixed bots getting confused about their hub/uplink after userfile transfer fails (fixes #61)
 * Fixed cmd_handle not properly bounds checking max handlen. (fixes #305)
 * Bans are now only retrieved from server after being opped. (addresses #406)
+* Update efnet server list and add new alias 'bs' for botset. (To get new defaults: 'set -YES servers -' and 'set -YES alias -')
 
 1.2.15 - http://wraith.botpack.net/milestone/1.2.15
 * Fix a possible segfault when binaries compiled wrong

doc/settings.txt

@@ -1,17 +1,31 @@
 :alias
 bc botcmd
 bl botcmd ?
+bs botset 
 op botcmd ? op
 +list set +
 -list set -
 list set list
 
+# From http://stats.efnet.org with hubs removed
 :servers
-efnet.teleglobe.net
-irc.arcti.ca
-irc.choopa.ca
-irc.dks.ca
-irc.igs.ca
+#US
+irc.blessed.net
+irc.choopa.net
+irc.chowned.org
+irc.colosolutions.net
+irc.easynews.com
+irc.eversible.com
+irc.he.net
+irc.mindspring.com
+irc.mzima.net
+irc.nac.net
+irc.servercentral.net
+irc.shoutcast.com
+irc.umich.edu
+irc.vel.net
+irc.wh.verio.net
+#EU
 efnet.cs.hut.fi
 efnet.demon.co.uk
 efnet.port80.se
@@ -30,32 +44,21 @@ irc.inet.tele.dk
 irc.inter.net.il
 irc.pte.hu
 irc.swepipe.se
-irc.chowned.org
-irc.blackened.com
-irc.blessed.net
-irc.choopa.net
-irc.colosolutions.net
-irc.easynews.com
-irc.eversible.com
-irc.he.net
-irc.mindspring.com
-irc.mzima.net
-irc.nac.net
-irc.servercentral.net
-irc.SHOUTcast.com
-irc.umich.edu
-irc.umn.edu
-irc.vel.net
-irc.wh.verio.net
-irc2.choopa.net
+#CA
+efnet.teleglobe.net
+irc.arcti.ca
+irc.choopa.ca
+irc.dks.ca
+irc.igs.ca
 
 :servers6
+efnet.ipv6.port80.se
 efnet.ipv6.xs4all.nl
-irc.efnet.nl
 irc.ac.za
+irc.efnet.ch
+irc.efnet.nl
+irc.ipv6.he.net
 irc.ipv6.homelien.no
 irc.ipv6.inter.net.il
-irc.ipv6.he.net
-irc.efnet.ch
 
 :end

src/makeset.c

@@ -21,6 +21,7 @@ int main(int argc, char *argv[]) {
   char c;
 
   while (file.getline(line, sizeof(line))) {
+    if (line[0] == '#') continue;
     if (line[0] == ':') {
       type = &line[1];
       if (type == "end")