Fix the issue when establishing the already existing route. Probably

internal/skysocks/server.go

@@ -55,6 +55,8 @@ func (s *Server) Serve(l net.Listener) error {
 			return fmt.Errorf("accept: %s", err)
 		}
 
+		s.log.Infoln("ACCEPTED NEW SKYSOCKS CONN")
+
 		sessionCfg := yamux.DefaultConfig()
 		sessionCfg.EnableKeepAlive = false
 		session, err := yamux.Server(conn, sessionCfg)

pkg/router/route_group.go

@@ -267,6 +267,9 @@ func (rg *RouteGroup) read(p []byte) (int, error) {
 func (rg *RouteGroup) write(data []byte, tp *transport.ManagedTransport, rule routing.Rule) (int, error) {
 	packet := routing.MakeDataPacket(rule.NextRouteID(), data)
 
+	rg.logger.Infof("WRITING PACKET OF TYPE %s AND ROUTE ID %d AND NEXT ID %d", packet.Type(),
+		rule.KeyRouteID(), rule.NextRouteID())
+
 	ctx, cancel := context.WithCancel(context.Background())
 
 	errCh := rg.writePacketAsync(ctx, tp, packet)

pkg/router/router.go

@@ -330,13 +330,34 @@ func (r *router) saveRouteGroupRules(rules routing.EdgeRules) *RouteGroup {
 		r.logger.Infof("Creating new route group rule with desc: %s", &rules.Desc)
 		rg = NewRouteGroup(DefaultRouteGroupConfig(), r.rt, rules.Desc)
 		r.rgs[rules.Desc] = rg
+
+		rg.fwd = append(rg.fwd, rules.Forward)
+		rg.rvs = append(rg.rvs, rules.Reverse)
+
+		tp := r.tm.Transport(rules.Forward.NextTransportID())
+		rg.tps = append(rg.tps, tp)
+	} else {
+		r.logger.Infoln("ROUTE GROUP ALREADY EXISTS")
+
+		if err := rg.Close(); err != nil {
+			r.logger.Errorf("Error closing already existing route group: %v", err)
+		}
+
+		rg = NewRouteGroup(DefaultRouteGroupConfig(), r.rt, rules.Desc)
+		r.rgs[rules.Desc] = rg
+
+		rg.fwd = append(rg.fwd, rules.Forward)
+		rg.rvs = append(rg.rvs, rules.Reverse)
+
+		tp := r.tm.Transport(rules.Forward.NextTransportID())
+		rg.tps = append(rg.tps, tp)
 	}
 
-	rg.fwd = append(rg.fwd, rules.Forward)
+	/*rg.fwd = append(rg.fwd, rules.Forward)
 	rg.rvs = append(rg.rvs, rules.Reverse)
 
 	tp := r.tm.Transport(rules.Forward.NextTransportID())
-	rg.tps = append(rg.tps, tp)
+	rg.tps = append(rg.tps, tp)*/
 
 	return rg
 }
@@ -360,6 +381,14 @@ func (r *router) handleDataPacket(ctx context.Context, packet routing.Packet) er
 		return err
 	}
 
+	if rule.Type() == routing.RuleConsume {
+		r.logger.Infof("HANDLING PACKET OF TYPE %s WITH ROUTE ID %d", packet.Type(),
+			packet.RouteID())
+	} else {
+		r.logger.Infof("HANDLING PACKET OF TYPE %s WITH ROUTE ID %d AND NEXT ID %d", packet.Type(),
+			packet.RouteID(), rule.NextRouteID())
+	}
+
 	switch rule.Type() {
 	case routing.RuleForward, routing.RuleIntermediaryForward:
 		r.logger.Infoln("Handling intermediary data packet")
@@ -396,6 +425,14 @@ func (r *router) handleClosePacket(ctx context.Context, packet routing.Packet) e
 		return err
 	}
 
+	if rule.Type() == routing.RuleConsume {
+		r.logger.Infof("HANDLING PACKET OF TYPE %s WITH ROUTE ID %d", packet.Type(),
+			packet.RouteID())
+	} else {
+		r.logger.Infof("HANDLING PACKET OF TYPE %s WITH ROUTE ID %d AND NEXT ID %d", packet.Type(),
+			packet.RouteID(), rule.NextRouteID())
+	}
+
 	defer func() {
 		routeIDs := []routing.RouteID{routeID}
 		r.rt.DelRules(routeIDs)
@@ -449,6 +486,14 @@ func (r *router) handleKeepAlivePacket(ctx context.Context, packet routing.Packe
 		return err
 	}
 
+	if rule.Type() == routing.RuleConsume {
+		r.logger.Infof("HANDLING PACKET OF TYPE %S WITH ROUTE ID %d", packet.Type(),
+			packet.RouteID())
+	} else {
+		r.logger.Infof("HANDLING PACKET OF TYPE %S WITH ROUTE ID %d AND NEXT ID %d", packet.Type(),
+			packet.RouteID(), rule.NextRouteID())
+	}
+
 	// propagate packet only for intermediary rule. forward rule workflow doesn't get here,
 	// consume rules should be omitted, activity is already updated
 	if t := rule.Type(); t == routing.RuleIntermediaryForward {

vendor/modules.txt

@@ -89,7 +89,7 @@ github.com/stretchr/testify/mock
 github.com/stretchr/testify/require
 # go.etcd.io/bbolt v1.3.3
 go.etcd.io/bbolt
-# golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4
+# golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
 golang.org/x/crypto/blake2b
 golang.org/x/crypto/blake2s
 golang.org/x/crypto/chacha20