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

Endpoint option in SuperConfig

Browse Source
This commit is contained in:
Kusakabe Si 2021-12-15 10:34:49 +00:00
parent b4285d3e5d
commit ca697b4822
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main_super.go
View File

@ -266,6 +266,14 @@ func super_peeradd(peerconf mtypes.SuperPeerInfo) error {
if peerconf.PSKey != "" {
peer4.SetPSK(psk)
}
if peerconf.EndPoint != "" {
err = peer4.SetEndpointFromConnURL(peerconf.EndPoint, 4, false)
if err != nil {
if httpobj.http_sconfig.LogLevel.LogInternal {
fmt.Printf("Internal: Set endpoint failed:%v\n", err)
}
}
}
}
if httpobj.http_sconfig.PrivKeyV6 != "" {
var psk device.NoisePresharedKey
@ -283,6 +291,14 @@ func super_peeradd(peerconf mtypes.SuperPeerInfo) error {
if peerconf.PSKey != "" {
peer6.SetPSK(psk)
}
if peerconf.EndPoint != "" {
err = peer6.SetEndpointFromConnURL(peerconf.EndPoint, 6, false)
if err != nil {
if httpobj.http_sconfig.LogLevel.LogInternal {
fmt.Printf("Internal: Set endpoint failed:%v\n", err)
}
}
}
}
httpobj.http_PeerID2Info[peerconf.NodeID] = peerconf
@ -469,7 +485,7 @@ func PushNhTable(force bool) {
copy(buf[path.EgHeaderLen:], body)
for pkstr, peerstate := range httpobj.http_PeerState {
isAlive := peerstate.LastSeen.Load().(time.Time).Add(mtypes.S2TD(httpobj.http_sconfig.PeerAliveTimeout)).After(time.Now())
if !isAlive {
if !isAlive && !force {
continue
}
if force || peerstate.NhTableState.Load().(string) != httpobj.http_NhTable_Hash {
@ -502,7 +518,7 @@ func PushPeerinfo(force bool) {
copy(buf[path.EgHeaderLen:], body)
for pkstr, peerstate := range httpobj.http_PeerState {
isAlive := peerstate.LastSeen.Load().(time.Time).Add(mtypes.S2TD(httpobj.http_sconfig.PeerAliveTimeout)).After(time.Now())
if !isAlive {
if !isAlive && !force {
continue
}
if force || peerstate.PeerInfoState.Load().(string) != httpobj.http_PeerInfo_hash {
@ -520,7 +536,7 @@ func PushServerParams(force bool) {
//No lock
for pkstr, peerstate := range httpobj.http_PeerState {
isAlive := peerstate.LastSeen.Load().(time.Time).Add(mtypes.S2TD(httpobj.http_sconfig.PeerAliveTimeout)).After(time.Now())
if !isAlive {
if !isAlive && !force {
continue
}
if force || peerstate.SuperParamState.Load().(string) != peerstate.SuperParamStateClient.Load().(string) {

1
mtypes/config.go
View File

@ -95,6 +95,7 @@ type SuperPeerInfo struct {
PSKey string `yaml:"PSKey"`
AdditionalCost float64 `yaml:"AdditionalCost"`
SkipLocalIP bool `yaml:"SkipLocalIP"`
EndPoint string `yaml:"EndPoint"`
}
type LoggerInfo struct {