aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-20 14:38:36 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-20 14:38:36 +0000
commit5bfa6e3dc22a361cac8033ef1e750113552890ed (patch)
tree34782c0c57ac6462b0324972f96d798027eb24c8
parentdc2e8cb722e904a24b05ea6026b02006429ce452 (diff)
expose struct ast_ha so external code can do things such as printing it
(e.g. chan_sip.c in a subsequent commit). Obviously exposing the internals of a data structure is far from ideal (especially in a case like this where the implementation is very inefficient and will need to be changed at some point). On the other hand, it was also unclear what additional APIs should we provide instead, and because exposing the stucture has no impact on source and binary compatibility, this seemed to me the best option at this time. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@76034 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--include/asterisk/acl.h16
-rw-r--r--main/acl.c8
2 files changed, 15 insertions, 9 deletions
diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h
index 9dba9c17e..7b107641c 100644
--- a/include/asterisk/acl.h
+++ b/include/asterisk/acl.h
@@ -36,7 +36,21 @@ extern "C" {
/* Host based access control */
-struct ast_ha;
+/*! \brief internal representation of acl entries
+ * In principle user applications would have no need for this,
+ * but there is sometimes a need to extract individual items,
+ * e.g. to print them, and rather than defining iterators to
+ * navigate the list, and an externally visible 'struct ast_ha_entry',
+ * at least in the short term it is more convenient to make the whole
+ * thing public and let users play with them.
+ */
+struct ast_ha {
+ /* Host access rule */
+ struct in_addr netaddr;
+ struct in_addr netmask;
+ int sense;
+ struct ast_ha *next;
+};
/*! \brief Free host access list */
void ast_free_ha(struct ast_ha *ha);
diff --git a/main/acl.c b/main/acl.c
index e15f4a336..efbc9d183 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -70,14 +70,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/srv.h"
-struct ast_ha {
- /* Host access rule */
- struct in_addr netaddr;
- struct in_addr netmask;
- int sense;
- struct ast_ha *next;
-};
-
struct my_ifreq {
char ifrn_name[IFNAMSIZ]; /* Interface name, e.g. "eth0", "ppp0", etc. */
struct sockaddr_in ifru_addr;