Merge branch 'fix/app2-router2-tests' of https://github.com/Darkren/s…

…kywire-mainnet into fix/adapt-to-services
skycoin · Nov 29, 2019 · 0eea49d · 0eea49d
2 parents 71c8119 + 17f67b9
commit 0eea49d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pkg/app/appnet/skywire_networker.go b/pkg/app/appnet/skywire_networker.go
@@ -107,8 +107,7 @@ func (r *SkywireNetworker) serve(ctx context.Context) error {
 
 // serveRG passes accepted router group to the corresponding listener.
 func (r *SkywireNetworker) serveRG(rg *router.RouteGroup) {
-	// TODO: local? remote? decide on this
-	localAddr, ok := rg.RemoteAddr().(routing.Addr)
+	localAddr, ok := rg.LocalAddr().(routing.Addr)
 	if !ok {
 		r.closeRG(rg)
 		r.log.Error("wrong type of addr in accepted conn")

diff --git a/pkg/router/route_group.go b/pkg/router/route_group.go
@@ -258,11 +258,11 @@ func (r *RouteGroup) Close() error {
 }
 
 func (r *RouteGroup) LocalAddr() net.Addr {
-	return r.desc.Src()
+	return r.desc.Dst()
 }
 
 func (r *RouteGroup) RemoteAddr() net.Addr {
-	return r.desc.Dst()
+	return r.desc.Src()
 }
 
 // https://golang.org/src/internal/poll/fd_plan9.go#L103