Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-29 14:26:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Xray设置下一跳为Socks5

Browse source
This commit is contained in:
crazypeace 2023-11-08 15:23:18 +08:00
parent 2652beed88
commit b37db9ea26
10 changed files with 110 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
v2rayN/v2rayN/Handler/ConfigHandler.cs
View file

@ -196,6 +196,16 @@ namespace v2rayN.Handler
};
}
if (config.socksOutbound == null)
{
config.socksOutbound = new()
{
isEnable = false,
address = "127.0.0.1",
port = 10086
};
}
LazyConfig.Instance.SetConfig(config);
return 0;
}

25
v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
View file

@ -52,6 +52,8 @@ namespace v2rayN.Handler
outbound(node, v2rayConfig);
socksOut(v2rayConfig);
dns(v2rayConfig);
statistic(v2rayConfig);
@ -470,6 +472,7 @@ namespace v2rayN.Handler
outbound.protocol = Global.trojanProtocolLite;
outbound.settings.vnext = null;
}
boundStreamSettings(node, outbound.streamSettings);
}
catch (Exception ex)
@ -698,6 +701,28 @@ namespace v2rayN.Handler
return 0;
}
private int socksOut(V2rayConfig v2rayConfig)
{
try
{
Outbounds4Ray outbound = v2rayConfig.outbounds[3];
ServersItem4Ray server = outbound.settings.servers[0];
server.address = _config.socksOutbound.address;
server.port = _config.socksOutbound.port;
// 如果下一跳Socks功能不打开, 那么配置文件中要删除sockopt这一段
if (! _config.socksOutbound.isEnable)
{
v2rayConfig.outbounds[0].streamSettings.sockopt = null;
}
}
catch (Exception ex)
{
Utils.SaveLog(ex.Message, ex);
}
return 0;
}
private int dns(V2rayConfig v2rayConfig)
{
try

3
v2rayN/v2rayN/Mode/Config.cs
View file

@ -32,6 +32,9 @@
public List<KeyEventItem> globalHotkeys { get; set; }
public List<CoreTypeItem> coreTypeItem { get; set; }
// Socks出口
public SocksOutbound socksOutbound { get; set; }
#endregion other entities
}
}

9
v2rayN/v2rayN/Mode/ConfigItems.cs
View file

@ -206,4 +206,13 @@ namespace v2rayN.Mode
public int max_streams { get; set; }
public bool padding { get; set; }
}
[Serializable]
// Socks出口
public class SocksOutbound
{
public bool isEnable { get; set; }
public string address { get; set; }
public int port { get; set; }
}
}

9
v2rayN/v2rayN/Mode/V2rayConfig.cs
View file

@ -451,6 +451,9 @@ namespace v2rayN.Mode
/// grpc
/// </summary>
public GrpcSettings4Ray grpcSettings { get; set; }
// 设置Socks出口
public SockoptObject sockopt { get; set; }
}
public class TlsSettings4Ray
@ -620,6 +623,12 @@ namespace v2rayN.Mode
public int initial_windows_size { get; set; }
}
// Socks出口
public class SockoptObject
{
public string dialerProxy { get; set; }
}
public class AccountsItem4Ray
{
/// <summary>

21
v2rayN/v2rayN/Sample/SampleClientConfig
View file

@ -76,7 +76,10 @@
}]
},
"streamSettings": {
"network": "tcp"
"network": "tcp",
"sockopt": {
"dialerProxy": "tunnel"
}
},
"mux": {
"enabled": false
@ -95,16 +98,24 @@
"type": "http"
}
}
},
{
"tag": "tunnel",
"protocol": "socks",
"settings": {
"servers": [{
"address": "127.0.0.1",
"port": 10086
}]
}
}
],
"routing": {
"domainStrategy": "IPIfNonMatch",
"rules": [
{
"rules": [{
"inboundTag": ["api"],
"outboundTag": "api",
"type": "field"
}
]
}]
}
}

5
v2rayN/v2rayN/Tool/Utils.cs
View file

@ -880,9 +880,10 @@ namespace v2rayN
string location = GetExePath();
if (blFull)
{
return string.Format("v2rayN - V{0} - {1}",
return string.Format("v2rayN - V{0} - {1} - {2}",
FileVersionInfo.GetVersionInfo(location).FileVersion.ToString(),
File.GetLastWriteTime(location).ToString("yyyy/MM/dd"));
File.GetLastWriteTime(location).ToString("yyyy/MM/dd"),
Path.GetFileName(location));
}
else
{

15
v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
View file

@ -33,6 +33,11 @@ namespace v2rayN.ViewModels
[Reactive] public string defUserAgent { get; set; }
[Reactive] public string mux4SboxProtocol { get; set; }
// Socsk出口设置
[Reactive] public bool socksOutboundEnable { get; set; }
[Reactive] public string socksOutboundIP { get; set; }
[Reactive] public int socksOutboundPort { get; set; }
#endregion Core
#region Core KCP
@ -175,6 +180,11 @@ namespace v2rayN.ViewModels
InitCoreType();
// Socks出口
socksOutboundEnable = _config.socksOutbound.isEnable;
socksOutboundIP = _config.socksOutbound.address;
socksOutboundPort = _config.socksOutbound.port;
SaveCmd = ReactiveCommand.Create(() =>
{
SaveSetting();
@ -317,6 +327,11 @@ namespace v2rayN.ViewModels
//coreType
SaveCoreType();
// Socks出口
_config.socksOutbound.isEnable = socksOutboundEnable;
_config.socksOutbound.address = socksOutboundIP;
_config.socksOutbound.port = socksOutboundPort;
if (ConfigHandler.SaveConfig(ref _config) == 0)
{
_noticeHandler?.Enqueue(ResUI.OperationSuccess);

12
v2rayN/v2rayN/Views/OptionSettingWindow.xaml
View file

@ -939,6 +939,18 @@
Style="{StaticResource DefComboBox}" />
</Grid>
</TabItem>
<TabItem Header="Core出口设置">
<Grid>
<Grid.ColumnDefinitions>
</Grid.ColumnDefinitions>
<Label Content="端口" HorizontalAlignment="Left" Margin="41,83,0,0" VerticalAlignment="Top"/>
<TextBox x:Name="txtSocksOutboundPort" HorizontalAlignment="Left" Margin="112,83,0,0" TextWrapping="Wrap" Text="10086" VerticalAlignment="Top" Width="120"/>
<Label Content="IP" HorizontalAlignment="Left" Margin="41,53,0,0" VerticalAlignment="Top"/>
<TextBox x:Name="txtSocksOutboundIP" HorizontalAlignment="Left" Margin="112,53,0,0" TextWrapping="Wrap" Text="127.0.0.1" VerticalAlignment="Top" Width="120"/>
<Label Content="下一跳Socks5接口" HorizontalAlignment="Left" Margin="41,24,0,0" VerticalAlignment="Top" Width="141"/>
<CheckBox x:Name="chkSocksOut" Content="" HorizontalAlignment="Left" Margin="187,27,0,0" VerticalAlignment="Top" IsChecked="False"/>
</Grid>
</TabItem>
</TabControl>
</DockPanel>
</reactiveui:ReactiveWindow>

5
v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
View file

@ -187,6 +187,11 @@ namespace v2rayN.Views
this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.Text).DisposeWith(disposables);
// Socks出口设置
this.Bind(ViewModel, vm => vm.socksOutboundEnable, v => v.chkSocksOut.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.socksOutboundIP, v => v.txtSocksOutboundIP.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.socksOutboundPort, v => v.txtSocksOutboundPort.Text).DisposeWith(disposables);
this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
});
}