Fix code according to the new changes in router2

skycoin · Oct 18, 2019 · b7b9f11 · b7b9f11
1 parent fc14d32
commit b7b9f11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/app2/appnet/skywire_networker.go b/pkg/app2/appnet/skywire_networker.go
@@ -43,7 +43,8 @@ func (r *SkywireNetworker) DialContext(ctx context.Context, addr Addr) (net.Conn
 		return nil, err
 	}
 
-	rg, err := r.r.DialRoutes(ctx, addr.PubKey, routing.Port(localPort), addr.Port, router.DefaultDialOptions)
+	dialOpts := router.DefaultDialOptions()
+	rg, err := r.r.DialRoutes(ctx, addr.PubKey, routing.Port(localPort), addr.Port, &dialOpts)
 	if err != nil {
 		return nil, err
 	}
@@ -79,7 +80,7 @@ func (r *SkywireNetworker) ListenContext(ctx context.Context, addr Addr) (net.Li
 
 	if atomic.CompareAndSwapInt32(&r.isServing, 0, 1) {
 		go func() {
-			if err := r.serve(); err != nil {
+			if err := r.serve(ctx); err != nil {
 				r.log.WithError(err).Error("error serving")
 			}
 		}()
@@ -89,9 +90,9 @@ func (r *SkywireNetworker) ListenContext(ctx context.Context, addr Addr) (net.Li
 }
 
 // serve accepts and serves routes.
-func (r *SkywireNetworker) serve() error {
+func (r *SkywireNetworker) serve(ctx context.Context) error {
 	for {
-		rg, err := r.r.AcceptRoutes()
+		rg, err := r.r.AcceptRoutes(ctx)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/router/router.go b/pkg/router/router.go
@@ -56,6 +56,7 @@ type DialOptions struct {
 	MaxConsumeRts int
 }
 
+// TODO(nkryuchkov): return pointer, make struct val unexported
 func DefaultDialOptions() DialOptions {
 	return DialOptions{
 		MinForwardRts: 1,