exposed whitelist and blacklist functions from repsheet.h

Author: prokopowicz

src/blacklist.c

@@ -3,7 +3,6 @@
 #include "common.h"
 #include "cidr.h"
 
-#include "blacklist.h"
 #include "check_cidr.h"
 
 /**

src/blacklist.h

@@ -5,8 +5,6 @@
 
 #include "config.h"
 #include "repsheet.h"
-#include "whitelist.h"
-#include "blacklist.h"
 
 /**
  * @file librepsheet.c

src/librepsheet.c

@@ -31,7 +31,14 @@ int actor_status(redisContext *context, const char *actor, int type, char *reaso
 int remote_address(char *connected_address, char *xff_header, char *address);
 
 int blacklist(redisContext *context, const char *actor, int type, const char *reason);
+int is_ip_blacklisted(redisContext *context, const char *actor, char *reason);
+int is_user_blacklisted(redisContext *context, const char *actor, char *reason);
+
 int whitelist(redisContext *context, const char *actor, int type, const char *reason);
+int is_ip_whitelisted(redisContext *context, const char *actor, char *reason);
+int is_user_whitelisted(redisContext *context, const char *actor, char *reason);
+int is_country_whitelisted(redisContext *context, const char *country_code);
+
 int mark(redisContext *context, const char *actor, int type, const char *reason);
 int is_ip_marked(redisContext *context, const char *actor, char *reason);
 int is_user_marked(redisContext *context, const char *actor, char *reason);

src/repsheet.h

@@ -3,7 +3,6 @@
 #include "common.h"
 #include "cidr.h"
 #include "check_cidr.h"
-#include "whitelist.h"
 
 
 /**

src/whitelist.c

@@ -16,9 +16,7 @@ test_runner_SOURCES = librepsheet_test.c   \
                       ../src/check_cidr.h  \
                       ../src/check_cidr.c  \
                       ../src/blacklist.c   \
-                      ../src/blacklist.h   \
                       ../src/whitelist.c   \
-                      ../src/whitelist.h   \
                       ../src/marked.c      \
                       ../src/xff.c         \
                       ../src/xff.h         \

src/whitelist.h

@@ -1,6 +1,5 @@
 #include <hiredis/hiredis.h>
 #include "../src/repsheet.h"
-#include "../src/blacklist.h"
 #include "check.h"
 
 redisContext *context;

test/Makefile.am

@@ -1,7 +1,5 @@
 #include <hiredis/hiredis.h>
 #include "../src/repsheet.h"
-#include "../src/whitelist.h"
-#include "../src/blacklist.h"
 #include "check.h"
 #include <unistd.h>
 

test/blacklist_test.c

@@ -1,6 +1,5 @@
 #include <hiredis/hiredis.h>
 #include "../src/repsheet.h"
-#include "../src/whitelist.h"
 #include "check.h"
 
 redisContext *context;