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/pb/cacep.proto | 39 --------------------------------------- src/lib/pb/cep.proto | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 src/lib/pb/cacep.proto create mode 100644 src/lib/pb/cep.proto (limited to 'src/lib/pb') diff --git a/src/lib/pb/cacep.proto b/src/lib/pb/cacep.proto deleted file mode 100644 index 166e261d..00000000 --- a/src/lib/pb/cacep.proto +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Ouroboros - Copyright (C) 2016 - 2024 - * - * Message for Connection Information in CACEP - * - * 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/. - */ - -syntax = "proto2"; - -message fixed_conc_syntax_msg { - repeated uint32 fids = 1; - repeated uint32 lens = 2; -} - -message cacep_msg { - required string comp_name = 1; - required string protocol = 2; - required int32 pref_version = 3; - repeated int32 supp_version = 4; - required int32 pref_syntax = 5; - repeated int32 supp_syntax = 6; - optional fixed_conc_syntax_msg syntax_spec = 7; - required uint64 address = 8; -} diff --git a/src/lib/pb/cep.proto b/src/lib/pb/cep.proto new file mode 100644 index 00000000..d31cf4f7 --- /dev/null +++ b/src/lib/pb/cep.proto @@ -0,0 +1,39 @@ +/* + * Ouroboros - Copyright (C) 2016 - 2024 + * + * Message for Connection Information in OCEP + * + * 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/. + */ + +syntax = "proto2"; + +message fixed_conc_syntax_msg { + repeated uint32 fids = 1; + repeated uint32 lens = 2; +} + +message cep_msg { + required string comp_name = 1; + required string protocol = 2; + required int32 pref_version = 3; + repeated int32 supp_version = 4; + required int32 pref_syntax = 5; + repeated int32 supp_syntax = 6; + optional fixed_conc_syntax_msg syntax_spec = 7; + required uint64 address = 8; +} -- cgit v1.2.3