Merged in dstaesse/ouroboros/be-deprecate-gam (pull request #572)

Be deprecate gam

1 files changed, 62 insertions, 8 deletions

diff --git a/src/lib/irm.c b/src/lib/irm.c
index 4232cec1..ce17bf18 100644
--- a/src/lib/irm.c
+++ b/src/lib/irm.c
@@ -121,10 +121,6 @@ int irm_bootstrap_ipcp(pid_t                      api,
                 config.has_ttl            = conf->has_ttl;
                 config.has_addr_auth_type = true;
                 config.addr_auth_type     = conf->addr_auth_type;
-                config.has_dt_gam_type    = true;
-                config.dt_gam_type        = conf->dt_gam_type;
-                config.has_rm_gam_type    = true;
-                config.rm_gam_type        = conf->rm_gam_type;
                 config.has_routing_type   = true;
                 config.routing_type       = conf->routing_type;
                 dif_info.dir_hash_algo    = conf->dif_info.dir_hash_algo;
@@ -150,7 +146,65 @@ int irm_bootstrap_ipcp(pid_t                      api,
 
         if (recv_msg->has_result == false) {
                 irm_msg__free_unpacked(recv_msg, NULL);
-                return -1;
+                return -EIRMD;
+        }
+
+        ret = recv_msg->result;
+        irm_msg__free_unpacked(recv_msg, NULL);
+
+        return ret;
+}
+
+int irm_connect_ipcp(pid_t        api,
+                     const char * dst,
+                     const char * component)
+{
+        irm_msg_t   msg      = IRM_MSG__INIT;
+        irm_msg_t * recv_msg = NULL;
+        int         ret;
+
+        msg.code      = IRM_MSG_CODE__IRM_CONNECT_IPCP;
+        msg.dst_name  = (char *) dst;
+        msg.comp_name = (char *) component;
+        msg.has_api   = true;
+        msg.api       = api;
+
+        recv_msg = send_recv_irm_msg(&msg);
+        if (recv_msg == NULL)
+                return -EIRMD;
+
+        if (recv_msg->has_result == false) {
+                irm_msg__free_unpacked(recv_msg, NULL);
+                return -EIRMD;
+        }
+
+        ret = recv_msg->result;
+        irm_msg__free_unpacked(recv_msg, NULL);
+
+        return ret;
+}
+
+int irm_disconnect_ipcp(pid_t        api,
+                        const char * dst,
+                        const char * component)
+{
+        irm_msg_t   msg      = IRM_MSG__INIT;
+        irm_msg_t * recv_msg = NULL;
+        int         ret;
+
+        msg.code      = IRM_MSG_CODE__IRM_DISCONNECT_IPCP;
+        msg.dst_name  = (char *) dst;
+        msg.comp_name = (char *) component;
+        msg.has_api   = true;
+        msg.api       = api;
+
+        recv_msg = send_recv_irm_msg(&msg);
+        if (recv_msg == NULL)
+                return -EIRMD;
+
+        if (recv_msg->has_result == false) {
+                irm_msg__free_unpacked(recv_msg, NULL);
+                return -EIRMD;
         }
 
         ret = recv_msg->result;
@@ -162,15 +216,15 @@ int irm_bootstrap_ipcp(pid_t                      api,
 ssize_t irm_list_ipcps(const char * name,
                        pid_t **     apis)
 {
-        irm_msg_t msg = IRM_MSG__INIT;
+        irm_msg_t msg        = IRM_MSG__INIT;
         irm_msg_t * recv_msg = NULL;
-        size_t nr = 0;
+        size_t nr            = 0;
         size_t i;
 
         if (apis == NULL)
                 return -EINVAL;
 
-        msg.code = IRM_MSG_CODE__IRM_LIST_IPCPS;
+        msg.code     = IRM_MSG_CODE__IRM_LIST_IPCPS;
         msg.dst_name = (char *) name;
 
         recv_msg = send_recv_irm_msg(&msg);