Hostinfo day 4: Implement command processing code.

[virt-hostinfo.git] / hostinfod / hostinfod.h

diff --git a/hostinfod/hostinfod.h b/hostinfod/hostinfod.h
index 103783e..98fcb63 100644 (file)
--- a/hostinfod/hostinfod.h
+++ b/hostinfod/hostinfod.h
@@ -26,6 +26,7 @@
 #include <apr_pools.h>
 #include <apr_network_io.h>
 #include <apr_poll.h>
+#include <apr_hash.h>
 
 enum guest_state {
   guest_state_connecting,      /* Connecting to socket. */
@@ -35,27 +36,43 @@ enum guest_state {
 };
 
 struct guest_description {
-  int counter;
   apr_pool_t *pool;            /* Pool for lifetime of guest connection. */
+
+  apr_pool_t *rpool;           /* Pool for lifetime of single req/resp. */
+
   const char *name;            /* "driver-name" */
   const char *sock_path;       /* Full path to socket. */
   int sock;                    /* Real socket. */
   apr_socket_t *aprsock;       /* APR socket. */
   apr_pollfd_t pollfd;         /* APR poll descriptor. */
   enum guest_state state;      /* State of the connection. */
-
-  /* Increments every time guest does something bad, decremented once per min */
-  unsigned penalty;
-  time_t last_penalty_decr;
+  int counter;                 /* Used in reread_socket_dir. */
 
   unsigned request_max;                /* Max. length of request buffer. */
   unsigned request_posn;       /* Position in request buffer. */
   char *request;               /* Request buffer. */
 
-  unsigned reply_alloc;                /* Allocated for reply buffer. */
-  unsigned reply_size;         /* Size used in reply buffer. */
+  unsigned reply_size;         /* Size of reply buffer. */
   unsigned reply_posn;         /* Position in reply buffer. */
   char *reply;                 /* Reply buffer. */
+
+  /* Increments every time guest does something bad, decremented once per min */
+  unsigned penalty;
+  struct timespec last_penalty_decr;
+};
+
+enum arg_type {
+  arg_type_string,
+  arg_type_int,
+  arg_type_bool,
+};
+
+struct arg {
+  enum arg_type type;
+  union {
+    long i;                    /* For int, bool types. */
+    char *str;                 /* For string type. */
+  } u;
 };
 
 /* main.c */
@@ -69,6 +86,8 @@ extern int foreground_set_on_cmdline;
 extern int messages_to_stderr;
 extern apr_pool_t *pool;       /* pool for global memory allocation */
 
+extern void initialize (void);
+
 /* error.c */
 extern void init_syslog (void);
 extern void error (const char *fs, ...)
@@ -94,6 +113,32 @@ extern int sockets_inotify_fd;
 extern void monitor_socket_dir (void);
 
 /* commands.c */
-extern void execute_command (time_t now, struct guest_description *hval, const char *command);
+extern apr_hash_t *commands;
+extern void execute_command (const struct timespec *now, struct guest_description *hval, const char *command);
+extern int get_args (apr_array_header_t *args, const char *argfs, ...);
+extern void send_error (struct guest_description *hval, int code);
+extern void send_reply (struct guest_description *hval, int code, const char *fs, ...)
+  __attribute__((format (printf,3,4)));
+
+typedef void (*command_fn) (struct guest_description *hval, const char *cmd, apr_array_header_t *args);
+
+#define REGISTER_COMMAND(name)                                         \
+  static void register_##name (void) __attribute__((constructor));     \
+                                                                       \
+  static void                                                          \
+  register_##name (void)                                               \
+  {                                                                    \
+    if (pool == NULL)                                                  \
+      initialize ();                                                   \
+                                                                       \
+    if (commands == NULL)                                              \
+      commands = apr_hash_make (pool);                                 \
+                                                                       \
+    /* The assignment below just causes a warning                      \
+     * if the callback has the wrong type.                             \
+     */                                                                        \
+    command_fn cb = name;                                              \
+    apr_hash_set (commands, #name, APR_HASH_KEY_STRING, cb);           \
+  }
 
 #endif /* HOSTINFOD_H */