lib: Simplify reg/unreg API

The reg/unreg API is simplified to registering and unregistering a
single name with a single IPCP. The functionality associated with
registering names was moved from the IRMd to the irm tool. The
function to list IPCPs was simplified to return all IPCPs in the
system with their basic properties needed for management.

The above changes led to some needed changes in the irm tool and the
management functions that were depending on the previous behaviour of
list_ipcps.

Command line functionality to list IPCPs in the system is also added
to the irm tool.

Some older code was refactored.

Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>

1 files changed, 24 insertions, 16 deletions

diff --git a/src/lib/irmd_messages.proto b/src/lib/irmd_messages.proto
index 51b15023..16dfe828 100644
--- a/src/lib/irmd_messages.proto
+++ b/src/lib/irmd_messages.proto
@@ -48,23 +48,31 @@ enum irm_msg_code {
         IRM_REPLY             = 21;
 };
 
+message ipcp_info_msg {
+        required uint32 pid   = 1;
+        required uint32 type  = 2;
+        required string name  = 3;
+        required string layer = 4;
+};
+
 message irm_msg {
         required irm_msg_code code    =  1;
-        optional string prog_name     =  2;
+        optional string prog          =  2;
         optional sint32 pid           =  3;
-        optional uint32 ipcp_type     =  4;
-        repeated string layer_name    =  5;
-        repeated string args          =  6;
-        optional sint32 response      =  7;
-        optional string dst_name      =  8;
-        optional bytes  hash          =  9;
-        optional sint32 port_id       = 10;
-        optional sint32 qoscube       = 11;
-        optional ipcp_config_msg conf = 12;
-        optional uint32 opts          = 13;
-        repeated sint32 pids          = 14;
-        optional uint32 timeo_sec     = 15;
-        optional uint32 timeo_nsec    = 16;
-        optional string comp_name     = 17;
-        optional sint32 result        = 18;
+        optional string name          =  4;
+        optional uint32 ipcp_type     =  5;
+        optional string layer         =  6;
+        repeated string args          =  7;
+        optional sint32 response      =  8;
+        optional string dst           =  9;
+        optional bytes  hash          = 10;
+        optional sint32 port_id       = 11;
+        optional sint32 qoscube       = 12;
+        optional ipcp_config_msg conf = 13;
+        optional uint32 opts          = 14;
+        repeated ipcp_info_msg ipcps  = 15;
+        optional uint32 timeo_sec     = 16;
+        optional uint32 timeo_nsec    = 17;
+        optional string comp          = 18;
+        optional sint32 result        = 19;
 };