xlink_transport uses handler_link, just like it's spiritual predecess…

…or. (#54)

router/xlink_transport/factory.go

@@ -18,25 +18,40 @@ package xlink_transport
 
 import (
 	"fmt"
+	forwarder2 "github.com/netfoundry/ziti-fabric/router/forwarder"
+	"github.com/netfoundry/ziti-fabric/router/xgress"
 	"github.com/netfoundry/ziti-fabric/router/xlink"
 	"github.com/netfoundry/ziti-foundation/channel2"
 	"github.com/netfoundry/ziti-foundation/identity/identity"
 )
 
-func newFactory(accepter Accepter, options *channel2.Options) xlink.Factory {
-	return &factory{accepter: accepter, options: options}
+func NewFactory(ctrl xgress.CtrlChannel, forwarder *forwarder2.Forwarder, forwarderOptions *forwarder2.Options, options *channel2.Options) xlink.Factory {
+	return &factory{
+		ctrl:             ctrl,
+		forwarder:        forwarder,
+		forwarderOptions: forwarderOptions,
+		options:          options,
+	}
 }
 
 func (self *factory) Create(id *identity.TokenId, configData map[interface{}]interface{}) (xlink.Xlink, error) {
 	c, err := loadConfig(configData)
 	if err != nil {
 		return nil, fmt.Errorf("error loading configuration (%w)", err)
 	}
-	return &impl{id: id, config: c, accepter: self.accepter, options: self.options}, nil
+	return &impl{
+		id:               id,
+		config:           c,
+		ctrl:             self.ctrl,
+		forwarder:        self.forwarder,
+		forwarderOptions: self.forwarderOptions,
+		options:          self.options,
+	}, nil
 }
 
 type factory struct {
-	id       *identity.TokenId
-	accepter Accepter
-	options  *channel2.Options
+	ctrl             xgress.CtrlChannel
+	forwarder        *forwarder2.Forwarder
+	forwarderOptions *forwarder2.Options
+	options          *channel2.Options
 }

router/xlink_transport/xlink.go

@@ -18,17 +18,19 @@ package xlink_transport
 
 import (
 	"fmt"
+	"github.com/netfoundry/ziti-fabric/router/forwarder"
+	"github.com/netfoundry/ziti-fabric/router/handler_link"
+	"github.com/netfoundry/ziti-fabric/router/xgress"
 	"github.com/netfoundry/ziti-foundation/channel2"
 	"github.com/netfoundry/ziti-foundation/identity/identity"
-	"github.com/sirupsen/logrus"
 )
 
 func (self *impl) Listen() error {
 	self.listener = channel2.NewClassicListener(self.id, self.config.listener)
 	if err := self.listener.Listen(); err != nil {
 		return fmt.Errorf("error listening (%w)", err)
 	}
-	go self.runAccepter()
+	go handler_link.NewAccepter(self.id, self.ctrl, self.forwarder, self.listener, self.options, self.forwarderOptions)
 	return nil
 }
 
@@ -40,26 +42,12 @@ func (_ *impl) GetAdvertisement() string {
 	return ""
 }
 
-func (self *impl) runAccepter() {
-	defer logrus.Warn("exited")
-	logrus.Info("started")
-
-	for {
-		ch, err := channel2.NewChannel("link", self.listener, self.options)
-		if err == nil {
-			if err := self.accepter.Accept(ch); err != nil {
-				logrus.Errorf("error invoking accepter (%w)", err)
-			}
-		} else {
-			logrus.Errorf("error accepting (%w)", err)
-		}
-	}
-}
-
 type impl struct {
-	id       *identity.TokenId
-	config   *config
-	listener channel2.UnderlayListener
-	accepter Accepter
-	options  *channel2.Options
+	id               *identity.TokenId
+	config           *config
+	listener         channel2.UnderlayListener
+	ctrl             xgress.CtrlChannel
+	forwarder        *forwarder.Forwarder
+	forwarderOptions *forwarder.Options
+	options          *channel2.Options
 }