Add count_characters and a CUnit test series for it.

client/fwknop_common.h

@@ -66,7 +66,6 @@
 #define HTTP_MAX_REQUEST_LEN        2000
 #define HTTP_MAX_RESPONSE_LEN       2000
 #define HTTP_MAX_USER_AGENT_LEN     100
-#define MAX_HOSTNAME_LEN            70
 #define MAX_URL_HOST_LEN            256
 #define MAX_URL_PATH_LEN            1024
 

common/fko_util.c

@@ -50,6 +50,11 @@
 
 #define NULL_STRING                 "<NULL>"                /*!< String which represents a NULL buffer */
 
+#ifdef HAVE_C_UNIT_TESTS
+#include "cunit_common.h"
+DECLARE_TEST_SUITE(utils_test, "Utility functions test suite");
+#endif
+
 /**
  * Structure to handle an encryption mode string string and its associated integer value
  */
@@ -1052,5 +1057,43 @@ ipv4_resolve(const char *dns_str, char *ip_str)
     return error;
 }
 
+int
+count_characters(const char *str, const char match, int len)
+{
+    int i, count = 0;
 
+    for (i=0; i < len; i++) {
+        if (str[i] == match)
+            count++;
+        if (str[i] == '\0')
+            return count;
+    }
+    return count;
+}
+
+#ifdef HAVE_C_UNIT_TESTS
+
+DECLARE_UTEST(test_count_characters, "test the count_characters function")
+{
+    char test_str[32];
+    strcpy(test_str, "abcd");
+    CU_ASSERT(count_characters(test_str, 'a', 4) == 1);
+    strcpy(test_str, "aacd");
+    CU_ASSERT(count_characters(test_str, 'a', 4) == 2);
+    strcpy(test_str, "a,b,c,d,");
+    CU_ASSERT(count_characters(test_str, ',', 4) == 2);
+    strcpy(test_str, "a,b,c,d,");
+    CU_ASSERT(count_characters(test_str, ',', 8) == 4);
+    strcpy(test_str, "aaaa");
+    CU_ASSERT(count_characters(test_str, 'a', 3) == 3);
+}
+
+int register_utils_test(void)
+{
+    ts_init(&TEST_SUITE(utils_test), TEST_SUITE_DESCR(utils_test), NULL, NULL);
+    ts_add_utest(&TEST_SUITE(utils_test), UTEST_FCT(test_count_characters), UTEST_DESCR(test_count_characters));
+
+    return register_ts(&TEST_SUITE(utils_test));
+}
+#endif
 /***EOF***/

common/fko_util.h

@@ -35,6 +35,8 @@
 
 #define MAX_CMDLINE_ARGS   30    /*!< should be way more than enough */
 #define MAX_ARGS_LINE_LEN  1024
+#define MAX_HOSTNAME_LEN    64
+
 /* Function prototypes
 */
 int     is_valid_encoded_msg_len(const int len);
@@ -61,11 +63,18 @@ void  chop_newline(char *str);
 void  chop_char(char *str, const char chop);
 void  chop_spaces(char *str);
 
+/**
+ *
+ * \brief counts the occurences of a character
+ *
+ * \return returns the number of chars found
+ */
+int   count_characters(const char *str, const char match, int len);
+
 int   strtoargv(const char * const args_str, char **argv_new, int *argc_new);
 void  free_argv(char **argv_new, int *argc_new);
 
-int     ipv4_resolve(const char *dns_str, char *ip_str);
-
+int   ipv4_resolve(const char *dns_str, char *ip_str);
 #if !HAVE_STRLCAT
 size_t  strlcat(char *dst, const char *src, size_t siz);
 #endif

lib/fko.h

@@ -1401,7 +1401,7 @@ int register_ts_fko_decode(void);
 int register_ts_hmac_test(void);
 int register_ts_digest_test(void);
 int register_ts_aes_test(void);
-
+int register_utils_test(void);
 #endif
 
 #endif /* FKO_H */

lib/fko_utests.c

@@ -2,6 +2,7 @@
 
 #include "fko.h"
 
+#include "fko_util.h"
 /**
  * Register test suites from FKO files.
  *
@@ -14,6 +15,7 @@ static void register_test_suites(void)
     register_ts_hmac_test();
     register_ts_digest_test();
     register_ts_aes_test();
+    register_utils_test();
 }
 
 /* The main() function for setting up and running the tests.

server/fw_util_firewalld.c

@@ -1319,7 +1319,7 @@ process_spa_request(const fko_srv_options_t * const opts,
         const acc_stanza_t * const acc, spa_data_t * const spadat)
 {
     char            nat_ip[MAX_IPV4_STR_LEN] = {0};
-    char            nat_dst[64] = {0}; //not finding a MAX_HOSTNAME_LEN #define
+    char            nat_dst[MAX_HOSTNAME_LEN] = {0};
     unsigned int    nat_port = 0;
     unsigned int    fst_proto;
     unsigned int    fst_port;

server/fw_util_iptables.c

@@ -1305,7 +1305,7 @@ process_spa_request(const fko_srv_options_t * const opts,
         const acc_stanza_t * const acc, spa_data_t * const spadat)
 {
     char            nat_ip[MAX_IPV4_STR_LEN] = {0};
-    char            nat_dst[64] = {0}; //not finding a MAX_HOSTNAME_LEN #define
+    char            nat_dst[MAX_HOSTNAME_LEN] = {0};
 
     unsigned int    nat_port = 0;
     unsigned int    fst_proto;