/*
GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2016 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2017 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
+ idsCache *govpn.MACCache
)
func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) {
pc.MTU = govpn.MTUDefault
}
if pc.MTU > govpn.MTUMax {
- log.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{
Noise: pc.Noise,
CPR: pc.CPR,
Encless: pc.Encless,
+ TimeSync: pc.TimeSync,
}
if pc.TimeoutInt <= 0 {
pc.TimeoutInt = govpn.TimeoutDefault
func confRefresh() error {
newConfs, err := confRead()
if err != nil {
- log.Println("Unable to parse peers configuration:", err)
+ govpn.Printf(`[conf-parse-failed bind="%s" err="%s"]`, *bindAddr, err)
return err
}
confs = *newConfs
- ids := make([]govpn.PeerId, 0, len(confs))
- for peerId, _ := range confs {
- ids = append(ids, peerId)
- }
- idsCache.Update(ids)
+ idsCache.Update(newConfs)
return nil
}
func confInit() {
- idsCache = govpn.NewCipherCache(nil)
+ idsCache = govpn.NewMACCache()
if err := confRefresh(); err != nil {
log.Fatalln(err)
}