gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-09-24 11:26:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

updates for add.channel2.connect.options

Browse Source
This commit is contained in:
Andrew M
2020-04-20 09:49:43 -04:00
parent c36715e1c1
commit 229ce0073b
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gateway/xgress_edge/factory.go
+8
View File
@@ -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 {
gateway/xgress_edge/listener.go
+2 -1
View File
@@ -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
}
go.mod
+2 -2
View File
@@ -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
go.sum
+4
View File
@@ -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=