WebSVN – HelenOS – Diff – /branches/dd/uspace/srv/vfs/vfs.c

  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** @addtogroup fs
  * @{
  */
 /**
- * @file    vfs.c
+ * @file vfs.c
- * @brief   VFS service for HelenOS.
+ * @brief VFS service for HelenOS.
  */
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <async.h>
 #include <as.h>
 #include <libadt/list.h>
 #include <atomic.h>
 #include "vfs.h"
-#define dprintf(...)    printf(__VA_ARGS__)
+#define NAME "vfs"
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
-    bool keep_on_going = 1;
+    bool keep_on_going = true;
-    printf("Connection opened from %p\n", icall->in_phone_hash);
     /*
      * The connection was opened via the IPC_CONNECT_ME_TO call.
      * This call needs to be answered.
      */
     ipc_answer_0(iid, EOK);
     /*
      * Here we enter the main connection fibril loop.
      * The logic behind this loop and the protocol is that we'd like to keep
      * each connection open until the client hangs up. When the client hangs
      * up, we will free its VFS state. The act of hanging up the connection
      * distinguish one from the other. On the other hand, the client can
      * hang up arbitrarily if it has no open files and reestablish the
      * connection later.
      */
     while (keep_on_going) {
-        ipc_callid_t callid;
         ipc_call_t call;
-        callid = async_get_call(&call);
+        ipc_callid_t callid = async_get_call(&call);
-        printf("Received call, method=%d\n", IPC_GET_METHOD(call));
+        fs_handle_t fs_handle;
+        int phone;
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             keep_on_going = false;
             break;
+        case IPC_M_CONNECT_ME_TO:
+            /*
+             * Connect the client file system to another one.
+             */
+            /* FIXME:
+             * Prevent ordinary clients from connecting to file
+             * system servers directly. This should be solved by
+             * applying some security mechanisms.
+             */
+            fs_handle = IPC_GET_ARG1(call);
+            phone = vfs_grab_phone(fs_handle);
+            (void) ipc_forward_fast(callid, phone, 0, 0, 0,
+                IPC_FF_NONE);
+            vfs_release_phone(phone);
+            break;
         case VFS_REGISTER:
             vfs_register(callid, &call);
+            /*
-            keep_on_going = false;
+             * Keep the connection open so that a file system can
+             * later ask us to connect it to another file system.
+             * This is necessary to support non-root mounts.
+             */
             break;
         case VFS_MOUNT:
             vfs_mount(callid, &call);
             break;
         case VFS_OPEN:
         default:
             ipc_answer_0(callid, ENOTSUP);
             break;
+        }
+    }
-    /* TODO: cleanup after the client */
+    /* TODO: cleanup after the client */
+}
 int main(int argc, char **argv)
+{
-    ipcarg_t phonead;
-    printf("VFS: HelenOS VFS server\n");
+    printf(NAME ": HelenOS VFS server\n");
     /*
      * Initialize the list of registered file systems.
      */
     list_initialize(&fs_head);
     /*
      * Initialize VFS node hash table.
      */
     if (!vfs_nodes_init()) {
-        printf("Failed to initialize the VFS node hash table.\n");
+        printf(NAME ": Failed to initialize VFS node hash table\n");
         return ENOMEM;
+    }
     /*
      * Allocate and initialize the Path Lookup Buffer.
      */
     list_initialize(&plb_head);
     plb = as_get_mappable_page(PLB_SIZE);
     if (!plb) {
-        printf("Cannot allocate a mappable piece of address space\n");
+        printf(NAME ": Cannot allocate a mappable piece of address space\n");
         return ENOMEM;
+    }
     if (as_area_create(plb, PLB_SIZE, AS_AREA_READ | AS_AREA_WRITE |
         AS_AREA_CACHEABLE) != plb) {
-        printf("Cannot create address space area.\n");
+        printf(NAME ": Cannot create address space area\n");
         return ENOMEM;
+    }
     memset(plb, 0, PLB_SIZE);
     /*
      * Set a connectio handling function/fibril.
      */
     async_set_client_connection(vfs_connection);
     /*
      * Register at the naming service.
      */
+    ipcarg_t phonead;
     ipc_connect_to_me(PHONE_NS, SERVICE_VFS, 0, 0, &phonead);
     /*
      * Start accepting connections.
      */
+    printf(NAME ": Accepting connections\n");
     async_manager();
     return 0;
+}
 /**
  * @}
  */

Subversion Repositories HelenOS

(root)/branches/dd/uspace/srv/vfs/vfs.c – Rev 3022 → 4055