lib: Rename CACEP to CEP and set conngmr timeout0.21.2

The Common Application Connection Establishment Protocol (CACEP) is a
RINA construct associated with the Common Distributed Application
Protocol (CDAP). We dropped CDAP as O7s sees connection establishment
as common to all applications (though it can be a nop). The wiki
already refers to this as (O7s) Connection Establishment Protocol
(CEP).

The connection manager will now timeout waiting for CEP messages to
avoid hanging forever, configurable at build time via
CONNMGR_RCV_TIMEOUT.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

4 files changed, 36 insertions, 42 deletions

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 66f26125..a6d7ac98 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -10,8 +10,8 @@ protobuf_generate_c(IPCP_CONFIG_PROTO_SRCS IPCP_CONFIG_PROTO_HDRS
   pb/ipcp_config.proto)
 protobuf_generate_c(ENROLL_PROTO_SRCS ENROLL_PROTO_HDRS
   pb/enroll.proto)
-protobuf_generate_c(CACEP_PROTO_SRCS CACEP_PROTO_HDRS
-  pb/cacep.proto)
+protobuf_generate_c(CEP_PROTO_SRCS CEP_PROTO_HDRS
+  pb/cep.proto)
 protobuf_generate_c(IRM_PROTO_SRCS IRM_PROTO_HDRS
   pb/irm.proto)
 protobuf_generate_c(IPCP_PROTO_SRCS IPCP_PROTO_HDRS
@@ -241,7 +241,7 @@ endif ()
 
 set(SOURCE_FILES_DEV
   # Add source files here
-  cacep.c
+  cep.c
   dev.c
   )
 
@@ -282,7 +282,7 @@ add_library(ouroboros-common SHARED ${SOURCE_FILES_COMMON} ${IRM_PROTO_SRCS}
   ${IPCP_PROTO_SRCS} ${IPCP_CONFIG_PROTO_SRCS} ${MODEL_PROTO_SRCS}
   ${ENROLL_PROTO_SRCS})
 
-add_library(ouroboros-dev SHARED ${SOURCE_FILES_DEV} ${CACEP_PROTO_SRCS})
+add_library(ouroboros-dev SHARED ${SOURCE_FILES_DEV} ${CEP_PROTO_SRCS})
 
 add_library(ouroboros-irm SHARED ${SOURCE_FILES_IRM})
 
diff --git a/src/lib/cacep.c b/src/lib/cep.c
index da1c2e2c..ba238023 100644
--- a/src/lib/cacep.c
+++ b/src/lib/cep.c
@@ -1,7 +1,7 @@
 /*
  * Ouroboros - Copyright (C) 2016 - 2024
  *
- * The Common Application Connection Establishment Protocol
+ * The Ouroboros Connection Establishment Protocol
  *
  *    Dimitri Staessens <dimitri@ouroboros.rocks>
  *    Sander Vrijders   <sander@ouroboros.rocks>
@@ -22,35 +22,35 @@
 
 #define _POSIX_C_SOURCE 199309L
 
-#include <ouroboros/cacep.h>
+#include <ouroboros/cep.h>
 #include <ouroboros/dev.h>
 #include <ouroboros/errno.h>
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "cacep.pb-c.h"
-typedef CacepMsg cacep_msg_t;
+#include "cep.pb-c.h"
+typedef CepMsg cep_msg_t;
 
 #define BUF_SIZE 128
 
 static int read_msg(int                fd,
                     struct conn_info * info)
 {
-        uint8_t                      buf[BUF_SIZE];
-        cacep_msg_t *                msg;
-        ssize_t                      len;
+        uint8_t     buf[BUF_SIZE];
+        cep_msg_t * msg;
+        ssize_t     len;
 
         len = flow_read(fd, buf, BUF_SIZE);
         if (len < 0)
-                return -1;
+                return (int) len;
 
-        msg = cacep_msg__unpack(NULL, len, buf);
+        msg = cep_msg__unpack(NULL, len, buf);
         if (msg == NULL)
                 return -1;
 
-        if (strlen(msg->comp_name) > CACEP_BUF_STRLEN) {
-                cacep_msg__free_unpacked(msg, NULL);
+        if (strlen(msg->comp_name) > OCEP_BUF_STRLEN) {
+                cep_msg__free_unpacked(msg, NULL);
                 return -1;
         }
 
@@ -61,7 +61,7 @@ static int read_msg(int                fd,
         info->pref_syntax  = msg->pref_syntax;
         info->addr         = msg->address;
 
-        cacep_msg__free_unpacked(msg, NULL);
+        cep_msg__free_unpacked(msg, NULL);
 
         return 0;
 }
@@ -69,9 +69,9 @@ static int read_msg(int                fd,
 static int send_msg(int                      fd,
                     const struct conn_info * info)
 {
-        cacep_msg_t msg = CACEP_MSG__INIT;
-        uint8_t *   data = NULL;
-        size_t      len  = 0;
+        cep_msg_t msg = CEP_MSG__INIT;
+        uint8_t * data = NULL;
+        size_t    len  = 0;
 
         msg.comp_name    = (char *) info->comp_name;
         msg.protocol     = (char *) info->protocol;
@@ -81,7 +81,7 @@ static int send_msg(int                      fd,
         if (msg.pref_syntax < 0)
                 return -1;
 
-        len = cacep_msg__get_packed_size(&msg);
+        len = cep_msg__get_packed_size(&msg);
         if (len == 0)
                 return -1;
 
@@ -89,7 +89,7 @@ static int send_msg(int                      fd,
         if (data == NULL)
                 return -ENOMEM;
 
-        cacep_msg__pack(&msg, data);
+        cep_msg__pack(&msg, data);
 
         if (flow_write(fd, data, len) < 0) {
                 free(data);
@@ -101,26 +101,20 @@ static int send_msg(int                      fd,
         return 0;
 }
 
-int cacep_snd(int                      fd,
-              const struct conn_info * in)
+int cep_snd(int                      fd,
+            const struct conn_info * in)
 {
         if (in == NULL)
                 return -EINVAL;
 
-        if (send_msg(fd, in))
-                return -1;
-
-        return 0;
+        return send_msg(fd, in);
 }
 
-int cacep_rcv(int                fd,
-              struct conn_info * out)
+int cep_rcv(int                fd,
+            struct conn_info * out)
 {
         if (out == NULL)
                 return -EINVAL;
 
-        if (read_msg(fd, out))
-                return -1;
-
-        return 0;
+        return read_msg(fd, out);
 }
diff --git a/src/lib/dev.c b/src/lib/dev.c
index a7f20e88..92310b9e 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -28,19 +28,19 @@
 
 #include "config.h"
 
-#include <ouroboros/hash.h>
-#include <ouroboros/cacep.h>
+#include <ouroboros/bitmap.h>
+#include <ouroboros/cep.h>
 #include <ouroboros/crypt.h>
-#include <ouroboros/errno.h>
 #include <ouroboros/dev.h>
+#include <ouroboros/errno.h>
+#include <ouroboros/fccntl.h>
 #include <ouroboros/flow.h>
+#include <ouroboros/fqueue.h>
+#include <ouroboros/hash.h>
 #include <ouroboros/ipcp.h>
 #include <ouroboros/ipcp-dev.h>
 #include <ouroboros/list.h>
 #include <ouroboros/local-dev.h>
-#include <ouroboros/sockets.h>
-#include <ouroboros/fccntl.h>
-#include <ouroboros/bitmap.h>
 #include <ouroboros/np1_flow.h>
 #include <ouroboros/pthread.h>
 #include <ouroboros/random.h>
@@ -48,8 +48,8 @@
 #include <ouroboros/shm_flow_set.h>
 #include <ouroboros/shm_rdrbuff.h>
 #include <ouroboros/shm_rbuff.h>
+#include <ouroboros/sockets.h>
 #include <ouroboros/utils.h>
-#include <ouroboros/fqueue.h>
 #ifdef PROC_FLOW_STATS
 #include <ouroboros/rib.h>
 #endif
diff --git a/src/lib/pb/cacep.proto b/src/lib/pb/cep.proto
index 166e261d..d31cf4f7 100644
--- a/src/lib/pb/cacep.proto
+++ b/src/lib/pb/cep.proto
@@ -1,7 +1,7 @@
 /*
  * Ouroboros - Copyright (C) 2016 - 2024
  *
- * Message for Connection Information in CACEP
+ * Message for Connection Information in OCEP
  *
  *    Dimitri Staessens <dimitri@ouroboros.rocks>
  *    Sander Vrijders   <sander@ouroboros.rocks>
@@ -27,7 +27,7 @@ message fixed_conc_syntax_msg {
         repeated uint32 lens = 2;
 }
 
-message cacep_msg {
+message cep_msg {
         required string comp_name                  = 1;
         required string protocol                   = 2;
         required int32 pref_version                = 3;