summaryrefslogtreecommitdiffstats
path: root/mysql-netdevname.patch
blob: af17f1305f23e97fcd6cffdbc592552b1d27be63 (plain)
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
diff -up mysql-5.5.15/mysys/my_gethwaddr.c.netdevname mysql-5.5.15/mysys/my_gethwaddr.c
--- mysql-5.5.15/mysys/my_gethwaddr.c.netdevname	2011-07-13 21:09:02.000000000 +0200
+++ mysql-5.5.15/mysys/my_gethwaddr.c	2011-11-01 12:32:35.356119715 +0100
@@ -68,28 +68,47 @@ err:
 #include <sys/ioctl.h>
 #include <net/ethernet.h>
 
+#define MAX_IFS 64
+
 my_bool my_gethwaddr(uchar *to)
 {
   int fd, res= 1;
   struct ifreq ifr;
   char zero_array[ETHER_ADDR_LEN] = {0};
+  struct ifconf ifc;
+  struct ifreq ifs[MAX_IFS], *ifri, *ifend;
 
   fd = socket(AF_INET, SOCK_DGRAM, 0);
   if (fd < 0)
     goto err;
 
-  bzero(&ifr, sizeof(ifr));
-  strnmov(ifr.ifr_name, "eth0", sizeof(ifr.ifr_name) - 1);
+  ifc.ifc_len = sizeof(ifs);
+  ifc.ifc_req = ifs;
+  if (ioctl(fd, SIOCGIFCONF, &ifc) < 0)
+  {
+    close(fd);
+    goto err;
+  }
+
+  memcpy(to, zero_array, ETHER_ADDR_LEN);
 
-  do
+  ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq));
+  for (ifri = ifc.ifc_req; ifri < ifend; ifri++)
   {
-    if (ioctl(fd, SIOCGIFHWADDR, &ifr) >= 0)
+    if (ifri->ifr_addr.sa_family == AF_INET)
     {
-      memcpy(to, &ifr.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
-      res= memcmp(to, zero_array, ETHER_ADDR_LEN) ? 0 : 1;
+      bzero(&ifr, sizeof(ifr));
+      strncpy(ifr.ifr_name, ifri->ifr_name, sizeof(ifr.ifr_name));
+      
+      /* Get HW address */
+      if (ioctl(fd, SIOCGIFHWADDR, &ifr) >= 0)
+      {
+        memcpy(to, &ifr.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
+        if (!(res= memcmp(to, zero_array, ETHER_ADDR_LEN) ? 0 : 1))
+          break;
+      }
     }
-  } while (res && (errno == 0 || errno == ENODEV) && ifr.ifr_name[3]++ < '6');
-
+  }
   close(fd);
 err:
   return res;