userspace socket support

include/metalsvm/syscall.h

@@ -51,6 +51,18 @@ extern "C" {
 #define __NR_execve		14
 #define __NR_times		15
 
+/* networking
+ */
+
+#define __NR_socket			16
+#define __NR_bind			17
+#define __NR_listen			18
+#define __NR_accept			19
+#define __NR_connect		20
+#define __NR_send			21
+#define __NR_recv			22
+#define __NR_closesocket	23
+
 #ifdef __cplusplus
 }
 #endif

kernel/syscall.c

@@ -25,6 +25,8 @@
 #include <metalsvm/spinlock.h>
 #include <metalsvm/time.h>
 
+#include <lwip/socket.h>
+
 static int sys_write(int fildes, const char *buf, size_t len)
 {
 	int i;
@@ -127,6 +129,61 @@ int syscall_handler(uint32_t sys_nr, ...)
 			ret = sys_times(buffer, clock);
 			break;
 		}
+	case __NR_socket: {
+			int domain= va_arg(v1,int);
+			int type = va_arg(v1,int);
+			int protocol = va_arg(v1,int);
+			ret = socket(domin,type,protocol);
+			break;
+		}
+	case __NR_bind: {
+			int s = va_arg(v1,int);
+			const struct sockaddr *name = va_arg(v1,(const struct sockaddr *));
+			socklen_t namelen = va_arg(v1,socklen_t);
+			ret = bind(s,name,namelen);
+			break;
+		}
+	case __NR_listen: {	
+			int s = va_arg(v1,int);
+			int backlog = va_arg(v1,int);
+			ret = listen(s,backlog);
+			break;
+		}
+	case __NR_accept: {
+			int s = va_arg(v1,int);
+			struct sockaddr *addr = va_arg(v1,(struct sockaddr *));
+			socklen_t *addrlen = va_arg(v1,socklen_t*);
+			ret = accept(s,addr,addrlen);
+			break;
+		}
+	case __NR_connect: {
+			int s = va_arg(v1,int);
+			const struct sockaddr *name  =va_arg(v1,(const struct sockaddr *));
+			socklen_t namelen = va_arg(v1,socklen_t);
+			ret = connect(s,name,namelen);
+			break;
+		}
+	case __NR_send: {
+			int s = va_arg(v1,int);
+			const void *data = va_arg(v1,void*);
+			size_t size = va_arg(v1,size_t);
+			int flags  = va_arg(v1,int);
+			ret = send(s,data,size,flags);
+			break;
+		}
+	case __NR_recv: {
+			int s = va_arg(v1,int);
+			const void *data = va_arg(v1,void*);
+			size_t size = va_arg(v1,size_t);
+			int flags  = va_arg(v1,int);
+			ret = recv(s,data,size,flags);
+			break;
+		}
+	case __NR_closesocket: {
+			int s = va_arg(v1,int);
+			ret = closesocket(s);
+			break;
+		}
 	default:
 		kputs("invalid system call\n");
 		ret = -ENOSYS;

newlib/src/libgloss/metalsvm/Makefile.in

@@ -63,7 +63,8 @@ CRT0 = crt0.o
 METALSVM_BSP = libgloss.a
 METALSVM_OBJS = chown.o errno.o fork.o gettod.o kill.o open.o sbrk.o times.o write.o \
            close.o execve.o fstat.o init.o link.o read.o stat.o unlink.o \
-           environ.o  _exit.o getpid.o isatty.o lseek.o readlink.o symlink.o wait.o
+           environ.o  _exit.o getpid.o isatty.o lseek.o readlink.o symlink.o wait.o \
+           socket.o bind.o listen.o accept.o connect.o send.o recv.o closesocket.o
 
 
 #### Host specific Makefile fragment comes in here.

newlib/src/libgloss/metalsvm/accept.c

@@ -0,0 +1,26 @@
+
+#include "config.h"
+#include <_ansi.h>
+#include <_syslist.h>
+#include <errno.h>
+#undef errno
+extern int errno;
+#include "warning.h"
+#include "syscall.h"
+
+#include <lwip/socket.h>
+
+int
+_DEFUN (accept, (s, addr, addrlen),
+        int s, struct sockaddr *addr, socklen_t *addrlen)
+{
+	int ret;
+
+        ret = SYSCALL3(__NR_accept, s, addr, addrlen);
+	if (ret < 0) {
+		errno = -ret;
+		ret = -1;
+	}
+
+        return ret;
+}

newlib/src/libgloss/metalsvm/bind.c

@@ -0,0 +1,26 @@
+
+#include "config.h"
+#include <_ansi.h>
+#include <_syslist.h>
+#include <errno.h>
+#undef errno
+extern int errno;
+#include "warning.h"
+#include "syscall.h"
+
+#include <lwip/socket.h>
+
+int
+_DEFUN (bind, (s, name, namelen),
+        int s, const struct sockaddr *name, socklen_t namelen)
+{
+	int ret;
+
+        ret = SYSCALL3(__NR_bind, s, name, namelen);
+	if (ret < 0) {
+		errno = -ret;
+		ret = -1;
+	}
+
+        return ret;
+}

