[svn-commits] blanchet: branch blanchet/v6 r60479 - /team/blanchet/v6/include/asterisk/acl.h

[svn-commits at lists.digium.com]

Author: blanchet
Date: Fri Apr  6 12:42:03 2007
New Revision: 60479

URL: http://svn.digium.com/view/asterisk?view=rev&rev=60479
Log:
restored ast_get_ip* routines to their original version. then copied the new IP version independent version to ast_viget_ip* versions, so that other customers of these routines could move whenever ready.


Modified:
    team/blanchet/v6/include/asterisk/acl.h

Modified: team/blanchet/v6/include/asterisk/acl.h
URL: http://svn.digium.com/view/asterisk/team/blanchet/v6/include/asterisk/acl.h?view=diff&rev=60479&r1=60478&r2=60479
==============================================================================
--- team/blanchet/v6/include/asterisk/acl.h (original)
+++ team/blanchet/v6/include/asterisk/acl.h Fri Apr  6 12:42:03 2007
@@ -42,8 +42,7 @@
 struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path);
 int ast_apply_ha(struct ast_ha *ha, struct sockaddr_in *sin);
 int ast_get_ip(struct sockaddr_in *sin, const char *value);
-int ast_get_ip_or_srv(struct sockaddr *sa, socklen_t *salen,
-		      const char *value, const char *service);
+int ast_get_ip_or_srv(struct sockaddr_in *sin, const char *value, const char *service);
 int ast_ouraddrfor(struct in_addr *them, struct in_addr *us);
 int ast_lookup_iface(char *iface, struct in_addr *address);
 struct ast_ha *ast_duplicate_ha_list(struct ast_ha *original);
@@ -51,6 +50,19 @@
 int ast_str2tos(const char *value, unsigned int *tos);
 const char *ast_tos2str(unsigned int tos);
 
+/* IP version independent (IPv4 and IPv6) version of ACL
+ * using a new namespace to avoid conflict with current code
+ * so any channel and module can transition to IPv6 one at a time.
+ * duplicate code however is not automatically synched with changes above
+ *
+ * \author Marc Blanchet <marc.blanchet at viagenie.ca>
+ * Copyright (C) 2007, Viagenie, Inc.
+ */
+struct ast_viha;
+
+int ast_viget_ip(struct sockaddr *sa, socklen_t *sa_len, const char *value);
+int ast_viget_ip_or_srv(struct sockaddr *sa, socklen_t *sa_len, const char *value, const char *service);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif