1 files changed, 12 insertions, 8 deletions

diff --git a/ot_accesslist.h b/ot_accesslist.h
index 0a7488e..0a8bf4c 100644
--- a/ot_accesslist.h
+++ b/ot_accesslist.h
@@ -16,13 +16,17 @@
 #define WANT_ACCESSLIST
 void         accesslist_init(void);
 void         accesslist_deinit(void);
-int          accesslist_hashisvalid(ot_hash hash);
+int          accesslist_hashisvalid(const ot_hash hash);
 void         accesslist_cleanup(void);
 
-extern char *g_accesslist_filename;
+/* Scan buf for up to capacity info_hashes in hexadecimal notation, one per
+   line, and return how many were written to dest */
+size_t       accesslist_parse_hashes(ot_hash *dest, size_t capacity, const char *buf, size_t len);
+
+extern const char *g_accesslist_filename;
 #ifdef WANT_DYNAMIC_ACCESSLIST
-extern char *g_accesslist_pipe_add;
-extern char *g_accesslist_pipe_delete;
+extern const char *g_accesslist_pipe_add;
+extern const char *g_accesslist_pipe_delete;
 #endif
 
 #else
@@ -36,7 +40,7 @@ extern char *g_accesslist_pipe_delete;
 #endif
 
 /* Test if an address is subset of an ot_net, return value is considered a bool */
-int   address_in_net(const ot_ip6 address, const ot_net *net);
+int   accesslist_address_in_net(const ot_ip6 address, const ot_net *net);
 
 /* Store a value into a vector of struct { ot_net net, uint8_t[x] value } member;
    returns NULL
@@ -47,13 +51,13 @@ int   address_in_net(const ot_ip6 address, const ot_net *net);
    returns pointer to new member in vector for success
    member_size can be sizeof(ot_net) to reduce the lookup to a boolean mapping
 */
-void *set_value_for_net(const ot_net *net, ot_vector *vector, const void *value, const size_t member_size);
+void *accesslist_set_value_for_net(const ot_net *net, ot_vector *vector, const void *value, const size_t member_size);
 
 /* Takes a vector filled with struct { ot_net net, uint8_t[x] value } member;
    Returns pointer to _member_ associated with the net, or NULL if not found
    member_size can be sizeof(ot_net) to reduce the lookup to a boolean mapping
 */
-void *get_value_for_net(const ot_ip6 address, const ot_vector *vector, const size_t member_size);
+void *accesslist_get_value_for_net(const ot_ip6 address, const ot_vector *vector, const size_t member_size);
 
 #ifdef WANT_IP_FROM_PROXY
 int proxylist_add_network(const ot_net *proxy, const ot_net *net);
@@ -72,7 +76,7 @@ struct ot_log {
 extern ot_log *g_logchain_first, *g_logchain_last;
 
 void           loglist_add_network(const ot_net *net);
-void           loglist_reset();
+void           loglist_reset(void);
 int            loglist_check_address(const ot_ip6 address);
 #endif