From 229ce0073bf7bc0ed1f64765fd3fa888bdece371 Mon Sep 17 00:00:00 2001 From: Andrew M Date: Mon, 20 Apr 2020 09:49:43 -0400 Subject: [PATCH] updates for add.channel2.connect.options --- gateway/xgress_edge/factory.go | 8 ++++++++ gateway/xgress_edge/listener.go | 3 ++- go.mod | 4 ++-- go.sum | 4 ++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gateway/xgress_edge/factory.go b/gateway/xgress_edge/factory.go index f87884c7e..47eba5029 100644 --- a/gateway/xgress_edge/factory.go +++ b/gateway/xgress_edge/factory.go @@ -17,6 +17,7 @@ package xgress_edge import ( + "fmt" "github.com/netfoundry/ziti-edge/gateway/handler_edge_ctrl" "github.com/netfoundry/ziti-edge/gateway/internal/apiproxy" "github.com/netfoundry/ziti-edge/gateway/internal/fabric" @@ -135,10 +136,17 @@ func (factory *Factory) CreateDialer(optionsData xgress.OptionsData) (xgress.Dia type Options struct { xgress.Options MaxOutOfOrderMsgs uint32 + channelOptions *channel2.Options } func (options *Options) load(data xgress.OptionsData) error { options.Options = *xgress.LoadOptions(data) + + options.channelOptions = channel2.LoadOptions(data) + if err := options.channelOptions.Validate(); err != nil { + return fmt.Errorf("error loading options for [edge/options]: %v", err) + } + options.MaxOutOfOrderMsgs = DefaultMaxOutOfOrderMsgs if value, found := data["options"]; found { diff --git a/gateway/xgress_edge/listener.go b/gateway/xgress_edge/listener.go index e1b96921b..9e3001df8 100644 --- a/gateway/xgress_edge/listener.go +++ b/gateway/xgress_edge/listener.go @@ -57,7 +57,8 @@ func (listener *listener) Listen(address string, bindHandler xgress.BindHandler) pfxlog.Logger().WithField("address", addr).Info("starting channel listener") - chListener := channel2.NewClassicListener(listener.id, addr) + chListener := channel2.NewClassicListener(listener.id, addr, listener.options.channelOptions.ConnectOptions) + if err := chListener.Listen(); err != nil { return err } diff --git a/go.mod b/go.mod index cefd387b9..84c7de7c3 100644 --- a/go.mod +++ b/go.mod @@ -35,8 +35,8 @@ require ( github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc github.com/miekg/dns v1.1.22 github.com/mitchellh/mapstructure v1.1.2 - github.com/netfoundry/ziti-fabric v0.11.11 - github.com/netfoundry/ziti-foundation v0.9.7 + github.com/netfoundry/ziti-fabric v0.11.13 + github.com/netfoundry/ziti-foundation v0.9.8 github.com/netfoundry/ziti-sdk-golang v0.11.15 github.com/oleiade/reflections v1.0.0 // indirect github.com/opencontainers/go-digest v1.0.0-rc1 // indirect diff --git a/go.sum b/go.sum index 50f441303..241b1b6af 100644 --- a/go.sum +++ b/go.sum @@ -173,10 +173,14 @@ github.com/netfoundry/secretstream v0.1.1 h1:z6T7B5DuOtr9O+SmKaS9DzwOoGLYtgvyTzu github.com/netfoundry/secretstream v0.1.1/go.mod h1:uasYkYSp0MmNSlKOWJ2sVzxPms8e58TS4ENq4yro86k= github.com/netfoundry/ziti-fabric v0.11.11 h1:G6xaDziZUPO5W1bzxlSp7toJ95CkXpkhA9BIxdnsUcM= github.com/netfoundry/ziti-fabric v0.11.11/go.mod h1:b4KUJ05JJkK9jmIlXy4TODXIgLHTdoruPe0EJ5HJHPg= +github.com/netfoundry/ziti-fabric v0.11.13 h1:W/YE3wmb9l4JLGRG6nJxGm3b2M/1yY6XMKx4VU2oPQk= +github.com/netfoundry/ziti-fabric v0.11.13/go.mod h1:v2tNx+9rl6eDDzfvU4PbsBQxIMH2G9MfS39i5oUY0dc= github.com/netfoundry/ziti-foundation v0.9.6 h1:rsZlM05qAa1PERTqcM4YeCilbCd1i95GbGUzh9OdgKU= github.com/netfoundry/ziti-foundation v0.9.6/go.mod h1:desAxe5jN/V/+cYe99TGEqxtMVdlJ1HfSRzCmuPJD7M= github.com/netfoundry/ziti-foundation v0.9.7 h1:ioFQB8uQOBY/fKjJcgGISgqNJbsrDOqNmhki1LSLZ7A= github.com/netfoundry/ziti-foundation v0.9.7/go.mod h1:desAxe5jN/V/+cYe99TGEqxtMVdlJ1HfSRzCmuPJD7M= +github.com/netfoundry/ziti-foundation v0.9.8 h1:Nyx4U+pZ6iPtXBYSIad8xg5nBVjQNLatCHg5krQmeWM= +github.com/netfoundry/ziti-foundation v0.9.8/go.mod h1:desAxe5jN/V/+cYe99TGEqxtMVdlJ1HfSRzCmuPJD7M= github.com/netfoundry/ziti-sdk-golang v0.11.15 h1:+BJ1Kn3PQvmT4FkEfr5R8oedvBJJCOSu06kIZ9GUM18= github.com/netfoundry/ziti-sdk-golang v0.11.15/go.mod h1:MpEYu9L4y4/oXgMUq5+MigYXA67c09iUxDeQmy2lLFE= github.com/oleiade/reflections v1.0.0 h1:0ir4pc6v8/PJ0yw5AEtMddfXpWBXg9cnG7SgSoJuCgY=