X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FUnixRuntime.java;h=2b32965eeee982aab2fe03bd94aeb3a64e801d45;hb=b6be9bcc91cf8e995a0e616a480813cdbef09dc2;hp=0bed8ed27ef330538112c773149dacc134fec68d;hpb=2db6b04d7557a26e3b9e7440e7968aaec262216f;p=nestedvm.git

diff --git a/src/org/ibex/nestedvm/UnixRuntime.java b/src/org/ibex/nestedvm/UnixRuntime.java
index 0bed8ed..2b32965 100644
--- a/src/org/ibex/nestedvm/UnixRuntime.java
+++ b/src/org/ibex/nestedvm/UnixRuntime.java
@@ -3,6 +3,8 @@ package org.ibex.nestedvm;
 import org.ibex.nestedvm.util.*;
 import java.io.*;
 import java.util.*;
+import java.net.Socket;
+import java.net.ServerSocket;
 
 // FEATURE: vfork
 
@@ -124,6 +126,9 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             case SYS_getdents: return sys_getdents(a,b,c,d);
             case SYS_unlink: return sys_unlink(a);
             case SYS_getppid: return sys_getppid();
+            case SYS_opensocket: return sys_opensocket(a,b);
+            case SYS_listensocket: return sys_listensocket(a);
+            case SYS_accept: return sys_accept(a);
 
             default: return super._syscall(syscall,a,b,c,d);
         }
@@ -519,6 +524,64 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         return n;
     }
     
+    private static class SocketFD extends InputOutputStreamFD {
+        private final Socket s;
+        
+        public SocketFD(Socket s) throws IOException {
+            super(s.getInputStream(),s.getOutputStream());
+            this.s = s;
+        }
+        
+        public void _close() { try { s.close(); } catch(IOException e) { } }
+    }
+    
+    public int sys_opensocket(int cstring, int port) throws FaultException, ErrnoException {
+        String hostname = cstring(cstring);
+        try {
+            FD fd = new SocketFD(new Socket(hostname,port));
+            int n = addFD(fd);
+            if(n == -1) fd.close();
+            return n;
+        } catch(IOException e) {
+            return -EIO;
+        }
+    }
+    
+    private static class ListenSocketFD extends FD {
+        ServerSocket s;
+        public ListenSocketFD(ServerSocket s) { this.s = s; }
+        public int flags() { return 0; }
+        // FEATURE: What should these be?
+        public FStat _fstat() { return new FStat(); }
+        public void _close() { try { s.close(); } catch(IOException e) { } }
+    }
+    
+    public int sys_listensocket(int port) {
+        try {
+            ListenSocketFD fd = new ListenSocketFD(new ServerSocket(port));
+            int n = addFD(fd);
+            if(n == -1) fd.close();
+            return n;            
+        } catch(IOException e) {
+            return -EIO;
+        }
+    }
+    
+    public int sys_accept(int fdn) {
+        if(fdn < 0 || fdn >= OPEN_MAX) return -EBADFD;
+        if(fds[fdn] == null) return -EBADFD;
+        if(!(fds[fdn] instanceof ListenSocketFD)) return -EBADFD;
+        try {
+            ServerSocket s = ((ListenSocketFD)fds[fdn]).s;
+            SocketFD fd = new SocketFD(s.accept());
+            int n = addFD(fd);
+            if(n == -1) fd.close();
+            return n;
+        } catch(IOException e) {
+            return -EIO;
+        }
+    }
+    
     //  FEATURE: Run through the fork/wait stuff one more time
     public static class GlobalState {    
         protected static final int OPEN = 1;
@@ -543,7 +606,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             }
         }
         
-        private static class MP {
+        private static class MP implements Comparable {
             public MP(String path, FS fs) { this.path = path; this.fs = fs; }
             public String path;
             public FS fs;
@@ -650,7 +713,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
 
         public synchronized Object exec(UnixRuntime r, String path) throws ErrnoException {
             // FIXME: Hideous hack to make a standalone busybox possible
-            if(path.equals("bin/busybox") && r.getClass().getName().endsWith("BusyBox"))
+            if(path.equals("bin/busybox") && Boolean.valueOf(getSystemProperty("nestedvm.busyboxhack")).booleanValue())
                 return r.getClass();
             FStat fstat = stat(r,path);
             if(fstat == null) return null;
@@ -986,16 +1049,12 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         }
         
         private FD devZeroFD = new FD() {
-            public boolean readable() { return true; }
-            public boolean writable() { return true; }
             public int read(byte[] a, int off, int length) { Arrays.fill(a,off,off+length,(byte)0); return length; }
             public int write(byte[] a, int off, int length) { return length; }
             public int seek(int n, int whence) { return 0; }
             public FStat _fstat() { return new DevFStat(){ public int inode() { return ZERO_INODE; } }; }
         };
         private FD devNullFD = new FD() {
-            public boolean readable() { return true; }
-            public boolean writable() { return true; }
             public int read(byte[] a, int off, int length) { return 0; }
             public int write(byte[] a, int off, int length) { return length; }
             public int seek(int n, int whence) { return 0; }