ipcpd: Fully gate fa/dt RIB ops on IPCP_FLOW_STATStestingbe

The previous shape registered no-op _rib_read / _rib_readdir /
_rib_getattr handlers when IPCP_FLOW_STATS was off, and there was a
bug where *buf was not set in the no-op causing free on an
uninitialized pointer.

IPCP_FLOW_STATS was referenced by config.h.in but the declaration was
lost during the CMake refactor.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

2 files changed, 20 insertions, 38 deletions

diff --git a/src/ipcpd/unicast/dt.c b/src/ipcpd/unicast/dt.c
index 8f5eb775..60cab486 100644
--- a/src/ipcpd/unicast/dt.c
+++ b/src/ipcpd/unicast/dt.c
@@ -179,11 +179,11 @@ struct {
         pthread_t          listener;
 } dt;
 
+#ifdef IPCP_FLOW_STATS
 static int dt_rib_read(const char * path,
                        char *       buf,
                        size_t       len)
 {
-#ifdef IPCP_FLOW_STATS
         int         fd;
         int         i;
         char        str[QOS_BLOCK_LEN + 1];
@@ -270,17 +270,10 @@ static int dt_rib_read(const char * path,
         pthread_mutex_unlock(&dt.stat[fd].lock);
 
         return RIB_FILE_STRLEN;
-#else
-        (void) path;
-        (void) buf;
-        (void) len;
-        return 0;
-#endif
 }
 
 static int dt_rib_readdir(char *** buf)
 {
-#ifdef IPCP_FLOW_STATS
         char   entry[RIB_PATH_LEN + 1];
         size_t i;
         int    idx = 0;
@@ -327,16 +320,11 @@ static int dt_rib_readdir(char *** buf)
  fail_entries:
         pthread_rwlock_unlock(&dt.lock);
         return -ENOMEM;
-#else
-        (void) buf;
-        return 0;
-#endif
 }
 
 static int dt_rib_getattr(const char *      path,
                           struct rib_attr * attr)
 {
-#ifdef IPCP_FLOW_STATS
         int    fd;
         char * entry;
 
@@ -356,10 +344,7 @@ static int dt_rib_getattr(const char *      path,
         }
 
         pthread_mutex_unlock(&dt.stat[fd].lock);
-#else
-        (void) path;
-        (void) attr;
-#endif
+
         return 0;
 }
 
@@ -368,6 +353,7 @@ static struct rib_ops r_ops = {
         .readdir = dt_rib_readdir,
         .getattr = dt_rib_getattr
 };
+#endif /* IPCP_FLOW_STATS */
 
 #ifdef IPCP_FLOW_STATS
 /*
@@ -573,7 +559,9 @@ int dt_init(struct dt_config cfg)
 {
         int              i;
         int              j;
+#ifdef IPCP_FLOW_STATS
         char             dtstr[RIB_NAME_STRLEN + 1];
+#endif
         enum pol_pff     pp;
         struct conn_info info;
 
@@ -655,17 +643,18 @@ int dt_init(struct dt_config cfg)
                 }
 
         dt.n_flows = 0;
-#endif
+
         sprintf(dtstr, "%s." ADDR_FMT32, DT, ADDR_VAL32(&dt.addr));
         if (rib_reg(dtstr, &r_ops)) {
                 log_err("Failed to register RIB.");
                 goto fail_rib_reg;
         }
+#endif
 
         return 0;
 
- fail_rib_reg:
 #ifdef IPCP_FLOW_STATS
+ fail_rib_reg:
         for (i = 0; i < PROC_MAX_FLOWS; ++i)
                 pthread_mutex_destroy(&dt.stat[i].lock);
  fail_stat_lock:
@@ -689,12 +678,14 @@ int dt_init(struct dt_config cfg)
 
 void dt_fini(void)
 {
+#ifdef IPCP_FLOW_STATS
         char dtstr[RIB_NAME_STRLEN + 1];
+#endif
         int i;
 
+#ifdef IPCP_FLOW_STATS
         sprintf(dtstr, "%s.%" PRIu64, DT, dt.addr);
         rib_unreg(dtstr);
-#ifdef IPCP_FLOW_STATS
         for (i = 0; i < PROC_MAX_FLOWS; ++i)
                 pthread_mutex_destroy(&dt.stat[i].lock);
 #endif
diff --git a/src/ipcpd/unicast/fa.c b/src/ipcpd/unicast/fa.c
index c0447885..43c56f90 100644
--- a/src/ipcpd/unicast/fa.c
+++ b/src/ipcpd/unicast/fa.c
@@ -125,11 +125,11 @@ struct {
         struct psched *  psched;
 } fa;
 
+#ifdef IPCP_FLOW_STATS
 static int fa_rib_read(const char * path,
                        char *       buf,
                        size_t       len)
 {
-#ifdef IPCP_FLOW_STATS
         struct fa_flow * flow;
         int              fd;
         char             r_addrstr[21];
@@ -199,17 +199,10 @@ static int fa_rib_read(const char * path,
         pthread_rwlock_unlock(&fa.flows_lock);
 
         return strlen(buf);
-#else
-        (void) path;
-        (void) buf;
-        (void) len;
-        return 0;
-#endif
 }
 
 static int fa_rib_readdir(char *** buf)
 {
-#ifdef IPCP_FLOW_STATS
         char   entry[RIB_PATH_LEN + 1];
         size_t i;
         int    idx = 0;
@@ -254,16 +247,11 @@ static int fa_rib_readdir(char *** buf)
  fail_entries:
         pthread_rwlock_unlock(&fa.flows_lock);
         return -ENOMEM;
-#else
-        (void) buf;
-        return 0;
-#endif
 }
 
 static int fa_rib_getattr(const char *      path,
                           struct rib_attr * attr)
 {
-#ifdef IPCP_FLOW_STATS
         int              fd;
         char *           entry;
         struct fa_flow * flow;
@@ -286,10 +274,7 @@ static int fa_rib_getattr(const char *      path,
         }
 
         pthread_rwlock_unlock(&fa.flows_lock);
-#else
-        (void) path;
-        (void) attr;
-#endif
+
         return 0;
 }
 
@@ -298,6 +283,7 @@ static struct rib_ops r_ops = {
         .readdir = fa_rib_readdir,
         .getattr = fa_rib_getattr
 };
+#endif /* IPCP_FLOW_STATS */
 
 static int eid_to_fd(uint64_t eid)
 {
@@ -655,8 +641,10 @@ int fa_init(void)
         if (pthread_cond_init(&fa.cond, &cattr))
                 goto fail_cond;
 
+#ifdef IPCP_FLOW_STATS
         if (rib_reg(FA, &r_ops))
                 goto fail_rib_reg;
+#endif
 
         fa.eid = dt_reg_comp(&fa, &fa_post_packet, FA);
         if ((int) fa.eid < 0)
@@ -669,8 +657,10 @@ int fa_init(void)
         return 0;
 
  fail_dt_reg:
+#ifdef IPCP_FLOW_STATS
         rib_unreg(FA);
  fail_rib_reg:
+#endif
         pthread_cond_destroy(&fa.cond);
  fail_cond:
         pthread_condattr_destroy(&cattr);
@@ -684,8 +674,9 @@ int fa_init(void)
 
 void fa_fini(void)
 {
+#ifdef IPCP_FLOW_STATS
         rib_unreg(FA);
-
+#endif
         pthread_cond_destroy(&fa.cond);;
         pthread_mutex_destroy(&fa.mtx);
         pthread_rwlock_destroy(&fa.flows_lock);