Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
ced700db
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ced700db
编写于
3月 24, 2018
作者:
I
igerasim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8195868: Address Internet Addresses
Reviewed-by: chegar, rriggs, igerasim, skoivu, rhalade
上级
a5af17b2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
32 addition
and
8 deletion
+32
-8
src/share/classes/java/net/InetAddress.java
src/share/classes/java/net/InetAddress.java
+7
-3
src/share/classes/java/net/NetworkInterface.java
src/share/classes/java/net/NetworkInterface.java
+15
-3
src/solaris/native/java/net/NetworkInterface.c
src/solaris/native/java/net/NetworkInterface.c
+10
-2
未找到文件。
src/share/classes/java/net/InetAddress.java
浏览文件 @
ced700db
/*
* Copyright (c) 1995, 201
5
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 201
8
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -37,6 +37,7 @@ import java.security.AccessController;
import
java.io.ObjectStreamException
;
import
java.io.ObjectStreamField
;
import
java.io.IOException
;
import
java.io.InvalidObjectException
;
import
java.io.ObjectInputStream
;
import
java.io.ObjectInputStream.GetField
;
import
java.io.ObjectOutputStream
;
...
...
@@ -1602,8 +1603,11 @@ class InetAddress implements java.io.Serializable {
}
GetField
gf
=
s
.
readFields
();
String
host
=
(
String
)
gf
.
get
(
"hostName"
,
null
);
int
address
=
gf
.
get
(
"address"
,
0
);
int
family
=
gf
.
get
(
"family"
,
0
);
int
address
=
gf
.
get
(
"address"
,
0
);
int
family
=
gf
.
get
(
"family"
,
0
);
if
(
family
!=
IPv4
&&
family
!=
IPv6
)
{
throw
new
InvalidObjectException
(
"invalid address family type: "
+
family
);
}
InetAddressHolder
h
=
new
InetAddressHolder
(
host
,
address
,
family
);
UNSAFE
.
putObject
(
this
,
FIELDS_OFFSET
,
h
);
}
...
...
src/share/classes/java/net/NetworkInterface.java
浏览文件 @
ced700db
/*
* Copyright (c) 2000, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 201
8
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -319,8 +319,20 @@ public final class NetworkInterface {
if
(
addr
==
null
)
{
throw
new
NullPointerException
();
}
if
(!(
addr
instanceof
Inet4Address
||
addr
instanceof
Inet6Address
))
{
throw
new
IllegalArgumentException
(
"invalid address type"
);
if
(
addr
instanceof
Inet4Address
)
{
Inet4Address
inet4Address
=
(
Inet4Address
)
addr
;
if
(
inet4Address
.
holder
.
family
!=
InetAddress
.
IPv4
)
{
throw
new
IllegalArgumentException
(
"invalid family type: "
+
inet4Address
.
holder
.
family
);
}
}
else
if
(
addr
instanceof
Inet6Address
)
{
Inet6Address
inet6Address
=
(
Inet6Address
)
addr
;
if
(
inet6Address
.
holder
.
family
!=
InetAddress
.
IPv6
)
{
throw
new
IllegalArgumentException
(
"invalid family type: "
+
inet6Address
.
holder
.
family
);
}
}
else
{
throw
new
IllegalArgumentException
(
"invalid address type: "
+
addr
);
}
return
getByInetAddress0
(
addr
);
}
...
...
src/solaris/native/java/net/NetworkInterface.c
浏览文件 @
ced700db
...
...
@@ -335,10 +335,18 @@ JNIEXPORT jobject JNICALL Java_java_net_NetworkInterface_getByInetAddress0
jobject
obj
=
NULL
;
jboolean
match
=
JNI_FALSE
;
#if defined(AF_INET6)
int
family
=
(
getInetAddress_family
(
env
,
iaObj
)
==
IPv4
)
?
AF_INET
:
AF_INET6
;
int
family
=
getInetAddress_family
(
env
,
iaObj
)
;
JNU_CHECK_EXCEPTION_RETURN
(
env
,
NULL
);
if
(
family
==
IPv4
)
{
family
=
AF_INET
;
}
else
if
(
family
==
IPv6
)
{
family
=
AF_INET6
;
}
else
{
return
NULL
;
// Invalid family
}
#else
int
family
=
AF_INET
;
int
family
=
AF_INET
;
#endif
ifs
=
enumInterfaces
(
env
);
if
(
ifs
==
NULL
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录