From 9903b8a2f9a7dc8ebac6928dcf2d2b5593ea0615 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Fri, 12 May 2017 13:05:47 +0200 Subject: ipcpd: Allow specifying fixed syntax This commits adds the functions and messages to specify a fixed protocol syntax during CACEP. It also revises the messages for specifying the DT protocol syntax from the irm tool. --- src/lib/ipcp_config.proto | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'src/lib/ipcp_config.proto') diff --git a/src/lib/ipcp_config.proto b/src/lib/ipcp_config.proto index d5ff75d6..b6c8c303 100644 --- a/src/lib/ipcp_config.proto +++ b/src/lib/ipcp_config.proto @@ -23,25 +23,24 @@ syntax = "proto2"; +message dif_info_msg { + required string dif_name = 1; + required uint32 dir_hash_algo = 2; +} + message ipcp_config_msg { - required string dif_name = 1; - required uint32 dir_hash_algo = 2; - required int32 ipcp_type = 3; + required dif_info_msg dif_info = 1; + required int32 ipcp_type = 2; // Config for normal IPCP - optional uint32 addr_size = 4; - optional uint32 cep_id_size = 5; - optional uint32 pdu_length_size = 6; - optional uint32 seqno_size = 7; - optional bool has_ttl = 8; - optional bool has_chk = 9; - optional uint32 min_pdu_size = 10; - optional uint32 max_pdu_size = 11; - optional uint32 addr_auth_type = 12; - optional uint32 dt_gam_type = 13; - optional uint32 rm_gam_type = 14; + optional uint32 addr_size = 3; + optional uint32 fd_size = 4; + optional bool has_ttl = 5; + optional uint32 addr_auth_type = 6; + optional uint32 dt_gam_type = 7; + optional uint32 rm_gam_type = 8; // Config for shim UDP - optional uint32 ip_addr = 15; - optional uint32 dns_addr = 16; + optional uint32 ip_addr = 9; + optional uint32 dns_addr = 10; // Config for the shim Ethernet LLC - optional string if_name = 17; -} \ No newline at end of file + optional string if_name = 11; +} -- cgit v1.2.3