diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-08-25 08:35:53 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-08-25 08:35:53 +0200 |
| commit | 5b74bb43d36624c4cfb81d5b37833ea241061b26 (patch) | |
| tree | 5f8beaf7290fc4d5b65c1acc27f7bc75e7ed6b55 /src/ipcpd/normal/main.c | |
| parent | 103325209373f0aec818efd775f91243eb912a33 (diff) | |
| parent | 7147313663c738c87ef98b8a9f965c7f6dc185a0 (diff) | |
| download | ouroboros-5b74bb43d36624c4cfb81d5b37833ea241061b26.tar.gz ouroboros-5b74bb43d36624c4cfb81d5b37833ea241061b26.zip | |
Merged in dstaesse/ouroboros/be-irmd-fix (pull request #222)
Fix locks
Diffstat (limited to 'src/ipcpd/normal/main.c')
| -rw-r--r-- | src/ipcpd/normal/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c index 9479b806..a067fb83 100644 --- a/src/ipcpd/normal/main.c +++ b/src/ipcpd/normal/main.c @@ -136,14 +136,13 @@ static int normal_ipcp_enroll(char * dif_name) return -1; /* -ENOTINIT */ } + pthread_rwlock_unlock(&_ipcp->state_lock); + if (fmgr_mgmt_flow(dif_name)) { - pthread_rwlock_unlock(&_ipcp->state_lock); LOG_ERR("Failed to establish management flow."); return -1; } - pthread_rwlock_unlock(&_ipcp->state_lock); - if (ipcp_wait_state(_ipcp, IPCP_ENROLLED, &timeout) == -ETIMEDOUT) { LOG_ERR("Enrollment timed out."); return -1; @@ -156,6 +155,8 @@ static int normal_ipcp_enroll(char * dif_name) return -1; } + pthread_rwlock_unlock(&_ipcp->state_lock); + return 0; } |