X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=acl.c;h=a3e161db3278c3db1e7b82d1836cbaa16e8897ec;hp=53a4170cccf7c1a957f3c6929ff0836ec8c673e1;hb=faccd246cf9ee662cd8262d0db2a2375c1d4da86;hpb=b88a9a0cbbb39e999ae4942ed596b17ce2ae7f23

diff --git a/acl.c b/acl.c
index 53a4170c..a3e161db 100644
--- a/acl.c
+++ b/acl.c
@@ -24,7 +24,6 @@ struct access_info {
 	struct list_head node;
 };
 
-
 /**
  * Return true if addr_1 matches addr_2 in the first `netmask' bits.
  */
@@ -45,7 +44,7 @@ static int v4_addr_match(uint32_t addr_1, uint32_t addr_2, uint8_t netmask)
  *
  * \return One if \a fd belongs to \a acl, zero otherwise.
  */
-int acl_lookup(int fd, struct list_head *acl)
+static int acl_lookup(int fd, struct list_head *acl)
 {
 	struct access_info *ai, *tmp;
 	struct sockaddr_storage ss;
@@ -74,7 +73,7 @@ no_match:
  * \param addr The address to add.
  * \param netmask The netmask to use for this entry.
  */
-void acl_add_entry(struct list_head *acl, struct in_addr addr,
+static void acl_add_entry(struct list_head *acl, struct in_addr addr,
 		int netmask)
 {
 	struct access_info *ai = para_malloc(sizeof(struct access_info));
@@ -85,7 +84,6 @@ void acl_add_entry(struct list_head *acl, struct in_addr addr,
 	para_list_add(&ai->node, acl);
 }
 
-
 /**
  * Delete an entry from an access control list.
  *
@@ -93,7 +91,7 @@ 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.
  */
-void acl_del_entry(struct list_head *acl, struct in_addr addr,
+static void acl_del_entry(struct list_head *acl, struct in_addr addr,
 		int netmask)
 {
 	struct access_info *ai, *tmp;
@@ -169,3 +167,51 @@ success:
 	}
 }
 
+/**
+ * Check whether the peer name of a given fd is allowed by an acl.
+ *
+ * \param fd File descriptor.
+ * \param acl The access control list.
+ * \param default_deny Whether \a acl is a whitelist.
+ *
+ * \return Positive if the peer of \a fd is permitted by \a acl, \p -E_ACL_PERM
+ * otherwise.
+ */
+int acl_check_access(int fd, struct list_head *acl, int default_deny)
+{
+	int match = acl_lookup(fd, acl);
+
+	return (!match || default_deny) && (match || !default_deny)?
+		1 : -E_ACL_PERM;
+}
+
+/**
+ * Permit access for a range of IP addresses.
+ *
+ * \param addr The address to permit.
+ * \param netmask The netmask of the entry to be permitted.
+ * \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)
+{
+	if (default_deny)
+		acl_add_entry(acl, addr, netmask);
+	else
+		acl_del_entry(acl, addr, 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 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)
+{
+	acl_allow(addr, netmask, acl, !default_deny);
+}