1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2016-03-25 13:04:45 UTC
+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
@@ -4,6 +4,10 @@
#include "chrome/browser/extensions/api/music_manager_private/device_id.h"
+#if defined(OS_FREEBSD)
+#include <sys/types.h>
+#include <net/if_dl.h>
+#endif
#include <ifaddrs.h>
#include <net/if.h>
#include <stddef.h>
@@ -105,11 +109,33 @@ class MacAddressProcessor {
const char* const prefixes[],
size_t prefixes_count) {
const int MAC_LENGTH = 6;
+#if defined(OS_FREEBSD)
+ struct ifaddrs *ifap, *ifinfo;
+#else
struct ifreq ifinfo;
+#endif
memset(&ifinfo, 0, sizeof(ifinfo));
- strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
+#if defined(OS_FREEBSD)
+ int result = getifaddrs(&ifap);
+ if (result != 0)
+ return true;
+ result = 1; // no MAC found yet
+ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) {
+ struct sockaddr* sa = ifinfo->ifa_addr;
+ if (sa->sa_family == AF_LINK &&
+ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name,
+ sizeof(ifinfo->ifa_name) - 1)) {
+ result = 0;
+ break;
+ }
+ }
+
+ char mac_address[6];
+ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address));
+#else
+ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
int sd = socket(AF_INET, SOCK_DGRAM, 0);
int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
close(sd);
@@ -119,11 +145,17 @@ class MacAddressProcessor {
const char* mac_address =
static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
+#endif
if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH))
return true;
+#if defined(OS_FREEBSD)
+ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count))
+ return true;
+#else
if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count))
return true;
+#endif
// Got one!
found_mac_address_ =
|
