[Asterisk-cvs] asterisk/pbx pbx_dundi.c,1.1,1.2

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/pbx
In directory mongoose.digium.com:/tmp/cvs-serv12763/pbx

Modified Files:
	pbx_dundi.c 
Log Message:
Disable mac lookup, fix compile on NetBSD (bug #2680)


Index: pbx_dundi.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_dundi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pbx_dundi.c	18 Oct 2004 21:45:13 -0000	1.1
+++ pbx_dundi.c	20 Oct 2004 12:47:03 -0000	1.2
@@ -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 reset_global_eid(void)
 {
+#if !defined(__NetBSD__)
 	int x,s;
 	char eid_str[20];
 	struct ifreq ifr;
@@ -367,6 +371,7 @@
 			}
         }
 	}
+#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 @@
 	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 @@
 				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")) {