--- deliantra/server/ext/tcp.ext 2006/12/23 03:38:43 1.5 +++ deliantra/server/ext/tcp.ext 2009/11/29 10:52:14 1.13 @@ -1,32 +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 # 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 sockect, exiting.\n"; - exit (2); -} - -Event->io (fd => $LISTEN, nice => 1, poll => 'r', data => cf::WF_AUTOCANCEL, cb => sub { - my ($fh, $peername) = $LISTEN->accept - or return; +our $BIND = $cf::CFG{bind_addresses} || [[undef, 13327]]; - my $fd = fileno $fh; - my $host = inet_ntoa +(sockaddr_in $peername)[1]; - - warn "new connection from $host\n"; +for (@$BIND) { + my ($host, $port) = @$_; + warn "listening on $host:$port\n"; + + tcp_server $host, $port, sub { + my ($fh, $host, $port) = @_ + or return; + + 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::LOCALDIR/crossfiremail\n" and Coro::AIO::aio_load "$cf::LOCALDIR/crossfiremail", my $dummy;#d# + cf::client::create fileno $fh, $host; + };#d#d + }; +} - cf::client::create $fd, $host; -});