extern/EtherGuard-VPN
1
0
Fork 0
mirror of https://github.com/KusakabeShi/EtherGuard-VPN.git synced 2025-08-17 12:17:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: loop breaks on error, should continue to next

Browse Source
This commit is contained in:
KusakabeSi
2021-09-23 22:44:40 +00:00
parent 34443127b9
commit 4d0b5d1a3f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@ -12,7 +12,7 @@
"program": "${workspaceFolder}", "program": "${workspaceFolder}",
"buildFlags": "-tags=vpp", "buildFlags": "-tags=vpp",
"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","tttttttttt.yaml","-mode","edge"/*,"-example"*/],
} }
] ]
} }

2
README.md
View File

@ -118,7 +118,7 @@ Install Go 1.16
```bash ```bash
add-apt-repository ppa:longsleep/golang-backports add-apt-repository ppa:longsleep/golang-backports
apt-get -y update apt-get -y update
apt-install -y wireguard-tools golang-go build-essential apt-get install -y wireguard-tools golang-go build-essential git
``` ```
Build Build

2
README_zh.md
View File

@ -128,7 +128,7 @@ Usage of ./etherguard-go-vpp:
```bash ```bash
add-apt-repository ppa:longsleep/golang-backports add-apt-repository ppa:longsleep/golang-backports
apt-get -y update apt-get -y update
apt-install -y wireguard-tools golang-go build-essential apt-get install -y wireguard-tools golang-go build-essential git
``` ```
Build Build

8
device/receivesendproc.go
View File

@ -166,7 +166,7 @@ func (device *Device) process_received(msg_type path.Usage, peer *Peer, body []b
return return
} }
func (device *Device) sprint_received(msg_type path.Usage, body []byte) (string) { func (device *Device) sprint_received(msg_type path.Usage, body []byte) string {
switch msg_type { switch msg_type {
case path.Register: case path.Register:
if content, err := path.ParseRegisterMsg(body); err == nil { if content, err := path.ParseRegisterMsg(body); err == nil {
@ -390,12 +390,12 @@ func (device *Device) process_UpdatePeerMsg(peer *Peer, content path.UpdatePeerM
for PubKey, peerinfo := range peer_infos { for PubKey, peerinfo := range peer_infos {
if len(peerinfo.Connurl) == 0 { if len(peerinfo.Connurl) == 0 {
return nil continue
} }
sk, err := Str2PubKey(PubKey) sk, err := Str2PubKey(PubKey)
if err != nil { if err != nil {
device.log.Errorf("Error decode base64:", err) device.log.Errorf("Error decode base64:", err)
return err continue
} }
if bytes.Equal(sk[:], device.staticIdentity.publicKey[:]) { if bytes.Equal(sk[:], device.staticIdentity.publicKey[:]) {
continue continue
@ -418,7 +418,7 @@ func (device *Device) process_UpdatePeerMsg(peer *Peer, content path.UpdatePeerM
pk, err := Str2PSKey(peerinfo.PSKey) pk, err := Str2PSKey(peerinfo.PSKey)
if err != nil { if err != nil {
device.log.Errorf("Error decode base64:", err) device.log.Errorf("Error decode base64:", err)
return err continue
} }
thepeer.SetPSK(pk) thepeer.SetPSK(pk)
} }