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
|
$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.3 2016/10/27 13:06:42 ryoon Exp $
Zones support.
--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2016-10-26 22:56:37.000000000 +0000
+++ jdk/src/solaris/native/java/net/NetworkInterface.c
@@ -42,6 +42,7 @@
#include <fcntl.h>
#include <stropts.h>
#include <sys/sockio.h>
+#include <zone.h>
#endif
#if defined(__linux__)
@@ -62,14 +63,12 @@
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/sockio.h>
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
#include <net/ethernet.h>
#include <net/if_var.h>
-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
#include <netinet/if_ether.h>
#include <netinet6/in6_var.h>
-#elif defined(__NetBSD__)
-#include <net/if_ether.h>
#endif
#include <net/if_dl.h>
#include <netinet/in_var.h>
@@ -1710,7 +1709,8 @@ static short getSubnet(JNIEnv *env, int
}
-#define DEV_PREFIX "/dev/"
+#define NET_DEV_PREFIX "/dev/"
+#define ZONE_NET_DEV_PREFIX "/dev/net/"
/*
* Solaris specific DLPI code to get hardware address from a device.
@@ -1728,9 +1728,18 @@ static int getMacFromDevice
char buf[128];
int flags = 0;
- // Device is in /dev. e.g.: /dev/bge0
- strcpy(style1dev, DEV_PREFIX);
+ /*
+ * Device is in /dev in global zone / standalone
+ * Device is in /dev/net in a zone
+ * e.g.: /dev/net/net0
+ */
+ if (getzoneid()==(zoneid_t)GLOBAL_ZONEID) {
+ strcpy(style1dev, NET_DEV_PREFIX);
+ } else {
+ strcpy(style1dev, ZONE_NET_DEV_PREFIX);
+ }
strcat(style1dev, ifname);
+
if ((fd = open(style1dev, O_RDWR)) < 0) {
// Can't open it. We probably are missing the privilege.
// We'll have to try something else
|
