lib/socket: update socket clients

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/lib/mpd.nit b/lib/mpd.nit
index 97c38f2..e814b56 100644 (file)
--- a/lib/mpd.nit
+++ b/lib/mpd.nit
@@ -23,7 +23,7 @@ import socket
 class MPDConnection
 
        # Socket connection to server.
-       var socket: nullable Socket = null
+       var socket: nullable TCPStream = null
 
        # Server hostname.
        var host: String
@@ -40,9 +40,10 @@ class MPDConnection
        # Connect to the MPD server
        fun connect
        do
-               var p: nullable Socket = null
+               var p: nullable TCPStream = null
 
-               p = new Socket.client(host, port)
+               p = new TCPStream.connect(host, port)
+               assert p.connected
 
                sys.nanosleep(0,5000)
 

diff --git a/lib/websocket/examples/websocket_server.nit b/lib/websocket/examples/websocket_server.nit
index aa1124a..089df1b 100644 (file)
--- a/lib/websocket/examples/websocket_server.nit
+++ b/lib/websocket/examples/websocket_server.nit
@@ -23,13 +23,13 @@ var sock = new WebSocket(8088, 1)
 
 var msg: String
 
-if sock.listener.eof then
+if sock.listener.closed then
        print sys.errno.strerror
 end
 
 sock.accept
 
-while not sock.listener.eof do
+while not sock.listener.closed do
        if not sock.connected then sock.accept
        if sys.stdin.poll_in then
                msg = gets

diff --git a/lib/websocket/websocket.nit b/lib/websocket/websocket.nit
index 9066391..ebf3f49 100644 (file)
--- a/lib/websocket/websocket.nit
+++ b/lib/websocket/websocket.nit
@@ -31,25 +31,28 @@ class WebSocket
        super PollableIStream
 
        # Client connection to the server
-       var client: Socket
+       var client: TCPStream
 
        # Socket listening to connections on a defined port
-       var listener: Socket
+       var listener: TCPServer
 
        # Creates a new Websocket server listening on given port with `max_clients` slots available
        init(port: Int, max_clients: Int)
        do
                _buffer = new FlatBuffer
                _buffer_pos = 0
-               listener = new Socket.server(port, max_clients)
+               listener = new TCPServer(port)
+               listener.listen max_clients
        end
 
        # Accept an incoming connection and initializes the handshake
        fun accept
        do
-               assert not listener.eof
+               assert not listener.closed
 
-               client = listener.accept
+               var client = listener.accept
+               assert client != null
+               self.client = client
 
                var headers = parse_handshake
                var resp = handshake_response(headers)

diff --git a/src/interpreter/debugger_socket.nit b/src/interpreter/debugger_socket.nit
index b3bac6b..5675a7d 100644 (file)
--- a/src/interpreter/debugger_socket.nit
+++ b/src/interpreter/debugger_socket.nit
@@ -90,8 +90,10 @@ redef class ModelBuilder
        fun set_stdstreams
        do
                if self.toolcontext.opt_socket_mode.value then
-                       var sock = new Socket.server(toolcontext.opt_debug_port.value, 1)
+                       var sock = new TCPServer(toolcontext.opt_debug_port.value)
+                       sock.listen 1
                        var ns = sock.accept
+                       assert ns != null
                        sock.close
                        sys.set_io(ns,ns,ns)
                else if self.toolcontext.opt_websocket_mode.value then
@@ -103,7 +105,7 @@ redef class ModelBuilder
 
        fun close_stdstreams
        do
-               if sys.stdin isa WebSocket or sys.stdin isa Socket then
+               if sys.stdin isa WebSocket or sys.stdin isa TCPStream then
                        sys.stdin.close
                        sys.stdout.close
                        sys.stderr.close

diff --git a/src/nitdbg_client.nit b/src/nitdbg_client.nit
index 8983b61..349f53c 100644 (file)
--- a/src/nitdbg_client.nit
+++ b/src/nitdbg_client.nit
@@ -65,19 +65,19 @@ if toolcontext.opt_debug_port.value < 0 or toolcontext.opt_debug_port.value > 65
        return
 end
 
-var debug: Socket
+var debug: TCPStream
 
 # An IPV4 address does always complies to this form : x.x.x.x
 # Where x is an integer whose value is >=0 and <= 255
 if toolcontext.opt_host_address.value != null then
        if toolcontext.opt_host_address.value.is_valid_ipv4_address then
-               debug = new Socket.client(toolcontext.opt_host_address.value.as(not null), toolcontext.opt_debug_port.value)
+               debug = new TCPStream.connect(toolcontext.opt_host_address.value.as(not null), toolcontext.opt_debug_port.value)
        else
                toolcontext.option_context.usage
                return
        end
 else
-       debug = new Socket.client("127.0.0.1", toolcontext.opt_debug_port.value)
+       debug = new TCPStream.connect("127.0.0.1", toolcontext.opt_debug_port.value)
 end
 
 print "[HOST ADDRESS] : {debug.address}"