X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=http_send.c;h=446cde4f72488c684696c13b41e91840df20fe0c;hb=e593b5f44255414087e226a25f4bbd392c9e7c76;hp=685ad45dd1d311062ca08d0a9094130e28088b41;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde;p=paraslash.git

diff --git a/http_send.c b/http_send.c
index 685ad45d..446cde4f 100644
--- 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. */
-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;
 };
 
@@ -214,14 +214,14 @@ static int v4_addr_match(uint32_t addr_1, uint32_t addr_2, uint8_t netmask)
 	return (htonl(addr_1) & mask) == (htonl(addr_2) & mask);
 }
 
-static int host_in_access_perm_list(struct http_client *hc)
+static int host_in_acl(int fd, struct list_head *acl)
 {
 	struct access_info *ai, *tmp;
 	struct sockaddr_storage ss;
 	socklen_t sslen = sizeof(ss);
 	struct in_addr v4_addr;
 
-	if (getpeername(hc->fd, (struct sockaddr *)&ss, &sslen) < 0) {
+	if (getpeername(fd, (struct sockaddr *)&ss, &sslen) < 0) {
 		PARA_ERROR_LOG("Can not determine peer address: %s\n", strerror(errno));
 		goto no_match;
 	}
@@ -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, acl, node)
 		if (v4_addr_match(v4_addr.s_addr, ai->addr.s_addr, ai->netmask))
 			return 1;
 no_match:
@@ -294,8 +294,8 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 		err_msg = "server full";
 		goto err_out;
 	}
-	match = host_in_access_perm_list(hc);
-	PARA_DEBUG_LOG("host_in_access_perm_list: %d\n", match);
+	match = host_in_acl(hc->fd, &http_acl);
+	PARA_DEBUG_LOG("host_in_acl: %d\n", match);
 	if ((match && !conf.http_default_deny_given) ||
 			(!match && conf.http_default_deny_given)) {
 		err_msg = "permission denied";
@@ -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)
@@ -436,18 +436,26 @@ static int http_com_allow(struct sender_command_data *scd)
 	return 1;
 }
 
-static char *http_info(void)
+static char *get_acl_contents(struct list_head *acl)
 {
-	char *clnts = NULL, *ap = NULL, *ret;
 	struct access_info *ai, *tmp_ai;
-	struct http_client *hc, *tmp_hc;
+	char *ret = NULL;
 
-	list_for_each_entry_safe(ai, tmp_ai, &access_perm_list, node) {
-		char *tmp = make_message("%s%s/%d ", ap? ap : "",
+	list_for_each_entry_safe(ai, tmp_ai, acl, node) {
+		char *tmp = make_message("%s%s/%d ", ret? ret : "",
 			inet_ntoa(ai->addr), ai->netmask);
-		free(ap);
-		ap = tmp;
+		free(ret);
+		ret = tmp;
 	}
+	return ret;
+}
+
+static char *http_info(void)
+{
+	char *clnts = NULL, *ret;
+	struct http_client *hc, *tmp_hc;
+
+	char *acl_contents = get_acl_contents(&http_acl);
 	list_for_each_entry_safe(hc, tmp_hc, &clients, node) {
 		char *tmp = make_message("%s%s ", clnts? clnts : "", hc->name);
 		free(clnts);
@@ -467,21 +475,21 @@ static char *http_info(void)
 		conf.http_max_clients_arg > 0? "" : " (unlimited)",
 		clnts? clnts : "(none)",
 		conf.http_default_deny_given? "allow" : "deny",
-		ap? ap : "(none)"
+		acl_contents? acl_contents : "(none)"
 	);
-	free(ap);
+	free(acl_contents);
 	free(clnts);
 	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 +543,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");