X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=acl.c;h=14edcf7d87c08617e175e0fff44e3c572e305160;hp=fb9cded668dd15baed93c548dfadc64085f98fc3;hb=ac153fd54a0f093581ee863984070a325d5343b8;hpb=8157cf8316ef9b3769933d5b17e169b400d36da8

diff --git a/acl.c b/acl.c
index fb9cded6..14edcf7d 100644
--- a/acl.c
+++ b/acl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -24,7 +24,6 @@ struct access_info {
 	struct list_head node;
 };
 
-
 /**
  * Return true if addr_1 matches addr_2 in the first `netmask' bits.
  */
@@ -74,18 +73,16 @@ no_match:
  * \param addr The address to add.
  * \param netmask The netmask to use for this entry.
  */
-static void acl_add_entry(struct list_head *acl, struct in_addr addr,
-		int netmask)
+static void acl_add_entry(struct list_head *acl, char *addr, int netmask)
 {
 	struct access_info *ai = para_malloc(sizeof(struct access_info));
-	ai->addr = addr;
+
+	inet_pton(AF_INET, addr, &ai->addr);
 	ai->netmask = netmask;
-	PARA_INFO_LOG("adding %s/%i to access list\n", inet_ntoa(ai->addr),
-		ai->netmask);
+	PARA_INFO_LOG("adding %s/%i to access list\n", addr, ai->netmask);
 	para_list_add(&ai->node, acl);
 }
 
-
 /**
  * Delete an entry from an access control list.
  *
@@ -93,21 +90,18 @@ static void acl_add_entry(struct list_head *acl, struct in_addr addr,
  * \param addr The address to delete.
  * \param netmask The netmask of the entry to be removed from the list.
  */
-static void acl_del_entry(struct list_head *acl, struct in_addr addr,
-		int netmask)
+static void acl_del_entry(struct list_head *acl, char *addr, int netmask)
 {
 	struct access_info *ai, *tmp;
 
 	list_for_each_entry_safe(ai, tmp, acl, node) {
-		char *nad = para_strdup(inet_ntoa(ai->addr));
-		if (!strcmp(nad, inet_ntoa(addr)) &&
+		if (!strcmp(addr, inet_ntoa(ai->addr)) &&
 				ai->netmask == netmask) {
 			PARA_NOTICE_LOG("removing %s/%i from access list\n",
-				nad, ai->netmask);
+					addr, ai->netmask);
 			list_del(&ai->node);
 			free(ai);
 		}
-		free(nad);
 	}
 }
 
@@ -148,18 +142,17 @@ void acl_init(struct list_head *acl, char * const *acl_info, int num)
 	for (i = 0; i < num; i++) {
 		char *arg = para_strdup(acl_info[i]);
 		char *p = strchr(arg, '/');
-		struct in_addr addr;
 		int netmask;
 
 		if (!p)
 			goto err;
 		*p = '\0';
-		if (!inet_pton(AF_INET, arg, &addr))
+		if (!is_valid_ipv4_address(arg))
 			goto err;
 		netmask = atoi(++p);
 		if (netmask < 0 || netmask > 32)
 			goto err;
-		acl_add_entry(acl, addr, netmask);
+		acl_add_entry(acl, arg, netmask);
 		goto success;
 err:
 		PARA_CRIT_LOG("syntax error: %s\n", acl_info[i]);
@@ -169,7 +162,6 @@ success:
 	}
 }
 
-
 /**
  * Check whether the peer name of a given fd is allowed by an acl.
  *
@@ -196,8 +188,8 @@ int acl_check_access(int fd, struct list_head *acl, int default_deny)
  * \param acl The access control list.
  * \param default_deny Whether \a acl is a whitelist.
  */
-void acl_allow(struct in_addr addr, int netmask,
-		struct list_head *acl, int default_deny)
+void acl_allow(char *addr, int netmask,
+	       struct list_head *acl, int default_deny)
 {
 	if (default_deny)
 		acl_add_entry(acl, addr, netmask);
@@ -208,13 +200,13 @@ void acl_allow(struct in_addr addr, int netmask,
 /**
  * Deny access for a range of IP addresses.
  *
- * \param addr The address to permit.
- * \param netmask The netmask of the entry to be permitted.
+ * \param addr The address to deny.
+ * \param netmask The netmask of the entry to be denied.
  * \param acl The access control list.
  * \param default_deny Whether \a acl is a whitelist.
  */
-void acl_deny(struct in_addr addr, int netmask,
-		struct list_head *acl, int default_deny)
+void acl_deny(char *addr, int netmask,
+	      struct list_head *acl, int default_deny)
 {
 	acl_allow(addr, netmask, acl, !default_deny);
 }