More BSD enhancements (#970)

[asterisk/asterisk.git] / acl.c

diff --git a/acl.c b/acl.c
index 399586a..9e1edb4 100755 (executable)
--- a/acl.c
+++ b/acl.c
@@ -29,7 +29,8 @@
 #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>
 
 static ast_mutex_t routeseq_lock = AST_MUTEX_INITIALIZER;
@@ -68,29 +69,43 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path)
 {
        struct ast_ha *ha = malloc(sizeof(struct ast_ha));
        char *nm;
+       char tmp[256] = "";
        struct ast_ha *prev = NULL;
        struct ast_ha *ret;
+       int x,z;
+       unsigned int y;
        ret = path;
        while(path) {
                prev = path;
                path = path->next;
        }
        if (ha) {
-               char *stringp=NULL;
-               stringp=stuff;
-               strsep(&stringp, "/");
-               nm = strsep(&stringp, "/");
+               strncpy(tmp, stuff, sizeof(tmp) - 1);
+               nm = strchr(tmp, '/');
                if (!nm)
                        nm = "255.255.255.255";
-               if (!inet_aton(stuff, &ha->netaddr)) {
-                       ast_log(LOG_WARNING, "%s not a valid IP\n", stuff);
-                       free(ha);
-                       return NULL;
+               else {
+                       *nm = '\0';
+                       nm++;
                }
-               if (!inet_aton(nm, &ha->netmask)) {
+               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 NULL;
+                       return path;
+               }
+               if (!inet_aton(tmp, &ha->netaddr)) {
+                       ast_log(LOG_WARNING, "%s not a valid IP\n", tmp);
+                       free(ha);
+                       return path;
                }
                ha->netaddr.s_addr &= ha->netmask.s_addr;
                if (!strncasecmp(sense, "p", 1)) {
@@ -164,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 {
@@ -172,7 +187,7 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us)
                char    m_space[512];
        } m_rtmsg;
        char *cp, *p = ast_strdupa(inet_ntoa(*them));
-       int i, l, s, seq;
+       int i, l, s, seq, flags;
        pid_t pid = getpid();
        static int routeseq;    /* Protected by "routeseq_lock" mutex */
 
@@ -197,6 +212,8 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us)
                ast_log(LOG_ERROR, "Error opening routing socket\n");
                return -1;
        }
+       flags = fcntl(s, F_GETFL);
+       fcntl(s, F_SETFL, flags | O_NONBLOCK);
        if (write(s, (char *)&m_rtmsg, m_rtmsg.m_rtm.rtm_msglen) < 0) {
                ast_log(LOG_ERROR, "Error writing to routing socket: %s\n", strerror(errno));
                close(s);
@@ -205,11 +222,13 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us)
        do {
                l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));
        } while (l > 0 && (m_rtmsg.m_rtm.rtm_seq != 1 || m_rtmsg.m_rtm.rtm_pid != pid));
-       close(s);
        if (l < 0) {
-               ast_log(LOG_ERROR, "Error reading from routing socket\n");
+               if (errno != EAGAIN)
+                       ast_log(LOG_ERROR, "Error reading from routing socket\n");
+               close(s);
                return -1;
        }
+       close(s);
 
        if (m_rtmsg.m_rtm.rtm_version != RTM_VERSION) {
                ast_log(LOG_ERROR, "Unsupported route socket protocol version\n");