archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Henry Jen 2019-01-15 10:55:26 -08:00
commit 776ef6a071
381 changed files with 8349 additions and 3043 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/unix/native/libjsig/jsig.c
View file

@ -5,7 +5,9 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

12
src/java.base/unix/native/libnet/net_util_md.c
View file

@ -805,12 +805,8 @@ NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, int port,
#ifdef __linux__
/*
* On Linux if we are connecting to a
*
* - link-local address
* - multicast interface-local or link-local address
*
* we need to specify the interface in the scope_id.
* On Linux if we are connecting to a link-local address
* we need to specify the interface in the scope_id (2.4 kernel only)
*
* If the scope was cached then we use the cached value. If not cached but
* specified in the Inet6Address we use that, but we first check if the
@ -820,9 +816,7 @@ NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, int port,
* we try to determine a value from the routing table. In all these
* cases the used value is cached for further use.
*/
if (IN6_IS_ADDR_LINKLOCAL(&sa->sa6.sin6_addr)
|| IN6_IS_ADDR_MC_NODELOCAL(&sa->sa6.sin6_addr)
|| IN6_IS_ADDR_MC_LINKLOCAL(&sa->sa6.sin6_addr)) {
if (IN6_IS_ADDR_LINKLOCAL(&sa->sa6.sin6_addr)) {
unsigned int cached_scope_id = 0, scope_id = 0;
if (ia6_cachedscopeidID) {