Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
6dfa9128
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看板
提交
6dfa9128
编写于
3月 24, 2016
作者:
R
robm
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8065078: NetworkInterface.getNetworkInterfaces() triggers intermittent test failures
Reviewed-by: chegar
上级
beda5993
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
6 deletion
+15
-6
src/windows/native/java/net/NetworkInterface_winXP.c
src/windows/native/java/net/NetworkInterface_winXP.c
+15
-6
未找到文件。
src/windows/native/java/net/NetworkInterface_winXP.c
浏览文件 @
6dfa9128
/*
* Copyright (c) 2003, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 201
5
, 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
...
...
@@ -28,6 +28,7 @@
#include <winsock2.h>
/* needed for htonl */
#include <iprtrmib.h>
#include <assert.h>
#include <limits.h>
#include "java_net_NetworkInterface.h"
#include "jni_util.h"
...
...
@@ -70,7 +71,7 @@ void printnifs (netif *netifPP, char *str) {
#endif
static
int
bufsize
=
1024
;
static
int
bufsize
=
4096
;
/*
* return an array of IP_ADAPTER_ADDRESSES containing one element
...
...
@@ -94,7 +95,12 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) {
ret
=
GetAdaptersAddresses
(
AF_UNSPEC
,
flags
,
NULL
,
adapterInfo
,
&
len
);
if
(
ret
==
ERROR_BUFFER_OVERFLOW
)
{
IP_ADAPTER_ADDRESSES
*
newAdapterInfo
=
(
IP_ADAPTER_ADDRESSES
*
)
realloc
(
adapterInfo
,
len
);
IP_ADAPTER_ADDRESSES
*
newAdapterInfo
=
NULL
;
if
(
len
<
(
ULONG_MAX
-
bufsize
))
{
len
=
len
+
bufsize
;
}
newAdapterInfo
=
(
IP_ADAPTER_ADDRESSES
*
)
realloc
(
adapterInfo
,
len
);
if
(
newAdapterInfo
==
NULL
)
{
free
(
adapterInfo
);
JNU_ThrowByName
(
env
,
"java/lang/OutOfMemoryError"
,
"Native heap allocation failure"
);
...
...
@@ -103,7 +109,6 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) {
adapterInfo
=
newAdapterInfo
;
bufsize
=
len
;
ret
=
GetAdaptersAddresses
(
AF_UNSPEC
,
flags
,
NULL
,
adapterInfo
,
&
len
);
}
...
...
@@ -137,7 +142,12 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) {
flags
|=
GAA_FLAG_INCLUDE_PREFIX
;
val
=
GetAdaptersAddresses
(
AF_UNSPEC
,
flags
,
NULL
,
adapterInfo
,
&
len
);
if
(
val
==
ERROR_BUFFER_OVERFLOW
)
{
IP_ADAPTER_ADDRESSES
*
newAdapterInfo
=
(
IP_ADAPTER_ADDRESSES
*
)
realloc
(
adapterInfo
,
len
);
IP_ADAPTER_ADDRESSES
*
newAdapterInfo
=
NULL
;
if
(
len
<
(
ULONG_MAX
-
bufsize
))
{
len
=
len
+
bufsize
;
}
newAdapterInfo
=
(
IP_ADAPTER_ADDRESSES
*
)
realloc
(
adapterInfo
,
len
);
if
(
newAdapterInfo
==
NULL
)
{
free
(
adapterInfo
);
JNU_ThrowByName
(
env
,
"java/lang/OutOfMemoryError"
,
"Native heap allocation failure"
);
...
...
@@ -146,7 +156,6 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) {
adapterInfo
=
newAdapterInfo
;
bufsize
=
len
;
val
=
GetAdaptersAddresses
(
AF_UNSPEC
,
flags
,
NULL
,
adapterInfo
,
&
len
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录