extern/EtherGuard-VPN
1
0
Fork 0
mirror of https://github.com/KusakabeShi/EtherGuard-VPN.git synced 2024-11-24 08:13:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

update some patamater

Browse Source
This commit is contained in:
Kusakabe Si 2021-11-28 11:39:40 +00:00
parent 15988280f7
commit c4ce0d0d36
11 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@ -10,7 +10,7 @@
"request": "launch",
"mode": "auto",
"program": "${workspaceFolder}",
"buildFlags": "-tags=vpp",
"buildFlags": "-tags 'novpp'",
"env": {"CGO_CFLAGS":"-I/usr/include/memif"},
"args":["-config","example_config/super_mode/s1.yaml","-mode","super"/*,"-example"*/],
}

4
Makefile
View File

@ -20,7 +20,7 @@ etherguard-go: $(wildcard *.go) $(wildcard */*.go)
go mod download && \
go mod tidy && \
go mod vendor && \
go build -v -tags novpp -o "$@"
go build -v -o "$@"
vpp:
@export GIT_CEILING_DIRECTORIES="$(realpath $(CURDIR)/..)" && \
@ -37,7 +37,7 @@ etherguard-go-vpp: $(wildcard *.go) $(wildcard */*.go)
go mod tidy && \
go mod vendor && \
patch -p0 -i govpp_remove_crcstring_check.patch && \
go build -v -o "$@"
go build -v -tags vpp -o "$@"
install: etherguard-go
@install -v -d "$(DESTDIR)$(BINDIR)" && install -v -m 0755 "$<" "$(DESTDIR)$(BINDIR)/etherguard-go"

2
example_config/super_mode/n1.yaml
View File

@ -26,7 +26,7 @@ dynamicroute:
sendpinginterval: 16
peeralivetimeout: 70
dupchecktimeout: 40
conntimeout: 30
conntimeout: 20
connnexttry: 5
savenewpeers: true
supernode:

2
example_config/super_mode/n2.yaml
View File

@ -26,7 +26,7 @@ dynamicroute:
sendpinginterval: 16
peeralivetimeout: 70
dupchecktimeout: 40
conntimeout: 30
conntimeout: 20
connnexttry: 5
savenewpeers: true
supernode:

2
example_config/super_mode/s1.yaml
View File

@ -19,7 +19,7 @@ graphrecalculatesetting:
staticmode: false
jittertolerance: 5
jittertolerancemultiplier: 1.01
nodereporttimeout: 20
nodereporttimeout: 70
timeoutcheckinterval: 5
recalculatecooldown: 1
nexthoptable:

8
main_edge.go
View File

@ -1,5 +1,3 @@
// +build !windows
/* SPDX-License-Identifier: MIT
*
* Copyright (C) 2017-2021 WireGuard LLC. All Rights Reserved.
@ -57,10 +55,10 @@ func printExampleEdgeConf() {
LogNTP: false,
},
DynamicRoute: config.DynamicRouteInfo{
SendPingInterval: 20,
PeerAliveTimeout: 30,
SendPingInterval: 16,
PeerAliveTimeout: 70,
DupCheckTimeout: 40,
ConnTimeOut: 30,
ConnTimeOut: 20,
ConnNextTry: 5,
SaveNewPeers: true,
SuperNode: config.SuperInfo{

4
main_super.go
View File

@ -1,5 +1,3 @@
// +build !windows
/* SPDX-License-Identifier: MIT
*
* Copyright (C) 2017-2021 WireGuard LLC. All Rights Reserved.
@ -91,7 +89,7 @@ func printExampleSuperConf() {
StaticMode: false,
JitterTolerance: 5,
JitterToleranceMultiplier: 1.01,
NodeReportTimeout: 40,
NodeReportTimeout: 70,
TimeoutCheckInterval: 5,
RecalculateCoolDown: 5,
},

3
tap/tap_fd.go
View File

@ -1,3 +1,6 @@
//go:build !windows
// +build !windows
package tap
import (

9
tap/tap_linux.go
View File

@ -1,3 +1,6 @@
//go:build !windows
// +build !windows
/* SPDX-License-Identifier: MIT
*
* Copyright (C) 2017-2021 WireGuard LLC. All Rights Reserved.
@ -450,7 +453,7 @@ func (tap *NativeTap) Close() error {
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)
if err != nil {
if os.IsNotExist(err) {
@ -490,10 +493,10 @@ func CreateTAP(iconfig config.InterfaceConf,NodeID config.Vertex) (Device, error
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{
tapFile: file,
events: make(chan Event, 5),

2
tap/tap_vpp.go
View File

@ -1,4 +1,4 @@
//+build !novpp
//+build vpp
package tap

2
tap/tap_vpp_fake.go
View File

@ -1,4 +1,4 @@
//+build novpp
//+build !vpp
package tap