lib: Update irm.h API

Removes rina_name_t from that API. Passing ap_name and api_id as
params instead. The IRM tool has been updated accordingly. Some errors
in the build related to protobuf-c have also been resolved.

2 files changed, 24 insertions, 13 deletions

diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h
index a6f0d9f3..fe72aefe 100644
--- a/include/ouroboros/irm.h
+++ b/include/ouroboros/irm.h
@@ -26,20 +26,26 @@
 #include "common.h"
 #include "rina_name.h"
 
-int     irm_create_ipcp(rina_name_t name,
-                        char * ipcp_type);
-int     irm_destroy_ipcp(rina_name_t name);
+int irm_create_ipcp(char * ap_name,
+                    int    api_id,
+                    char * ipcp_type);
+int irm_destroy_ipcp(char * ap_name,
+                     int    api_id);
 
-int     irm_bootstrap_ipcp(rina_name_t name,
-                           struct dif_config conf);
-int     irm_enroll_ipcp(rina_name_t name,
-                        char * dif_name);
+int irm_bootstrap_ipcp(char *              ap_name,
+                       int                 api_id,
+                       struct dif_config * conf);
+int irm_enroll_ipcp(char * ap_name,
+                    int    api_id,
+                    char * dif_name);
 
-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);
+int irm_reg_ipcp(char *  ap_name,
+                 int     api_id,
+                 char ** difs,
+                 size_t  difs_size);
+int irm_unreg_ipcp(char *  ap_name,
+                   int     api_id,
+                   char ** difs,
+                   size_t  difs_size);
 
 #endif
diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h
index 45d7a27d..69d86cd0 100644
--- a/include/ouroboros/sockets.h
+++ b/include/ouroboros/sockets.h
@@ -28,6 +28,9 @@
 
 #include <sys/types.h>
 
+#include "irmd_messages.pb-c.h"
+typedef IrmMsg irm_msg_t;
+
 #define IRM_SOCK_PATH "/tmp/irm_sock"
 #define IRM_MSG_BUF_SIZE 256
 
@@ -100,6 +103,8 @@ int               client_socket_open(char * file_name);
 int               send_irmd_msg(struct irm_msg * msg);
 struct irm_msg *  send_recv_irmd_msg(struct irm_msg * msg);
 
+int send_irm_msg(irm_msg_t * msg);
+
 /* Caller has to free the buffer */
 buffer_t *        serialize_irm_msg(struct irm_msg * msg);
 buffer_t *        serialize_ipcp_msg(struct ipcp_msg * msg);