renamed version pkg to handshake
Henry committed
Oct 16, 2014 at 13:37 UTC
6f8a89cd8d4d6066d59a901dbdd5f54dff3dcfc7
6 files changed
+11
-11
net/handshake/Makefile
renamed
net/handshake/semver.pb.go
renamed
+3
-3
@@ -3,7 +3,7 @@
3
// DO NOT EDIT!
4
5
/*
6
-Package version is a generated protocol buffer package.
6
+Package handshake is a generated protocol buffer package.
7
8
It is generated from these files:
9
semver.proto
@@ -11,9 +11,9 @@ It is generated from these files:
11
It has these top-level messages:
12
SemVer
13
*/
14
-package version
14
+package handshake
15
16
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
16
+import proto "code.google.com/p/gogoprotobuf/proto"
17
import math "math"
18
19
// Reference imports to suppress errors if they are not otherwise used.
net/handshake/semver.proto
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-package version;
1
+package handshake;
2
3
message SemVer {
4
optional int64 major = 1;
net/handshake/version.go
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-package version
1
+package handshake
2
3
// currentVersion holds the current protocol version for a client running this code
4
var currentVersion = NewSemVer(0, 0, 1)
net/handshake/version_test.go
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-package version
1
+package handshake
2
3
import "testing"
4
net/swarm/conn.go
+5
-5
@@ -6,8 +6,8 @@ import (
6
7
spipe "github.com/jbenet/go-ipfs/crypto/spipe"
8
conn "github.com/jbenet/go-ipfs/net/conn"
9
+ handshake "github.com/jbenet/go-ipfs/net/handshake"
10
msg "github.com/jbenet/go-ipfs/net/message"
10
- version "github.com/jbenet/go-ipfs/net/version"
11
12
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
13
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
@@ -161,8 +161,8 @@ func (s *Swarm) connSecure(c *conn.Conn) error {
161
// connVersionExchange exchanges local and remote versions and compares them
162
// closes remote and returns an error in case of major difference
163
func (s *Swarm) connVersionExchange(remote *conn.Conn) error {
164
- var remoteVersion, myVersion *version.SemVer
165
- myVersion = version.Current()
164
+ var remoteVersion, myVersion *handshake.SemVer
165
+ myVersion = handshake.Current()
166
167
// BUG(cryptix): do we need to use a NetMessage here?
168
myVersionMsg, err := msg.FromObject(s.local, myVersion)
@@ -202,7 +202,7 @@ func (s *Swarm) connVersionExchange(remote *conn.Conn) error {
202
return fmt.Errorf("Error retrieving from conn: %v", remote.Peer)
203
}
204
205
- remoteVersion = new(version.SemVer)
205
+ remoteVersion = new(handshake.SemVer)
206
err = proto.Unmarshal(data, remoteVersion)
207
if err != nil {
208
s.Close()
@@ -215,7 +215,7 @@ func (s *Swarm) connVersionExchange(remote *conn.Conn) error {
215
}
216
}
217
218
- if !version.Compatible(myVersion, remoteVersion) {
218
+ if !handshake.Compatible(myVersion, remoteVersion) {
219
remote.Close()
220
return errors.New("protocol missmatch")
221
}