* Don't use getifaddrs(), since it's not portable; and rework the MAC address reading code.

1 files changed, 11 insertions, 38 deletions

diff --git a/uuid.c b/uuid.c
index 56dd49f..3263241 100644
--- a/uuid.c
+++ b/uuid.c
@@ -22,6 +22,7 @@
 #include <sys/time.h>
 #include <errno.h>
 
+#include "getifaddr.h"
 #include "log.h"
 
 #define ETH_ALEN 6
@@ -109,55 +110,21 @@ generate_uuid(unsigned char uuid_out[16])
 {
 	static u_int64_t last_time_all;
 	static unsigned int clock_seq_started;
-	static char last_node[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+	static char last_node[6] = { 0, 0, 0, 0, 0, 0 };
 
 	struct timespec ts;
 	u_int64_t time_all;
 	int inc_clock_seq = 0;
 
-	struct ifaddrs *ifaddr, *ifa;
 	unsigned char mac[6];
-	struct ifreq ifr;
-	int fd;
-
-	int found_mac = 0;
+	int mac_error;
 
 	memset(&mac, '\0', sizeof(mac));
 	/* Get the spatially unique node identifier */
-	fd = socket(AF_INET, SOCK_DGRAM, 0);
-	if( fd < 0 )
-		return -1;
-
-	if(getifaddrs(&ifaddr) == -1)
-	{
-		DPRINTF(E_ERROR, L_HTTP, "getifaddrs(): %s\n", strerror(errno));
-		return -1;
-	}
-
-	for(ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next)
-	{
-		if(ifa->ifa_addr->sa_family != AF_PACKET)
-			continue;
-		if(ifa->ifa_flags & IFF_LOOPBACK)
-			continue;
 
-		strcpy(ifr.ifr_name, ifa->ifa_name);
-		if(strncmp(last_node, ifa->ifa_name, sizeof(last_node)) != 0)
-		{
-			inc_clock_seq = 1;
-			strncpy(last_node, ifa->ifa_name, sizeof(last_node));
-		}
-
-		if(ioctl(fd, SIOCGIFHWADDR, &ifr) == 0)
-			memmove(mac, ifr.ifr_hwaddr.sa_data, 6);
-
-		found_mac = 1;
-		break;
-	}
-	close(fd);
-	freeifaddrs(ifaddr);
+	mac_error = getsyshwaddr((char *)mac, sizeof(mac));
 
-	if(found_mac)
+	if(!mac_error)
 	{
 		memcpy(&uuid_out[10], mac, ETH_ALEN);
 	}
@@ -172,6 +139,12 @@ generate_uuid(unsigned char uuid_out[16])
 		}
 	}
 
+	if(memcmp(last_node, uuid_out+10, 6) != 0)
+	{
+		inc_clock_seq = 1;
+		memcpy(last_node, uuid_out+10, 6);
+	}
+
 	/* Determine 60-bit timestamp value. For UUID version 1, this is
 	 * represented by Coordinated Universal Time (UTC) as a count of 100-
 	 * nanosecond intervals since 00:00:00.00, 15 October 1582 (the date of