Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
483e81f3
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
483e81f3
编写于
11月 27, 2020
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix duplicate port forwards for ipv4 vs ipv6
Fixes
https://github.com/microsoft/vscode/issues/111400
上级
995983da
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
12 deletion
+29
-12
src/vs/platform/remote/common/tunnel.ts
src/vs/platform/remote/common/tunnel.ts
+7
-1
src/vs/workbench/services/remote/common/remoteExplorerService.ts
...workbench/services/remote/common/remoteExplorerService.ts
+22
-11
未找到文件。
src/vs/platform/remote/common/tunnel.ts
浏览文件 @
483e81f3
...
...
@@ -60,8 +60,14 @@ export function extractLocalHostUriMetaDataForPortMapping(uri: URI): { address:
};
}
export
const
LOCALHOST_ADDRESSES
=
[
'
localhost
'
,
'
127.0.0.1
'
,
'
0:0:0:0:0:0:0:1
'
,
'
::1
'
];
export
function
isLocalhost
(
host
:
string
):
boolean
{
return
host
===
'
localhost
'
||
host
===
'
127.0.0.1
'
;
return
LOCALHOST_ADDRESSES
.
indexOf
(
host
)
>=
0
;
}
export
const
ALL_INTERFACES_ADDRESSES
=
[
'
0.0.0.0
'
,
'
0:0:0:0:0:0:0:0
'
,
'
::
'
];
export
function
isAllInterfaces
(
host
:
string
):
boolean
{
return
ALL_INTERFACES_ADDRESSES
.
indexOf
(
host
)
>=
0
;
}
function
getOtherLocalhost
(
host
:
string
):
string
|
undefined
{
...
...
src/vs/workbench/services/remote/common/remoteExplorerService.ts
浏览文件 @
483e81f3
...
...
@@ -7,7 +7,7 @@ import { Event, Emitter } from 'vs/base/common/event';
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
IStorageService
,
StorageScope
,
StorageTarget
}
from
'
vs/platform/storage/common/storage
'
;
import
{
isLocalhost
,
ITunnelService
,
RemoteTunnel
}
from
'
vs/platform/remote/common/tunnel
'
;
import
{
ALL_INTERFACES_ADDRESSES
,
isAllInterfaces
,
isLocalhost
,
ITunnelService
,
LOCALHOST_ADDRESSES
,
RemoteTunnel
}
from
'
vs/platform/remote/common/tunnel
'
;
import
{
Disposable
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IEditableData
}
from
'
vs/workbench/common/views
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
...
...
@@ -65,18 +65,29 @@ export function parseAddress(address: string): { host: string, port: number } |
}
export
function
mapHasAddress
<
T
>
(
map
:
Map
<
string
,
T
>
,
host
:
string
,
port
:
number
):
T
|
undefined
{
if
(
!
isLocalhost
(
host
))
{
return
map
.
get
(
makeAddress
(
host
,
port
));
const
initialAddress
=
map
.
get
(
makeAddress
(
host
,
port
));
if
(
initialAddress
)
{
return
initialAddress
;
}
const
stringAddress
=
makeAddress
(
'
localhost
'
,
port
);
if
(
map
.
has
(
stringAddress
))
{
return
map
.
get
(
stringAddress
);
}
const
numberAddress
=
makeAddress
(
'
127.0.0.1
'
,
port
);
if
(
map
.
has
(
numberAddress
))
{
return
map
.
get
(
numberAddress
);
if
(
isLocalhost
(
host
))
{
// Do localhost checks
for
(
const
testHost
of
LOCALHOST_ADDRESSES
)
{
const
testAddress
=
makeAddress
(
testHost
,
port
);
if
(
map
.
has
(
testAddress
))
{
return
map
.
get
(
testAddress
);
}
}
}
else
if
(
isAllInterfaces
(
host
))
{
// Do all interfaces checks
for
(
const
testHost
of
ALL_INTERFACES_ADDRESSES
)
{
const
testAddress
=
makeAddress
(
testHost
,
port
);
if
(
map
.
has
(
testAddress
))
{
return
map
.
get
(
testAddress
);
}
}
}
return
undefined
;
}
...
...
@@ -85,7 +96,7 @@ export function mapHasAddressLocalhostOrAllInterfaces<T>(map: Map<string, T>, ho
if
(
originalAddress
)
{
return
originalAddress
;
}
const
otherHost
=
host
===
'
0.0.0.0
'
?
'
localhost
'
:
(
host
===
'
localhost
'
?
'
0.0.0.0
'
:
undefined
);
const
otherHost
=
isAllInterfaces
(
host
)
?
'
localhost
'
:
(
host
===
'
localhost
'
?
'
0.0.0.0
'
:
undefined
);
if
(
otherHost
)
{
return
mapHasAddress
(
map
,
otherHost
,
port
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录