1 files changed, 24 insertions, 23 deletions

diff --git a/src/ipcpd/ipcp.h b/src/ipcpd/ipcp.h
index 79b7b7c0..aab490c7 100644
--- a/src/ipcpd/ipcp.h
+++ b/src/ipcpd/ipcp.h
@@ -1,5 +1,5 @@
 /*
- * Ouroboros - Copyright (C) 2016 - 2022
+ * Ouroboros - Copyright (C) 2016 - 2024
  *
  * IPC process structure
  *
@@ -26,20 +26,14 @@
 #include <ouroboros/hash.h>
 #include <ouroboros/ipcp.h>
 #include <ouroboros/list.h>
+#include <ouroboros/protobuf.h>
+#include <ouroboros/qos.h>
 #include <ouroboros/sockets.h>
 #include <ouroboros/tpm.h>
 
 #include <pthread.h>
 #include <time.h>
 
-enum ipcp_state {
-        IPCP_NULL = 0,
-        IPCP_INIT,
-        /* Layer name must be set for states below. */
-        IPCP_OPERATIONAL,
-        IPCP_SHUTDOWN
-};
-
 struct ipcp_ops {
         int   (* ipcp_bootstrap)(const struct ipcp_config * conf);
 
@@ -59,20 +53,18 @@ struct ipcp_ops {
 
         int   (* ipcp_query)(const uint8_t * hash);
 
-        int   (* ipcp_flow_alloc)(int             fd,
-                                  const uint8_t * dst,
-                                  qosspec_t       qs,
-                                  const void *    data,
-                                  size_t          len);
+        int   (* ipcp_flow_alloc)(int              fd,
+                                  const uint8_t *  dst,
+                                  qosspec_t        qs,
+                                  const buffer_t * data);
 
         int   (* ipcp_flow_join)(int             fd,
                                  const uint8_t * dst,
                                  qosspec_t       qs);
 
-        int   (* ipcp_flow_alloc_resp)(int          fd,
-                                       int          response,
-                                       const void * data,
-                                       size_t       len);
+        int   (* ipcp_flow_alloc_resp)(int              fd,
+                                       int              response,
+                                       const buffer_t * data);
 
         int   (* ipcp_flow_dealloc)(int fd);
 };
@@ -85,7 +77,7 @@ extern struct ipcp {
         char *             name;
 
         enum ipcp_type     type;
-        char *             layer_name;
+        char               layer_name[LAYER_NAME_SIZE + 1];
 
         uint64_t           dt_addr;
 
@@ -95,9 +87,8 @@ extern struct ipcp {
         int                irmd_fd;
 
         enum ipcp_state    state;
-        pthread_rwlock_t   state_lock;
-        pthread_mutex_t    state_mtx;
         pthread_cond_t     state_cond;
+        pthread_mutex_t    state_mtx;
 
         int                sockfd;
         char *             sock_path;
@@ -120,9 +111,11 @@ int             ipcp_init(int               argc,
                           struct ipcp_ops * ops,
                           enum ipcp_type    type);
 
-int             ipcp_boot(void);
+int             ipcp_start(void);
 
-void            ipcp_shutdown(void);
+void            ipcp_sigwait(void);
+
+void            ipcp_stop(void);
 
 void            ipcp_fini(void);
 
@@ -133,6 +126,14 @@ enum ipcp_state ipcp_get_state(void);
 int             ipcp_parse_arg(int    argc,
                                char * argv[]);
 
+/* Helper functions to handle races during flow allocation */
+int             ipcp_wait_flow_req_arr(const uint8_t *  dst,
+                                       qosspec_t        qs,
+                                       time_t           mpl,
+                                       const buffer_t * data);
+
+int             ipcp_wait_flow_resp(const int fd);
+
 /* Helper functions for directory entries, could be moved */
 uint8_t *       ipcp_hash_dup(const uint8_t * hash);