fix addrinfo from udp and add more tests

Author: CapsAdmin

ljsocket.lua

@@ -1168,16 +1168,15 @@ do -- addrinfo
 		return addrinfos[1]
 	end
 
-	function M.addrinfo_for_receive(sockaddr_ptr, src_address, len, family)
-		return {
-			addrinfo = {
-				ai_addr = ffi.cast(sockaddr_ptr, src_address),
-				ai_addrlen = len,
-			},
-			family = family,
-			get_port = addrinfo_get_port,
-			get_ip = addrinfo_get_ip,
-		}
+	function M.addrinfo_for_receive(ai_addr, len, family)
+		-- Create a minimal addrinfo structure with the received address
+		local ai = addrinfo_out()
+		ai.ai_addr = ai_addr
+		ai.ai_addrlen = len
+		ai.ai_family = AF.strict_lookup(family)
+		
+		-- Use the existing addressinfo constructor which properly sets up the metatable
+		return M.addressinfo(ai, nil, nil)
 	end
 end
 
@@ -1483,7 +1482,7 @@ do
 
 			if src_address then
 				return ffi.string(buff, len),
-				M.addrinfo_for_receive(sockaddr_ptr, src_address, len_res[0], self.family)
+				M.addrinfo_for_receive(ffi.cast(sockaddr_ptr, src_address), len_res[0], self.family)
 			end
 
 			return ffi.string(buff, len)

test/run.lua

@@ -1,8 +1,10 @@
 require("test.dns_lookup_test")
 require("test.tcp_client_test")
 require("test.tcp_client_server")
+require("test.udp_client_server")
 
 require("examples.dns_lookup")
 require("examples.tcp_client_blocking")
 require("examples.tcp_client_nonblocking")
---require("examples.udp_client_server")
+require("examples.tcp_client_blocking_tls")
+require("examples.tcp_client_nonblocking_tls")

examples/udp_client_server.lua test/udp_client_server.luaexamples/udp_client_server.lua renamed to test/udp_client_server.lua

@@ -13,7 +13,9 @@ do -- server
 
 		if data then
 			print(data)
-			assert(server:send_to(addr, "hello from server " .. os.clock()))
+			assert(data == "hello from client")
+			assert(addr:get_port())
+			assert(server:send_to(addr, "hello from server"))
 		elseif addr ~= "timeout" then
 			error(addr)
 		end
@@ -26,23 +28,33 @@ do -- client
 	assert(client:set_blocking(false))
 	local next_send = 0
 
+	local sent = false
+	local times = 0
 	function update_client()
-		if next_send < os.clock() then
-			assert(client:send_to(send_address, "hello from client " .. os.clock()))
-			next_send = os.clock() + math.random() + 0.5
+
+		if not sent then
+			assert(client:send_to(send_address, "hello from client"))
+			sent = true
 		end
 
 		local data, addr = client:receive_from()
 
 		if data then
-			print(data, addr:get_ip(), addr:get_port())
+			print(data)
+			assert(data == "hello from server")
+			assert(addr:get_port())
+			assert(client:send_to(send_address, "hello from client"))
+			times = times + 1
+			if times > 5 then
+				return true
+			end
 		elseif addr ~= "timeout" then
 			error(addr)
 		end
 	end
 end
 
 while true do
+	if update_client() then break end
 	update_server()
-	update_client()
 end