irmd: Refactor and bugfixes

Refactors the IRMd to extract reg_api and irm_flow structures to their
own sources.

Fixes some locking bugs.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/irmd/registry.h b/src/irmd/registry.h
index fb0dceb7..19e27a21 100644
--- a/src/irmd/registry.h
+++ b/src/irmd/registry.h
@@ -33,6 +33,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "reg_api.h"
+
 #define registry_has_name(r, name) \
         (registry_get_entry_by_name(r, name) != NULL)
 #define registry_name_has_api(r, name) \
@@ -48,8 +50,6 @@ enum reg_name_state {
         REG_NAME_DESTROY
 };
 
-struct reg_api;
-
 /* an entry in the registry */
 struct reg_entry {
         struct list_head    next;
@@ -71,9 +71,6 @@ struct reg_entry {
         pthread_mutex_t     state_lock;
 };
 
-void                  reg_api_sleep(struct reg_api * i);
-void                  reg_api_wake(struct reg_api * i);
-
 struct reg_binding *  reg_entry_get_binding(struct reg_entry * e,
                                             char *             apn);
 char **               reg_entry_get_auto_info(struct reg_entry * e);