X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-server%2Fconf.go;h=f5b4dd8f8269c470f80bed68f6486f8c3305cf0a;hb=70e70dfded87dc2d737160444829c58ed8ed2fa0;hp=28ee501443a0a7dbcc3ceb332c3eee22b80f7644;hpb=3413874a359d386b082614637c9ab247bb6510b4;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
index 28ee501..f5b4dd8 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2016 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 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
@@ -24,7 +24,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/go-yaml/yaml"
+	"gopkg.in/yaml.v2"
 
 	"cypherpunks.ru/govpn"
 )
@@ -34,11 +34,11 @@ const (
 )
 
 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
@@ -49,7 +49,7 @@ func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) {
 		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 {
@@ -67,7 +67,7 @@ func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) {
 		}
 		conf := govpn.PeerConf{
 			Verifier: verifier,
-			Id:       verifier.Id,
+			ID:       verifier.ID,
 			Name:     name,
 			Iface:    pc.Iface,
 			MTU:      pc.MTU,
@@ -82,7 +82,7 @@ func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) {
 			pc.TimeoutInt = govpn.TimeoutDefault
 		}
 		conf.Timeout = time.Second * time.Duration(pc.TimeoutInt)
-		confs[*verifier.Id] = &conf
+		confs[*verifier.ID] = &conf
 	}
 	return &confs, nil
 }
@@ -99,7 +99,7 @@ func confRefresh() error {
 }
 
 func confInit() {
-	idsCache = govpn.NewCipherCache()
+	idsCache = govpn.NewMACCache()
 	if err := confRefresh(); err != nil {
 		log.Fatalln(err)
 	}