SIG: Make the snet connection in ingress.Dispatcher mockable (#3659)

scionproto · Feb 7, 2020 · f80a268 · f80a268
1 parent 08481a3
commit f80a268
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/go/sig/internal/ingress/api.go b/go/sig/internal/ingress/api.go
@@ -16,15 +16,24 @@
 package ingress
 
 import (
+	"context"
 	"io"
 
+	"github.com/scionproto/scion/go/lib/addr"
 	"github.com/scionproto/scion/go/lib/fatal"
 	"github.com/scionproto/scion/go/lib/log"
+	"github.com/scionproto/scion/go/sig/internal/sigcmn"
 )
 
 func Init(tunIO io.ReadWriteCloser) {
 	fatal.Check()
-	d := NewDispatcher(tunIO)
+	conn, err := sigcmn.Network.Listen(context.Background(), "udp",
+		sigcmn.EncapSnetAddr().Host, addr.SvcNone)
+	if err != nil {
+		log.Crit("Unable to initialize ingress connection", err)
+		fatal.Fatal(err)
+	}
+	d := NewDispatcher(tunIO, conn)
 	go func() {
 		defer log.LogPanicAndExit()
 		if err := d.Run(); err != nil {

diff --git a/go/sig/internal/ingress/dispatcher.go b/go/sig/internal/ingress/dispatcher.go
@@ -16,7 +16,6 @@
 package ingress
 
 import (
-	"context"
 	"fmt"
 	"io"
 	"time"
@@ -28,7 +27,6 @@ import (
 	"github.com/scionproto/scion/go/lib/snet"
 	"github.com/scionproto/scion/go/lib/sock/reliable"
 	"github.com/scionproto/scion/go/sig/internal/metrics"
-	"github.com/scionproto/scion/go/sig/internal/sigcmn"
 	"github.com/scionproto/scion/go/sig/mgmt"
 )
 
@@ -43,28 +41,22 @@ const (
 // source ISD-AS -> source host Addr -> Sess Id and hands it off to the
 // appropriate Worker, starting a new one if none currently exists.
 type Dispatcher struct {
-	laddr              *snet.UDPAddr
 	workers            map[string]*Worker
 	extConn            snet.Conn
 	tunIO              io.ReadWriteCloser
 	framesRecvCounters map[metrics.CtrPairKey]metrics.CtrPair
 }
 
-func NewDispatcher(tio io.ReadWriteCloser) *Dispatcher {
+func NewDispatcher(tio io.ReadWriteCloser, conn snet.Conn) *Dispatcher {
 	return &Dispatcher{
 		tunIO:              tio,
+		extConn:            conn,
 		framesRecvCounters: make(map[metrics.CtrPairKey]metrics.CtrPair),
-		laddr:              sigcmn.EncapSnetAddr(),
 		workers:            make(map[string]*Worker),
 	}
 }
 
 func (d *Dispatcher) Run() error {
-	var err error
-	d.extConn, err = sigcmn.Network.Listen(context.Background(), "udp", d.laddr.Host, addr.SvcNone)
-	if err != nil {
-		return common.NewBasicError("Unable to initialize extConn", err)
-	}
 	return d.read()
 }