irmd, lib: Replace stubs in irmd

This replaces the stubs in the irmd and calls the actual IPCP
operations from the library. It also calls the DIF Allocator API in
one of the operations.

2 files changed, 16 insertions, 12 deletions

diff --git a/include/ouroboros/da.h b/include/ouroboros/da.h
index 62bc66e5..17c25203 100644
--- a/include/ouroboros/da.h
+++ b/include/ouroboros/da.h
@@ -25,7 +25,7 @@
 
 #include "common.h"
 
-rina_name_t da_resolve_daf(char * daf_name);
-char **     da_resolve_dap(rina_name_t * name);
+rina_name_t * da_resolve_daf(char * daf_name);
+char **       da_resolve_dap(rina_name_t * name);
 
 #endif
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index 7b53d827..c8682ec3 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -25,18 +25,22 @@
 
 #include "common.h"
 
-int ipcp_create(rina_name_t name,
-                char * ipcp_type);
-int ipcp_destroy(int instance);
+struct ipcp;
 
-int ipcp_reg(int instance,
-             char ** difs);
-int ipcp_unreg(int instance,
-               char ** difs);
+struct ipcp * ipcp_create(rina_name_t name,
+                          char * ipcp_type);
+int ipcp_destroy(struct ipcp * instance);
 
-int ipcp_bootstrap(int instance,
-                   struct dif_conf conf);
-int ipcp_enroll(int instance,
+int ipcp_reg(struct ipcp * instance,
+             char ** difs,
+             size_t difs_size);
+int ipcp_unreg(struct ipcp * instance,
+               char ** difs,
+               size_t difs_size);
+
+int ipcp_bootstrap(struct ipcp * instance,
+                   struct dif_config conf);
+int ipcp_enroll(struct ipcp * instance,
                 char * dif_name,
                 rina_name_t member);