X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-server%2Fconf.go;h=7c63f65810a93dc8452098783919dfc9c2736b58;hb=443636bb4dd00aa3b054e233ad09671ac04913ed;hp=e486ec97b12a92b37f03a9b2846612bf70903701;hpb=831cb44403d1c94eddff4ac9f56d386a9707c47b;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 e486ec9..7c63f65 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
@@ -24,7 +24,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/go-yaml/yaml"
+	"gopkg.in/yaml.v2"
 
 	"cypherpunks.ru/govpn"
 )
@@ -35,7 +35,7 @@ const (
 
 var (
 	confs    map[govpn.PeerId]*govpn.PeerConf
-	idsCache *govpn.CipherCache
+	idsCache *govpn.MACCache
 )
 
 func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) {
@@ -62,7 +62,7 @@ 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{
@@ -90,7 +90,7 @@ func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) {
 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
@@ -99,7 +99,7 @@ func confRefresh() error {
 }
 
 func confInit() {
-	idsCache = govpn.NewCipherCache()
+	idsCache = govpn.NewMACCache()
 	if err := confRefresh(); err != nil {
 		log.Fatalln(err)
 	}