vodorod/umbrix-libcore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix: reenable indeependent nat for vpn server

Browse Source
This commit is contained in:
Hiddify
2024-08-03 15:48:12 +02:00
parent 56ceaa9f62
commit 0e3d3a0032
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/admin_service_commander.go
View File

@@ -96,7 +96,7 @@ func startTunnelRequest(opt ConfigOptions, installService bool) (bool, error) {
Ipv6: opt.IPv6Mode == option.DomainStrategy(dns.DomainStrategyUseIPv4), Ipv6: opt.IPv6Mode == option.DomainStrategy(dns.DomainStrategyUseIPv4),
ServerPort: int32(opt.InboundOptions.MixedPort), ServerPort: int32(opt.InboundOptions.MixedPort),
StrictRoute: opt.InboundOptions.StrictRoute, StrictRoute: opt.InboundOptions.StrictRoute,
EndpointIndependentNat: false, EndpointIndependentNat: true,
Stack: opt.InboundOptions.TUNStack, Stack: opt.InboundOptions.TUNStack,
}) })
if err != nil { if err != nil {

5
v2/tunnel_service.go
View File

@@ -11,13 +11,13 @@ import (
func (s *TunnelService) Start(ctx context.Context, in *pb.TunnelStartRequest) (*pb.TunnelResponse, error) { func (s *TunnelService) Start(ctx context.Context, in *pb.TunnelStartRequest) (*pb.TunnelResponse, error) {
if in.ServerPort == 0 { if in.ServerPort == 0 {
in.ServerPort = 2334 in.ServerPort = 12334
} }
useFlutterBridge = false useFlutterBridge = false
res, err := Start(&pb.StartRequest{ res, err := Start(&pb.StartRequest{
ConfigContent: makeTunnelConfig(in.Ipv6, in.ServerPort, in.StrictRoute, in.EndpointIndependentNat, in.Stack), ConfigContent: makeTunnelConfig(in.Ipv6, in.ServerPort, in.StrictRoute, in.EndpointIndependentNat, in.Stack),
EnableOldCommandServer: false, EnableOldCommandServer: false,
DisableMemoryLimit: false, DisableMemoryLimit: true,
EnableRawConfig: true, EnableRawConfig: true,
}) })
fmt.Printf("Start Result: %+v\n", res) fmt.Printf("Start Result: %+v\n", res)
@@ -49,7 +49,6 @@ func makeTunnelConfig(Ipv6 bool, ServerPort int32, StrictRoute bool, EndpointInd
"interface_name": "HiddifyTunnel", "interface_name": "HiddifyTunnel",
"inet4_address": "172.19.0.1/30", "inet4_address": "172.19.0.1/30",
` + ipv6 + ` ` + ipv6 + `
"mtu": 1492,
"auto_route": true, "auto_route": true,
"strict_route": ` + fmt.Sprintf("%t", StrictRoute) + `, "strict_route": ` + fmt.Sprintf("%t", StrictRoute) + `,
"endpoint_independent_nat": ` + fmt.Sprintf("%t", EndpointIndependentNat) + `, "endpoint_independent_nat": ` + fmt.Sprintf("%t", EndpointIndependentNat) + `,