diff options
| author | dimitri staessens <[email protected]> | 2017-04-13 09:55:31 +0000 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2017-04-13 09:55:31 +0000 |
| commit | 72c28d6173ade511e9dc6969e0fc66db2dbba38a (patch) | |
| tree | 12756b89d8f4ce421c70d5cf05850b4968e76412 /src/ipcpd/normal/connmgr.c | |
| parent | 2cc9c8d742e037c8a6ddc3eea4c05f4a905183d3 (diff) | |
| parent | fc10a7587b1a642748ae0fd69f08d92b4a902248 (diff) | |
| download | ouroboros-72c28d6173ade511e9dc6969e0fc66db2dbba38a.tar.gz ouroboros-72c28d6173ade511e9dc6969e0fc66db2dbba38a.zip | |
Merged in dstaesse/ouroboros/be-hashes (pull request #479)
lib, ipcpd, irmd: Register hash instead of name
Diffstat (limited to 'src/ipcpd/normal/connmgr.c')
| -rw-r--r-- | src/ipcpd/normal/connmgr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/ipcpd/normal/connmgr.c b/src/ipcpd/normal/connmgr.c index 8068d173..421bc5b0 100644 --- a/src/ipcpd/normal/connmgr.c +++ b/src/ipcpd/normal/connmgr.c @@ -116,16 +116,11 @@ static void * flow_acceptor(void * o) memset(&fail_info, 0, sizeof(fail_info)); while (true) { - pthread_rwlock_rdlock(&ipcpi.state_lock); - if (ipcp_get_state() != IPCP_OPERATIONAL) { - pthread_rwlock_unlock(&ipcpi.state_lock); log_info("Shutting down flow acceptor."); return 0; } - pthread_rwlock_unlock(&ipcpi.state_lock); - fd = flow_accept(&qs, NULL); if (fd < 0) { if (fd != -EIRMD) @@ -271,7 +266,7 @@ void connmgr_ae_destroy(struct ae * ae) } int connmgr_alloc(struct ae * ae, - char * dst_name, + const char * dst_name, qosspec_t * qs, struct conn * conn) { |