summaryrefslogtreecommitdiff
path: root/src/ipcpd
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-09-02 11:09:13 +0200
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-09-02 11:13:14 +0200
commitad28e916756f7075a06f6b54d456676d0c081b36 (patch)
tree2bf62382b76fa87fab0397f2e43d423c7698b7a4 /src/ipcpd
parentfe197a226c0a7755f19a2956294ba435701a42ea (diff)
downloadouroboros-ad28e916756f7075a06f6b54d456676d0c081b36.tar.gz
ouroboros-ad28e916756f7075a06f6b54d456676d0c081b36.zip
lib: ipcp: Decouple flow_dealloc
Sending a dealloc to the irmd moved to its own call.
Diffstat (limited to 'src/ipcpd')
-rw-r--r--src/ipcpd/normal/fmgr.c2
-rw-r--r--src/ipcpd/shim-eth-llc/main.c2
-rw-r--r--src/ipcpd/shim-udp/main.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c
index 3056b46d..5d54842e 100644
--- a/src/ipcpd/normal/fmgr.c
+++ b/src/ipcpd/normal/fmgr.c
@@ -583,7 +583,7 @@ int fmgr_flow_alloc_msg(struct frct_i * frct_i,
return -1;
}
- ret = ipcp_flow_dealloc(0, flow->flow.port_id);
+ ret = irm_flow_dealloc(flow->flow.port_id);
break;
default:
LOG_ERR("Got an unknown flow allocation message.");
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index d1100001..a1ded117 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -599,7 +599,7 @@ static int eth_llc_ipcp_flow_dealloc_req(uint8_t ssap,
pthread_rwlock_unlock(&shim_data(_ipcp)->flows_lock);
pthread_rwlock_unlock(&_ipcp->state_lock);
- ipcp_flow_dealloc(0, port_id);
+ irm_flow_dealloc(port_id);
LOG_DBG("Flow with port_id %d deallocated.", port_id);
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index 451a2a4c..34af71a7 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -606,7 +606,7 @@ static int ipcp_udp_flow_dealloc_req(int udp_port)
pthread_rwlock_unlock(&_ipcp->state_lock);
- ipcp_flow_dealloc(0, port_id);
+ irm_flow_dealloc(port_id);
close(fd);