From ebc7f15ec75526ffacad7b82c99764b90eef021a Mon Sep 17 00:00:00 2001
From: rofl0r <rofl0r@users.noreply.github.com>
Date: Mon, 7 Sep 2020 21:53:14 +0100
Subject: [PATCH] acl: typedef access_list to acl_list_t

this allows to switch the underlying implementation easily.
---
 src/acl.c  | 8 ++++----
 src/acl.h  | 7 ++++---
 src/conf.h | 3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/acl.c b/src/acl.c
index 15bc2a1..9e905d7 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -111,7 +111,7 @@ fill_netmask_array (char *bitmask_string, int v6,
 /**
  * If the access list has not been set up, create it.
  */
-static int init_access_list(vector_t *access_list)
+static int init_access_list(acl_list_t *access_list)
 {
         if (!*access_list) {
                 *access_list = vector_create ();
@@ -135,7 +135,7 @@ static int init_access_list(vector_t *access_list)
  *     0 otherwise.
  */
 int
-insert_acl (char *location, acl_access_t access_type, vector_t *access_list)
+insert_acl (char *location, acl_access_t access_type, acl_list_t *access_list)
 {
         struct acl_s acl;
         int ret;
@@ -332,7 +332,7 @@ static int check_numeric_acl (const struct acl_s *acl, uint8_t addr[IPV6_LEN])
  *     1 if allowed
  *     0 if denied
  */
-int check_acl (const char *ip, union sockaddr_union *addr, vector_t access_list)
+int check_acl (const char *ip, union sockaddr_union *addr, acl_list_t access_list)
 {
         struct acl_s *acl;
         int perm = 0, is_numeric_addr;
@@ -388,7 +388,7 @@ int check_acl (const char *ip, union sockaddr_union *addr, vector_t access_list)
         return 0;
 }
 
-void flush_access_list (vector_t access_list)
+void flush_access_list (acl_list_t access_list)
 {
         struct acl_s *acl;
         size_t i;
diff --git a/src/acl.h b/src/acl.h
index ba0aebe..495a4b3 100644
--- a/src/acl.h
+++ b/src/acl.h
@@ -25,11 +25,12 @@
 #include "sock.h"
 
 typedef enum { ACL_ALLOW, ACL_DENY } acl_access_t;
+typedef vector_t acl_list_t;
 
 extern int insert_acl (char *location, acl_access_t access_type,
-                       vector_t *access_list);
+                       acl_list_t *access_list);
 extern int check_acl (const char *ip_address, union sockaddr_union *addr,
-                      vector_t access_list);
-extern void flush_access_list (vector_t access_list);
+                      acl_list_t access_list);
+extern void flush_access_list (acl_list_t access_list);
 
 #endif
diff --git a/src/conf.h b/src/conf.h
index 085169d..e89806a 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -24,6 +24,7 @@
 
 #include "hashmap.h"
 #include "vector.h"
+#include "acl.h"
 
 /*
  * Stores a HTTP header created using the AddHeader directive.
@@ -93,7 +94,7 @@ struct config_s {
          */
         char *statpage;
 
-        vector_t access_list;
+        acl_list_t access_list;
 
         /*
          * Store the list of port allowed by CONNECT.