Improved tcp server example

Author: britzl

README.md

@@ -73,16 +73,16 @@ Once discovery has been completed communication can take place over a socket of
 The `defnet/tcp_server` module can be used to create a TCP socket server that accepts incoming TCP client connections and can send and receive data. Example:
 
 ```
-local function on_data(data, ip)
+local function on_data(data, ip, port, client)
 	print("Received", data, "from", ip)
 	return "My response"
 end
 
-local function on_client_connected(ip)
+local function on_client_connected(ip, port, client)
 	print("Client", ip, "connected")
 end
 
-local function on_client_disconnected(ip)
+local function on_client_disconnected(ip, port, client)
 	print("Client", ip, "disconnected")
 end
 

defnet/tcp_server.lua

@@ -4,16 +4,16 @@
 --
 -- @usage
 --
---	local function on_data(data, ip)
+--	local function on_data(data, ip, port, client)
 --		print("Received", data, "from", ip)
 --		return "My response"
 --	end
 --	
---	local function on_client_connected(ip)
+--	local function on_client_connected(ip, port, client)
 --		print("Client", ip, "connected")
 --	end
 --	
---	local function on_client_disconnected(ip)
+--	local function on_client_disconnected(ip, port, client)
 --		print("Client", ip, "disconnected")
 --	end
 --	
@@ -69,7 +69,7 @@ function M.create(port, on_data, on_client_connected, on_client_disconnected)
 				queues[connection_to_remove] = nil
 				if on_client_disconnected then
 					local client_ip, client_port = connection:getsockname()
-					on_client_disconnected(client_ip, client_port)
+					on_client_disconnected(client_ip, client_port, connection)
 				end
 				break
 			end
@@ -144,7 +144,7 @@ function M.create(port, on_data, on_client_connected, on_client_disconnected)
 			queues[client] = tcp_send_queue.create(client, M.TCP_SEND_CHUNK_SIZE)
 			if on_client_connected then
 				local client_ip, client_port = client:getsockname()
-				on_client_connected(client_ip, client_port)
+				on_client_connected(client_ip, client_port, client)
 			end
 		end
 
@@ -155,7 +155,7 @@ function M.create(port, on_data, on_client_connected, on_client_disconnected)
 				local data, err = server.receive(client)
 				if data and on_data then
 					local client_ip, client_port = client:getsockname()
-					local response = on_data(data, client_ip, client_port, function(response)
+					local response = on_data(data, client_ip, client_port, client, function(response)
 						if not queues[client] then
 							return false
 						end

examples/tcp_server/tcp_server.gui_script

@@ -3,17 +3,27 @@ local dirtylarry = require "gooey.themes.dirtylarry.dirtylarry"
 
 local TCP_SERVER_PORT = 5555
 
+local function on_data(data, ip, port, client)
+	print("TCP server received data '" .. data .. "' from " .. ip .. ":" .. port)
+	local logo = gui.get_node("logo")
+	gui.animate(logo, "rotation.z", gui.get_rotation(logo).z -360, gui.EASING_INOUTEXPO, 2, 0, nil, gui.PLAYBACK_ONCE_FORWARD)
+end
+
+local function on_client_connected(ip, port, client)
+	print("Client connected from " .. ip .. ":" .. port)
+end
+
+local function on_client_disconnected(ip, port, client)
+	print("Client discconnected from " .. ip .. ":" .. port)
+end
+
 function init(self)
 	msg.post(".", "acquire_input_focus")
 
-	local logo = gui.get_node("logo")
 	dirtylarry.set_enabled(dirtylarry.button("stop"), false)
 	dirtylarry.set_enabled(dirtylarry.button("broadcast"), false)
 
-	self.tcp_server = tcp_server.create(TCP_SERVER_PORT, function(data, ip, port)
-		print("TCP server received data '" .. data .. "' from " .. ip .. ":" .. port)
-		gui.animate(logo, "rotation.z", gui.get_rotation(logo).z -360, gui.EASING_INOUTEXPO, 2, 0, nil, gui.PLAYBACK_ONCE_FORWARD)
-	end)
+	self.tcp_server = tcp_server.create(TCP_SERVER_PORT, on_data, on_client_connected, on_client_disconnected)
 end
 
 function final(self)