Merge remote-tracking branch 'earl/prot-udp' into master-oldes

Author: Oldes

src/core/c-port.c

@@ -624,6 +624,7 @@ SCHEME_ACTIONS *Scheme_Actions;	// Initial Global (not threaded)
 	Init_Dir_Scheme();
 	Init_Event_Scheme();
 	Init_TCP_Scheme();
+	Init_UDP_Scheme();
 	Init_DNS_Scheme();
 #ifndef MIN_OS
 	Init_Clipboard_Scheme();

src/core/p-net.c

@@ -34,6 +34,11 @@
 
 #define NET_BUF_SIZE 32*1024
 
+enum Transport_Types {
+	TRANSPORT_TCP,
+	TRANSPORT_UDP
+};
+
 /***********************************************************************
 **
 */	static void Ret_Query_Net(REBSER *port, REBREQ *sock, REBVAL *ret)
@@ -86,10 +91,9 @@
 	OS_FREE(nsock); // allocated by dev_net.c (MT issues?)
 }
 
-
 /***********************************************************************
 **
-*/	static int TCP_Actor(REBVAL *ds, REBSER *port, REBCNT action)
+*/	static int Transport_Actor(REBVAL *ds, REBSER *port, REBCNT action, enum Transport_Types proto)
 /*
 ***********************************************************************/
 {
@@ -109,6 +113,9 @@
 	refs = 0;
 
 	sock = Use_Port_State(port, RDI_NET, sizeof(*sock));
+	if (proto == TRANSPORT_UDP) {
+		SET_FLAG(sock->modes, RST_UDP);
+	}
 	//Debug_Fmt("Sock: %x", sock);
 	spec = OFV(port, STD_PORT_SPEC);
 	if (!IS_OBJECT(spec)) Trap0(RE_INVALID_PORT);
@@ -189,7 +196,9 @@
 		// Read data into a buffer, expanding the buffer if needed.
 		// If no length is given, program must stop it at some point.
 		refs = Find_Refines(ds, ALL_READ_REFS);
-		if (!GET_FLAG(sock->state, RSM_CONNECT)) Trap_Port(RE_NOT_CONNECTED, port, -15);
+		if (!GET_FLAG(sock->modes, RST_UDP)
+				&& !GET_FLAG(sock->state, RSM_CONNECT))
+			Trap_Port(RE_NOT_CONNECTED, port, -15);
 
 		// Setup the read buffer (allocate a buffer if needed):
 		arg = OFV(port, STD_PORT_DATA);
@@ -214,7 +223,9 @@
 		// The lower level write code continues until done.
 
 		refs = Find_Refines(ds, ALL_WRITE_REFS);
-		if (!GET_FLAG(sock->state, RSM_CONNECT)) Trap_Port(RE_NOT_CONNECTED, port, -15);
+		if (!GET_FLAG(sock->modes, RST_UDP)
+				&& !GET_FLAG(sock->state, RSM_CONNECT))
+			Trap_Port(RE_NOT_CONNECTED, port, -15);
 
 		// Determine length. Clip /PART to size of string if needed.
 		spec = D_ARG(2);
@@ -293,6 +304,23 @@
 	return R_RET;
 }
 
+/***********************************************************************
+**
+*/	static int TCP_Actor(REBVAL *ds, REBSER *port, REBCNT action)
+/*
+***********************************************************************/
+{
+	return Transport_Actor(ds, port, action, TRANSPORT_TCP);
+}
+
+/***********************************************************************
+**
+*/	static int UDP_Actor(REBVAL *ds, REBSER *port, REBCNT action)
+/*
+***********************************************************************/
+{
+	return Transport_Actor(ds, port, action, TRANSPORT_UDP);
+}
 
 /***********************************************************************
 **
@@ -302,3 +330,11 @@
 {
 	Register_Scheme(SYM_TCP, 0, TCP_Actor);
 }
+/***********************************************************************
+**
+*/	void Init_UDP_Scheme(void)
+/*
+***********************************************************************/
+{
+	Register_Scheme(SYM_UDP, 0, UDP_Actor);
+}

src/mezz/sys-ports.r

@@ -261,6 +261,14 @@ init-schemes: func [
 		awake: func [event] [print ['TCP-event event/type] true]
 	]
 
+	make-scheme [
+		title: "UDP Networking"
+		name: 'udp
+		spec: system/standard/port-spec-net
+		info: system/standard/net-info ; for C enums
+		awake: func [event] [print ['UDP-event event/type] true]
+	]
+
 	make-scheme [
 		title: "Clipboard"
 		name: 'clipboard

src/os/dev-net.c

@@ -57,6 +57,7 @@ void Signal_Device(REBREQ *req, REBINT type);
 DEVICE_CMD Listen_Socket(REBREQ *sock);
 
 #ifdef TO_WIN32
+typedef int socklen_t;
 extern HWND Event_Handle; // For WSAAsync API
 #endif
 
@@ -356,6 +357,14 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 
 	if (GET_FLAG(sock->state, RSM_CONNECT)) return DR_DONE; // already connected
 
+	if (GET_FLAG(sock->modes, RST_UDP)) {
+		CLR_FLAG(sock->state, RSM_ATTEMPT);
+		SET_FLAG(sock->state, RSM_CONNECT);
+		Get_Local_IP(sock);
+		Signal_Device(sock, EVT_CONNECT);
+		return DR_DONE; // done
+	}
+
 	Set_Addr(&sa, sock->net.remote_ip, sock->net.remote_port);
 	result = connect(sock->socket, (struct sockaddr *)&sa, sizeof(sa));
 
@@ -422,9 +431,12 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 {
 	int result;
 	long len;
+	SOCKAI remote_addr;
+	socklen_t addr_len = sizeof(remote_addr);
 	int mode = (sock->command == RDC_READ ? RSM_RECEIVE : RSM_SEND);
 
-	if (!GET_FLAG(sock->state, RSM_CONNECT)) {
+	if (!GET_FLAG(sock->state, RSM_CONNECT)
+			&& !GET_FLAG(sock->modes, RST_UDP)) {
 		sock->error = -18;
 		return DR_ERROR;
 	}
@@ -436,7 +448,11 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 
 	if (mode == RSM_SEND) {
 		// If host is no longer connected:
-		result = send(sock->socket, sock->data, len, 0);
+		if (GET_FLAG(sock->modes, RST_UDP)) {
+			Set_Addr(&remote_addr, sock->net.remote_ip, sock->net.remote_port);
+		}
+		result = sendto(sock->socket, sock->data, len, 0,
+						(struct sockaddr*)&remote_addr, addr_len);
 		WATCH2("send() len: %d actual: %d\n", len, result);
 
 		if (result >= 0) {
@@ -451,10 +467,15 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 		// if (result < 0) ...
 	}
 	else {
-		result = recv(sock->socket, sock->data, len, 0);
+		result = recvfrom(sock->socket, sock->data, len, 0,
+						  (struct sockaddr*)&remote_addr, &addr_len);
 		WATCH2("recv() len: %d result: %d\n", len, result);
 
 		if (result > 0) {
+			if (GET_FLAG(sock->modes, RST_UDP)) {
+				sock->net.remote_ip = remote_addr.sin_addr.s_addr;
+				sock->net.remote_port = ntohs(remote_addr.sin_port);
+			}
 			sock->actual = result;
 			Signal_Device(sock, EVT_READ);
 			return DR_DONE;