move wii network error translation

Author: WinterMute

gc/network.h

@@ -159,6 +159,8 @@ void net_wc24cleanup(void);
 s32 net_get_mac_address(void *mac_buf);
 void net_deinit(void);
 
+s32 _net_convert_error(s32 ios_retval);
+
 u32 net_gethostip(void);
 s32 net_socket(u32 domain,u32 type,u32 protocol);
 s32 net_bind(s32 s,struct sockaddr *name,socklen_t namelen);

libogc/CMakeLists.txt

@@ -7,6 +7,8 @@ add_library(ogc STATIC
 	lwpcompat/lwpc_sem.c
 	lwpcompat/lwpc_mq.c
 
+	ogc_sockets/soc_common.c
+
 	console.c
 	lwp_queue.c
 	lwp_wkspace.c

libogc/network_wii.c

@@ -69,7 +69,6 @@ distribution.
 #define IOCTL_NCD_GETLINKSTATUS		0x07
 #define IOCTLV_NCD_GETMACADDRESS    0x08
 
-#define NET_UNKNOWN_ERROR_OFFSET	-10000
 
 #define IOCTLV_SO_GETINTERFACEOPT_LEVEL 0x0000FFFE;
 
@@ -191,87 +190,6 @@ struct getinterfaceopt_iproute{
 	u64 ticks;
 };
 
-// 0 means we don't know what this error code means
-// I sense a pattern here...
-static u8 _net_error_code_map[] = {
-	0, // 0
- 	E2BIG,
- 	EACCES,
- 	EADDRINUSE,
- 	EADDRNOTAVAIL,
- 	EAFNOSUPPORT, // 5
-	EAGAIN,
-	EALREADY,
-	EBADFD,
- 	EBADMSG,
- 	EBUSY, // 10
- 	ECANCELED,
- 	ECHILD,
- 	ECONNABORTED,
- 	ECONNREFUSED,
- 	ECONNRESET, // 15
- 	EDEADLK,
- 	EDESTADDRREQ,
- 	EDOM,
- 	EDQUOT,
- 	EEXIST, // 20
- 	EFAULT,
- 	EFBIG,
- 	EHOSTUNREACH,
- 	EIDRM,
- 	EILSEQ, // 25
-	EINPROGRESS,
- 	EINTR,
- 	EINVAL,
- 	EIO,
-	EISCONN, // 30
- 	EISDIR,
- 	ELOOP,
- 	EMFILE,
- 	EMLINK,
- 	EMSGSIZE, // 35
- 	EMULTIHOP,
- 	ENAMETOOLONG,
- 	ENETDOWN,
- 	ENETRESET,
- 	ENETUNREACH, // 40
- 	ENFILE,
- 	ENOBUFS,
- 	ENODATA,
- 	ENODEV,
- 	ENOENT, // 45
- 	ENOEXEC,
- 	ENOLCK,
- 	ENOLINK,
- 	ENOMEM,
- 	ENOMSG, // 50
- 	ENOPROTOOPT,
- 	ENOSPC,
- 	ENOSR,
- 	ENOSTR,
- 	ENOSYS, // 55
- 	ENOTCONN,
- 	ENOTDIR,
- 	ENOTEMPTY,
- 	ENOTSOCK,
- 	ENOTSUP, // 60
- 	ENOTTY,
- 	ENXIO,
- 	EOPNOTSUPP,
- 	EOVERFLOW,
- 	EPERM, // 65
- 	EPIPE,
- 	EPROTO,
- 	EPROTONOSUPPORT,
- 	EPROTOTYPE,
- 	ERANGE, // 70
- 	EROFS,
- 	ESPIPE,
- 	ESRCH,
- 	ESTALE,
- 	ETIME, // 75
- 	ETIMEDOUT,
-};
 
 static const s32 maxblocksize = (NET_HEAP_SIZE/2);
 static volatile bool _init_busy = false;
@@ -324,16 +242,6 @@ static BOOL net_free(void *ptr)
 	return __lwp_heap_free(&__net_heap, ptr);
 }
 
