From bb617311f4fc4ece5bf963d3f445e73e09a9cdaa Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Sun, 25 Feb 2024 12:00:11 +0100 Subject: lib: Rename CACEP to CEP and set conngmr timeout 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 Signed-off-by: Sander Vrijders --- src/lib/cacep.c | 126 -------------------------------------------------------- 1 file changed, 126 deletions(-) delete mode 100644 src/lib/cacep.c (limited to 'src/lib/cacep.c') diff --git a/src/lib/cacep.c b/src/lib/cacep.c deleted file mode 100644 index da1c2e2c..00000000 --- a/src/lib/cacep.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Ouroboros - Copyright (C) 2016 - 2024 - * - * The Common Application Connection Establishment Protocol - * - * Dimitri Staessens - * Sander Vrijders - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., http://www.fsf.org/about/contact/. - */ - -#define _POSIX_C_SOURCE 199309L - -#include -#include -#include - -#include -#include - -#include "cacep.pb-c.h" -typedef CacepMsg cacep_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; - - len = flow_read(fd, buf, BUF_SIZE); - if (len < 0) - return -1; - - msg = cacep_msg__unpack(NULL, len, buf); - if (msg == NULL) - return -1; - - if (strlen(msg->comp_name) > CACEP_BUF_STRLEN) { - cacep_msg__free_unpacked(msg, NULL); - return -1; - } - - strcpy(info->comp_name, msg->comp_name); - strcpy(info->protocol, msg->protocol); - - info->pref_version = msg->pref_version; - info->pref_syntax = msg->pref_syntax; - info->addr = msg->address; - - cacep_msg__free_unpacked(msg, NULL); - - return 0; -} - -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; - - msg.comp_name = (char *) info->comp_name; - msg.protocol = (char *) info->protocol; - msg.address = info->addr; - msg.pref_version = info->pref_version; - msg.pref_syntax = info->pref_syntax; - if (msg.pref_syntax < 0) - return -1; - - len = cacep_msg__get_packed_size(&msg); - if (len == 0) - return -1; - - data = malloc(len); - if (data == NULL) - return -ENOMEM; - - cacep_msg__pack(&msg, data); - - if (flow_write(fd, data, len) < 0) { - free(data); - return -1; - } - - free(data); - - return 0; -} - -int cacep_snd(int fd, - const struct conn_info * in) -{ - if (in == NULL) - return -EINVAL; - - if (send_msg(fd, in)) - return -1; - - return 0; -} - -int cacep_rcv(int fd, - struct conn_info * out) -{ - if (out == NULL) - return -EINVAL; - - if (read_msg(fd, out)) - return -1; - - return 0; -} -- cgit v1.2.3