summaryrefslogtreecommitdiff
path: root/src/ipcpd
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-10-23 16:34:54 +0200
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-10-23 16:34:54 +0200
commit15bc37f3cbfc8df224854f5d988e0689ec7c94e0 (patch)
tree19a645367cd4bdfaac08a4cc9dc680a88b34bc9c /src/ipcpd
parent5a2e524418154deab5cac0e65d48a8391c860eea (diff)
downloadouroboros-15bc37f3cbfc8df224854f5d988e0689ec7c94e0.tar.gz
ouroboros-15bc37f3cbfc8df224854f5d988e0689ec7c94e0.zip
ipcpd: Fix log message and lock
Remote requests for a flow that's locally deallocated should not generate an error. Sending messages should not be under lock.
Diffstat (limited to 'src/ipcpd')
-rw-r--r--src/ipcpd/shim-eth-llc/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index 3fc7eda5..6046d939 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -426,7 +426,7 @@ static int eth_llc_ipcp_flow_dealloc_req(uint8_t ssap)
if (fd < 0) {
pthread_rwlock_unlock(&eth_llc_data.flows_lock);
pthread_rwlock_unlock(&ipcpi.state_lock);
- LOG_ERR("No flow found for remote deallocation request.");
+ LOG_DBG("Flow already deallocated.");
return 0;
}
@@ -1009,10 +1009,9 @@ static int eth_llc_ipcp_flow_dealloc(int fd)
eth_llc_data.ef_to_fd[sap] = -1;
pthread_rwlock_unlock(&eth_llc_data.flows_lock);
-
- ret = eth_llc_ipcp_sap_dealloc(addr, r_sap);
pthread_rwlock_unlock(&ipcpi.state_lock);
+ ret = eth_llc_ipcp_sap_dealloc(addr, r_sap);
if (ret < 0)
LOG_DBG("Could not notify remote.");