--- deliantra/server/ext/tcp.ext	2007/03/06 21:19:10	1.7
+++ deliantra/server/ext/tcp.ext	2008/05/25 21:15:44	1.12
@@ -1,40 +1,34 @@
-#! perl
+#! perl # MANDATORY
 
 # this listens for new tcp connections and hands them over to the server core
 # wether this being an extension introduces or reduces stability problems
 # is unknown as of today.
 
 use Socket;
-use IO::Socket::INET;
+use AnyEvent::Socket;
 
-our $LISTEN = new IO::Socket::INET
-   LocalPort => cf::settings->csport,
-   Listen    => 1,
-   Blocking  => 0, # bugfix workaround for Event calling handler twice :(
-   ReuseAddr => 1;
-
-if (!$LISTEN) {
-   # extension yes, completely stupid, not yet
-   warn "unable to establish listen socket, exiting.\n";
-   exit (2);
-}
+our $BIND = $cf::CFG{bind_addresses} || [[undef, 13327]];
+
+for (@$BIND) {
+   my ($host, $port) = @$_;
+   warn "listening on $host:$port\n";
 
-Event->io (
-   reentrant => 0,
-   fd        => $LISTEN,
-   nice      => 1,
-   poll      => 'r',
-   data      => cf::WF_AUTOCANCEL,
-   cb        => sub {
-      my ($fh, $peername) = $LISTEN->accept
+   tcp_server $host, $port, sub {
+      my ($fh, $host, $port) = @_
          or return;
 
       my $fd   = fileno $fh;
-      my $host = inet_ntoa +(sockaddr_in $peername)[1];
 
-      warn "new connection from $host\n";
+      warn "new connection from [$host]:$port\n";
 
+      # HACK to avoid blocking on common files on log-in.
+      # remove once async
+      cf::async {#d#
+      warn "HACK ext/tcp.ext: $cf::CONFDIR/$_\n" and Coro::AIO::aio_load "$cf::CONFDIR/$_", my $dummy for qw(rules news motd);#d#
+      warn "HACK ext/tcp.ext: $cf::LOCALDIR/crossfiremail\n" and Coro::AIO::aio_load "$cf::LOCALDIR/crossfiremail", my $dummy;#d#
       cf::client::create $fd, $host;
-   },
-);
+      undef $fh;#d#
+      };#d#d
+   };
+}