format

This will be used in the client and the daemon

guestfs-inspectd.c

@@ -5,9 +5,11 @@
 #include <zactor.h>
 #include <guestfs.h>
 
+#include "libguestfs-inspect.h"
+
 #define STREQ(a, b) (strcmp((a), (b)) == 0)
 
-static void *worker_task(char*);
+static void *worker_task(zsock_t*, char*);
 
 char *endpoint(void);
 
@@ -23,84 +25,95 @@ char *endpoint() {
 }
 
 static int compare_key_len(const void *p1, const void *p2) {
-        const char *key1 = *(char* const*) p1;
-        const char *key2 = *(char* const*) p2;
-        return strlen(key1) - strlen(key2);
+  const char *key1 = *(char* const*) p1;
+  const char *key2 = *(char* const*) p2;
+  return strlen(key1) - strlen(key2);
 }
 
 static int count_mountpoints(char *const *argv) {
-        size_t c;
-        for (c = 0; argv[c]; c++) {}
-        return c;
+  size_t c;
+  for (c = 0; argv[c]; c++) {}
+  return c;
 }
 
-static void *worker_task(char *disk_path) {
-        guestfs_h *g;
-        char **roots, **mountpoints;
-        char *root;
-        size_t i, j;
+static void *worker_task(zsock_t *pipe, char *disk_path) {
+  guestfs_h *g;
+  char **roots, **mountpoints;
+  char *root;
+  size_t i, j;
 
-        //char *file_content;
-        //size_t file_size;
+  //char *file_content;
+  //size_t file_size;
 
-	// Create a connection handle
-        g = guestfs_create();
-        if (g == NULL) {
-                exit(EXIT_FAILURE);
-        }
+  // Create a connection handle
+  g = guestfs_create();
+  if (g == NULL) {
+    exit(EXIT_FAILURE);
+  }
 
-	// Adding disk_path to connection handle
-        if (guestfs_add_drive_opts(g, disk_path,
-                                   GUESTFS_ADD_DRIVE_OPTS_READONLY, 1,
-                                   -1) == -1) {
-                exit(EXIT_FAILURE);
-        }
+  // Adding disk_path to connection handle
+  if (guestfs_add_drive_opts(g, disk_path, GUESTFS_ADD_DRIVE_OPTS_READONLY, 1, -1) == -1) {
+    exit(EXIT_FAILURE);
+  }
 
-	// Launching connection handle
-        if (guestfs_launch(g) == -1) {
-                exit(EXIT_FAILURE);
-        }
+  // Launching connection handle
+  if (guestfs_launch(g) == -1) {
+    exit(EXIT_FAILURE);
+  }
 
-	// Pulling rootfs information
-        roots = guestfs_inspect_os(g);
-        if (roots == NULL) {
-                exit(EXIT_FAILURE);
-        }
+  // Pulling rootfs information
+  roots = guestfs_inspect_os(g);
+  if (roots == NULL) {
+    exit(EXIT_FAILURE);
+  }
 
-	// Looping through roots to mount mountpoints
-        for (j = 0; roots[j] != NULL; j++) {
-                root = roots[j];
-                mountpoints = guestfs_inspect_get_mountpoints(g, root);
-                if (mountpoints == NULL) {
-                        exit(EXIT_FAILURE);
-                }
-		// Sorting mountpoints to be in {'${device_path}', '${mount_path}'} format
-                qsort(mountpoints, count_mountpoints(mountpoints) / 2, 2 * sizeof (char*), compare_key_len);
-                for (i = 0; mountpoints[i] != NULL; i += 2) {
-                        guestfs_mount_ro(g, mountpoints[i+1], mountpoints[i]);
-                        free(mountpoints[i]);
-                        free(mountpoints[i+1]);
-                }
-                free(mountpoints);
-                free(root);
-        }
+  // Looping through roots to mount mountpoints
+  for (j = 0; roots[j] != NULL; j++) {
+    root = roots[j];
+    mountpoints = guestfs_inspect_get_mountpoints(g, root);
+    if (mountpoints == NULL) {
+      exit(EXIT_FAILURE);
+    }
+    // Sorting mountpoints to be in {'${device_path}', '${mount_path}'} format
+    qsort(mountpoints, count_mountpoints(mountpoints) / 2, 2 * sizeof (char*), compare_key_len);
+      for (i = 0; mountpoints[i] != NULL; i += 2) {
+        guestfs_mount_ro(g, mountpoints[i+1], mountpoints[i]);
+        free(mountpoints[i]);
+        free(mountpoints[i+1]);
+      }
+      free(mountpoints);
+      free(root);
+  }
 
-        // ZeroMQ Opens here
-	for (;;) {
+  // ZeroMQ Opens here
+  zsock_signal(pipe, 0);
+  while (true) {
+    zmsg_t *message = zmsg_recv(pipe);
+    if (message == NULL) {
+      break;
+    }
+    // Process message
 
-	}
-        /*if (guestfs_is_file_opts(g, file_path, GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) {
-                printf("--- %s ---\n", file_path);
-                file_content = guestfs_read_file(g, file_path, &file_size);
-                if (file_content == NULL) {
-                        exit(EXIT_FAILURE);
-                }
-                printf("%s\n", file_content);
-                free(file_content);
-        }*/
-        free(roots);
-        guestfs_close(g);
-        exit(EXIT_SUCCESS);
+    // do something here
+
+    // Sending reply
+    zmsg_t *reply = zmsg_new();
+    zmsg_addstr(reply, "Reply from worker");
+    zmsg_send(&reply, pipe);
+    zmsg_destroy(&message);
+  }
+  /*if (guestfs_is_file_opts(g, file_path, GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) {
+      printf("--- %s ---\n", file_path);
+      file_content = guestfs_read_file(g, file_path, &file_size);
+      if (file_content == NULL) {
+        exit(EXIT_FAILURE);
+      }
+      printf("%s\n", file_content);
+      free(file_content);
+    }*/
+  free(roots);
+  guestfs_close(g);
+  exit(EXIT_SUCCESS);
 }
 
 int main(int argc, char **argv) {

libguestfs-inspect.h

@@ -0,0 +1,23 @@
+enum guestfs_inspect_command {
+  GUESTFS_COMMAND_LS,
+  /* GUESTFS_COMMAND_TOUCH, */
+  /* GUESTFS_COMMAND_MKDIR, */
+  GUESTFS_COMMAND_CAT
+};
+
+struct guestfs_ls_args {
+  size_t path_length;
+  char path[];
+};
+struct guestfs_cat_args {};
+
+struct guestfs_inpsect_command {
+  enum guestfs_inspect_command command;
+  union {
+    struct guestfs_ls_args ls;
+    struct guestfs_cat_args cat;
+  } args;
+  size_t name_length;
+  char name[];
+};
+