1 files changed, 45 insertions, 9 deletions

diff --git a/src/lib/pb/ipcp_config.proto b/src/lib/pb/ipcp_config.proto
index 28528b0c..1308c6d1 100644
--- a/src/lib/pb/ipcp_config.proto
+++ b/src/lib/pb/ipcp_config.proto
@@ -24,17 +24,45 @@ syntax = "proto2";
 
 import "model.proto";
 
+
+message ls_config_msg {
+        required uint32 pol      = 1;
+        required uint32 t_recalc = 2;
+        required uint32 t_update = 3;
+        required uint32 t_timeo  = 4;
+}
+
+message routing_config_msg {
+        required uint32 pol       = 1;
+        optional ls_config_msg ls = 2;
+}
+
 message dt_config_msg {
-        required uint32 addr_size    = 1;
-        required uint32 eid_size     = 2;
-        required uint32 max_ttl      = 3;
-        required uint32 routing_type = 4;
+        required uint32 addr_size           = 1;
+        required uint32 eid_size            = 2;
+        required uint32 max_ttl             = 3;
+        required routing_config_msg routing = 4;
+}
+
+message dir_dht_config_msg {
+        required uint32 alpha       = 1;
+        required uint32 k           = 2;
+        required uint32 t_expire    = 3;
+        required uint32 t_refresh   = 4;
+        required uint32 t_replicate = 5;
+        required uint64 peer        = 6;
+}
+
+message dir_config_msg {
+        required uint32 pol             = 1;
+        optional dir_dht_config_msg dht = 2;
 }
 
 message uni_config_msg {
         required dt_config_msg dt      = 1;
-        required uint32 addr_auth_type = 2;
-        required uint32 cong_avoid     = 3;
+        required dir_config_msg  dir   = 2;
+        required uint32 addr_auth_type = 3;
+        required uint32 cong_avoid     = 4;
 }
 
 message eth_config_msg {
@@ -42,16 +70,24 @@ message eth_config_msg {
         required uint32 ethertype = 2;
 }
 
-message udp_config_msg {
+message udp4_config_msg {
         required uint32 ip_addr  = 1;
         required uint32 port     = 2;
         required uint32 dns_addr = 3; /* set to 0 if unused */
 }
 
+message udp6_config_msg {
+        required bytes  ip_addr  = 1;
+        required uint32 port     = 2;
+        required bytes  dns_addr = 3; /* set to NULL if unused */
+}
+
+
 message ipcp_config_msg {
         required layer_info_msg layer_info =  1;
         required uint32 ipcp_type          =  2;
         optional uni_config_msg unicast    =  3;
-        optional udp_config_msg udp        =  4;
-        optional eth_config_msg eth        =  5;
+        optional udp4_config_msg udp4      =  4;
+        optional udp6_config_msg udp6      =  5;
+        optional eth_config_msg eth        =  6;
 }