lib, irmd: Use GPB for dev.c and IRMd

IRMd and dev.c now also use GPB instead of our own ser/des. irm_msg
struct has been dropped as well as the methods associated with it.

1 files changed, 2 insertions, 47 deletions

diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h
index 69d86cd0..0974ada0 100644
--- a/include/ouroboros/sockets.h
+++ b/include/ouroboros/sockets.h
@@ -37,47 +37,6 @@ typedef IrmMsg irm_msg_t;
 #define IPCP_SOCK_PATH_PREFIX "/tmp/ipcp_sock"
 #define IPCP_MSG_BUFS_SIZE IRM_MSG_BUF_SIZE
 
-enum irm_msg_code {
-        IRM_CREATE_IPCP,
-        IRM_DESTROY_IPCP,
-        IRM_BOOTSTRAP_IPCP,
-        IRM_ENROLL_IPCP,
-        IRM_REG_IPCP,
-        IRM_UNREG_IPCP,
-        IRM_AP_REG,
-        IRM_AP_REG_R,
-        IRM_AP_UNREG,
-        IRM_FLOW_ACCEPT,
-        IRM_FLOW_ACCEPT_R,
-        IRM_FLOW_ALLOC_RESP,
-        IRM_FLOW_ALLOC,
-        IRM_FLOW_ALLOC_R,
-        IRM_FLOW_ALLOC_RES,
-        IRM_FLOW_ALLOC_RES_R,
-        IRM_FLOW_DEALLOC,
-        IRM_FLOW_CONTROL,
-        IRM_FLOW_WRITE,
-        IRM_FLOW_READ
-};
-
-struct irm_msg {
-        enum irm_msg_code   code;
-        rina_name_t *       name;
-        char *              ipcp_type;
-        struct dif_config * conf;
-        char *              dif_name;
-        char **             difs;
-        size_t              difs_size;
-        char *              ap_name;
-        char *              ae_name;
-        int                 fd;
-        int                 result;
-        struct qos_spec *   qos;
-        int                 oflags;
-        char *              dst_ap_name;
-        ssize_t             count;
-};
-
 enum ipcp_msg_code {
         IPCP_BOOTSTRAP,
         IPCP_ENROLL,
@@ -100,16 +59,12 @@ char *            ipcp_sock_path(pid_t pid);
 int               server_socket_open(char * file_name);
 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);
+int               send_irm_msg(irm_msg_t * msg);
+irm_msg_t *       send_recv_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);
 /* Caller has to free all the allocated fields in the message */
-struct irm_msg *  deserialize_irm_msg(buffer_t * data);
 struct ipcp_msg * deserialize_ipcp_msg(buffer_t * data);
 
 #endif