Merged in dstaesse/ouroboros/be-irmd-refactor (pull request #213)

irmd, lib: Rebuild the IRMd data model

1 files changed, 36 insertions, 36 deletions

diff --git a/src/lib/dev.c b/src/lib/dev.c
index f27ef0fe..3a5fc8e0 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -54,6 +54,37 @@ struct ap_data {
         pthread_rwlock_t      flows_lock;
 } * _ap_instance;
 
+static int api_announce(char * ap_name)
+{
+        irm_msg_t msg = IRM_MSG__INIT;
+        irm_msg_t * recv_msg = NULL;
+        int ret = -1;
+
+        msg.code    = IRM_MSG_CODE__IRM_API_ANNOUNCE;
+        msg.has_api = true;
+
+        pthread_rwlock_rdlock(&_ap_instance->data_lock);
+
+        msg.api = _ap_instance->api;
+        msg.ap_name = ap_name;
+
+        pthread_rwlock_unlock(&_ap_instance->data_lock);
+
+        recv_msg = send_recv_irm_msg(&msg);
+        if (recv_msg == NULL) {
+                return -1;
+        }
+
+        if (!recv_msg->has_result || (ret = recv_msg->result)) {
+                irm_msg__free_unpacked(recv_msg, NULL);
+                return ret;
+        }
+
+        irm_msg__free_unpacked(recv_msg, NULL);
+
+        return ret;
+}
+
 int ap_init(char * ap_name)
 {
         int i = 0;
@@ -100,6 +131,9 @@ int ap_init(char * ap_name)
         pthread_rwlock_init(&_ap_instance->flows_lock, NULL);
         pthread_rwlock_init(&_ap_instance->data_lock, NULL);
 
+        if (ap_name != NULL)
+                return api_announce(ap_name);
+
         return 0;
 }
 
@@ -134,42 +168,6 @@ void ap_fini(void)
         free(_ap_instance);
 }
 
-int api_bind(char * ap_subset)
-{
-        irm_msg_t msg = IRM_MSG__INIT;
-        irm_msg_t * recv_msg = NULL;
-        int ret = -1;
-
-        msg.code    = IRM_MSG_CODE__IRM_API_BIND;
-        msg.has_api = true;
-
-        if (_ap_instance->ap_name == NULL)
-                return -EPERM; /* call init first */
-
-        pthread_rwlock_rdlock(&_ap_instance->data_lock);
-
-        msg.api = _ap_instance->api;
-        msg.ap_name = _ap_instance->ap_name;
-
-        pthread_rwlock_unlock(&_ap_instance->data_lock);
-
-        msg.ap_subset = ap_subset;
-
-        recv_msg = send_recv_irm_msg(&msg);
-        if (recv_msg == NULL) {
-                return -1;
-        }
-
-        if (!recv_msg->has_result || (ret = recv_msg->result)) {
-                irm_msg__free_unpacked(recv_msg, NULL);
-                return ret;
-        }
-
-        irm_msg__free_unpacked(recv_msg, NULL);
-
-        return ret;
-}
-
 static int port_id_to_fd(int port_id)
 {
         int i;
@@ -417,6 +415,8 @@ int flow_dealloc(int fd)
 
         msg.code         = IRM_MSG_CODE__IRM_FLOW_DEALLOC;
         msg.has_port_id  = true;
+        msg.has_api      = true;
+        msg.api          = getpid();
 
         pthread_rwlock_rdlock(&_ap_instance->data_lock);
         pthread_rwlock_wrlock(&_ap_instance->flows_lock);