Greyhound: comparison webserver.php

equal deleted inserted replaced

-:53b0f0d7ff6f
+:31ce64a3ff6c
 }
 $socket_do_root = ( $allow_root ) ? function_exists('posix_geteuid') : false;
 $class = 'Socket_' . HTTPD_SOCKET_LAYER;
 $this->server = new $class();
-$this->server->tcp_listen($address, $port);
+if ( is_array($address) )
+{
+foreach ( $address as $a )
+{
+if ( is_array($port) )
+{
+foreach ( $port as $p )
+{
+$this->server->tcp_listen($a, $p);
+}
+}
+else
+{
+$this->server->tcp_listen($a, $port);
+}
+}
+}
+else
+{
+if ( is_array($port) )
+{
+foreach ( $port as $p )
+{
+$this->server->tcp_listen($address, $p);
+}
+}
+else
+{
+$this->server->tcp_listen($address, $port);
+}
+}
 // if running as root and we made it here, switch credentials
 if ( $socket_do_root )
 {
 posix_setuid($targetuser);
 * Socket abstraction layer - low-level socket functions (socket_*)
 */
 class Socket_Raw
 {
-var $sock;
+var $sock = array();
 var $socket_initted = false;
 function tcp_listen($address, $port)
 {
 // do we have socket functions?
 if ( !function_exists('socket_create') )
 {
 burnout('System does not support socket functions. Please rebuild your PHP or install an appropriate extension.');
 }
-$this->sock = @socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp'));
+$sockid = count($this->sock);
-if ( !$this->sock )
+$socktype = ( strstr($address, ':') ) ? AF_INET6 : AF_INET;
+$this->sock[$sockid] = @socket_create($socktype, SOCK_STREAM, getprotobyname('tcp'));
+if ( !$this->sock[$sockid] )
 throw new Exception('Could not create socket');
-$result = @socket_bind($this->sock, $address, $port);
+$result = @socket_bind($this->sock[$sockid], $address, $port);
 if ( !$result )
 throw new Exception("Could not bind to $address:$port");
 $this->socket_initted = true;
-$result = @socket_listen($this->sock, SOMAXCONN);
+$result = @socket_listen($this->sock[$sockid], SOMAXCONN);
 if ( !$result )
 throw new Exception("Could not listen for connections $address:$port");
 $this->socket_initted = true;
 }
 function destroy()
 {
 if ( $this->socket_initted )
 {
 // http://us3.php.net/manual/en/function.socket-bind.php
-if ( !@socket_set_option($this->sock, SOL_SOCKET, SO_REUSEADDR, 1) )
+if ( is_array($this->sock) )
 {
-echo socket_strerror(socket_last_error($this->sock)) . "\n";
+foreach ( $this->sock as $sock )
-}
+{
-@socket_shutdown($this->sock, 2);
+if ( !@socket_set_option($sock, SOL_SOCKET, SO_REUSEADDR, 1) )
-@socket_close($this->sock);
+{
+echo socket_strerror(socket_last_error($sock)) . "\n";
+}
+@socket_shutdown($sock, 2);
+@socket_close($sock);
+}
+}
+else
+{
+if ( !@socket_set_option($this->sock, SOL_SOCKET, SO_REUSEADDR, 1) )
+{
+echo socket_strerror(socket_last_error($this->sock)) . "\n";
+}
+@socket_shutdown($this->sock, 2);
+@socket_close($this->sock);
+}
 }
 }
 function accept()
 {
 $remote = false;
-$timeout = 5;
+foreach ( $this->sock as $sock )
-switch(@socket_select($r = array($this->sock), $w = array($this->sock), $e = array($this->sock), $timeout)) {
+{
-case 2:
+$timeout = 200000;
-return false;
+switch(@socket_select($r = array($sock), $w = array($sock), $e = array($sock), 0, $timeout)) {
-case 1:
+case 2:
-$remote = @socket_accept($this->sock);
+return false;
-$return = new Socket_Raw();
+case 1:
-$return->sock = $remote;
+$remote = @socket_accept($sock);
-$return->socket_initted = true;
+$return = new Socket_Raw();
-return $return;
+$return->sock = $remote;
-break;
+$return->socket_initted = true;
-case 0:
+return $return;
-return false;
+break;
+case 0:
+continue;
+}
 }
 }
 /**
 * Closes the socket but doesn't destroy it.
 * Socket abstraction layer - PHP stream support
 */
 class Socket_Stream
 {
-var $sock;
+var $sock = array();
 var $socket_initted = false;
 function tcp_listen($address, $port)
 {
 // does PHP support this?
 if ( !function_exists('stream_socket_server') )
 {
 burnout('System does not support stream functions. Please rebuild your PHP or install an appropriate extension.');
 }
-$this->sock = @stream_socket_server("tcp://$address:$port", $errno, $errstr);
+if ( strstr($address, ':') )
-if ( !$this->sock )
+{
+// ipv6 address (probably)
+$address = "[$address]";
+}
+$sockid = count($this->sock);
+$this->sock[$sockid] = @stream_socket_server("tcp://$address:$port", $errno, $errstr);
+if ( !$this->sock[$sockid] )
+{
 throw new Exception("Could not create the socket: error $errno: $errstr");
+}
 }
 function destroy()
 {
 if ( $this->socket_initted )
 {
 // PHP >= 5.2.1
-if ( function_exists('stream_socket_shutdown') )
+if ( is_array($this->sock) )
 {
-@stream_socket_shutdown($this->sock, STREAM_SHUT_RDWR);
+foreach ( $this->sock as $sock )
-}
+{
-while ( !@fclose($this->sock) )
+if ( function_exists('stream_socket_shutdown') )
 {
-usleep(100000);
+@stream_socket_shutdown($sock, STREAM_SHUT_RDWR);
+}
+while ( !@fclose($sock) )
+{
+usleep(100000);
+}
+}
+}
+else
+{
+if ( function_exists('stream_socket_shutdown') )
+{
+@stream_socket_shutdown($this->sock, STREAM_SHUT_RDWR);
+}
+while ( !@fclose($this->sock) )
+{
+usleep(100000);
+}
 }
 }
 }
 function accept()
 {
 // the goal of a custom accept() with *_select() is to tick every 200ms to allow signals.
-stream_set_blocking($this->sock, 1);
+foreach ( $this->sock as $sock )
-$timeout = 5;
+{
-$selection = @stream_select($r = array($this->sock), $w = array($this->sock), $e = array($this->sock), $timeout);
+stream_set_blocking($sock, 1);
-if ( !$selection )
+$timeout = 200000;
-{
+$selection = @stream_select($r = array($sock), $w = array($sock), $e = array($sock), 0, $timeout);
-return false;
+if ( !$selection )
-}
+{
-$remote = stream_socket_accept($this->sock);
+return false;
-$return = new Socket_Stream();
+}
-$return->sock = $remote;
+$remote = stream_socket_accept($sock);
-$return->socket_initted = true;
+$return = new Socket_Stream();
-return $return;
+$return->sock = $remote;
+$return->socket_initted = true;
+return $return;
+}
 }
 function soft_shutdown()
 {
 fclose($this->sock);

changeset 57	31ce64a3ff6c
parent 56	53b0f0d7ff6f
child 62	1b73be5346df