From 6446ee9c6006bb97e7fd9cf85624bc03a00a90ef Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Fri, 14 May 2021 14:04:56 -0400 Subject: [PATCH] Use transport.Configuration. --- router/xlink/xlink.go | 5 +++-- router/xlink_transport/factory.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/router/xlink/xlink.go b/router/xlink/xlink.go index c01fe792a..959b1b3db 100644 --- a/router/xlink/xlink.go +++ b/router/xlink/xlink.go @@ -19,11 +19,12 @@ package xlink import ( "github.com/openziti/fabric/router/xgress" "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport" ) type Factory interface { - CreateListener(id *identity.TokenId, f Forwarder, config map[interface{}]interface{}) (Listener, error) - CreateDialer(id *identity.TokenId, f Forwarder, config map[interface{}]interface{}) (Dialer, error) + CreateListener(id *identity.TokenId, f Forwarder, config transport.Configuration) (Listener, error) + CreateDialer(id *identity.TokenId, f Forwarder, config transport.Configuration) (Dialer, error) } type Listener interface { diff --git a/router/xlink_transport/factory.go b/router/xlink_transport/factory.go index c6ee4b657..4cefeb387 100644 --- a/router/xlink_transport/factory.go +++ b/router/xlink_transport/factory.go @@ -35,7 +35,7 @@ func NewFactory(accepter xlink.Accepter, chAccepter ChannelAccepter, c transport return &factory{accepter: accepter, chAccepter: chAccepter, tcfg: c} } -func (self *factory) CreateListener(id *identity.TokenId, _ xlink.Forwarder, configData map[interface{}]interface{}) (xlink.Listener, error) { +func (self *factory) CreateListener(id *identity.TokenId, _ xlink.Forwarder, configData transport.Configuration) (xlink.Listener, error) { config, err := loadListenerConfig(configData) if err != nil { return nil, fmt.Errorf("error loading listener configuration (%w)", err) @@ -51,7 +51,7 @@ func (self *factory) CreateListener(id *identity.TokenId, _ xlink.Forwarder, con }, nil } -func (self *factory) CreateDialer(id *identity.TokenId, _ xlink.Forwarder, configData map[interface{}]interface{}) (xlink.Dialer, error) { +func (self *factory) CreateDialer(id *identity.TokenId, _ xlink.Forwarder, configData transport.Configuration) (xlink.Dialer, error) { config, err := loadDialerConfig(configData) if err != nil { return nil, fmt.Errorf("error loading dialer configuration (%w)", err)