mirror of
https://github.com/KusakabeShi/EtherGuard-VPN.git
synced 2024-11-28 10:13:07 +01:00
update some patamater
This commit is contained in:
parent
15988280f7
commit
c4ce0d0d36
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@ -10,7 +10,7 @@
|
|||||||
"request": "launch",
|
"request": "launch",
|
||||||
"mode": "auto",
|
"mode": "auto",
|
||||||
"program": "${workspaceFolder}",
|
"program": "${workspaceFolder}",
|
||||||
"buildFlags": "-tags=vpp",
|
"buildFlags": "-tags 'novpp'",
|
||||||
"env": {"CGO_CFLAGS":"-I/usr/include/memif"},
|
"env": {"CGO_CFLAGS":"-I/usr/include/memif"},
|
||||||
"args":["-config","example_config/super_mode/s1.yaml","-mode","super"/*,"-example"*/],
|
"args":["-config","example_config/super_mode/s1.yaml","-mode","super"/*,"-example"*/],
|
||||||
}
|
}
|
||||||
|
4
Makefile
4
Makefile
@ -20,7 +20,7 @@ etherguard-go: $(wildcard *.go) $(wildcard */*.go)
|
|||||||
go mod download && \
|
go mod download && \
|
||||||
go mod tidy && \
|
go mod tidy && \
|
||||||
go mod vendor && \
|
go mod vendor && \
|
||||||
go build -v -tags novpp -o "$@"
|
go build -v -o "$@"
|
||||||
|
|
||||||
vpp:
|
vpp:
|
||||||
@export GIT_CEILING_DIRECTORIES="$(realpath $(CURDIR)/..)" && \
|
@export GIT_CEILING_DIRECTORIES="$(realpath $(CURDIR)/..)" && \
|
||||||
@ -37,7 +37,7 @@ etherguard-go-vpp: $(wildcard *.go) $(wildcard */*.go)
|
|||||||
go mod tidy && \
|
go mod tidy && \
|
||||||
go mod vendor && \
|
go mod vendor && \
|
||||||
patch -p0 -i govpp_remove_crcstring_check.patch && \
|
patch -p0 -i govpp_remove_crcstring_check.patch && \
|
||||||
go build -v -o "$@"
|
go build -v -tags vpp -o "$@"
|
||||||
|
|
||||||
install: etherguard-go
|
install: etherguard-go
|
||||||
@install -v -d "$(DESTDIR)$(BINDIR)" && install -v -m 0755 "$<" "$(DESTDIR)$(BINDIR)/etherguard-go"
|
@install -v -d "$(DESTDIR)$(BINDIR)" && install -v -m 0755 "$<" "$(DESTDIR)$(BINDIR)/etherguard-go"
|
||||||
|
@ -26,7 +26,7 @@ dynamicroute:
|
|||||||
sendpinginterval: 16
|
sendpinginterval: 16
|
||||||
peeralivetimeout: 70
|
peeralivetimeout: 70
|
||||||
dupchecktimeout: 40
|
dupchecktimeout: 40
|
||||||
conntimeout: 30
|
conntimeout: 20
|
||||||
connnexttry: 5
|
connnexttry: 5
|
||||||
savenewpeers: true
|
savenewpeers: true
|
||||||
supernode:
|
supernode:
|
||||||
|
@ -26,7 +26,7 @@ dynamicroute:
|
|||||||
sendpinginterval: 16
|
sendpinginterval: 16
|
||||||
peeralivetimeout: 70
|
peeralivetimeout: 70
|
||||||
dupchecktimeout: 40
|
dupchecktimeout: 40
|
||||||
conntimeout: 30
|
conntimeout: 20
|
||||||
connnexttry: 5
|
connnexttry: 5
|
||||||
savenewpeers: true
|
savenewpeers: true
|
||||||
supernode:
|
supernode:
|
||||||
|
@ -19,7 +19,7 @@ graphrecalculatesetting:
|
|||||||
staticmode: false
|
staticmode: false
|
||||||
jittertolerance: 5
|
jittertolerance: 5
|
||||||
jittertolerancemultiplier: 1.01
|
jittertolerancemultiplier: 1.01
|
||||||
nodereporttimeout: 20
|
nodereporttimeout: 70
|
||||||
timeoutcheckinterval: 5
|
timeoutcheckinterval: 5
|
||||||
recalculatecooldown: 1
|
recalculatecooldown: 1
|
||||||
nexthoptable:
|
nexthoptable:
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
// +build !windows
|
|
||||||
|
|
||||||
/* SPDX-License-Identifier: MIT
|
/* SPDX-License-Identifier: MIT
|
||||||
*
|
*
|
||||||
* Copyright (C) 2017-2021 WireGuard LLC. All Rights Reserved.
|
* Copyright (C) 2017-2021 WireGuard LLC. All Rights Reserved.
|
||||||
@ -57,10 +55,10 @@ func printExampleEdgeConf() {
|
|||||||
LogNTP: false,
|
LogNTP: false,
|
||||||
},
|
},
|
||||||
DynamicRoute: config.DynamicRouteInfo{
|
DynamicRoute: config.DynamicRouteInfo{
|
||||||
SendPingInterval: 20,
|
SendPingInterval: 16,
|
||||||
PeerAliveTimeout: 30,
|
PeerAliveTimeout: 70,
|
||||||
DupCheckTimeout: 40,
|
DupCheckTimeout: 40,
|
||||||
ConnTimeOut: 30,
|
ConnTimeOut: 20,
|
||||||
ConnNextTry: 5,
|
ConnNextTry: 5,
|
||||||
SaveNewPeers: true,
|
SaveNewPeers: true,
|
||||||
SuperNode: config.SuperInfo{
|
SuperNode: config.SuperInfo{
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
// +build !windows
|
|
||||||
|
|
||||||
/* SPDX-License-Identifier: MIT
|
/* SPDX-License-Identifier: MIT
|
||||||
*
|
*
|
||||||
* Copyright (C) 2017-2021 WireGuard LLC. All Rights Reserved.
|
* Copyright (C) 2017-2021 WireGuard LLC. All Rights Reserved.
|
||||||
@ -91,7 +89,7 @@ func printExampleSuperConf() {
|
|||||||
StaticMode: false,
|
StaticMode: false,
|
||||||
JitterTolerance: 5,
|
JitterTolerance: 5,
|
||||||
JitterToleranceMultiplier: 1.01,
|
JitterToleranceMultiplier: 1.01,
|
||||||
NodeReportTimeout: 40,
|
NodeReportTimeout: 70,
|
||||||
TimeoutCheckInterval: 5,
|
TimeoutCheckInterval: 5,
|
||||||
RecalculateCoolDown: 5,
|
RecalculateCoolDown: 5,
|
||||||
},
|
},
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
//go:build !windows
|
||||||
|
// +build !windows
|
||||||
|
|
||||||
package tap
|
package tap
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
//go:build !windows
|
||||||
|
// +build !windows
|
||||||
|
|
||||||
/* SPDX-License-Identifier: MIT
|
/* SPDX-License-Identifier: MIT
|
||||||
*
|
*
|
||||||
* Copyright (C) 2017-2021 WireGuard LLC. All Rights Reserved.
|
* Copyright (C) 2017-2021 WireGuard LLC. All Rights Reserved.
|
||||||
@ -450,7 +453,7 @@ func (tap *NativeTap) Close() error {
|
|||||||
return err2
|
return err2
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateTAP(iconfig config.InterfaceConf,NodeID config.Vertex) (Device, error) {
|
func CreateTAP(iconfig config.InterfaceConf, NodeID config.Vertex) (Device, error) {
|
||||||
nfd, err := unix.Open(cloneDevicePath, os.O_RDWR, 0)
|
nfd, err := unix.Open(cloneDevicePath, os.O_RDWR, 0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
@ -490,10 +493,10 @@ func CreateTAP(iconfig config.InterfaceConf,NodeID config.Vertex) (Device, error
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return CreateTAPFromFile(fd, iconfig,NodeID)
|
return CreateTAPFromFile(fd, iconfig, NodeID)
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateTAPFromFile(file *os.File, iconfig config.InterfaceConf,NodeID config.Vertex) (Device, error) {
|
func CreateTAPFromFile(file *os.File, iconfig config.InterfaceConf, NodeID config.Vertex) (Device, error) {
|
||||||
tap := &NativeTap{
|
tap := &NativeTap{
|
||||||
tapFile: file,
|
tapFile: file,
|
||||||
events: make(chan Event, 5),
|
events: make(chan Event, 5),
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
//+build !novpp
|
//+build vpp
|
||||||
|
|
||||||
package tap
|
package tap
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
//+build novpp
|
//+build !vpp
|
||||||
|
|
||||||
package tap
|
package tap
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user