From fc10a7587b1a642748ae0fd69f08d92b4a902248 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Wed, 12 Apr 2017 16:57:48 +0200 Subject: lib, ipcpd, irmd: Register hash instead of name All information passed over the IRMd/IPCP boundary for using IPC services (flow allocation, registration) is now hashed. This effectively fixes the shared namespace between DIFs and the IRMDs. This PR also fixes some API issues (adding const identifiers), shuffles the include headers a bit and some small bugs. --- src/lib/ipcpd_messages.proto | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'src/lib/ipcpd_messages.proto') diff --git a/src/lib/ipcpd_messages.proto b/src/lib/ipcpd_messages.proto index da817944..bd71d3f3 100644 --- a/src/lib/ipcpd_messages.proto +++ b/src/lib/ipcpd_messages.proto @@ -23,14 +23,14 @@ syntax = "proto2"; -import "dif_config.proto"; +import "ipcp_config.proto"; enum ipcp_msg_code { IPCP_BOOTSTRAP = 1; IPCP_ENROLL = 2; - IPCP_NAME_REG = 3; - IPCP_NAME_UNREG = 4; - IPCP_NAME_QUERY = 5; + IPCP_REG = 3; + IPCP_UNREG = 4; + IPCP_QUERY = 5; IPCP_FLOW_ALLOC = 6; IPCP_FLOW_ALLOC_RESP = 7; IPCP_FLOW_DEALLOC = 8; @@ -38,17 +38,14 @@ enum ipcp_msg_code { }; message ipcp_msg { - required ipcp_msg_code code = 1; - optional string dif_name = 2; - repeated string dif_names = 3; - optional int32 len = 4; - optional string name = 5; - optional sint32 port_id = 6; - optional string dst_name = 7; - optional sint32 qoscube = 8; - optional dif_config_msg conf = 9; - optional sint32 fd = 10; - optional sint32 api = 11; - optional sint32 response = 12; - optional sint32 result = 13; + required ipcp_msg_code code = 1; + optional string name = 2; + optional bytes hash = 3; + optional int32 port_id = 4; + optional string dst_name = 5; + optional uint32 qoscube = 6; + optional ipcp_config_msg conf = 7; + optional int32 api = 8; + optional int32 response = 9; + optional int32 result = 10; }; -- cgit v1.2.3