-static s32 _net_convert_error(s32 ios_retval)
-{
-//	return ios_retval;
-	if (ios_retval >= 0) return ios_retval;
-	if (ios_retval < -sizeof(_net_error_code_map)
-		|| !_net_error_code_map[-ios_retval])
-			return NET_UNKNOWN_ERROR_OFFSET + ios_retval;
-	return -_net_error_code_map[-ios_retval];
-}
-
 u32 net_gethostip(void)
 {
 	u32 ip_addr=0;

libogc/ogc_sockets/soc_common.c

@@ -0,0 +1,96 @@
+#include "soc_common.h"
+
+
+#define NET_UNKNOWN_ERROR_OFFSET	-10000
+
+// 0 means we don't know what this error code means
+// I sense a pattern here...
+static u8 _net_error_code_map[] = {
+	0, // 0
+ 	E2BIG,
+ 	EACCES,
+ 	EADDRINUSE,
+ 	EADDRNOTAVAIL,
+ 	EAFNOSUPPORT, // 5
+	EAGAIN,
+	EALREADY,
+	EBADFD,
+ 	EBADMSG,
+ 	EBUSY, // 10
+ 	ECANCELED,
+ 	ECHILD,
+ 	ECONNABORTED,
+ 	ECONNREFUSED,
+ 	ECONNRESET, // 15
+ 	EDEADLK,
+ 	EDESTADDRREQ,
+ 	EDOM,
+ 	EDQUOT,
+ 	EEXIST, // 20
+ 	EFAULT,
+ 	EFBIG,
+ 	EHOSTUNREACH,
+ 	EIDRM,
+ 	EILSEQ, // 25
+	EINPROGRESS,
+ 	EINTR,
+ 	EINVAL,
+ 	EIO,
+	EISCONN, // 30
+ 	EISDIR,
+ 	ELOOP,
+ 	EMFILE,
+ 	EMLINK,
+ 	EMSGSIZE, // 35
+ 	EMULTIHOP,
+ 	ENAMETOOLONG,
+ 	ENETDOWN,
+ 	ENETRESET,
+ 	ENETUNREACH, // 40
+ 	ENFILE,
+ 	ENOBUFS,
+ 	ENODATA,
+ 	ENODEV,
+ 	ENOENT, // 45
+ 	ENOEXEC,
+ 	ENOLCK,
+ 	ENOLINK,
+ 	ENOMEM,
+ 	ENOMSG, // 50
+ 	ENOPROTOOPT,
+ 	ENOSPC,
+ 	ENOSR,
+ 	ENOSTR,
+ 	ENOSYS, // 55
+ 	ENOTCONN,
+ 	ENOTDIR,
+ 	ENOTEMPTY,
+ 	ENOTSOCK,
+ 	ENOTSUP, // 60
+ 	ENOTTY,
+ 	ENXIO,
+ 	EOPNOTSUPP,
+ 	EOVERFLOW,
+ 	EPERM, // 65
+ 	EPIPE,
+ 	EPROTO,
+ 	EPROTONOSUPPORT,
+ 	EPROTOTYPE,
+ 	ERANGE, // 70
+ 	EROFS,
+ 	ESPIPE,
+ 	ESRCH,
+ 	ESTALE,
+ 	ETIME, // 75
+ 	ETIMEDOUT,
+};
+
+s32 _net_convert_error(s32 ios_retval)
+{
+//	return ios_retval;
+	if (ios_retval >= 0) return ios_retval;
+	if (ios_retval < -sizeof(_net_error_code_map)
+		|| !_net_error_code_map[-ios_retval])
+			return NET_UNKNOWN_ERROR_OFFSET + ios_retval;
+	return -_net_error_code_map[-ios_retval];
+}

libogc/ogc_sockets/soc_common.h

@@ -0,0 +1,24 @@
+#pragma once
+#define __LINUX_ERRNO_EXTENSIONS__
+
+#include <errno.h>
+#include <string.h>
+#include <sys/iosupport.h>
+#include <gctypes.h>
+
+#define SYNC_ERROR ENODEV
+
+typedef s32 Handle;
+
+static inline int
+soc_get_fd(int fd)
+{
+	__handle *handle = __get_handle(fd);
+	if(handle == NULL)
+		return -ENODEV;
+	if(strcmp(devoptab_list[handle->device]->name, "soc") != 0)
+		return -ENOTSOCK;
+	return *(Handle*)handle->fileStruct;
+}
+
+s32 _net_convert_error(s32 sock_retval);