X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Facess2.git;a=blobdiff_plain;f=Usermode%2FLibraries%2Flibnet.so_src%2Fsocket.c;fp=Usermode%2FLibraries%2Flibnet.so_src%2Fsocket.c;h=825dc6fe274a2011bd56f61d01748205799db0d5;hp=85f7e54f28944711b7f026a280625bf3ccd94db7;hb=845b6f9d90bb87b5e760e4d49aa93b0e003ab750;hpb=67a7fe2bb79eceaf10c572a99bd8345c4e81cf5b

diff --git a/Usermode/Libraries/libnet.so_src/socket.c b/Usermode/Libraries/libnet.so_src/socket.c
index 85f7e54f..825dc6fe 100644
--- a/Usermode/Libraries/libnet.so_src/socket.c
+++ b/Usermode/Libraries/libnet.so_src/socket.c
@@ -8,17 +8,28 @@
 #include <net.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <string.h>	// memcpy
 #include <acess/sys.h>
 
-int Net_OpenSocket(int AddrType, void *Addr, const char *Filename)
+enum {
+	UDP_IOCTL_GETSETLPORT = 4,
+	UDP_IOCTL_GETSETRPORT,
+	UDP_IOCTL_GETSETRMASK,
+	UDP_IOCTL_SETRADDR,
+	UDP_IOCTL_SENDTO,
+	UDP_IOCTL_RECVFROM,
+};
+
+int Net_OpenSocket(int AddrType, const void *Addr, const char *Filename)
 {
 	 int	addrLen = Net_GetAddressSize(AddrType);
-	 int	i;
-	uint8_t	*addrBuffer = Addr;
 	char	hexAddr[addrLen*2+1];
 	
-	for( i = 0; i < addrLen; i ++ )
-		sprintf(hexAddr+i*2, "%02x", addrBuffer[i]);
+	{
+		const uint8_t	*addrBuffer = Addr;
+		for( unsigned int i = 0; i < addrLen; i ++ )
+			sprintf(hexAddr+i*2, "%02x", addrBuffer[i]);
+	}
 	
 	if(Filename)
 	{
@@ -37,14 +48,82 @@ int Net_OpenSocket(int AddrType, void *Addr, const char *Filename)
 	}
 }
 
-int Net_OpenSocket_TCPC(int AddrType, void *Addr, int Port)
+int Net_OpenSocket_TCPC(int AddrType, const void *Addr, int Port)
 {
 	int fd = Net_OpenSocket(AddrType, Addr, "tcpc");
 	if( fd == -1 )	return -1;
 	
-	_SysIOCtl(fd, 5, &Port);	// Remote Port
-        _SysIOCtl(fd, 6, Addr);	// Remote address
-	_SysIOCtl(fd, 7, NULL);	// connect
+	if( _SysIOCtl(fd, 5, &Port) < 0 )	// Remote Port
+		goto err;
+	if( _SysIOCtl(fd, 6, (void*)Addr) < 0 )	// Remote address (kernel shouldn't modify)
+		goto err;
+	if( _SysIOCtl(fd, 7, NULL) < 0)	// connect
+		goto err;
+	return fd;
+err:
+	_SysClose(fd);
+	return -1;
+}
+
+int Net_OpenSocket_UDP(int AddrType, const void *Addr, int RPort, int LPort)
+{
+	int fd = Net_OpenSocket(AddrType, Addr, "udp");
+	if( fd == -1 )	return -1;
+	
+	if( _SysIOCtl(fd, UDP_IOCTL_GETSETLPORT, &LPort) < 0 )
+		goto err;
+	if( _SysIOCtl(fd, UDP_IOCTL_GETSETRPORT, &RPort) < 0 )
+		goto err;
+	int maskbits = Net_GetAddressSize(AddrType) * 8;
+	if( _SysIOCtl(fd, UDP_IOCTL_GETSETRMASK, &maskbits) < 0 )
+		goto err;
+	if( _SysIOCtl(fd, UDP_IOCTL_SETRADDR, (void*)Addr) < 0 )	// Remote address (kernel shouldn't modify)
+		goto err;
 	return fd;
+err:
+	_SysClose(fd);
+	return -1;
+}
+
+int Net_UDP_SendTo(int FD, int Port, int AddrType, const void *Addr, size_t Length, const void *Data)
+{
+	struct {
+		uint16_t port;
+		uint16_t addr_type;
+		char	addr[16];
+	} ep;
+	ep.port = Port;
+	ep.addr_type = AddrType;
+	memcpy(ep.addr, Addr, Net_GetAddressSize(AddrType));
+	struct {
+		const void *ep;
+		const void *buf;
+		uint16_t len;
+	} info = { .ep = &ep, .buf = Data, .len = Length };
+	
+	return _SysIOCtl(FD, UDP_IOCTL_SENDTO, &info);
+}
+
+int Net_UDP_RecvFrom(int FD, int* Port, int* AddrType, void *Addr, size_t Length, void *Data)
+{
+	struct {
+		uint16_t port;
+		uint16_t addr_type;
+		char	addr[16];
+	} ep;
+	struct {
+		void *ep;
+		void *buf;
+		uint16_t len;
+	} info = { .ep = &ep, .buf = Data, .len = Length };
+	
+	int rv = _SysIOCtl(FD, UDP_IOCTL_RECVFROM, &info);
+	if( rv > 0 )
+	{
+		if(Port)	*Port = ep.port;
+		if(AddrType)	*AddrType = ep.addr_type;
+		if(Addr)	memcpy(Addr, ep.addr, Net_GetAddressSize(ep.addr_type));
+	}
+	return rv;
 }