Disable mac lookup, fix compile on NetBSD (bug #2680)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4040 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 652afb37ab846c2eeb5401bb5905895f146750c4..bd585033d3fe7cb8f31f0c1d5eb6909f1585ff73 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ DEBUG=-g #-pg
 #OPTIONS += -DLOW_MEMORY
 
 # Optional debugging parameters
-DEBUG_THREADS = #-DDEBUG_THREADS #-DDO_CRASH 
+DEBUG_THREADS = -DDEBUG_THREADS #-DDO_CRASH 
 
 # Uncomment next one to enable ast_frame tracing (for debugging)
 TRACE_FRAMES = #-DTRACE_FRAMES

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index bcb1e146f0aa0253b2f38d2204917ad78d27b6d6..f4847c598a674aff5b75295582749de9b0b71e10 100755 (executable)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -39,6 +39,9 @@
 #include <sys/socket.h>
 #include <string.h>
 #include <errno.h>
+#if defined(__NetBSD__)
+#include <netinet/in_systm.h>
+#endif
 #include <netinet/ip.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
@@ -350,6 +353,7 @@ static void dundi_reject(struct dundi_hdr *h, struct sockaddr_in *sin)
 
 static void reset_global_eid(void)
 {
+#if !defined(__NetBSD__)
        int x,s;
        char eid_str[20];
        struct ifreq ifr;
@@ -367,6 +371,7 @@ static void reset_global_eid(void)
                        }
         }
        }
+#endif
        ast_log(LOG_NOTICE, "No ethernet interface found for seeding global EID  You will have to set it manually.\n");
 }
 
@@ -3173,7 +3178,7 @@ static void build_mapping(char *name, char *value)
        struct dundi_mapping *map;
        int x;
        int y;
-       t = strdupa(value);
+       t = ast_strdupa(value);
        if (t) {
                map = mappings;
                while(map) {
@@ -3661,12 +3666,18 @@ static int set_config(char *config_file, struct sockaddr_in* sin)
                                tos = IPTOS_THROUGHPUT;
                        else if (!strcasecmp(v->value, "reliability"))
                                tos = IPTOS_RELIABILITY;
+#if !defined(__NetBSD__)
                        else if (!strcasecmp(v->value, "mincost"))
                                tos = IPTOS_MINCOST;
+#endif
                        else if (!strcasecmp(v->value, "none"))
                                tos = 0;
                        else
+#if defined(__NetBSD__)
                                ast_log(LOG_WARNING, "Invalid tos value at line %d, should be 'lowdelay', 'throughput', 'reliability', 'mincost', or 'none'\n", v->lineno);
+#else
+                               ast_log(LOG_WARNING, "Invalid tos value at line %d, should be 'lowdelay', 'throughput', 'reliability', or 'none'\n", v->lineno);
+#endif
                } else if (!strcasecmp(v->name, "department")) {
                        strncpy(dept, v->value, sizeof(dept) - 1);
                } else if (!strcasecmp(v->name, "organization")) {