summaryrefslogtreecommitdiff
path: root/src/ipcpd
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-10-05 11:42:59 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-10-05 11:42:59 +0200
commitc0a08d0f7a4b66a030eb0eca0e3f1dc45ff08665 (patch)
treed90985e61884066204bf45091ff59a106d147fad /src/ipcpd
parent8a0bc74c2c7c3f5851b1a4dd51eb6ebbb0859a81 (diff)
downloadouroboros-c0a08d0f7a4b66a030eb0eca0e3f1dc45ff08665.tar.gz
ouroboros-c0a08d0f7a4b66a030eb0eca0e3f1dc45ff08665.zip
lib, ipcpd: Fix bad locking
Some locks were taken at an inappropriate time, causing the shim-eth-llc to block indefinitely upon shutdown and causing flow allocation to halt since a response could never be given.
Diffstat (limited to 'src/ipcpd')
-rw-r--r--src/ipcpd/shim-eth-llc/main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index 2cf46e51..7a64b9e1 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -575,14 +575,11 @@ static void * eth_llc_ipcp_sdu_writer(void * o)
uint8_t dsap;
uint8_t r_addr[MAC_SIZE];
- pthread_rwlock_rdlock(&ipcpi.state_lock);
-
fd = ipcp_flow_read(&sdb);
- if (fd < 0) {
- pthread_rwlock_unlock(&ipcpi.state_lock);
+ if (fd < 0)
continue;
- }
+ pthread_rwlock_rdlock(&ipcpi.state_lock);
pthread_rwlock_rdlock(&eth_llc_data.flows_lock);
ssap = reverse_bits(eth_llc_data.fd_to_ef[fd].sap);