1 files changed, 18 insertions, 36 deletions

diff --git a/src/irmd/reg/flow.c b/src/irmd/reg/flow.c
index 4d091b23..93c3e128 100644
--- a/src/irmd/reg/flow.c
+++ b/src/irmd/reg/flow.c
@@ -1,5 +1,5 @@
 /*
- * Ouroboros - Copyright (C) 2016 - 2024
+ * Ouroboros - Copyright (C) 2016 - 2026
  *
  * The IPC Resource Manager - Registry - Flows
  *
@@ -66,11 +66,11 @@ struct reg_flow * reg_flow_create(const struct flow_info * info)
 static void destroy_rbuffs(struct reg_flow * flow)
 {
         if (flow->n_rb != NULL)
-                shm_rbuff_destroy(flow->n_rb);
+                ssm_rbuff_destroy(flow->n_rb);
         flow->n_rb = NULL;
 
         if (flow->n_1_rb != NULL)
-                shm_rbuff_destroy(flow->n_1_rb);
+                ssm_rbuff_destroy(flow->n_1_rb);
         flow->n_1_rb = NULL;
 }
 
@@ -80,7 +80,7 @@ void reg_flow_destroy(struct reg_flow * flow)
 
         switch(flow->info.state) {
         case FLOW_ACCEPT_PENDING:
-                clrbuf(flow->data);
+                clrbuf(flow->req_data);
                 /* FALLTHRU */
         default:
                 destroy_rbuffs(flow);
@@ -89,8 +89,10 @@ void reg_flow_destroy(struct reg_flow * flow)
 
         assert(flow->n_rb == NULL);
         assert(flow->n_1_rb == NULL);
-        assert(flow->data.data == NULL);
-        assert(flow->data.len == 0);
+        assert(flow->req_data.data == NULL);
+        assert(flow->req_data.len == 0);
+        assert(flow->rsp_data.data == NULL);
+        assert(flow->rsp_data.len == 0);
 
         assert(list_is_empty(&flow->next));
 
@@ -103,22 +105,28 @@ static int create_rbuffs(struct reg_flow *  flow,
         assert(flow != NULL);
         assert(info != NULL);
 
-        flow->n_rb = shm_rbuff_create(info->n_pid, info->id);
+        flow->n_rb = ssm_rbuff_create(info->n_pid, info->id);
         if (flow->n_rb == NULL)
                 goto fail_n_rb;
 
+        if (ssm_rbuff_mlock(flow->n_rb) < 0)
+                log_warn("Failed to mlock n_rb for flow %d.", info->id);
+
         assert(flow->info.n_1_pid == 0);
         assert(flow->n_1_rb == NULL);
 
         flow->info.n_1_pid = info->n_1_pid;
-        flow->n_1_rb = shm_rbuff_create(info->n_1_pid, info->id);
+        flow->n_1_rb = ssm_rbuff_create(info->n_1_pid, info->id);
         if (flow->n_1_rb == NULL)
                 goto fail_n_1_rb;
 
+        if (ssm_rbuff_mlock(flow->n_1_rb) < 0)
+                log_warn("Failed to mlock n_1_rb for flow %d.", info->id);
+
         return 0;
 
  fail_n_1_rb:
-        shm_rbuff_destroy(flow->n_rb);
+        ssm_rbuff_destroy(flow->n_rb);
  fail_n_rb:
         return -ENOMEM;
 }
@@ -172,6 +180,7 @@ int reg_flow_update(struct reg_flow *  flow,
         }
 
         flow->info.state = info->state;
+        flow->info.uid   = info->uid;
 
         *info = flow->info;
 
@@ -179,30 +188,3 @@ int reg_flow_update(struct reg_flow *  flow,
  fail:
         return -ENOMEM;
 }
-
-void reg_flow_set_data(struct reg_flow * flow,
-                       const buffer_t *  buf)
-{
-        assert(flow != NULL);
-        assert(buf != NULL);
-        assert(flow->data.data == NULL);
-        assert(flow->data.len == 0);
-
-        flow->data = *buf;
-}
-
-void reg_flow_get_data(struct reg_flow * flow,
-                       buffer_t *        buf)
-{
-        assert(flow != NULL);
-        assert(buf != NULL);
-
-        *buf = flow->data;
-
-        clrbuf(flow->data);
-}
-
-void reg_flow_free_data(struct reg_flow * flow)
-{
-        freebuf(flow->data);
-}