/*
GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2016 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2019 Sergey Matveev <stargrave@stargrave.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
"log"
"time"
- "github.com/go-yaml/yaml"
+ "gopkg.in/yaml.v2"
"cypherpunks.ru/govpn"
)
)
var (
- confs map[govpn.PeerId]*govpn.PeerConf
- idsCache *govpn.CipherCache
+ confs map[govpn.PeerID]*govpn.PeerConf
+ idsCache *govpn.MACCache
)
-func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) {
+func confRead() (*map[govpn.PeerID]*govpn.PeerConf, error) {
data, err := ioutil.ReadFile(*confPath)
if err != nil {
return nil, err
return nil, err
}
- confs := make(map[govpn.PeerId]*govpn.PeerConf, len(*confsRaw))
+ confs := make(map[govpn.PeerID]*govpn.PeerConf, len(*confsRaw))
for name, pc := range *confsRaw {
verifier, err := govpn.VerifierFromString(pc.VerifierRaw)
if err != nil {
pc.MTU = govpn.MTUDefault
}
if pc.MTU > govpn.MTUMax {
- govpn.Println("MTU value", pc.MTU, "is too high, overriding to", govpn.MTUMax)
+ govpn.Printf(`[mtu-high bind="%s" value="%d" overriden="%d"]`, *bindAddr, pc.MTU, govpn.MTUMax)
pc.MTU = govpn.MTUMax
}
conf := govpn.PeerConf{
Verifier: verifier,
- Id: verifier.Id,
+ ID: verifier.ID,
Name: name,
Iface: pc.Iface,
MTU: pc.MTU,
pc.TimeoutInt = govpn.TimeoutDefault
}
conf.Timeout = time.Second * time.Duration(pc.TimeoutInt)
- confs[*verifier.Id] = &conf
+ confs[*verifier.ID] = &conf
}
return &confs, nil
}
func confRefresh() error {
newConfs, err := confRead()
if err != nil {
- govpn.Println("Unable to parse peers configuration:", err)
+ govpn.Printf(`[conf-parse-failed bind="%s" err="%s"]`, *bindAddr, err)
return err
}
confs = *newConfs
}
func confInit() {
- idsCache = govpn.NewCipherCache()
+ idsCache = govpn.NewMACCache()
if err := confRefresh(); err != nil {
log.Fatalln(err)
}