Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
idsCache *govpn.CipherCache
)
idsCache *govpn.CipherCache
)
-func confRead() map[govpn.PeerId]*govpn.PeerConf {
+func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) {
data, err := ioutil.ReadFile(*confPath)
if err != nil {
data, err := ioutil.ReadFile(*confPath)
if err != nil {
- log.Fatalln("Unable to read configuration:", err)
}
confsRaw := new(map[string]govpn.PeerConf)
err = json.Unmarshal(data, confsRaw)
if err != nil {
}
confsRaw := new(map[string]govpn.PeerConf)
err = json.Unmarshal(data, confsRaw)
if err != nil {
- log.Fatalln("Unable to parse configuration:", err)
}
confs := make(map[govpn.PeerId]*govpn.PeerConf, len(*confsRaw))
for name, pc := range *confsRaw {
verifier, err := govpn.VerifierFromString(pc.VerifierRaw)
if err != nil {
}
confs := make(map[govpn.PeerId]*govpn.PeerConf, len(*confsRaw))
for name, pc := range *confsRaw {
verifier, err := govpn.VerifierFromString(pc.VerifierRaw)
if err != nil {
- log.Fatalln("Unable to decode the key:", err.Error(), pc.VerifierRaw)
+ return nil, errors.New("Unable to decode verifier: " + err.Error())
}
if pc.Encless {
pc.Noise = true
}
if pc.Encless {
pc.Noise = true
conf.Timeout = time.Second * time.Duration(pc.TimeoutInt)
confs[*verifier.Id] = &conf
}
conf.Timeout = time.Second * time.Duration(pc.TimeoutInt)
confs[*verifier.Id] = &conf
}
-func confRefresh() {
- confs = confRead()
+func confRefresh() error {
+ newConfs, err := confRead()
+ if err != nil {
+ log.Println("Unable to parse peers configuration:", err)
+ return err
+ }
+ confs = *newConfs
ids := make([]govpn.PeerId, 0, len(confs))
for peerId, _ := range confs {
ids = append(ids, peerId)
}
idsCache.Update(ids)
ids := make([]govpn.PeerId, 0, len(confs))
for peerId, _ := range confs {
ids = append(ids, peerId)
}
idsCache.Update(ids)
}
func confInit() {
idsCache = govpn.NewCipherCache(nil)
}
func confInit() {
idsCache = govpn.NewCipherCache(nil)
+ if err := confRefresh(); err != nil {
+ log.Fatalln(err)
+ }
go func() {
for {
time.Sleep(RefreshRate)
go func() {
for {
time.Sleep(RefreshRate)