Merge pull request #157 from Arceliar/develop

Update admin socket error message and run gofmt
This commit is contained in:
Arceliar 2018-07-07 19:43:53 -05:00 committed by GitHub
commit 70e755fdd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 26 deletions

View File

@ -245,7 +245,7 @@ func (a *admin) listen() {
case "tcp": case "tcp":
a.listener, err = net.Listen("tcp", u.Host) a.listener, err = net.Listen("tcp", u.Host)
default: default:
err = errors.New("protocol not supported") err = errors.New(fmt.Sprint("protocol not supported: ", u.Scheme))
} }
} else { } else {
a.listener, err = net.Listen("tcp", a.listenaddr) a.listener, err = net.Listen("tcp", a.listenaddr)

View File

@ -5,7 +5,7 @@ package defaults
// for the platform being targeted. They must be set. // for the platform being targeted. They must be set.
type platformDefaultParameters struct { type platformDefaultParameters struct {
// Admin socket // Admin socket
DefaultAdminListen string DefaultAdminListen string
// TUN/TAP // TUN/TAP
MaximumIfMTU int MaximumIfMTU int

View File

@ -6,13 +6,13 @@ package defaults
// may be replaced by the running configuration. // may be replaced by the running configuration.
func GetDefaults() platformDefaultParameters { func GetDefaults() platformDefaultParameters {
return platformDefaultParameters{ return platformDefaultParameters{
// Admin // Admin
DefaultAdminListen: "tcp://localhost:9001", DefaultAdminListen: "tcp://localhost:9001",
// TUN/TAP // TUN/TAP
MaximumIfMTU: 65535, MaximumIfMTU: 65535,
DefaultIfMTU: 65535, DefaultIfMTU: 65535,
DefaultIfName: "auto", DefaultIfName: "auto",
DefaultIfTAPMode: false, DefaultIfTAPMode: false,
} }
} }

View File

@ -6,13 +6,13 @@ package defaults
// may be replaced by the running configuration. // may be replaced by the running configuration.
func GetDefaults() platformDefaultParameters { func GetDefaults() platformDefaultParameters {
return platformDefaultParameters{ return platformDefaultParameters{
// Admin // Admin
DefaultAdminListen: "tcp://localhost:9001", DefaultAdminListen: "tcp://localhost:9001",
// TUN/TAP // TUN/TAP
MaximumIfMTU: 65535, MaximumIfMTU: 65535,
DefaultIfMTU: 65535, DefaultIfMTU: 65535,
DefaultIfName: "auto", DefaultIfName: "auto",
DefaultIfTAPMode: false, DefaultIfTAPMode: false,
} }
} }

View File

@ -6,13 +6,13 @@ package defaults
// may be replaced by the running configuration. // may be replaced by the running configuration.
func GetDefaults() platformDefaultParameters { func GetDefaults() platformDefaultParameters {
return platformDefaultParameters{ return platformDefaultParameters{
// Admin // Admin
DefaultAdminListen: "tcp://localhost:9001", DefaultAdminListen: "tcp://localhost:9001",
// TUN/TAP // TUN/TAP
MaximumIfMTU: 65535, MaximumIfMTU: 65535,
DefaultIfMTU: 65535, DefaultIfMTU: 65535,
DefaultIfName: "none", DefaultIfName: "none",
DefaultIfTAPMode: false, DefaultIfTAPMode: false,
} }
} }

View File

@ -6,13 +6,13 @@ package defaults
// may be replaced by the running configuration. // may be replaced by the running configuration.
func GetDefaults() platformDefaultParameters { func GetDefaults() platformDefaultParameters {
return platformDefaultParameters{ return platformDefaultParameters{
// Admin // Admin
DefaultAdminListen: "tcp://localhost:9001", DefaultAdminListen: "tcp://localhost:9001",
// TUN/TAP // TUN/TAP
MaximumIfMTU: 65535, MaximumIfMTU: 65535,
DefaultIfMTU: 65535, DefaultIfMTU: 65535,
DefaultIfName: "auto", DefaultIfName: "auto",
DefaultIfTAPMode: true, DefaultIfTAPMode: true,
} }
} }