Changeset 234 for trollforge/jmax

Timestamp:

07/06/06 00:35:01 (7 years ago)

Author:

jmax

Message:

added multi-network support

File:

• trollforge/jmax/asian.pl (modified) (11 diffs)

trollforge/jmax/asian.pl

@@ -33 +33 @@
 
 # TODO:
-# 18:47:34 <@Rucas> jmax, keep proxies in a list and remove them if they do not connect, and keep a list for each server and as they are banned for each server remove from list
-# file flooding with adjustments for nick-length
-# fix warnings
-# connect to a network other than the control channel
-# add to help msg
-# dictionary for nick ?
-# make username and nick different
+# X 18:47:34 <@Rucas> jmax, keep proxies in a list and remove them if they do not connect, and keep a list for each server and as they are banned for each server remove from list
+#   file flooding with adjustments for nick-length
+# X fix warnings
+# X connect to a network other than the control channel
+# X add to help msg 
+#   dictionary for nick ?
+#   make username and nick different
 
 use warnings;
@@ -54 +54 @@
 $VERSION = "2.0-beta2";
 
-print "Please run using the --help argument\n" and exit 666 unless $ARGV[0];
+print "!!! please run using the --help argument\n" and exit 666 unless $ARGV[0];
 my ($server, $port, $channel);
 if ($ARGV[0] eq '--help') {
@@ -60 +60 @@
           "\n".
           "\n".
-          "    Invocation:\n".
+          "  Invocation:\n".
           "      perl ".__FILE__." server[:port] \"#channel\"\n".
           "\n".
@@ -70 +70 @@
           "\n".
           "\n".
-          "    Usage:\n".
+          "  Usage:\n".
           "      all <raw IRC command> [space-delimited arguments] :[arguments with spaces]\n".
           "      all connect <server>\n".
@@ -78 +78 @@
           "    Simply privmsg your command to the control channel, and the respective bots will follow.\n".
           "\n".
-          "    Examples:\n".
+          "  Examples:\n".
           "      <~supers> all join #gnaa gnaa\n".
           "        All bots will join #gnaa using the key 'gnaa'\n".
@@ -95 +95 @@
     exit 0;
 } else {
-    print "Please run using the --help argument\n" and exit 666 unless $ARGV[1];
+    print "!!!! please run using the --help argument\n" and exit 666 unless $ARGV[1];
     if ($ARGV[0] =~ /(.+):(\d+)/) {
         $server = $1;
@@ -105 +105 @@
     $channel = $ARGV[1];    
 }
-my (undef, undef, undef, undef, @servers) = gethostbyname($server);
-unless (@servers) {
-    print "Cannot resolve server $ARGV[0]: $?\n";
-    exit 666;
-}
-my @servers_ip;
-foreach my $server (@servers) {
-    my ($a, $b, $c, $d) = unpack('C4', $server);
-    my $server_ip = "$a.$b.$c.$d";
-    push (@servers_ip, $server_ip);
-}
+
+my @servers = resolve($server);
 my %proxies = load_socks();
 my @proxylist;
-foreach my $key (keys %proxies) {
-    push(@proxylist, $key);
-}
+sub clean_proxylist { push(@proxylist, $key) foreach my $key (keys %proxies); }
+clean_proxylist();
+
 for ($forkcount = 0; $forkcount < $maxfork; $forkcount++) { # $forkcount must _not_ be local to here
     sleep 1;                          # so we don't overload ourselves
@@ -129 +120 @@
             my $proxy_ip = $proxylist[int rand @proxylist];
             my $proxy_port = $proxies{$proxy_ip};
-            spawn_bot($proxy_ip, $proxy_port, $servers_ip[int rand @servers_ip], $port) 
-                or delete $proxies{$proxy_ip};
+            spawn_bot($proxy_ip, $proxy_port, $servers[int rand @servers], $port) 
+               or delete $proxies{$proxy_ip} and clean_proxylist;
             sleep 1;
         }
@@ -169 +160 @@
     };
     if ($@) {
-      warn "!!!! unkown error: $@" unless $@ eq "alarm\n";   # propagate unexpected errors
-      warn "TIMEOUT / CONNECTION REFUSED, SOCKS == SHIT (probably); DELETING AND LOADING NEW;"; 
+      warn "!!!! unkown error: $@" unless $@ eq "alarm\n"; # propagate unexpected errors
+      print "!!!! TIMEOUT / CONNECTION REFUSED; SOCKS == SHIT; DELETING AND LOADING NEW;"; 
       return 0;
     }
@@ -201 +192 @@
             print $sock "$cmd\r\n";
             print STDOUT "<<<< $nick] $cmd\r\n";
-        } elsif ($line =~ /PRIVMSG $channel :\S*$nick\S* (.*)$/) {
+        } elsif ($line =~ /PRIVMSG $channel :\S*$nick\S* (.*)$/i) {
             my $cmd = $1;
             if ($cmd =~ /nick (\S*)/i) {
                 $nick = $1;
-            }
+            } 
             print $sock "$cmd\r\n";
             print STDOUT "<<<< $nick] $cmd\r\n";
+        } elsif ($line =~ /PRIVMSG $channel :all connect (.*)$/i) {
+            my $net = $1;
+            if ($net =~ /(.+):(\d+)/) {
+                my $remote_server = $1;
+                my $remote_port = $2;
+            }
+            my @remote_ips = resolve($remote_server);
+            my $altsock = connect_to_socks_proxy($socks_ip, $socks_port, $remote_ips[int rand @remote_ips], $remote_port);
+            print STDOUT "<<<< $nick] connecting to $net\r\n";                        
+        } elsif ($line =~ /PRIVMSG $channel :\S*$nick\S* connect (.*)$/i) {
+            my $net = $1;
+            if ($net =~ /(.+):(\d+)/) {
+                my $remote_server = $1;
+                my $remote_port = $2;
+            }
+            my @remote_ips = resolve($remote_server);
+            my $altsock = connect_to_socks_proxy($socks_ip, $socks_port, $remote_ips[int rand @remote_ips], $remote_port);
+            print STDOUT "<<<< $nick] connecting to $net\r\n";            
+        } elsif ($line =~ /PRIVMSG $channel :all:(\S*) (.*)$/i) {
+            my $net = $1;
+            my $cmd = $2;
+            print $altsock "$2\r\n";
+            print STDOUT "<<<< $nick] $cmd\r\n";            
+        } elsif ($line =~ /PRIVMSG $channel :\S*$nick\S*:(\S*) connect (.*)$/i) {
+            my $net = $1;
+            my $cmd = $2;
+            print $altsock "$2\r\n";
+            print STDOUT "<<<< $nick] $cmd\r\n";            
         } else {
             print STDOUT "<<<< $line\n";
@@ -245 +264 @@
     return $str;
 }
+
+sub resolve {
+    my $host = shift;
+    my (undef, undef, undef, undef, @servers) = gethostbyname($server);
+    unless (@servers) {
+        print "!!!! cannot resolve server $ARGV[0]: $?\n";
+        return 0;
+    }
+    my @servers_ip;
+    foreach my $server (@servers) {
+        my ($a, $b, $c, $d) = unpack('C4', $server);
+        my $server_ip = "$a.$b.$c.$d";
+        push (@servers_ip, $server_ip);
+   }
+   return @servers_ip;
+}
+