diff --git a/router/xgress_proxy/factory.go b/router/xgress_proxy/factory.go index c607149dd..210801d8e 100644 --- a/router/xgress_proxy/factory.go +++ b/router/xgress_proxy/factory.go @@ -23,8 +23,8 @@ import ( "github.com/openziti/foundation/transport" ) -func NewFactory(id *identity.TokenId, ctrl xgress.CtrlChannel, c transport.Configuration) xgress.Factory { - return &factory{id: id, ctrl: ctrl, c: c} +func NewFactory(id *identity.TokenId, ctrl xgress.CtrlChannel, tcfg transport.Configuration) xgress.Factory { + return &factory{id: id, ctrl: ctrl, tcfg: tcfg} } func (factory *factory) CreateListener(optionsData xgress.OptionsData) (xgress.Listener, error) { @@ -35,7 +35,7 @@ func (factory *factory) CreateListener(optionsData xgress.OptionsData) (xgress.L } else { return nil, fmt.Errorf("missing 'service' configuration option") } - return newListener(factory.id, factory.ctrl, options, factory.c, service), nil + return newListener(factory.id, factory.ctrl, options, factory.tcfg, service), nil } func (factory *factory) CreateDialer(optionsData xgress.OptionsData) (xgress.Dialer, error) { @@ -46,5 +46,5 @@ type factory struct { id *identity.TokenId ctrl xgress.CtrlChannel options *xgress.Options - c transport.Configuration + tcfg transport.Configuration } diff --git a/router/xgress_proxy/listener.go b/router/xgress_proxy/listener.go index 085eb9fd1..50ef89e5b 100644 --- a/router/xgress_proxy/listener.go +++ b/router/xgress_proxy/listener.go @@ -24,12 +24,12 @@ import ( "github.com/openziti/foundation/transport" ) -func newListener(id *identity.TokenId, ctrl xgress.CtrlChannel, options *xgress.Options, c transport.Configuration, service string) xgress.Listener { +func newListener(id *identity.TokenId, ctrl xgress.CtrlChannel, options *xgress.Options, tcfg transport.Configuration, service string) xgress.Listener { return &listener{ id: id, ctrl: ctrl, options: options, - c: c, + tcfg: tcfg, service: service, closeHelper: &xgress.CloseHelper{}, } @@ -42,7 +42,7 @@ func (listener *listener) Listen(address string, bindHandler xgress.BindHandler) } incomingPeers := make(chan transport.Connection) - go listener.closeHelper.Init(txAddress.MustListen("tcp", listener.id, incomingPeers, listener.c)) + go listener.closeHelper.Init(txAddress.MustListen("tcp", listener.id, incomingPeers, listener.tcfg)) go func() { for { select { @@ -74,7 +74,7 @@ type listener struct { id *identity.TokenId ctrl xgress.CtrlChannel options *xgress.Options - c transport.Configuration + tcfg transport.Configuration service string closeHelper *xgress.CloseHelper } diff --git a/router/xgress_transport/client.go b/router/xgress_transport/client.go index 540b2de5e..82beea282 100644 --- a/router/xgress_transport/client.go +++ b/router/xgress_transport/client.go @@ -24,8 +24,8 @@ import ( ) // ClientDial dials the given xgress address and handles authentication, returning an authed connection or an error -func ClientDial(addr transport.Address, id *identity.TokenId, serviceId *identity.TokenId, c transport.Configuration) (transport.Connection, error) { - peer, err := addr.Dial("i/"+id.Token, id, c) +func ClientDial(addr transport.Address, id *identity.TokenId, serviceId *identity.TokenId, tcfg transport.Configuration) (transport.Connection, error) { + peer, err := addr.Dial("i/"+id.Token, id, tcfg) if err != nil { return nil, err } diff --git a/router/xgress_transport/dialer.go b/router/xgress_transport/dialer.go index 1b947f212..e7e222c90 100644 --- a/router/xgress_transport/dialer.go +++ b/router/xgress_transport/dialer.go @@ -28,19 +28,19 @@ type dialer struct { id *identity.TokenId ctrl xgress.CtrlChannel options *xgress.Options - c transport.Configuration + tcfg transport.Configuration } func (txd *dialer) IsTerminatorValid(string, string) bool { return true } -func newDialer(id *identity.TokenId, ctrl xgress.CtrlChannel, options *xgress.Options, c transport.Configuration) (xgress.Dialer, error) { +func newDialer(id *identity.TokenId, ctrl xgress.CtrlChannel, options *xgress.Options, tcfg transport.Configuration) (xgress.Dialer, error) { txd := &dialer{ id: id, ctrl: ctrl, options: options, - c: c, + tcfg: tcfg, } return txd, nil } @@ -51,7 +51,7 @@ func (txd *dialer) Dial(destination string, sessionId *identity.TokenId, address return nil, fmt.Errorf("cannot dial on invalid address [%s] (%s)", destination, err) } - peer, err := txDestination.Dial("x/"+sessionId.Token, sessionId, txd.c) + peer, err := txDestination.Dial("x/"+sessionId.Token, sessionId, txd.tcfg) if err != nil { return nil, err } diff --git a/router/xgress_transport/factory.go b/router/xgress_transport/factory.go index 198a0a237..da48756ba 100644 --- a/router/xgress_transport/factory.go +++ b/router/xgress_transport/factory.go @@ -26,20 +26,20 @@ type factory struct { id *identity.TokenId ctrl xgress.CtrlChannel options *xgress.Options - c transport.Configuration + tcfg transport.Configuration } // NewFactory returns a new Transport Xgress factory -func NewFactory(id *identity.TokenId, ctrl xgress.CtrlChannel, c transport.Configuration) xgress.Factory { - return &factory{id: id, ctrl: ctrl, c: c} +func NewFactory(id *identity.TokenId, ctrl xgress.CtrlChannel, tcfg transport.Configuration) xgress.Factory { + return &factory{id: id, ctrl: ctrl, tcfg: tcfg} } func (factory *factory) CreateListener(optionsData xgress.OptionsData) (xgress.Listener, error) { options := xgress.LoadOptions(optionsData) - return newListener(factory.id, factory.ctrl, options, factory.c), nil + return newListener(factory.id, factory.ctrl, options, factory.tcfg), nil } func (factory *factory) CreateDialer(optionsData xgress.OptionsData) (xgress.Dialer, error) { options := xgress.LoadOptions(optionsData) - return newDialer(factory.id, factory.ctrl, options, factory.c) + return newDialer(factory.id, factory.ctrl, options, factory.tcfg) } diff --git a/router/xgress_transport/listener.go b/router/xgress_transport/listener.go index d891331df..73780b0f5 100644 --- a/router/xgress_transport/listener.go +++ b/router/xgress_transport/listener.go @@ -28,16 +28,16 @@ type listener struct { id *identity.TokenId ctrl xgress.CtrlChannel options *xgress.Options - c transport.Configuration + tcfg transport.Configuration closeHelper *xgress.CloseHelper } -func newListener(id *identity.TokenId, ctrl xgress.CtrlChannel, options *xgress.Options, c transport.Configuration) xgress.Listener { +func newListener(id *identity.TokenId, ctrl xgress.CtrlChannel, options *xgress.Options, tcfg transport.Configuration) xgress.Listener { return &listener{ id: id, ctrl: ctrl, options: options, - c: c, + tcfg: tcfg, closeHelper: &xgress.CloseHelper{}, } } @@ -49,7 +49,7 @@ func (listener *listener) Listen(address string, bindHandler xgress.BindHandler) } incomingPeers := make(chan transport.Connection) - go listener.closeHelper.Init(txAddress.MustListen("tcp", listener.id, incomingPeers, listener.c)) + go listener.closeHelper.Init(txAddress.MustListen("tcp", listener.id, incomingPeers, listener.tcfg)) go func() { for { select { diff --git a/router/xlink_transport/dialer.go b/router/xlink_transport/dialer.go index 186f0f785..4ca936d43 100644 --- a/router/xlink_transport/dialer.go +++ b/router/xlink_transport/dialer.go @@ -30,7 +30,7 @@ func (self *dialer) Dial(addressString string, linkId *identity.TokenId) error { logrus.Infof("dialing link [l/%s]", linkId.Token) dialer := channel2.NewClassicDialer(linkId, address, nil) - ch, err := channel2.NewChannelWithTransportConfig("l/"+linkId.Token, dialer, self.config.options, self.c) + ch, err := channel2.NewChannelWithTransportConfiguration("l/"+linkId.Token, dialer, self.config.options, self.tcfg) if err == nil { xlink := &impl{id: linkId, ch: ch} @@ -59,5 +59,5 @@ type dialer struct { config *dialerConfig accepter xlink.Accepter chAccepter ChannelAccepter - c transport.Configuration + tcfg transport.Configuration } diff --git a/router/xlink_transport/factory.go b/router/xlink_transport/factory.go index 2ee7782d4..68f8b346c 100644 --- a/router/xlink_transport/factory.go +++ b/router/xlink_transport/factory.go @@ -24,7 +24,7 @@ import ( ) func NewFactory(accepter xlink.Accepter, chAccepter ChannelAccepter, c transport.Configuration) xlink.Factory { - return &factory{accepter: accepter, chAccepter: chAccepter, c: c} + return &factory{accepter: accepter, chAccepter: chAccepter, tcfg: c} } func (self *factory) CreateListener(id *identity.TokenId, _ xlink.Forwarder, configData map[interface{}]interface{}) (xlink.Listener, error) { @@ -37,7 +37,7 @@ func (self *factory) CreateListener(id *identity.TokenId, _ xlink.Forwarder, con config: config, accepter: self.accepter, chAccepter: self.chAccepter, - c: self.c, + tcfg: self.tcfg, }, nil } @@ -51,12 +51,12 @@ func (self *factory) CreateDialer(id *identity.TokenId, _ xlink.Forwarder, confi config: config, accepter: self.accepter, chAccepter: self.chAccepter, - c: self.c, + tcfg: self.tcfg, }, nil } type factory struct { accepter xlink.Accepter chAccepter ChannelAccepter - c transport.Configuration + tcfg transport.Configuration } diff --git a/router/xlink_transport/listener.go b/router/xlink_transport/listener.go index 97fe4e605..57ec4e421 100644 --- a/router/xlink_transport/listener.go +++ b/router/xlink_transport/listener.go @@ -27,7 +27,7 @@ import ( ) func (self *listener) Listen() error { - listener := channel2.NewClassicListenerWithConfiguration(self.id, self.config.bind, self.config.options.ConnectOptions, self.c) + listener := channel2.NewClassicListenerWithTransportConfiguration(self.id, self.config.bind, self.config.options.ConnectOptions, self.tcfg) self.listener = listener if err := self.listener.Listen(); err != nil { @@ -47,7 +47,7 @@ func (self *listener) Close() error { func (self *listener) acceptLoop() { for { - ch, err := channel2.NewChannelWithTransportConfig("link", self.listener, self.config.options, self.c) + ch, err := channel2.NewChannelWithTransportConfiguration("link", self.listener, self.config.options, self.tcfg) if err == nil { xlink := &impl{id: ch.Id(), ch: ch} logrus.Infof("accepted link id [l/%s]", xlink.Id().Token) @@ -79,5 +79,5 @@ type listener struct { listener channel2.UnderlayListener accepter xlink.Accepter chAccepter ChannelAccepter - c transport.Configuration + tcfg transport.Configuration }