X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibnet.so_src%2Fsocket.c;h=85f7e54f28944711b7f026a280625bf3ccd94db7;hb=5b487e31cf5145372e9777e9f82a8cd661d4f1b4;hp=0b54079329a1759d6412323d4d4c6269b4c181a8;hpb=d0b4559f2936f6d9f06be0f7c3c51527a480ec0d;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libnet.so_src/socket.c b/Usermode/Libraries/libnet.so_src/socket.c
index 0b540793..85f7e54f 100644
--- a/Usermode/Libraries/libnet.so_src/socket.c
+++ b/Usermode/Libraries/libnet.so_src/socket.c
@@ -22,18 +22,18 @@ int Net_OpenSocket(int AddrType, void *Addr, const char *Filename)
 	
 	if(Filename)
 	{
-		 int	len = snprintf(NULL, 100, "/Devices/ip/routes/@%i:%s/%s", AddrType, hexAddr, Filename);
+		 int	len = snprintf(NULL, 0, "/Devices/ip/routes/@%i:%s/%s", AddrType, hexAddr, Filename);
 		char	path[len+1];
-		snprintf(path, 100, "/Devices/ip/routes/@%i:%s/%s", AddrType, hexAddr, Filename);
+		snprintf(path, len+1, "/Devices/ip/routes/@%i:%s/%s", AddrType, hexAddr, Filename);
 		_SysDebug("%s", path);
-		return open(path, OPENFLAG_READ|OPENFLAG_WRITE);
+		return _SysOpen(path, OPENFLAG_READ|OPENFLAG_WRITE);
 	}
 	else
 	{
-		 int	len = snprintf(NULL, 100, "/Devices/ip/routes/@%i:%s", AddrType, hexAddr);
+		 int	len = snprintf(NULL, 0, "/Devices/ip/routes/@%i:%s", AddrType, hexAddr);
 		char	path[len+1];
-		snprintf(path, 100, "/Devices/ip/routes/@%i:%s", AddrType, hexAddr);
-		return open(path, OPENFLAG_READ);
+		snprintf(path, len+1, "/Devices/ip/routes/@%i:%s", AddrType, hexAddr);
+		return _SysOpen(path, OPENFLAG_READ);
 	}
 }
 
@@ -42,9 +42,9 @@ int Net_OpenSocket_TCPC(int AddrType, void *Addr, int Port)
 	int fd = Net_OpenSocket(AddrType, Addr, "tcpc");
 	if( fd == -1 )	return -1;
 	
-	ioctl(fd, 5, &Port);	// Remote Port
-        ioctl(fd, 6, Addr);	// Remote address
-	ioctl(fd, 7, NULL);	// connect
+	_SysIOCtl(fd, 5, &Port);	// Remote Port
+        _SysIOCtl(fd, 6, Addr);	// Remote address
+	_SysIOCtl(fd, 7, NULL);	// connect
 	return fd;
 }