http_send.c: Make init_access_control_list() generic.

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index e60b3f90f2853c6ff12f9958d642cb8b3e691e36..7fe216b1a226987300dbd8aea89441a6da1da98a 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -50,7 +50,7 @@ enum http_status {
 /** The list of connected clients. */
 static struct list_head clients;
 /** The whitelist/blacklist. */
-static struct list_head access_perm_list;
+static struct list_head http_acl;
 
 /** Describes one client that connected the tcp port of the http sender. */
 struct http_client {
@@ -78,7 +78,7 @@ struct access_info {
        struct in_addr addr;
        /** The netmask for this entry. */
        unsigned netmask;
-       /** The position of this entry in the access_perm_list. */
+       /** The position of this entry in the acl. */
        struct list_head node;
 };
 
@@ -229,7 +229,7 @@ static int host_in_access_perm_list(struct http_client *hc)
        if (!v4_addr.s_addr)
                goto no_match;
 
-       list_for_each_entry_safe(ai, tmp, &access_perm_list, node)
+       list_for_each_entry_safe(ai, tmp, &http_acl, node)
                if (v4_addr_match(v4_addr.s_addr, ai->addr.s_addr, ai->netmask))
                        return 1;
 no_match:
@@ -395,7 +395,7 @@ static void del_perm_list_entry(struct sender_command_data *scd)
 {
        struct access_info *ai, *tmp;
 
-       list_for_each_entry_safe(ai, tmp, &access_perm_list, node) {
+       list_for_each_entry_safe(ai, tmp, &http_acl, node) {
                char *nad = para_strdup(inet_ntoa(ai->addr));
                if (!strcmp(nad, inet_ntoa(scd->addr)) &&
                                ai->netmask == scd->netmask) {
@@ -415,7 +415,7 @@ static void add_perm_list_entry(struct sender_command_data *scd)
        ai->netmask = scd->netmask;
        PARA_INFO_LOG("adding %s/%i to access list\n", inet_ntoa(ai->addr),
                ai->netmask);
-       para_list_add(&ai->node, &access_perm_list);
+       para_list_add(&ai->node, &http_acl);
 }
 
 static int http_com_deny(struct sender_command_data *scd)
@@ -442,7 +442,7 @@ static char *http_info(void)
        struct access_info *ai, *tmp_ai;
        struct http_client *hc, *tmp_hc;
 
-       list_for_each_entry_safe(ai, tmp_ai, &access_perm_list, node) {
+       list_for_each_entry_safe(ai, tmp_ai, &http_acl, node) {
                char *tmp = make_message("%s%s/%d ", ap? ap : "",
                        inet_ntoa(ai->addr), ai->netmask);
                free(ap);
@@ -474,14 +474,14 @@ static char *http_info(void)
        return ret;
 }
 
-static void init_access_control_list(void)
+static void init_acl(struct list_head *acl, char * const *acl_info, int num)
 {
        int i;
        struct sender_command_data scd;
 
-       INIT_LIST_HEAD(&access_perm_list);
-       for (i = 0; i < conf.http_access_given; i++) {
-               char *arg = para_strdup(conf.http_access_arg[i]);
+       INIT_LIST_HEAD(acl);
+       for (i = 0; i < num; i++) {
+               char *arg = para_strdup(acl_info[i]);
                char *p = strchr(arg, '/');
                if (!p)
                        goto err;
@@ -535,7 +535,7 @@ void http_send_init(struct sender *s)
        s->client_cmds[SENDER_ADD] = NULL;
        s->client_cmds[SENDER_DELETE] = NULL;
        self = s;
-       init_access_control_list();
+       init_acl(&http_acl, conf.http_access_arg, conf.http_access_given);
        if (!conf.http_no_autostart_given)
                open_tcp_port(conf.http_port_arg); /* ignore errors */
        PARA_DEBUG_LOG("%s", "http sender init complete\n");