From 0921044139bf323c308ff73109b508250db9db02 Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@intec.ugent.be>
Date: Tue, 19 Apr 2016 19:23:23 +0200
Subject: ipcpd: fixes in ipcp-data

deletion of flows was not implemented, renamed to ipcp_data_del_flow
removal of stub for has_flow_s (not needed)
made find_flow public, renamed to ipcp_data_find_flow
---
 src/ipcpd/ipcp-data.c | 29 ++++++++++++++++++++++++++---
 src/ipcpd/ipcp-data.h |  9 ++++-----
 2 files changed, 30 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/ipcpd/ipcp-data.c b/src/ipcpd/ipcp-data.c
index 2ed20943..1828fda9 100644
--- a/src/ipcpd/ipcp-data.c
+++ b/src/ipcpd/ipcp-data.c
@@ -436,8 +436,8 @@ uint64_t ipcp_data_get_addr(struct ipcp_data * data,
         return addr;
 }
 
-static flow_t * find_flow(struct ipcp_data * data,
-                          uint32_t           port_id)
+flow_t * ipcp_data_find_flow(struct ipcp_data * data,
+                             uint32_t           port_id)
 {
         struct list_head * h;
         list_for_each(h, &data->flows) {
@@ -452,7 +452,7 @@ static flow_t * find_flow(struct ipcp_data * data,
 bool ipcp_data_has_flow(struct ipcp_data * data,
                         uint32_t           port_id)
 {
-        return find_flow(data, port_id) != NULL;
+        return ipcp_data_find_flow(data, port_id) != NULL;
 }
 
 int ipcp_data_add_flow(struct ipcp_data * data,
@@ -474,3 +474,26 @@ int ipcp_data_add_flow(struct ipcp_data * data,
 
         return 0;
 }
+
+int ipcp_data_del_flow(struct ipcp_data * data,
+                       uint32_t           port_id)
+{
+        flow_t * f;
+
+        if (data == NULL)
+                return -1;
+
+        pthread_mutex_lock(&data->flow_lock);
+
+        f = ipcp_data_find_flow(data, port_id);
+        if (f == NULL)
+                return -1;
+
+        list_del(&f->list);
+
+        free(f);
+
+        pthread_mutex_unlock(&data->flow_lock);
+
+        return 0;
+}
diff --git a/src/ipcpd/ipcp-data.h b/src/ipcpd/ipcp-data.h
index a8db44f7..3f036ef5 100644
--- a/src/ipcpd/ipcp-data.h
+++ b/src/ipcpd/ipcp-data.h
@@ -80,12 +80,11 @@ uint64_t     ipcp_data_get_addr(struct ipcp_data * data,
                                 const char *       ap_name);
 bool         ipcp_data_has_flow(struct ipcp_data * data,
                                 uint32_t           port_id);
-bool         ipcp_data_has_flow_s(struct ipcp_data * data,
-                                  uint32_t           port_id,
-                                  enum flow_state    state);
+flow_t *     ipcp_data_find_flow(struct ipcp_data * data,
+                                 uint32_t           port_id);
 int          ipcp_data_add_flow(struct ipcp_data * data,
                                 flow_t *           flow);
-int          ipcp_data_remove_flow(struct ipcp_data * data,
-                                   uint32_t           port_id);
+int          ipcp_data_del_flow(struct ipcp_data * data,
+                                uint32_t           port_id);
 
 #endif /* IPCPD_IPCP_DATA_H */
-- 
cgit v1.2.3