Skip to content

Commit ce61eb6

Browse files
djelinskidjelinski
committedAug 4, 2022
8290349: IP_DONTFRAGMENT doesn't set DF bit in IPv4 header
Reviewed-by: michaelm, alanb
·
JEP-429-branchpoint
1 parent 26e5c11 commit ce61eb6

File tree

9 files changed

+74
-134
lines changed

9 files changed

+74
-134
lines changed
 

‎src/java.base/share/classes/sun/net/ext/ExtendedSocketOptions.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ private Set<SocketOption<?>> options0(short type, boolean server) {
133133
}
134134

135135
/** Sets the value of a socket option, for the given socket. */
136-
public abstract void setOption(FileDescriptor fd, SocketOption<?> option, Object value)
136+
public abstract void setOption(FileDescriptor fd, SocketOption<?> option, Object value, boolean isIPv6)
137137
throws SocketException;
138138

139139
/** Returns the value of a socket option, for the given socket. */
140-
public abstract Object getOption(FileDescriptor fd, SocketOption<?> option)
140+
public abstract Object getOption(FileDescriptor fd, SocketOption<?> option, boolean isIPv6)
141141
throws SocketException;
142142

143143
protected ExtendedSocketOptions(Set<SocketOption<?>> options) {
@@ -206,15 +206,15 @@ static final class NoExtendedSocketOptions extends ExtendedSocketOptions {
206206
}
207207

208208
@Override
209-
public void setOption(FileDescriptor fd, SocketOption<?> option, Object value)
209+
public void setOption(FileDescriptor fd, SocketOption<?> option, Object value, boolean isIPv6)
210210
throws SocketException
211211
{
212212
throw new UnsupportedOperationException(
213213
"no extended options: " + option.name());
214214
}
215215

216216
@Override
217-
public Object getOption(FileDescriptor fd, SocketOption<?> option)
217+
public Object getOption(FileDescriptor fd, SocketOption<?> option, boolean isIPv6)
218218
throws SocketException
219219
{
220220
throw new UnsupportedOperationException(

‎src/java.base/share/classes/sun/nio/ch/Net.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,10 @@ static void setSocketOption(FileDescriptor fd, ProtocolFamily family,
402402

403403
// only simple values supported by this method
404404
Class<?> type = name.type();
405+
boolean isIPv6 = (family == StandardProtocolFamily.INET6);
405406

406407
if (extendedOptions.isOptionSupported(name)) {
407-
extendedOptions.setOption(fd, name, value);
408+
extendedOptions.setOption(fd, name, value, isIPv6);
408409
return;
409410
}
410411

@@ -451,7 +452,6 @@ static void setSocketOption(FileDescriptor fd, ProtocolFamily family,
451452
}
452453

453454
boolean mayNeedConversion = (family == UNSPEC);
454-
boolean isIPv6 = (family == StandardProtocolFamily.INET6);
455455
setIntOption0(fd, mayNeedConversion, key.level(), key.name(), arg, isIPv6);
456456
}
457457

@@ -467,7 +467,8 @@ static Object getSocketOption(FileDescriptor fd, ProtocolFamily family, SocketOp
467467
Class<?> type = name.type();
468468

469469
if (extendedOptions.isOptionSupported(name)) {
470-
return extendedOptions.getOption(fd, name);
470+
boolean isIPv6 = (family == StandardProtocolFamily.INET6);
471+
return extendedOptions.getOption(fd, name, isIPv6);
471472
}
472473

473474
// only simple values supported by this method

‎src/jdk.net/linux/classes/jdk/net/LinuxSocketOptions.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ int getIncomingNapiId(int fd) throws SocketException {
108108
}
109109

110110
@Override
111-
void setIpDontFragment(int fd, final boolean value) throws SocketException {
112-
setIpDontFragment0(fd, value);
111+
void setIpDontFragment(int fd, final boolean value, boolean isIPv6) throws SocketException {
112+
setIpDontFragment0(fd, value, isIPv6);
113113
}
114114

115115
@Override
116-
boolean getIpDontFragment(int fd) throws SocketException {
117-
return getIpDontFragment0(fd);
116+
boolean getIpDontFragment(int fd, boolean isIPv6) throws SocketException {
117+
return getIpDontFragment0(fd, isIPv6);
118118
}
119119

120120
@Override
@@ -130,11 +130,11 @@ UnixDomainPrincipal getSoPeerCred(int fd) throws SocketException {
130130
private static native void setTcpkeepAliveProbes0(int fd, int value) throws SocketException;
131131
private static native void setTcpKeepAliveTime0(int fd, int value) throws SocketException;
132132
private static native void setTcpKeepAliveIntvl0(int fd, int value) throws SocketException;
133-
private static native void setIpDontFragment0(int fd, boolean value) throws SocketException;
133+
private static native void setIpDontFragment0(int fd, boolean value, boolean isIPv6) throws SocketException;
134134
private static native int getTcpkeepAliveProbes0(int fd) throws SocketException;
135135
private static native int getTcpKeepAliveTime0(int fd) throws SocketException;
136136
private static native int getTcpKeepAliveIntvl0(int fd) throws SocketException;
137-
private static native boolean getIpDontFragment0(int fd) throws SocketException;
137+
private static native boolean getIpDontFragment0(int fd, boolean isIPv6) throws SocketException;
138138
private static native void setQuickAck0(int fd, boolean on) throws SocketException;
139139
private static native boolean getQuickAck0(int fd) throws SocketException;
140140
private static native long getSoPeerCred0(int fd) throws SocketException;

‎src/jdk.net/linux/native/libextnet/LinuxSocketOptions.c

+6-27
Original file line numberDiff line numberDiff line change
@@ -244,34 +244,18 @@ JNIEXPORT jint JNICALL Java_jdk_net_LinuxSocketOptions_getIncomingNapiId0
244244
return optval;
245245
}
246246

247-
static int socketFamily(jint fd) {
248-
struct sockaddr_storage st;
249-
struct sockaddr *sa = (struct sockaddr *)&st;
250-
socklen_t sa_len = sizeof(st);
251-
252-
if (getsockname(fd, sa, &sa_len) == 0) {
253-
return sa->sa_family;
254-
}
255-
return -1;
256-
}
257-
258247
/*
259248
* Class: jdk_net_LinuxSocketOptions
260249
* Method: setIpDontFragment0
261-
* Signature: (IZ)V
250+
* Signature: (IZZ)V
262251
*/
263252
JNIEXPORT void JNICALL Java_jdk_net_LinuxSocketOptions_setIpDontFragment0
264-
(JNIEnv *env, jobject unused, jint fd, jboolean optval) {
253+
(JNIEnv *env, jobject unused, jint fd, jboolean optval, jboolean isIPv6) {
265254
jint rv, optsetting;
266-
jint family = socketFamily(fd);
267-
if (family == -1) {
268-
handleError(env, family, "get socket family failed");
269-
return;
270-
}
271255

272256
optsetting = optval ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
273257

274-
if (family == AF_INET) {
258+
if (!isIPv6) {
275259
rv = setsockopt(fd, IPPROTO_IP, IP_MTU_DISCOVER, &optsetting, sizeof (optsetting));
276260
} else {
277261
rv = setsockopt(fd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, &optsetting, sizeof (optsetting));
@@ -282,18 +266,13 @@ JNIEXPORT void JNICALL Java_jdk_net_LinuxSocketOptions_setIpDontFragment0
282266
/*
283267
* Class: jdk_net_LinuxSocketOptions
284268
* Method: getIpDontFragment0
285-
* Signature: (I)Z;
269+
* Signature: (IZ)Z;
286270
*/
287271
JNIEXPORT jboolean JNICALL Java_jdk_net_LinuxSocketOptions_getIpDontFragment0
288-
(JNIEnv *env, jobject unused, jint fd) {
272+
(JNIEnv *env, jobject unused, jint fd, jboolean isIPv6) {
289273
jint optlevel, optname, optval, rv;
290-
jint family = socketFamily(fd);
291-
if (family == -1) {
292-
handleError(env, family, "get socket family failed");
293-
return JNI_FALSE;
294-
}
295274

296-
if (family == AF_INET) {
275+
if (!isIPv6) {
297276
optlevel = IPPROTO_IP;
298277
optname = IP_MTU_DISCOVER;
299278
} else {

‎src/jdk.net/macosx/classes/jdk/net/MacOSXSocketOptions.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ int getTcpKeepAliveIntvl(int fd) throws SocketException {
8484
}
8585

8686
@Override
87-
void setIpDontFragment(int fd, final boolean value) throws SocketException {
88-
setIpDontFragment0(fd, value);
87+
void setIpDontFragment(int fd, final boolean value, boolean isIPv6) throws SocketException {
88+
setIpDontFragment0(fd, value, isIPv6);
8989
}
9090

9191
@Override
92-
boolean getIpDontFragment(int fd) throws SocketException {
93-
return getIpDontFragment0(fd);
92+
boolean getIpDontFragment(int fd, boolean isIPv6) throws SocketException {
93+
return getIpDontFragment0(fd, isIPv6);
9494
}
9595

9696
@Override
@@ -106,11 +106,11 @@ UnixDomainPrincipal getSoPeerCred(int fd) throws SocketException {
106106
private static native void setTcpkeepAliveProbes0(int fd, int value) throws SocketException;
107107
private static native void setTcpKeepAliveTime0(int fd, int value) throws SocketException;
108108
private static native void setTcpKeepAliveIntvl0(int fd, int value) throws SocketException;
109-
private static native void setIpDontFragment0(int fd, boolean value) throws SocketException;
109+
private static native void setIpDontFragment0(int fd, boolean value, boolean isIPv6) throws SocketException;
110110
private static native int getTcpkeepAliveProbes0(int fd) throws SocketException;
111111
private static native int getTcpKeepAliveTime0(int fd) throws SocketException;
112112
private static native int getTcpKeepAliveIntvl0(int fd) throws SocketException;
113-
private static native boolean getIpDontFragment0(int fd) throws SocketException;
113+
private static native boolean getIpDontFragment0(int fd, boolean isIPv6) throws SocketException;
114114
private static native long getSoPeerCred0(int fd) throws SocketException;
115115
private static native boolean keepAliveOptionsSupported0();
116116
private static native boolean ipDontFragmentSupported0();

‎src/jdk.net/macosx/native/libextnet/MacOSXSocketOptions.c

+20-41
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,6 @@ JNIEXPORT jint JNICALL Java_jdk_net_MacOSXSocketOptions_getTcpKeepAliveIntvl0
178178
return optval;
179179
}
180180

181-
static int socketFamily(jint fd) {
182-
struct sockaddr_storage st;
183-
struct sockaddr* sa = (struct sockaddr *)&st;
184-
socklen_t sa_len = sizeof(st);
185-
186-
if (getsockname(fd, sa, &sa_len) == 0) {
187-
return sa->sa_family;
188-
}
189-
return -1;
190-
}
191-
192181
/*
193182
* Class: jdk_net_MacOSXSocketOptions
194183
* Method: ipDontFragmentSupported0
@@ -198,42 +187,37 @@ JNIEXPORT jboolean JNICALL Java_jdk_net_MacOSXSocketOptions_ipDontFragmentSuppor
198187
(JNIEnv *env, jobject unused) {
199188
jint rv, fd, value;
200189
fd = socket(AF_INET, SOCK_DGRAM, 0);
201-
if (fd == -1)
202-
return JNI_FALSE;
203-
value = 1;
204-
rv = setsockopt(fd, IPPROTO_IP, IP_DONTFRAG, &value, sizeof(value));
205-
close(fd);
206-
if (rv == -1) {
207-
return JNI_FALSE;
190+
if (fd != -1) {
191+
value = 1;
192+
rv = setsockopt(fd, IPPROTO_IP, IP_DONTFRAG, &value, sizeof(value));
193+
close(fd);
194+
if (rv == -1) {
195+
return JNI_FALSE;
196+
}
208197
}
209198
fd = socket(AF_INET6, SOCK_DGRAM, 0);
210-
if (fd == -1)
211-
return JNI_FALSE;
212-
value = 1;
213-
rv = setsockopt(fd, IPPROTO_IPV6, IPV6_DONTFRAG, &value, sizeof(value));
214-
close(fd);
215-
if (rv == -1) {
216-
return JNI_FALSE;
199+
if (fd != -1) {
200+
value = 1;
201+
rv = setsockopt(fd, IPPROTO_IPV6, IPV6_DONTFRAG, &value, sizeof(value));
202+
close(fd);
203+
if (rv == -1) {
204+
return JNI_FALSE;
205+
}
217206
}
218207
return JNI_TRUE;
219208
}
220209

221210
/*
222211
* Class: jdk_net_MacOSXSocketOptions
223212
* Method: setIpDontFragment0
224-
* Signature: (IZ)V
213+
* Signature: (IZZ)V
225214
*/
226215
JNIEXPORT void JNICALL Java_jdk_net_MacOSXSocketOptions_setIpDontFragment0
227-
(JNIEnv *env, jobject unused, jint fd, jboolean optval) {
216+
(JNIEnv *env, jobject unused, jint fd, jboolean optval, jboolean isIPv6) {
228217
jint rv;
229-
jint family = socketFamily(fd);
230218
jint value = optval ? 1 : 0;
231219

232-
if (family == -1) {
233-
handleError(env, family, "get socket family failed");
234-
return;
235-
}
236-
if (family == AF_INET) {
220+
if (!isIPv6) {
237221
rv = setsockopt(fd, IPPROTO_IP, IP_DONTFRAG, &value, sizeof(value));
238222
} else {
239223
rv = setsockopt(fd, IPPROTO_IPV6, IPV6_DONTFRAG, &value, sizeof(value));
@@ -244,18 +228,13 @@ JNIEXPORT void JNICALL Java_jdk_net_MacOSXSocketOptions_setIpDontFragment0
244228
/*
245229
* Class: jdk_net_MacOSXSocketOptions
246230
* Method: getIpDontFragment0
247-
* Signature: (I)Z;
231+
* Signature: (IZ)Z;
248232
*/
249233
JNIEXPORT jboolean JNICALL Java_jdk_net_MacOSXSocketOptions_getIpDontFragment0
250-
(JNIEnv *env, jobject unused, jint fd) {
234+
(JNIEnv *env, jobject unused, jint fd, jboolean isIPv6) {
251235
jint optval, rv;
252236
socklen_t sz = sizeof (optval);
253-
jint family = socketFamily(fd);
254-
if (family == -1) {
255-
handleError(env, family, "get socket family failed");
256-
return 0;
257-
}
258-
if (family == AF_INET) {
237+
if (!isIPv6) {
259238
rv = getsockopt(fd, IPPROTO_IP, IP_DONTFRAG, &optval, &sz);
260239
} else {
261240
rv = getsockopt(fd, IPPROTO_IPV6, IPV6_DONTFRAG, &optval, &sz);

‎src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java

+14-12
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.io.FileDescriptor;
2929
import java.net.SocketException;
3030
import java.net.SocketOption;
31+
import java.net.StandardProtocolFamily;
3132
import java.security.AccessController;
3233
import java.security.PrivilegedAction;
3334
import java.util.Collections;
@@ -209,6 +210,9 @@ private ExtendedSocketOptions() { }
209210
* sizes to the {@link java.net.NetworkInterface#getMTU() local MTU}. Depending
210211
* on the implementation and the network interface, packets larger than the MTU
211212
* may be sent or dropped silently or dropped with an exception thrown.
213+
* For {@link StandardProtocolFamily#INET6 IPv6} sockets it is
214+
* system dependent whether the option also applies to datagrams
215+
* sent to IPv4 addresses.
212216
*
213217
* @apiNote
214218
* For IPv4 this option sets the DF (Do not Fragment) flag in the IP packet
@@ -263,10 +267,9 @@ static Set<SocketOption<?>> options() {
263267
new sun.net.ext.ExtendedSocketOptions(extendedOptions) {
264268

265269
@Override
266-
@SuppressWarnings("removal")
267270
public void setOption(FileDescriptor fd,
268271
SocketOption<?> option,
269-
Object value)
272+
Object value, boolean isIPv6)
270273
throws SocketException
271274
{
272275
if (fd == null || !fd.valid())
@@ -277,7 +280,7 @@ public void setOption(FileDescriptor fd,
277280
} else if (option == TCP_KEEPCOUNT) {
278281
setTcpkeepAliveProbes(fd, (Integer) value);
279282
} else if (option == IP_DONTFRAGMENT) {
280-
setIpDontFragment(fd, (Boolean) value);
283+
setIpDontFragment(fd, (Boolean) value, isIPv6);
281284
} else if (option == TCP_KEEPIDLE) {
282285
setTcpKeepAliveTime(fd, (Integer) value);
283286
} else if (option == TCP_KEEPINTERVAL) {
@@ -295,9 +298,8 @@ public void setOption(FileDescriptor fd,
295298
}
296299

297300
@Override
298-
@SuppressWarnings("removal")
299301
public Object getOption(FileDescriptor fd,
300-
SocketOption<?> option)
302+
SocketOption<?> option, boolean isIPv6)
301303
throws SocketException
302304
{
303305
if (fd == null || !fd.valid())
@@ -308,7 +310,7 @@ public Object getOption(FileDescriptor fd,
308310
} else if (option == TCP_KEEPCOUNT) {
309311
return getTcpkeepAliveProbes(fd);
310312
} else if (option == IP_DONTFRAGMENT) {
311-
return getIpDontFragment(fd);
313+
return getIpDontFragment(fd, isIPv6);
312314
} else if (option == TCP_KEEPIDLE) {
313315
return getTcpKeepAliveTime(fd);
314316
} else if (option == TCP_KEEPINTERVAL) {
@@ -352,9 +354,9 @@ private static void setTcpKeepAliveTime(FileDescriptor fd, int value)
352354
platformSocketOptions.setTcpKeepAliveTime(fdAccess.get(fd), value);
353355
}
354356

355-
private static void setIpDontFragment(FileDescriptor fd, boolean value)
357+
private static void setIpDontFragment(FileDescriptor fd, boolean value, boolean isIPv6)
356358
throws SocketException {
357-
platformSocketOptions.setIpDontFragment(fdAccess.get(fd), value);
359+
platformSocketOptions.setIpDontFragment(fdAccess.get(fd), value, isIPv6);
358360
}
359361

360362
private static void setTcpKeepAliveIntvl(FileDescriptor fd, int value)
@@ -366,8 +368,8 @@ private static int getTcpkeepAliveProbes(FileDescriptor fd) throws SocketExcepti
366368
return platformSocketOptions.getTcpkeepAliveProbes(fdAccess.get(fd));
367369
}
368370

369-
private static boolean getIpDontFragment(FileDescriptor fd) throws SocketException {
370-
return platformSocketOptions.getIpDontFragment(fdAccess.get(fd));
371+
private static boolean getIpDontFragment(FileDescriptor fd, boolean isIPv6) throws SocketException {
372+
return platformSocketOptions.getIpDontFragment(fdAccess.get(fd), isIPv6);
371373
}
372374

373375
private static int getTcpKeepAliveTime(FileDescriptor fd) throws SocketException {
@@ -462,11 +464,11 @@ void setTcpKeepAliveIntvl(int fd, final int value) throws SocketException {
462464
throw new UnsupportedOperationException("unsupported TCP_KEEPINTVL option");
463465
}
464466

465-
void setIpDontFragment(int fd, final boolean value) throws SocketException {
467+
void setIpDontFragment(int fd, final boolean value, boolean isIPv6) throws SocketException {
466468
throw new UnsupportedOperationException("unsupported IP_DONTFRAGMENT option");
467469
}
468470

469-
boolean getIpDontFragment(int fd) throws SocketException {
471+
boolean getIpDontFragment(int fd, boolean isIPv6) throws SocketException {
470472
throw new UnsupportedOperationException("unsupported IP_DONTFRAGMENT option");
471473
}
472474

‎src/jdk.net/windows/classes/jdk/net/WindowsSocketOptions.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ boolean ipDontFragmentSupported() {
4242
}
4343

4444
@Override
45-
void setIpDontFragment(int fd, final boolean value) throws SocketException {
46-
setIpDontFragment0(fd, value);
45+
void setIpDontFragment(int fd, final boolean value, boolean isIPv6) throws SocketException {
46+
setIpDontFragment0(fd, value, isIPv6);
4747
}
4848

4949
@Override
50-
boolean getIpDontFragment(int fd) throws SocketException {
51-
return getIpDontFragment0(fd);
50+
boolean getIpDontFragment(int fd, boolean isIPv6) throws SocketException {
51+
return getIpDontFragment0(fd, isIPv6);
5252
}
5353

54-
private static native void setIpDontFragment0(int fd, boolean value) throws SocketException;
55-
private static native boolean getIpDontFragment0(int fd) throws SocketException;
54+
private static native void setIpDontFragment0(int fd, boolean value, boolean isIPv6) throws SocketException;
55+
private static native boolean getIpDontFragment0(int fd, boolean isIPv6) throws SocketException;
5656

5757
static {
5858
if (System.getSecurityManager() == null) {

‎src/jdk.net/windows/native/libextnet/WindowsSocketOptions.c

+8-29
Original file line numberDiff line numberDiff line change
@@ -43,32 +43,16 @@ static void handleError(JNIEnv *env, jint rv, const char *errmsg) {
4343
}
4444
}
4545

46-
static int socketFamily(jint fd) {
47-
WSAPROTOCOL_INFO info;
48-
socklen_t sa_len = sizeof(info);
49-
50-
if (getsockopt(fd, SOL_SOCKET, SO_PROTOCOL_INFO, (char *)&info, &sa_len) == 0) {
51-
return info.iAddressFamily;
52-
}
53-
return -1;
54-
}
55-
5646
/*
5747
* Class: jdk_net_WindowsSocketOptions
5848
* Method: setIpDontFragment0
59-
* Signature: (IZ)V
49+
* Signature: (IZZ)V
6050
*/
6151
JNIEXPORT void JNICALL Java_jdk_net_WindowsSocketOptions_setIpDontFragment0
62-
(JNIEnv *env, jobject unused, jint fd, jboolean optval) {
52+
(JNIEnv *env, jobject unused, jint fd, jboolean optval, jboolean isIPv6) {
6353
int rv, opt;
64-
jint family = socketFamily(fd);
65-
if (family == -1) {
66-
handleError(env, family, "get socket family failed");
67-
return;
68-
}
6954

70-
71-
if (family == AF_INET) {
55+
if (!isIPv6) {
7256
opt = optval ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
7357
rv = setsockopt(fd, IPPROTO_IP, IP_MTU_DISCOVER, (char *)&opt, sizeof(int));
7458
if (rv == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT) {
@@ -81,7 +65,7 @@ JNIEXPORT void JNICALL Java_jdk_net_WindowsSocketOptions_setIpDontFragment0
8165
if (rv == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT) {
8266
/* IPV6_MTU_DISCOVER not supported on W 2016 and older, can use old option */
8367
opt = optval;
84-
rv = setsockopt(fd, IPPROTO_IP, IP_DONTFRAGMENT, (char *)&opt, sizeof(int));
68+
rv = setsockopt(fd, IPPROTO_IPV6, IPV6_DONTFRAG, (char *)&opt, sizeof(int));
8569
}
8670
}
8771
handleError(env, rv, "set option IP_DONTFRAGMENT failed");
@@ -90,18 +74,13 @@ JNIEXPORT void JNICALL Java_jdk_net_WindowsSocketOptions_setIpDontFragment0
9074
/*
9175
* Class: jdk_net_WindowsSocketOptions
9276
* Method: getIpDontFragment0
93-
* Signature: (I)Z;
77+
* Signature: (IZ)Z;
9478
*/
9579
JNIEXPORT jboolean JNICALL Java_jdk_net_WindowsSocketOptions_getIpDontFragment0
96-
(JNIEnv *env, jobject unused, jint fd) {
80+
(JNIEnv *env, jobject unused, jint fd, jboolean isIPv6) {
9781
int optval, rv, sz = sizeof(optval);
98-
jint family = socketFamily(fd);
99-
if (family == -1) {
100-
handleError(env, family, "get socket family failed");
101-
return JNI_FALSE;
102-
}
10382

104-
if (family == AF_INET) {
83+
if (!isIPv6) {
10584
rv = getsockopt(fd, IPPROTO_IP, IP_MTU_DISCOVER, (char *)&optval, &sz);
10685
if (rv == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT) {
10786
sz = sizeof(optval);
@@ -115,7 +94,7 @@ JNIEXPORT jboolean JNICALL Java_jdk_net_WindowsSocketOptions_getIpDontFragment0
11594
rv = getsockopt(fd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, (char *)&optval, &sz);
11695
if (rv == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT) {
11796
sz = sizeof(optval);
118-
rv = getsockopt(fd, IPPROTO_IP, IP_DONTFRAGMENT, (char *)&optval, &sz);
97+
rv = getsockopt(fd, IPPROTO_IPV6, IPV6_DONTFRAG, (char *)&optval, &sz);
11998
handleError(env, rv, "get option IP_DONTFRAGMENT failed");
12099
return optval;
121100
}

0 commit comments

Comments
 (0)
Please sign in to comment.