X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fpeer_test.go;fp=src%2Fcypherpunks.ru%2Fgovpn%2Fpeer_test.go;h=4a0c7523f6a71abc67061c82102116b2fa478a4f;hb=b97d37d9494cf064a50d30b4936393eeab32b0e1;hp=7fa8aab8438a7fd04eaccf53972064edd91b8792;hpb=ce2d12cc15b31a2a1157123f47e58e7857436783;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/peer_test.go b/src/cypherpunks.ru/govpn/peer_test.go
index 7fa8aab..4a0c752 100644
--- a/src/cypherpunks.ru/govpn/peer_test.go
+++ b/src/cypherpunks.ru/govpn/peer_test.go
@@ -51,12 +51,16 @@ func init() {
 		MTU:     MTUDefault,
 		Timeout: time.Second * time.Duration(TimeoutDefault),
 	}
-	testPeer = newPeer(true, "foo", Dummy{&testCt}, testConf, new([SSize]byte))
 	testPt = make([]byte, 789)
 }
 
+func testPeerNew() {
+	testPeer = newPeer(true, "foo", Dummy{&testCt}, testConf, new([SSize]byte))
+}
+
 func TestTransportSymmetric(t *testing.T) {
-	peerd := newPeer(true, "foo", Dummy{nil}, testConf, new([SSize]byte))
+	testPeerNew()
+	peerd := newPeer(false, "foo", Dummy{nil}, testConf, new([SSize]byte))
 	f := func(payload []byte) bool {
 		if len(payload) == 0 {
 			return true
@@ -70,7 +74,8 @@ func TestTransportSymmetric(t *testing.T) {
 }
 
 func TestTransportSymmetricNoise(t *testing.T) {
-	peerd := newPeer(true, "foo", Dummy{nil}, testConf, new([SSize]byte))
+	testPeerNew()
+	peerd := newPeer(false, "foo", Dummy{nil}, testConf, new([SSize]byte))
 	testPeer.NoiseEnable = true
 	peerd.NoiseEnable = true
 	f := func(payload []byte) bool {
@@ -87,7 +92,8 @@ func TestTransportSymmetricNoise(t *testing.T) {
 }
 
 func TestTransportSymmetricEncless(t *testing.T) {
-	peerd := newPeer(true, "foo", Dummy{nil}, testConf, new([SSize]byte))
+	testPeerNew()
+	peerd := newPeer(false, "foo", Dummy{nil}, testConf, new([SSize]byte))
 	testPeer.Encless = true
 	testPeer.NoiseEnable = true
 	peerd.Encless = true
@@ -119,10 +125,14 @@ func BenchmarkDec(b *testing.B) {
 	testPeer = newPeer(true, "foo", Dummy{nil}, testConf, new([SSize]byte))
 	orig := make([]byte, len(testCt))
 	copy(orig, testCt)
+	nonce := new([NonceSize]byte)
+	copy(nonce[:], testCt[len(testCt)-NonceSize:])
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		testPeer.nonceBucket0 = make(map[uint64]struct{}, 1)
-		testPeer.nonceBucket1 = make(map[uint64]struct{}, 1)
+		testPeer.nonceBucketL = make(map[[NonceSize]byte]struct{}, 1)
+		testPeer.nonceBucketM = make(map[[NonceSize]byte]struct{}, 1)
+		testPeer.nonceBucketH = make(map[[NonceSize]byte]struct{}, 1)
+		testPeer.nonceBucketL[*nonce] = struct{}{}
 		copy(testCt, orig)
 		if !testPeer.PktProcess(testCt, Dummy{nil}, true) {
 			b.Fail()