More BSD enhancements (#970)

[asterisk/asterisk.git] / acl.c

diff --git a/acl.c b/acl.c
index 6adc7f3..9e1edb4 100755 (executable)
--- a/acl.c
+++ b/acl.c
@@ -29,7 +29,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/ioctl.h>
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
 #include <fcntl.h>
 #include <net/route.h>
 
@@ -72,6 +72,8 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path)
        char tmp[256] = "";
        struct ast_ha *prev = NULL;
        struct ast_ha *ret;
+       int x,z;
+       unsigned int y;
        ret = path;
        while(path) {
                prev = path;
@@ -86,13 +88,22 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path)
                        *nm = '\0';
                        nm++;
                }
-               if (!inet_aton(tmp, &ha->netaddr)) {
-                       ast_log(LOG_WARNING, "%s not a valid IP\n", stuff);
+               if (!strchr(nm, '.')) {
+                       if ((sscanf(nm, "%i", &x) == 1) && (x >= 0) && (x <= 32)) {
+                               y = 0;
+                               for (z=0;z<x;z++) {
+                                       y >>= 1;
+                                       y |= 0x80000000;
+                               }
+                               ha->netmask.s_addr = htonl(y);
+                       }
+               } else if (!inet_aton(nm, &ha->netmask)) {
+                       ast_log(LOG_WARNING, "%s not a valid netmask\n", nm);
                        free(ha);
                        return path;
                }
-               if (!inet_aton(nm, &ha->netmask)) {
-                       ast_log(LOG_WARNING, "%s not a valid netmask\n", nm);
+               if (!inet_aton(tmp, &ha->netaddr)) {
+                       ast_log(LOG_WARNING, "%s not a valid IP\n", tmp);
                        free(ha);
                        return path;
                }
@@ -168,7 +179,7 @@ int ast_lookup_iface(char *iface, struct in_addr *address) {
 
 int ast_ouraddrfor(struct in_addr *them, struct in_addr *us)
 {
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
        struct sockaddr_in *sin;
        struct sockaddr *sa;
        struct {