--- deliantra/server/ext/tcp.ext	2008/05/05 09:01:58	1.10
+++ deliantra/server/ext/tcp.ext	2011/01/21 19:45:08	1.19
@@ -1,40 +1,30 @@
-#! 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
+# whether 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,
-   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]];
+our @LISTENERS;
+
+for (@$BIND) {
+   my ($host, $port) = @$_;
+   cf::info "listening on ", (format_hostport $host, $port), "\n";
+
+   push @LISTENERS, tcp_server $host, $port, sub {
+      my ($fh, $host, $port) = @_
+         or return;
 
-our $LISTENER = EV::io $LISTEN, EV::READ, sub {
-   my ($fh, $peername) = $LISTEN->accept
-      or return;
-
-   my $fd   = fileno $fh;
-   my $host = inet_ntoa +(sockaddr_in $peername)[1];
-
-   warn "new connection from $host\n";
-
-   # HACK to avoid blocking on common files on log-in.
-   # remove once async
-   cf::async {#d#
-   warn "HACK: $cf::CONFDIR/$_", Coro::AIO::aio_load "$cf::CONFDIR/$_", my $dummy for qw(rules news motd);#d#
-   warn "HACK: $cf::VARDIR/crossfiremail", Coro::AIO::aio_load "$cf::VARDIR/crossfiremail", my $dummy;#d#
-   cf::client::create $fd, $host;
-   undef $fh;#d#
-   };#d#d
-};
+      my $lhost = AnyEvent::Socket::format_address
+                     +(AnyEvent::Socket::unpack_sockaddr getsockname $fh)[1];
+
+      cf::info "new connection from ", (format_hostport $host, $port), "\n"
+         if $lhost ne $host; # do not log connections from the host, e.g. for watchdogs
+
+      cf::client::create fileno $fh, $host;
+   };
+}