newlib/src/libgloss/metalsvm/closesocket.c

@@ -0,0 +1,26 @@
+
+#include "config.h"
+#include <_ansi.h>
+#include <_syslist.h>
+#include <errno.h>
+#undef errno
+extern int errno;
+#include "warning.h"
+#include "syscall.h"
+
+#include <lwip/socket.h>
+
+int
+_DEFUN (closesocket, (s),
+        int s)
+{
+	int ret;
+
+        ret = SYSCALL1(__NR_closesocket, s);
+	if (ret < 0) {
+		errno = -ret;
+		ret = -1;
+	}
+
+        return ret;
+}

newlib/src/libgloss/metalsvm/connect.c

@@ -0,0 +1,26 @@
+
+#include "config.h"
+#include <_ansi.h>
+#include <_syslist.h>
+#include <errno.h>
+#undef errno
+extern int errno;
+#include "warning.h"
+#include "syscall.h"
+
+#include <lwip/socket.h>
+
+int
+_DEFUN (connect, (s, name, namelen),
+        int s, const struct sockaddr *name, socklen_t namelen)
+{
+	int ret;
+
+        ret = SYSCALL3(__NR_connect, s, name, namelen);
+	if (ret < 0) {
+		errno = -ret;
+		ret = -1;
+	}
+
+        return ret;
+}

newlib/src/libgloss/metalsvm/listen.c

@@ -0,0 +1,26 @@
+
+#include "config.h"
+#include <_ansi.h>
+#include <_syslist.h>
+#include <errno.h>
+#undef errno
+extern int errno;
+#include "warning.h"
+#include "syscall.h"
+
+#include <lwip/socket.h>
+
+int
+_DEFUN (listen, (s, backlog),
+        int s, int backlog)
+{
+	int ret;
+
+        ret = SYSCALL2(__NR_listen, s, backlog);
+	if (ret < 0) {
+		errno = -ret;
+		ret = -1;
+	}
+
+        return ret;
+}

newlib/src/libgloss/metalsvm/recv.c

@@ -0,0 +1,26 @@
+
+#include "config.h"
+#include <_ansi.h>
+#include <_syslist.h>
+#include <errno.h>
+#undef errno
+extern int errno;
+#include "warning.h"
+#include "syscall.h"
+
+#include <lwip/socket.h>
+
+int
+_DEFUN (recv, (s, data, size,flags),
+        int s, const void *data, size_t size, int flags)
+{
+	int ret;
+
+        ret = SYSCALL4(__NR_recv, s, data, size, flags);
+	if (ret < 0) {
+		errno = -ret;
+		ret = -1;
+	}
+
+        return ret;
+}

newlib/src/libgloss/metalsvm/send.c

@@ -0,0 +1,26 @@
+
+#include "config.h"
+#include <_ansi.h>
+#include <_syslist.h>
+#include <errno.h>
+#undef errno
+extern int errno;
+#include "warning.h"
+#include "syscall.h"
+
+#include <lwip/socket.h>
+
+int
+_DEFUN (send, (s, data, size,flags),
+        int s, const void *data, size_t size, int flags)
+{
+	int ret;
+
+        ret = SYSCALL4(__NR_send, s, data, size, flags);
+	if (ret < 0) {
+		errno = -ret;
+		ret = -1;
+	}
+
+        return ret;
+}

newlib/src/libgloss/metalsvm/socket.c

@@ -0,0 +1,26 @@
+
+#include "config.h"
+#include <_ansi.h>
+#include <_syslist.h>
+#include <errno.h>
+#undef errno
+extern int errno;
+#include "warning.h"
+#include "syscall.h"
+
+#include <lwip/socket.h>
+
+int
+_DEFUN (socket, (domain, type, protocol),
+        int domain, int type, int protocol)
+{
+	int ret;
+
+        ret = SYSCALL3(__NR_socket, domain, type, protocol);
+	if (ret < 0) {
+		errno = -ret;
+		ret = -1;
+	}
+
+        return ret;
+}

newlib/src/libgloss/metalsvm/syscall.h

@@ -40,6 +40,18 @@ extern "C" {
 #define __NR_execve		14
 #define __NR_times		15
 
+/* networking
+ */
+
+#define __NR_socket			16
+#define __NR_bind			17
+#define __NR_listen			18
+#define __NR_accept			19
+#define __NR_connect		20
+#define __NR_send			21
+#define __NR_recv			22
+#define __NR_closesocket	23
+
 #define _STR(token)             #token
 #define _SYSCALLSTR(x)          "int $" _STR(x) " "
 #define INT_SYSCALL		0x80