diff options
author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-03-29 14:21:05 +0200 |
---|---|---|
committer | dimitri staessens <dimitri.staessens@ugent.be> | 2017-03-29 14:21:05 +0200 |
commit | d79d9f864f4dc146386547df5a1c6afced55b8cd (patch) | |
tree | 03408220a1e8a0a1a8337cfea68dcad9b88c6814 | |
parent | 9097a5446c31b83ec224b3e1403a319b24025346 (diff) | |
download | ouroboros-d79d9f864f4dc146386547df5a1c6afced55b8cd.tar.gz ouroboros-d79d9f864f4dc146386547df5a1c6afced55b8cd.zip |
irmd: Set failed flows to FLOW_NULL before destroy
-rw-r--r-- | src/irmd/irm_flow.c | 1 | ||||
-rw-r--r-- | src/irmd/main.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/irmd/irm_flow.c b/src/irmd/irm_flow.c index 8ca25b5b..99966561 100644 --- a/src/irmd/irm_flow.c +++ b/src/irmd/irm_flow.c @@ -125,7 +125,6 @@ enum flow_state irm_flow_get_state(struct irm_flow * f) void irm_flow_set_state(struct irm_flow * f, enum flow_state state) { assert(f); - assert(state != FLOW_NULL); assert(state != FLOW_DESTROY); pthread_mutex_lock(&f->state_lock); diff --git a/src/irmd/main.c b/src/irmd/main.c index 9a062cf3..afd60f4d 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -1205,6 +1205,7 @@ static struct irm_flow * flow_alloc(pid_t api, bmp_release(irmd->port_ids, f->port_id); pthread_rwlock_unlock(&irmd->flows_lock); pthread_rwlock_unlock(&irmd->state_lock); + irm_flow_set_state(f, FLOW_NULL); irm_flow_destroy(f); return NULL; } |