diff --git a/init.go b/init.go index 8b6a58d..ae87ef9 100644 --- a/init.go +++ b/init.go @@ -35,12 +35,12 @@ func Init() { // get a random /22 subnet on 10.0.0.0 (1023 hosts) (or /24?) // TODO also the 20 bit block and 16 bit block? -func getRandomNetwork() IPNet { +func getRandomNetwork() JSONIPNet { rbs := make([]byte, 2) rand.Seed(time.Now().UTC().UnixNano()) rand.Read(rbs) - return IPNet{ + return JSONIPNet{ net.IPNet { net.IP{10,rbs[0],rbs[1]<<2,0}, net.IPMask{255,255,252,0}, diff --git a/types.go b/types.go index d5f36cb..2a4b68d 100644 --- a/types.go +++ b/types.go @@ -64,14 +64,14 @@ type Dsnet struct { Peers []Peer } -type IPNet struct { +type JSONIPNet struct { ipNet net.IPNet } -func (n IPNet) MarshalJSON() ([]byte, error) { +func (n JSONIPNet) MarshalJSON() ([]byte, error) { return []byte("\"" + n.ipNet.String() + "\""), nil } -func (n *IPNet) String() string { +func (n *JSONIPNet) String() string { return n.ipNet.String() }