Changed to support 1-way connections

MFrank2016 · Apr 19, 2020 · 1092abe · 1092abe
1 parent eacdf54
commit 1092abe
Show file tree

Hide file tree

Showing 9 changed files with 470 additions and 462 deletions.
diff --git a/api/admin/networking.go b/api/admin/networking.go
@@ -10,14 +10,14 @@ import (
 )
 
 // Peerable can return a group of peers
-type Peerable interface{ Peers() []utils.IPDesc }
+type Peerable interface{ IPs() []utils.IPDesc }
 
 // Networking provides helper methods for tracking the current network state
 type Networking struct{ peers Peerable }
 
 // Peers returns the current peers
 func (n *Networking) Peers() ([]string, error) {
-	ipDescs := n.peers.Peers()
+	ipDescs := n.peers.IPs()
 	ips := make([]string, len(ipDescs))
 	for i, ipDesc := range ipDescs {
 		ips[i] = ipDesc.String()

diff --git a/networking/addrset.go b/networking/addrset.go
diff --git a/networking/builder.go b/networking/builder.go
@@ -16,10 +16,11 @@ type Builder struct{ Codec }
 func (m Builder) GetVersion() (Msg, error) { return m.Pack(GetVersion, nil) }
 
 // Version message
-func (m Builder) Version(networkID uint32, myTime uint64, myVersion string) (Msg, error) {
+func (m Builder) Version(networkID uint32, myTime uint64, ip utils.IPDesc, myVersion string) (Msg, error) {
 	return m.Pack(Version, map[Field]interface{}{
 		NetworkID:  networkID,
 		MyTime:     myTime,
+		IP:         ip,
 		VersionStr: myVersion,
 	})
 }

diff --git a/networking/commands.go b/networking/commands.go
@@ -17,6 +17,7 @@ const (
 	VersionStr     Field = iota // Used in handshake
 	NetworkID                   // Used in handshake
 	MyTime                      // Used in handshake
+	IP                          // Used in handshake
 	Peers                       // Used in handshake
 	ChainID                     // Used for dispatching
 	RequestID                   // Used for all messages
@@ -38,6 +39,8 @@ func (f Field) Packer() func(*wrappers.Packer, interface{}) {
 		return wrappers.TryPackInt
 	case MyTime:
 		return wrappers.TryPackLong
+	case IP:
+		return wrappers.TryPackIP
 	case Peers:
 		return wrappers.TryPackIPList
 	case ChainID: // TODO: This will be shortened to use a modified varint spec
@@ -72,6 +75,8 @@ func (f Field) Unpacker() func(*wrappers.Packer) interface{} {
 		return wrappers.TryUnpackInt
 	case MyTime:
 		return wrappers.TryUnpackLong
+	case IP:
+		return wrappers.TryUnpackIP
 	case Peers:
 		return wrappers.TryUnpackIPList
 	case ChainID: // TODO: This will be shortened to use a modified varint spec
@@ -105,6 +110,8 @@ func (f Field) String() string {
 		return "NetworkID"
 	case MyTime:
 		return "MyTime"
+	case IP:
+		return "IP"
 	case Peers:
 		return "Peers"
 	case ChainID:
@@ -161,7 +168,7 @@ var (
 	Messages = map[salticidae.Opcode][]Field{
 		// Handshake:
 		GetVersion:  []Field{},
-		Version:     []Field{NetworkID, MyTime, VersionStr},
+		Version:     []Field{NetworkID, MyTime, IP, VersionStr},
 		GetPeerList: []Field{},
 		PeerList:    []Field{Peers},
 		// Bootstrapping: