Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-common

2 files changed, 17 insertions, 18 deletions

diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h
index 954e4b2d..819675d1 100644
--- a/include/ouroboros/irm.h
+++ b/include/ouroboros/irm.h
@@ -27,19 +27,18 @@
 
 int     irm_create_ipcp(rina_name_t name,
                         char * ipcp_type);
-int     irm_destroy_ipcp(int ipcp_id);
+int     irm_destroy_ipcp(rina_name_t name);
 
-int     irm_bootstrap_ipcp(int ipcp_id,
+int     irm_bootstrap_ipcp(rina_name_t name,
                            struct dif_info info);
-int     irm_enroll_ipcp(int ipcp_id,
+int     irm_enroll_ipcp(rina_name_t name,
                         char * dif_name);
 
-int     irm_reg_ipcp(int ipcp_id,
-                     char ** difs);
-int     irm_unreg_ipcp(int ipcp_id,
-                       char ** difs);
-
-char ** irm_list_ipcps();
-char ** irm_list_ipcp_types();
+int     irm_reg_ipcp(rina_name_t name,
+                     char ** difs,
+                     size_t difs_size);
+int     irm_unreg_ipcp(rina_name_t name,
+                       char ** difs,
+                       size_t difs_size);
 
 #endif
diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h
index fe7ddb28..88e9564b 100644
--- a/include/ouroboros/sockets.h
+++ b/include/ouroboros/sockets.h
@@ -24,6 +24,7 @@
 #define OUROBOROS_SOCKETS_H
 
 #define IRM_SOCK_PATH "/tmp/irm_sock"
+#define IRM_MSG_BUF_SIZE 256
 
 enum irm_msg_code {
         IRM_CREATE_IPCP,
@@ -31,18 +32,17 @@ enum irm_msg_code {
         IRM_BOOTSTRAP_IPCP,
         IRM_ENROLL_IPCP,
         IRM_REG_IPCP,
-        IRM_UNREG_IPCP,
-        IRM_LIST_IPCPS
+        IRM_UNREG_IPCP
 };
 
 struct irm_msg {
         enum irm_msg_code code;
-        union {
-                struct {
-                        rina_name_t * name;
-                        char * ipcp_type;
-                } create_ipcp;
-        } msgs;
+        rina_name_t * name;
+        char * ipcp_type;
+        struct dif_info * info;
+        char * dif_name;
+        char ** difs;
+        size_t difs_size;
 };
 
 int              client_socket_open(char * file_name);