diff --git a/api/version_vars.go b/api/version_vars.go
index ab6b7356d36db61e2e5d548fa1893167ddcd05d5..6eb030049fa01f6eeb97fbb88fa2f1a9efde127d 100644
--- a/api/version_vars.go
+++ b/api/version_vars.go
@@ -1,9 +1,9 @@
// Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at
-// 2021-05-24 13:15:09.546928 -0500 CDT m=+0.071553794
+// 2021-06-17 12:29:26.375688 -0500 CDT m=+0.020676695
package api
-const GITVERSION = `c85adeb9 Merge branch 'Anne/CI2' into 'release'`
+const GITVERSION = `fe119dd8 changed user discovery host parameters`
const SEMVER = "2.7.0"
const DEPENDENCIES = `module gitlab.com/elixxir/client
@@ -11,7 +11,7 @@ go 1.13
require (
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
- github.com/golang/protobuf v1.4.3
+ github.com/golang/protobuf v1.5.2
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
github.com/magiconair/properties v1.8.4 // indirect
github.com/mitchellh/mapstructure v1.4.0 // indirect
@@ -24,21 +24,18 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.7.1
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228
- gitlab.com/elixxir/comms v0.0.4-0.20210524170509-89dd425cb228
- gitlab.com/elixxir/crypto v0.0.7-0.20210524170447-264b215ce90b
+ gitlab.com/elixxir/comms v0.0.4-0.20210617172121-72e712e5becd
+ gitlab.com/elixxir/crypto v0.0.7-0.20210614155844-c1e9c23a6ba7
gitlab.com/elixxir/ekv v0.1.5
- gitlab.com/elixxir/primitives v0.0.3-0.20210524170524-9780695d2b55
- gitlab.com/xx_network/comms v0.0.4-0.20210524170426-175f698a7b07
- gitlab.com/xx_network/crypto v0.0.5-0.20210524170434-dc9a398a2581
- gitlab.com/xx_network/primitives v0.0.4-0.20210524170438-ab712af183db
+ gitlab.com/elixxir/primitives v0.0.3-0.20210614155726-ebcf2d47a527
+ gitlab.com/xx_network/comms v0.0.4-0.20210617171959-947839a8d2e5
+ gitlab.com/xx_network/crypto v0.0.5-0.20210614155554-8c333814205b
+ gitlab.com/xx_network/primitives v0.0.4-0.20210608160426-670aab2d82cf
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
- golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
- golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect
+ golang.org/x/net v0.0.0-20210525063256-abc453219eb5
google.golang.org/genproto v0.0.0-20210105202744-fe13368bc0e1 // indirect
- google.golang.org/grpc v1.34.0 // indirect
- google.golang.org/protobuf v1.26.0-rc.1
+ google.golang.org/protobuf v1.26.0
gopkg.in/ini.v1 v1.62.0 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
)
-
-replace google.golang.org/grpc => github.com/grpc/grpc-go v1.27.1
`
diff --git a/cmd/getndf.go b/cmd/getndf.go
index 7ac150020c911d695f646993e3a409c18d6cb8da..dbde74e5c3bee416fbf136a561772f0fb3a12e81 100644
--- a/cmd/getndf.go
+++ b/cmd/getndf.go
@@ -13,6 +13,9 @@ import (
"github.com/spf13/cobra"
jww "github.com/spf13/jwalterweatherman"
"github.com/spf13/viper"
+ "math"
+ "time"
+
// "gitlab.com/elixxir/crypto/contact"
// "gitlab.com/elixxir/client/interfaces/message"
// "gitlab.com/elixxir/client/switchboard"
@@ -59,6 +62,8 @@ var getNDFCmd = &cobra.Command{
}
params := connect.GetDefaultHostParams()
+ // Client will not send KeepAlive packets
+ params.KaClientOpts.Time = time.Duration(math.MaxInt64)
params.AuthEnabled = false
comms, _ := client.NewClientComms(nil, nil, nil, nil)
// Gateway lookup
@@ -70,8 +75,8 @@ var getNDFCmd = &cobra.Command{
Partial: &pb.NDFHash{
Hash: nil,
},
- LastUpdate: uint64(0),
- ReceptionID: dummyID[:],
+ LastUpdate: uint64(0),
+ ReceptionID: dummyID[:],
ClientVersion: []byte(api.SEMVER),
}
resp, err := comms.SendPoll(host, pollMsg)
diff --git a/go.mod b/go.mod
index 751d38d99f09935e88760efb7eb2ba47be7d2755..fc402e455d83c9eb50f5fcaa2ee2a178f95fe18b 100644
--- a/go.mod
+++ b/go.mod
@@ -17,11 +17,11 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.7.1
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228
- gitlab.com/elixxir/comms v0.0.4-0.20210614160131-de90e88a68cc
+ gitlab.com/elixxir/comms v0.0.4-0.20210617172121-72e712e5becd
gitlab.com/elixxir/crypto v0.0.7-0.20210614155844-c1e9c23a6ba7
gitlab.com/elixxir/ekv v0.1.5
gitlab.com/elixxir/primitives v0.0.3-0.20210614155726-ebcf2d47a527
- gitlab.com/xx_network/comms v0.0.4-0.20210614155654-191473de2702
+ gitlab.com/xx_network/comms v0.0.4-0.20210617171959-947839a8d2e5
gitlab.com/xx_network/crypto v0.0.5-0.20210614155554-8c333814205b
gitlab.com/xx_network/primitives v0.0.4-0.20210608160426-670aab2d82cf
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
diff --git a/go.sum b/go.sum
index 7f1f0b4b1edfbdfcf92ef60042ae87ba814e74ce..1a0ee86cc78dbe59b6f68ad9c921e0e344ababe8 100644
--- a/go.sum
+++ b/go.sum
@@ -247,8 +247,8 @@ github.com/zeebo/pcg v1.0.0 h1:dt+dx+HvX8g7Un32rY9XWoYnd0NmKmrIzpHF7qiTDj0=
github.com/zeebo/pcg v1.0.0/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228 h1:Gi6rj4mAlK0BJIk1HIzBVMjWNjIUfstrsXC2VqLYPcA=
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228/go.mod h1:H6jztdm0k+wEV2QGK/KYA+MY9nj9Zzatux/qIvDDv3k=
-gitlab.com/elixxir/comms v0.0.4-0.20210614160131-de90e88a68cc h1:MB+Ixmz/0eWt2akBYajjH2h53GF0NjWn4Oy4Q7x4QVg=
-gitlab.com/elixxir/comms v0.0.4-0.20210614160131-de90e88a68cc/go.mod h1:JeCKUXRS9xP3YYGPl4+OMFdvtt7ySJIxEsL9AzgeCu0=
+gitlab.com/elixxir/comms v0.0.4-0.20210617172121-72e712e5becd h1:W2ZlCl7t6pnrgmuRIobxBKE83sE37ce4VD/6mAY7kAk=
+gitlab.com/elixxir/comms v0.0.4-0.20210617172121-72e712e5becd/go.mod h1:vAaMrQFZqXo3w86zdnUweUPBQIeLRsn/eepUgGb5TX8=
gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c=
gitlab.com/elixxir/crypto v0.0.3/go.mod h1:ZNgBOblhYToR4m8tj4cMvJ9UsJAUKq+p0gCp07WQmhA=
gitlab.com/elixxir/crypto v0.0.7-0.20210614155844-c1e9c23a6ba7 h1:UBq4/xMUWkYmEzUN2F7nLw5qQeiNKoLaoX3vZ/flz1c=
@@ -262,8 +262,8 @@ gitlab.com/elixxir/primitives v0.0.1/go.mod h1:kNp47yPqja2lHSiS4DddTvFpB/4D9dB2Y
gitlab.com/elixxir/primitives v0.0.3-0.20210614155726-ebcf2d47a527 h1:kBNAGFy5Ylz7F0K3DmyzuHLf1npBg7a3t4qKvfqPL3Y=
gitlab.com/elixxir/primitives v0.0.3-0.20210614155726-ebcf2d47a527/go.mod h1:nSmBXcw4hkBLFdhu+araAPvf9szCDQF1fpRZ9/BgBec=
gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw=
-gitlab.com/xx_network/comms v0.0.4-0.20210614155654-191473de2702 h1:ydi8FaAjFGfxMcvmIGlvnng491K2uEl3ymALC2Hh8Vw=
-gitlab.com/xx_network/comms v0.0.4-0.20210614155654-191473de2702/go.mod h1:ehwxZxcAQHkJjP5BNkwPNK8/o6avUn0j0iDDiu+nMFc=
+gitlab.com/xx_network/comms v0.0.4-0.20210617171959-947839a8d2e5 h1:BvnY19nnDdo4HsmrAcuuelb9IcRcjC2nvwpvQF3sFso=
+gitlab.com/xx_network/comms v0.0.4-0.20210617171959-947839a8d2e5/go.mod h1:ehwxZxcAQHkJjP5BNkwPNK8/o6avUn0j0iDDiu+nMFc=
gitlab.com/xx_network/crypto v0.0.3/go.mod h1:DF2HYvvCw9wkBybXcXAgQMzX+MiGbFPjwt3t17VRqRE=
gitlab.com/xx_network/crypto v0.0.4/go.mod h1:+lcQEy+Th4eswFgQDwT0EXKp4AXrlubxalwQFH5O0Mk=
gitlab.com/xx_network/crypto v0.0.5-0.20210614155554-8c333814205b h1:X2Hhg9/IYowxMdI6TTnWj6WW3pnO2vMB/7f4mnu6Muw=
diff --git a/network/manager.go b/network/manager.go
index fcb20f2d77f94a57c4c2f01e581b03fca06b6178..d480f4afe6c2b23da229c4c20b0b752c3e4d936f 100644
--- a/network/manager.go
+++ b/network/manager.go
@@ -28,6 +28,8 @@ import (
"gitlab.com/elixxir/comms/network"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/xx_network/primitives/ndf"
+ "math"
+ "time"
)
// Manager implements the NetworkManager interface inside context. It
@@ -95,6 +97,8 @@ func NewManager(session *storage.Session, switchboard *switchboard.Switchboard,
// Set up gateway.Sender
poolParams := gateway.DefaultPoolParams()
+ // Client will not send KeepAlive packets
+ poolParams.HostParams.KaClientOpts.Time = time.Duration(math.MaxInt64)
m.sender, err = gateway.NewSender(poolParams, rng,
ndf, comms, session, m.NodeRegistration)
if err != nil {