ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/tcp.ext
(Generate patch)

Comparing deliantra/server/ext/tcp.ext (file contents):
Revision 1.20 by root, Fri Feb 3 03:01:45 2012 UTC vs.
Revision 1.21 by root, Tue Oct 30 17:07:50 2012 UTC

6 6
7use Socket; 7use Socket;
8use AnyEvent::Socket; 8use AnyEvent::Socket;
9 9
10CONF BIND_ADDRESSES = [[undef, 13327]]; 10CONF BIND_ADDRESSES = [[undef, 13327]];
11
12our $MAX_DETECT = 16; # how many bytes to raed to identify the protocol
11 13
12our @LISTENERS; 14our @LISTENERS;
13 15
14for (@$BIND_ADDRESSES) { 16for (@$BIND_ADDRESSES) {
15 my ($host, $port) = @$_; 17 my ($host, $port) = @$_;
20 or return; 22 or return;
21 23
22 my $lhost = AnyEvent::Socket::format_address 24 my $lhost = AnyEvent::Socket::format_address
23 +(AnyEvent::Socket::unpack_sockaddr getsockname $fh)[1]; 25 +(AnyEvent::Socket::unpack_sockaddr getsockname $fh)[1];
24 26
25 cf::info "new connection from ", (format_hostport $host, $port), "\n" 27 my $id = format_hostport $host, $port;
28
29 cf::info "$id: new connection\n"
26 if $lhost ne $host; # do not log connections from the host, e.g. for watchdogs 30 if $lhost ne $host; # do not log connections from the host, e.g. for watchdogs
27 31
32 my $buf;
33 my $w; $w = AE::io $fh, 0, sub {
34 my $len = sysread $fh, $buf, 512, length $buf;
35
36 if ($len) {
37 if ($buf =~ /^..version /s) { # deliantra protocol
38 undef $w;
39
28 cf::client::create fileno $fh, $host; 40 my $ns = cf::client::create fileno $fh, $host;
41 $ns->inbuf_append ($buf);
42
43 } elsif ($buf =~ /^GET / && defined &ext::http::server) { # http or websocket
44 undef $w;
45
46 &ext::http::server ($fh, $buf);
47
48 } elsif (length $buf >= $MAX_DETECT) { # unable to detect protocol
49 undef $w;
50
51 cf::info "$id: protocol detection error\n";
52 }
53 } else {
54 undef $w;
55
56 cf::info "$id: read error during protocol detection\n";
57 }
58 };
29 }; 59 };
30} 60}
31 61

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines