X-Git-Url: http://nitlanguage.org

diff --git a/lib/socket/socket.nit b/lib/socket/socket.nit
index a665b41..2d17656 100644
--- a/lib/socket/socket.nit
+++ b/lib/socket/socket.nit
@@ -18,13 +18,30 @@
 module socket
 
 private import socket_c
-intrude import standard::stream
+intrude import core::stream
 
-# A general TCP socket, either a `TCPStream` or a `TCPServer`
+# A general Socket, either TCP or UDP
 abstract class Socket
 
 	# Underlying C socket
-	private var socket: NativeSocket is noinit
+	private var native: NativeSocket is noinit
+
+	# Is this socket closed?
+	var closed = false
+
+	# Set whether calls to `accept` are blocking
+	fun blocking=(value: Bool)
+	do
+		# We use the opposite from the native version as the native API
+		# is closer to the C API. In the Nity API, we use a positive version
+		# of the name.
+		native.non_blocking = not value
+	end
+end
+
+# A general TCP socket, either a `TCPStream` or a `TCPServer`
+abstract class TCPSocket
+	super Socket
 
 	# Port used by the socket
 	var port: Int
@@ -33,14 +50,11 @@ abstract class Socket
 	#
 	# Formatted as xxx.xxx.xxx.xxx.
 	var address: String is noinit
-
-	# Is this socket closed?
-	var closed = false
 end
 
 # Simple communication stream with a remote socket
 class TCPStream
-	super Socket
+	super TCPSocket
 	super BufferedReader
 	super Writer
 	super PollableReader
@@ -57,40 +71,59 @@ class TCPStream
 	# Creates a socket connection to host `host` on port `port`
 	init connect(host: String, port: Int)
 	do
-		_buffer = new NativeString(1024)
+		_buffer = new CString(1024)
 		_buffer_pos = 0
-		socket = new NativeSocket.socket(new NativeSocketAddressFamilies.af_inet,
+		native = new NativeSocket.socket(new NativeSocketAddressFamilies.af_inet,
 			new NativeSocketTypes.sock_stream, new NativeSocketProtocolFamilies.pf_null)
-		if socket.address_is_null then
+		if native.address_is_null then
 			end_reached = true
 			closed = true
 			return
 		end
-		if not socket.setsockopt(new NativeSocketOptLevels.socket, new NativeSocketOptNames.reuseaddr, 1) then
+		if not native.setsockopt(new NativeSocketOptLevels.socket, new NativeSocketOptNames.reuseaddr, 1) then
 			end_reached = true
 			closed = true
 			return
 		end
-		var hostname = socket.gethostbyname(host)
-		addrin = new NativeSocketAddrIn.with_hostent(hostname, port)
 
-		address = addrin.address
-		init(addrin.port, hostname.h_name)
+		var hostent = sys.gethostbyname(host.to_cstring)
+		if hostent.address_is_null then
+			# Error in name lookup
+			last_error = new IOError.from_h_errno
+
+			closed = true
+			end_reached = true
+
+			return
+		end
+
+		addrin = new NativeSocketAddrIn
+		addrin.fill_from_hostent hostent
+		addrin.port = port
+
+		address = addrin.address.to_s
+		init(addrin.port, hostent.h_name.to_s)
 
 		closed = not internal_connect
 		end_reached = closed
+		if closed then
+			# Connection failed
+			last_error = new IOError.from_errno
+		end
+
+		prepare_buffer(1024)
 	end
 
 	# Creates a client socket, this is meant to be used by accept only
 	private init server_side(h: SocketAcceptResult)
 	do
-		_buffer = new NativeString(1024)
-		_buffer_pos = 0
-		socket = h.socket
+		native = h.socket
 		addrin = h.addr_in
-		address = addrin.address
+		address = addrin.address.to_s
 
 		init(addrin.port, address)
+
+		prepare_buffer(1024)
 	end
 
 	redef fun poll_in do return ready_to_read(0)
@@ -102,7 +135,7 @@ class TCPStream
 	# timeout : Time in milliseconds before stopping listening for events on this socket
 	private fun pollin(event_types: Array[NativeSocketPollValues], timeout: Int): Array[NativeSocketPollValues] do
 		if end_reached then return new Array[NativeSocketPollValues]
-		return socket.socket_poll(new PollFD(socket.descriptor, event_types), timeout)
+		return native.socket_poll(new PollFD(native.descriptor, event_types), timeout)
 	end
 
 	# Easier use of pollin to check for something to read on all channels of any priority
@@ -116,12 +149,11 @@ class TCPStream
 		return pollin(events, timeout).length != 0
 	end
 
-	# Checks if the socket still is connected
+	# Is this socket still connected?
 	fun connected: Bool
 	do
 		if closed then return false
-		var events = [new NativeSocketPollValues.pollhup, new NativeSocketPollValues.pollerr]
-		if pollin(events, 0).length == 0 then
+		if native.poll_hup_err == 0 then
 			return true
 		else
 			closed = true
@@ -137,53 +169,54 @@ class TCPStream
 	private fun internal_connect: Bool
 	do
 		assert not closed
-		return socket.connect(addrin) >= 0
+		return native.connect(addrin) >= 0
 	end
 
 	# If socket.end_reached, nothing will happen
 	redef fun write(msg)
 	do
 		if closed then return
-		socket.write(msg.to_s)
+		native.write(msg.to_cstring, msg.length)
 	end
 
 	redef fun write_byte(value)
 	do
 		if closed then return
-		socket.write_byte value
+		native.write_byte value
 	end
 
-	redef fun write_bytes(s) do
+	redef fun write_bytes(bytes) do
 		if closed then return
-		socket.write(s.to_s)
+		var s = bytes.to_s
+		native.write(s.to_cstring, s.length)
 	end
 
 	fun write_ln(msg: Text)
 	do
-		if end_reached then return
-		write(msg.to_s)
-		write("\n")
+		if closed then return
+		write msg.to_s
+		write "\n"
 	end
 
 	redef fun fill_buffer
 	do
-		_buffer_length = 0
-		_buffer_pos = 0
 		if not connected then return
-		var read = socket.read
-		if read.length == 0 then
+
+		var read = native.read(_buffer, _buffer_capacity)
+		if read == -1 then
 			close
 			end_reached = true
 		end
-		enlarge(_buffer_capacity + read.length)
-		read.copy_to_native(_buffer, read.length, 0, 0)
-		_buffer_length = read.length
+
+		_buffer_length = read
+		_buffer_pos = 0
 	end
 
 	fun enlarge(len: Int) do
 		if _buffer_capacity >= len then return
-		while _buffer_capacity < len do _buffer_capacity *= 2
-		var ns = new NativeString(_buffer_capacity)
+		_buffer_capacity = len
+
+		var ns = new CString(_buffer_capacity)
 		_buffer.copy_to(ns, _buffer_length - _buffer_pos, _buffer_pos, 0)
 		_buffer = ns
 	end
@@ -191,7 +224,7 @@ class TCPStream
 	redef fun close
 	do
 		if closed then return
-		if socket.close >= 0 then
+		if native.close >= 0 then
 			closed = true
 			end_reached = true
 		end
@@ -200,8 +233,8 @@ class TCPStream
 	# Send the data present in the socket buffer
 	fun flush
 	do
-		if not socket.setsockopt(new NativeSocketOptLevels.tcp, new NativeSocketOptNames.tcp_nodelay, 1) or
-		   not socket.setsockopt(new NativeSocketOptLevels.tcp, new NativeSocketOptNames.tcp_nodelay, 0) then
+		if not native.setsockopt(new NativeSocketOptLevels.tcp, new NativeSocketOptNames.tcp_nodelay, 1) or
+		   not native.setsockopt(new NativeSocketOptLevels.tcp, new NativeSocketOptNames.tcp_nodelay, 0) then
 			closed = true
 		end
 	end
@@ -211,22 +244,27 @@ end
 #
 # Create streams to communicate with clients using `accept`.
 class TCPServer
-	super Socket
+	super TCPSocket
 
 	private var addrin: NativeSocketAddrIn is noinit
 
 	# Create and bind a listening server socket on port `port`
 	init
 	do
-		socket = new NativeSocket.socket(new NativeSocketAddressFamilies.af_inet,
+		native = new NativeSocket.socket(new NativeSocketAddressFamilies.af_inet,
 			new NativeSocketTypes.sock_stream, new NativeSocketProtocolFamilies.pf_null)
-		assert not socket.address_is_null
-		if not socket.setsockopt(new NativeSocketOptLevels.socket, new NativeSocketOptNames.reuseaddr, 1) then
+		assert not native.address_is_null
+		if not native.setsockopt(new NativeSocketOptLevels.socket, new NativeSocketOptNames.reuseaddr, 1) then
 			closed = true
 			return
 		end
-		addrin = new NativeSocketAddrIn.with_port(port, new NativeSocketAddressFamilies.af_inet)
-		address = addrin.address
+
+		addrin = new NativeSocketAddrIn
+		addrin.family = new NativeSocketAddressFamilies.af_inet
+		addrin.port = port
+		addrin.address_any
+
+		address = addrin.address.to_s
 
 		# Bind it
 		closed = not bind
@@ -236,14 +274,14 @@ class TCPServer
 	#
 	# Returns whether the socket has been be bound.
 	private fun bind: Bool do
-		return socket.bind(addrin) >= 0
+		return native.bind(addrin) >= 0
 	end
 
 	# Sets the socket as ready to accept incoming connections, `size` is the maximum number of queued clients
 	#
 	# Returns `true` if the socket could be set, `false` otherwise
 	fun listen(size: Int): Bool do
-		return socket.listen(size) >= 0
+		return native.listen(size) >= 0
 	end
 
 	# Accepts an incoming connection from a client
@@ -256,27 +294,18 @@ class TCPServer
 	fun accept: nullable TCPStream
 	do
 		assert not closed
-		var native = socket.accept
+		var native = native.accept
 		if native == null then return null
 		return new TCPStream.server_side(native)
 	end
 
-	# Set whether calls to `accept` are blocking
-	fun blocking=(value: Bool)
-	do
-		# We use the opposite from the native version as the native API
-		# is closer to the C API. In the Nity API, we use a positive version
-		# of the name.
-		socket.non_blocking = not value
-	end
-
 	# Close this socket
 	fun close
 	do
 		# FIXME unify with `SocketStream::close` when we can use qualified names
 
 		if closed then return
-		if socket.close >= 0 then
+		if native.close >= 0 then
 			closed = true
 		end
 	end
@@ -289,13 +318,13 @@ class SocketSet
 	init do clear
 
 	# Add `socket` to this set
-	fun add(socket: Socket) do native.set(socket.socket)
+	fun add(socket: Socket) do native.set(socket.native)
 
 	# Remove `socket` from this set
-	fun remove(socket: Socket) do native.clear(socket.socket)
+	fun remove(socket: Socket) do native.clear(socket.native)
 
 	# Does this set has `socket`?
-	fun has(socket: Socket): Bool do return native.is_set(socket.socket)
+	fun has(socket: Socket): Bool do return native.is_set(socket.native)
 
 	# Clear all sockets from this set
 	fun clear do native.zero
@@ -324,6 +353,167 @@ class SocketObserver
 		# `NativeSockectObserver::select` is not stable.
 
 		var timeval = new NativeTimeval(seconds, microseconds)
-		return native.select(max.socket, read_set.native, write_set.native, except_set.native, timeval) > 0
+		return native.select(max.native, read_set.native, write_set.native, except_set.native, timeval) > 0
+	end
+end
+
+# Socket over UDP, sends and receive data without the need for a connection
+class UDPSocket
+	super Socket
+
+	# Last error raised by this socket
+	var error: nullable Error = null
+
+	init do native = new NativeSocket.socket(
+			new NativeSocketAddressFamilies.af_inet,
+			new NativeSocketTypes.sock_dgram,
+			new NativeSocketProtocolFamilies.pf_null)
+
+	# Bind this socket to an `address`, on `port` (to all addresses if `null`)
+	#
+	# On error, sets `error` appropriately.
+	fun bind(address: nullable Text, port: Int)
+	do
+		var addr_in = new NativeSocketAddrIn
+		addr_in.port = port
+		if address != null then
+			# FIXME replace all use of gethostbyname with something not obsolete
+			var hostent = sys.gethostbyname(address.to_cstring)
+			if hostent.address_is_null then
+				error = new IOError.from_h_errno
+				addr_in.free
+				return
+			end
+
+			addr_in.fill_from_hostent hostent
+		else
+			addr_in.family = new NativeSocketAddressFamilies.af_inet
+			addr_in.address_any
+		end
+
+		if native.bind(addr_in) != 0 then error = new IOError.from_errno
+
+		addr_in.free
+	end
+
+	# Receive `length` bytes of data from any sender
+	#
+	# On error, returns an empty string and sets `error` appropriately.
+	fun recv(length: Int): String
+	do
+		var buf = new CString(length)
+		var len = native.recvfrom(buf, length, 0, new NativeSocketAddrIn.nul)
+		if len == -1 then
+			error = new IOError.from_errno
+			return ""
+		end
+		return buf.to_s_with_length(len)
+	end
+
+	# Receive `length` bytes of data from any sender and store the sender info in `sender.item`
+	#
+	# On error, returns an empty string and sets `error` appropriately.
+	fun recv_from(length: Int, sender: Ref[nullable SocketAddress]): String
+	do
+		var src = new NativeSocketAddrIn
+		var buf = new CString(length)
+
+		var len = native.recvfrom(buf, length, 0, src)
+		if len == -1 then
+			error = new IOError.from_errno
+			src.free
+			return ""
+		end
+
+		sender.item = new SocketAddress(src)
+		return buf.to_s_with_length(len)
+	end
+
+	# Send `data` to `dest_address` on `port`
+	#
+	# On error, sets `error` appropriately.
+	fun send_to(dest_address: Text, port: Int, data: Text)
+	do
+		var hostent = sys.gethostbyname(dest_address.to_cstring)
+		if hostent.address_is_null then
+			error = new IOError.from_h_errno
+			return
+		end
+
+		var dest = new NativeSocketAddrIn
+		dest.fill_from_hostent hostent
+		dest.port = port
+		native.setsockopt(new NativeSocketOptLevels.socket, new NativeSocketOptNames.broadcast, 1)
+
+		var buf = data.to_cstring
+		if native.sendto(buf, data.length, 0, dest) == -1 then
+			error = new IOError.from_errno
+		end
+		dest.free
 	end
+
+	# Enable broadcasting for this socket
+	#
+	# On error, sets `error` appropriately.
+	fun enable_broadcast=(value: Bool) do
+		var res = native.setsockopt(new NativeSocketOptLevels.socket, new NativeSocketOptNames.broadcast, value.to_i)
+		if res == -1 then error = new IOError.from_errno
+	end
+
+	# Broadcast `data` on the network on `port`
+	#
+	# On error, sets `error` appropriately.
+	#
+	# Require: setting `enable_broadcast = true`
+	fun broadcast(port: Int, data: Text)
+	do
+		var addr_in = new NativeSocketAddrIn
+		addr_in.port = port
+		addr_in.family = new NativeSocketAddressFamilies.af_inet
+		addr_in.address_broadcast
+
+		var buf = data.to_cstring
+		if native.sendto(buf, data.length, 0, addr_in) == -1 then
+			error = new IOError.from_errno
+		end
+
+		addr_in.free
+	end
+end
+
+# Address of a socket in the Internet namespace
+#
+# Used in one of the out parameters of `UDPSocket::recv_from`.
+class SocketAddress
+	super FinalizableOnce
+
+	# FIXME make init private
+
+	private var native: NativeSocketAddrIn
+
+	init
+	do
+		address = native.address.to_s
+		port = native.port
+	end
+
+	# Internet address
+	var address: String is noinit
+
+	# Port of the socket
+	var port: Int is noinit
+
+	redef fun ==(o) do return o isa SocketAddress and o.address == address and o.port == port
+
+	redef fun finalize_once do native.free
+end
+
+redef class IOError
+	# Fill a new `IOError` from the message of `errno`
+	init from_errno do init errno.strerror
+
+	# Fill a new `IOError` from the message of `h_errno`
+	#
+	# Used with `gethostbyname`.
+	init from_h_errno do init h_errno.to_s
 end