--- deliantra/server/ext/tcp.ext	2009/11/29 10:52:14	1.13
+++ deliantra/server/ext/tcp.ext	2012/11/06 16:17:23	1.27
@@ -1,30 +1,85 @@
-#! perl # MANDATORY
+#! 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 AnyEvent::Socket;
 
-our $BIND = $cf::CFG{bind_addresses} || [[undef, 13327]];
+CONF BIND_ADDRESSES = [[undef, 13327]];
 
-for (@$BIND) {
+our $MAX_DETECT; # how many bytes to read to identify the protocol
+
+our @LISTENERS;
+our @DETECTORS;
+our %DETECTORS;
+
+sub _update_detectors {
+   $MAX_DETECT = List::Util::max map $_->[1], values %DETECTORS;
+}
+
+sub register($$$$) {
+   my ($name, $max_detect, $detect, $serve) = @_;
+
+   $DETECTORS{$name} = [$max_detect, $detect, $serve, $name];
+   _update_detectors;
+
+   Guard::guard {
+      delete $DETECTORS{$name};
+      _update_detectors;
+   }
+}
+
+our $deliantra_detector = ext::tcp::register deliantra => 10, sub {
+   /^..version /s
+}, sub {
+   my $ns = cf::client::create fileno $_[1], $_[0];
+   $ns->run;
+   $ns->inbuf_append ($_[2]);
+};
+
+for (@$BIND_ADDRESSES) {
    my ($host, $port) = @$_;
-   warn "listening on $host:$port\n";
+   cf::info "listening on ", (format_hostport $host, $port), "\n";
 
-   tcp_server $host, $port, sub {
+   push @LISTENERS, tcp_server $host, $port, sub {
       my ($fh, $host, $port) = @_
          or return;
 
-      warn "new connection from [$host]:$port\n";
+      my $lhost = AnyEvent::Socket::format_address
+                     +(AnyEvent::Socket::unpack_sockaddr getsockname $fh)[1];
+
+      my $id = format_hostport $host, $port;
+
+      cf::info "$id: accepted connection.\n"
+         if $lhost ne $host; # do not log connections from the host, e.g. for watchdogs
 
-      # 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
+      my $buf;
+      my $w; $w = AE::io $fh, 0, sub {
+         my $len = sysread $fh, $buf, 512, length $buf;
+
+         if ($len) {
+            for ($buf) {
+               for my $v (values %DETECTORS) {
+                  if (my $cb = $v->[1]()) {
+                     undef $w;
+                     cf::debug "$id: detected protocol $v->[3].\n";
+                     $v->[2]($id, $fh, $buf);
+                     return;
+                  }
+               }
+
+               if (length >= $MAX_DETECT) { # unable to detect protocol
+                  undef $w;
+                  cf::debug "$id: data received, but cannot detect protocol, closing.\n";
+               }
+            }
+         } else {
+            undef $w;
+            cf::info "$id: read error during protocol detection ($!)\n";
+         }
+      };
    };
 }