From a81e1dfb377ef3e53c2a158ea438f27773ceb25d Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@intec.ugent.be>
Date: Sun, 22 May 2016 10:03:49 +0200
Subject: lib: removed fd cleaning function

---
 src/ipcpd/shim-udp/main.c |  7 ++++---
 src/lib/dev.c             | 37 ++++++++++---------------------------
 2 files changed, 14 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index 601698e2..1e58a8fc 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -595,9 +595,10 @@ static int ipcp_udp_port_alloc_reply(int src_udp_port,
 
 static int ipcp_udp_flow_dealloc_req(int udp_port)
 {
-        int fd          = -1;
+        int fd      = -1;
+        int port_id = -1;
+
         struct shm_ap_rbuff * rb;
-        int port_id     = -1;
 
         rw_lock_rdlock(&_ipcp->state_lock);
         rw_lock_wrlock(&_ap_instance->flows_lock);
@@ -1477,7 +1478,7 @@ static int ipcp_udp_flow_dealloc(int port_id)
                 rw_lock_unlock(&_ipcp->state_lock);
                 LOG_DBGF("Flow with port_id %d has no peer.", port_id);
                 close(fd);
-                return 0 ;
+                return 0;
         }
 
         remote_udp       = r_saddr.sin_port;
diff --git a/src/lib/dev.c b/src/lib/dev.c
index 95fca1ec..d332a27f 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -154,26 +154,6 @@ static int port_id_to_fd(int port_id)
 }
 #endif
 
-static void clean_fds()
-{
-        int i;
-        for (i = 0; i < AP_MAX_FLOWS; ++i) {
-                if (flow_alloc_res(i) < 0) {
-                        rw_lock_wrlock(&_ap_instance->flows_lock);
-                        if (_ap_instance->flows[i].port_id < 0) {
-                                rw_lock_unlock(&_ap_instance->flows_lock);
-                                continue;
-                        }
-
-                        bmp_release(_ap_instance->fds, i);
-                        _ap_instance->flows[i].port_id = -1;
-                        shm_ap_rbuff_close(_ap_instance->flows[i].rb);
-                        _ap_instance->flows[i].rb = NULL;
-                        rw_lock_unlock(&_ap_instance->flows_lock);
-                }
-        }
-}
-
 int ap_reg(char ** difs,
            size_t  len)
 {
@@ -289,8 +269,6 @@ int flow_accept(int     fd,
 
         msg.pid     = _ap_instance->api->id;
 
-        clean_fds();
-
         rw_lock_unlock(&_ap_instance->data_lock);
 
         recv_msg = send_recv_irm_msg(&msg);
@@ -322,8 +300,12 @@ int flow_accept(int     fd,
 
         rw_lock_rdlock(&_ap_instance->data_lock);
         rw_lock_wrlock(&_ap_instance->flows_lock);
-
         cfd = bmp_allocate(_ap_instance->fds);
+        if (!bmp_is_id_valid(_ap_instance->fds, cfd)) {
+                rw_lock_unlock(&_ap_instance->flows_lock);
+                rw_lock_unlock(&_ap_instance->data_lock);
+                return -1;
+        }
 
         _ap_instance->flows[cfd].rb = shm_ap_rbuff_open(recv_msg->pid);
         if (_ap_instance->flows[cfd].rb == NULL) {
@@ -412,8 +394,6 @@ int flow_alloc(char * dst_name,
         msg.pid         = _ap_instance->api->id;
         msg.ap_name     = _ap_instance->api->name;
 
-        clean_fds();
-
         rw_lock_unlock(&_ap_instance->data_lock);
 
         recv_msg = send_recv_irm_msg(&msg);
@@ -427,11 +407,14 @@ int flow_alloc(char * dst_name,
         }
 
         rw_lock_rdlock(&_ap_instance->data_lock);
-
         rw_lock_wrlock(&_ap_instance->flows_lock);
 
         fd = bmp_allocate(_ap_instance->fds);
-
+        if (!bmp_is_id_valid(_ap_instance->fds, fd)) {
+                rw_lock_unlock(&_ap_instance->flows_lock);
+                rw_lock_unlock(&_ap_instance->data_lock);
+                return -1;
+        }
         _ap_instance->flows[fd].rb = shm_ap_rbuff_open(recv_msg->pid);
         if (_ap_instance->flows[fd].rb == NULL) {
                 bmp_release(_ap_instance->fds, fd);
-- 
cgit v1.2.3