http_send: Rename access_perm_list to http_acl.

diff --git a/http_send.c b/http_send.c
index 685ad45dd1d311062ca08d0a9094130e28088b41..a5c37864c199c8dd7d49b5c9bc3756820120ea87 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -50,7 +50,7 @@ enum http_status {
 /** The list of connected clients. */
 static struct list_head clients;
 /** The whitelist/blacklist. */
 /** 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 {
 
 /** 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;
        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;
 };
 
        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;
 
        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:
                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;
 
 {
        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) {
                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);
        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)
 }
 
 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;
 
        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);
                char *tmp = make_message("%s%s/%d ", ap? ap : "",
                        inet_ntoa(ai->addr), ai->netmask);
                free(ap);


@@ -479,7 +479,7 @@ static void init_access_control_list(void)
        int i;
        struct sender_command_data scd;
 
        int i;
        struct sender_command_data scd;
 

-       INIT_LIST_HEAD(&access_perm_list);
+       INIT_LIST_HEAD(&http_acl);

        for (i = 0; i < conf.http_access_given; i++) {
                char *arg = para_strdup(conf.http_access_arg[i]);
                char *p = strchr(arg, '/');
        for (i = 0; i < conf.http_access_given; i++) {
                char *arg = para_strdup(conf.http_access_arg[i]);
                char *p = strchr(arg, '/');