diff options
Diffstat (limited to 'src/irmd/reg')
-rw-r--r-- | src/irmd/reg/flow.c | 1 | ||||
-rw-r--r-- | src/irmd/reg/flow.h | 9 | ||||
-rw-r--r-- | src/irmd/reg/ipcp.c | 2 | ||||
-rw-r--r-- | src/irmd/reg/ipcp.h | 6 |
4 files changed, 2 insertions, 16 deletions
diff --git a/src/irmd/reg/flow.c b/src/irmd/reg/flow.c index 43d6cb3a..66bd25a3 100644 --- a/src/irmd/reg/flow.c +++ b/src/irmd/reg/flow.c @@ -27,6 +27,7 @@ #define OUROBOROS_PREFIX "reg-flow" #include <ouroboros/errno.h> +#include <ouroboros/flow.h> #include <ouroboros/logs.h> #include <ouroboros/time_utils.h> #include <ouroboros/pthread.h> diff --git a/src/irmd/reg/flow.h b/src/irmd/reg/flow.h index 76266228..22e191be 100644 --- a/src/irmd/reg/flow.h +++ b/src/irmd/reg/flow.h @@ -32,15 +32,6 @@ #include <pthread.h> #include <time.h> -enum flow_state { - FLOW_NULL = 0, - FLOW_ALLOC_PENDING, - FLOW_ALLOC_REQ_PENDING, - FLOW_ALLOCATED, - FLOW_DEALLOC_PENDING, - FLOW_DESTROY -}; - struct reg_flow { struct list_head next; diff --git a/src/irmd/reg/ipcp.c b/src/irmd/reg/ipcp.c index de4b2f1e..c1d06d94 100644 --- a/src/irmd/reg/ipcp.c +++ b/src/irmd/reg/ipcp.c @@ -134,7 +134,7 @@ int reg_ipcp_wait_boot(struct reg_ipcp * ipcp) pthread_cond_signal(&ipcp->cond); } - if (ipcp->state != IPCP_LIVE) { + if (ipcp->state != IPCP_OPERATIONAL) { pthread_mutex_unlock(&ipcp->mtx); return -1; } diff --git a/src/irmd/reg/ipcp.h b/src/irmd/reg/ipcp.h index c669a0e1..6dfdfb6b 100644 --- a/src/irmd/reg/ipcp.h +++ b/src/irmd/reg/ipcp.h @@ -25,12 +25,6 @@ #include <ouroboros/list.h> -enum ipcp_state { - IPCP_NULL = 0, - IPCP_BOOT, - IPCP_LIVE -}; - struct reg_ipcp { struct list_head next; |