Ability to explicitly specify TAP interface, without up-script using

[govpn.git] / src / govpn / conf.go

diff --git a/src/govpn/conf.go b/src/govpn/conf.go
index 0eff5909fa75c7cc6f243acde2e42a0523e3fd01..eb69ec6d1de34b34dbe19e776cca5197e5613436 100644 (file)
--- a/src/govpn/conf.go
+++ b/src/govpn/conf.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2016 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
@@ -25,18 +25,20 @@ import (
 )
 
 type PeerConf struct {
-       Id         *PeerId       `json:"-"`
-       Name       string        `json:"name"`
-       Up         string        `json:"up"`
-       Down       string        `json:"down"`
-       TimeoutInt int           `json:"timeout"`
-       Timeout    time.Duration `json:"-"`
-       Noise      bool          `json:"noise"`
-       CPR        int           `json:"cpr"`
-       Verifier   string        `json:"verifier"`
+       Id          *PeerId       `json:"-"`
+       Name        string        `json:"name"`
+       Iface       string        `json:"iface"`
+       Up          string        `json:"up"`
+       Down        string        `json:"down"`
+       TimeoutInt  int           `json:"timeout"`
+       Timeout     time.Duration `json:"-"`
+       Noise       bool          `json:"noise"`
+       CPR         int           `json:"cpr"`
+       EncLess     bool          `json:"encless"`
+       VerifierRaw string        `json:"verifier"`
 
        // This is passphrase verifier
-       DSAPub *[ed25519.PublicKeySize]byte `json:"-"`
+       Verifier *Verifier
        // This field exists only on client's side
        DSAPriv *[ed25519.PrivateKeySize]byte `json:"-"`
 }