diff options
| author | dimitri staessens <[email protected]> | 2016-08-10 12:31:14 +0200 |
|---|---|---|
| committer | dimitri staessens <[email protected]> | 2016-08-10 12:31:14 +0200 |
| commit | 0ec8f7b6d977a9cc469445d4990d432253f979d9 (patch) | |
| tree | 33ca5c8a7a237952b8c037596ecdd874b518a6fb /src/ipcpd | |
| parent | 31b2edb845628e1d6b1b5b17821b060c152679af (diff) | |
| parent | 6e854784ebc67af1eb8cdc3209f574e0af5e574d (diff) | |
| download | ouroboros-0ec8f7b6d977a9cc469445d4990d432253f979d9.tar.gz ouroboros-0ec8f7b6d977a9cc469445d4990d432253f979d9.zip | |
Merged in sandervrijders/ouroboros/be-bootstrap (pull request #199)
Several small fixes and enhancements
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/local/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c index 99580a45..a6076800 100644 --- a/src/ipcpd/local/main.c +++ b/src/ipcpd/local/main.c @@ -261,14 +261,14 @@ static int ipcp_local_bootstrap(struct dif_config * conf) return -1; } + pthread_rwlock_wrlock(&_ipcp->state_lock); + if (_ipcp->state != IPCP_INIT) { pthread_rwlock_unlock(&_ipcp->state_lock); LOG_ERR("IPCP in wrong state."); return -1; } - pthread_rwlock_wrlock(&_ipcp->state_lock); - _ipcp->state = IPCP_ENROLLED; pthread_create(&_ap_instance->sduloop, |