xsteadfastx/dsnet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "embed types without alias properly"

Browse Source 
This reverts commit b7ed21f2ec.
This commit is contained in:
Callan Bryant 2020-03-05 20:59:56 +00:00
parent f0ffa166f8
commit c579372eaa
No known key found for this signature in database
GPG Key ID: C31FA9DF3ACBFFAA
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configtypes.go
View File

@ -20,7 +20,7 @@ type PeerConfig struct {
// Description of what the host is and/or does // Description of what the host is and/or does
Description string `validate:"required,gte=1,lte=255"` Description string `validate:"required,gte=1,lte=255"`
// Internal VPN IP address. Added to AllowedIPs in server config as a /32 // Internal VPN IP address. Added to AllowedIPs in server config as a /32
net.IP `validate:"required` IP net.IP `validate:"required`
PublicKey JSONKey `validate:"required,len=44"` PublicKey JSONKey `validate:"required,len=44"`
PrivateKey JSONKey `json:"-"` // omitted from config! PrivateKey JSONKey `json:"-"` // omitted from config!
PresharedKey JSONKey `validate:"required,len=44"` PresharedKey JSONKey `validate:"required,len=44"`
@ -40,8 +40,8 @@ type DsnetConfig struct {
// IP network from which to allocate automatic sequential addresses // IP network from which to allocate automatic sequential addresses
// Network is chosen randomly when not specified // Network is chosen randomly when not specified
Network JSONIPNet `validate:"required"` Network JSONIPNet `validate:"required"`
net.IP `validate:"required"` IP net.IP `validate:"required"`
DNS net.IP `validate:"required"` DNS net.IP `validate:"required"`
// TODO Default subnets to route via VPN // TODO Default subnets to route via VPN
ReportFile string `validate:"required"` ReportFile string `validate:"required"`
PrivateKey JSONKey `validate:"required,len=44"` PrivateKey JSONKey `validate:"required,len=44"`

4
exttypes.go
View File

@ -8,7 +8,7 @@ import (
) )
type JSONIPNet struct { type JSONIPNet struct {
net.IPNet IPNet net.IPNet
} }
func (n JSONIPNet) MarshalJSON() ([]byte, error) { func (n JSONIPNet) MarshalJSON() ([]byte, error) {
@ -28,7 +28,7 @@ func (n *JSONIPNet) String() string {
} }
type JSONKey struct { type JSONKey struct {
wgtypes.Key Key wgtypes.Key
} }
func (k JSONKey) MarshalJSON() ([]byte, error) { func (k JSONKey) MarshalJSON() ([]byte, error) {

10
reporttypes.go
View File

@ -51,9 +51,9 @@ type DsnetReport struct {
// IP network from which to allocate automatic sequential addresses // IP network from which to allocate automatic sequential addresses
// Network is chosen randomly when not specified // Network is chosen randomly when not specified
Network JSONIPNet Network JSONIPNet
net.IP IP net.IP
DNS net.IP DNS net.IP
Peers []PeerReport Peers []PeerReport
} }
func GenerateReport(dev *wgtypes.Device, conf *DsnetConfig) DsnetReport { func GenerateReport(dev *wgtypes.Device, conf *DsnetConfig) DsnetReport {
@ -74,8 +74,8 @@ type PeerReport struct {
// Description of what the host is and/or does // Description of what the host is and/or does
Description string Description string
// Internal VPN IP address. Added to AllowedIPs in server config as a /32 // Internal VPN IP address. Added to AllowedIPs in server config as a /32
net.IP IP net.IP
Status Status Status
// TODO ExternalIP support (Endpoint) // TODO ExternalIP support (Endpoint)
//ExternalIP net.UDPAddr `validate:"required,udp4_addr"` //ExternalIP net.UDPAddr `validate:"required,udp4_addr"`
// TODO support routing additional networks (AllowedIPs) // TODO support routing additional networks (AllowedIPs)