making cache expiry configurable

Author: prokopowicz

src/blacklist.c

@@ -14,12 +14,16 @@
 
 int initial_blacklist_size = 100;
 
+/**
+ * externally settable parameter
+ *
+ * @param new_size initial size of expandable blacklist cache
+ */
+
 void set_initial_blacklist_size(int new_size) 
 {
   initial_blacklist_size = new_size;
 }
-
-
 /**
  * Adds the actor to the Repsheet blacklist
  *

src/check_cidr.c

@@ -7,13 +7,23 @@
 #include "vector.h"
 
 
-int CACHED_FOR_SECONDS = 60;
+unsigned int cache_expiry = 60;
+
+/**
+ * externally settable parameter
+ *
+ * @param new_expiry number of seconds for caching CIDR blocks before hitting redis again
+ */
+void set_cache_expiry(unsigned int new_expiry) 
+{
+  cache_expiry = new_expiry;
+}
 
 int check_and_update_cache(redisContext *context, const char *actor, char *reason, char *list, expanding_vector *ev, time_t *last_update_time)
 {
   long current_seconds = time(NULL);
 
-  if (*last_update_time + CACHED_FOR_SECONDS < current_seconds) {
+  if (*last_update_time + cache_expiry < current_seconds) {
     clear_expanding_vector(ev);
     redisReply *listed = redisCommand(context, "SMEMBERS repsheet:cidr:%s", list);
     if (listed) {

src/check_cidr.h

@@ -1,9 +1,6 @@
 #ifndef CHECK_CIDR
 #define CHECK_CIDR
 
-extern int CACHED_FOR_SECONDS;
-
 #include "vector.h"
 int checkCIDR(redisContext *context, const char *actor, char *reason, char *list, expanding_vector *ev, long *cache_update_time);
-
 #endif

src/repsheet.h

@@ -38,5 +38,6 @@ int is_user_marked(redisContext *context, const char *actor, char *reason);
 
 void set_initial_whitelist_size(int new_size);
 void set_initial_blacklist_size(int new_size);
+void set_cache_expiry(unsigned int new_expiry);
 
 #endif

test/cidr_test.c

@@ -5,10 +5,12 @@ START_TEST(class_c)
 {
   char *block = "10.0.0.0/24";
   int in = ip_address_to_integer("10.0.0.50");
+  int out = ip_address_to_integer("10.0.1.50");
   int lower = ip_address_to_integer("10.0.0.0");
   int upper = ip_address_to_integer("10.0.0.255");
 
   ck_assert_int_eq(1, cidr_contains(block, in));
+  ck_assert_int_eq(0, cidr_contains(block, out));
   ck_assert_int_eq(1, cidr_contains(block, lower));
   ck_assert_int_eq(1, cidr_contains(block, upper));
 }