diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-09-02 12:18:49 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-09-02 12:18:49 +0200 |
| commit | ee2235c62cf0c51f7188fdeb6ac283c1e2ea0335 (patch) | |
| tree | 35502bdec6dd660cd1b7e6f69740c5fef2319be4 /src/ipcpd | |
| parent | 4493d36a4769c6625e3025a0c484bf0ec65708bd (diff) | |
| parent | ad28e916756f7075a06f6b54d456676d0c081b36 (diff) | |
| download | ouroboros-ee2235c62cf0c51f7188fdeb6ac283c1e2ea0335.tar.gz ouroboros-ee2235c62cf0c51f7188fdeb6ac283c1e2ea0335.zip | |
Merged in dstaesse/ouroboros/be-ipcp-dev (pull request #237)
lib: ipcp: Decouple flow_dealloc
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/normal/fmgr.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/shim-eth-llc/main.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/shim-udp/main.c | 2 |
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); |