Fill local PK in forward rules

skycoin · Dec 6, 2019 · b8fb5ee · b8fb5ee
1 parent 17f67b9
commit b8fb5ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/routing/rule.go b/pkg/routing/rule.go
@@ -308,7 +308,7 @@ func (rs *RuleSummary) ToRule() (Rule, error) {
 		f := rs.ForwardFields
 		d := f.RouteDescriptor
 
-		return ForwardRule(rs.KeepAlive, rs.KeyRouteID, f.NextRID, f.NextTID, d.DstPK, d.SrcPort, d.DstPort), nil
+		return ForwardRule(rs.KeepAlive, rs.KeyRouteID, f.NextRID, f.NextTID, d.SrcPK, d.DstPK, d.SrcPort, d.DstPort), nil
 	case rs.Type == RuleIntermediaryForward:
 		if rs.ConsumeFields != nil || rs.ForwardFields != nil || rs.IntermediaryForwardFields == nil {
 			return nil, errors.New("invalid routing rule summary")
@@ -386,7 +386,7 @@ func ForwardRule(
 	keepAlive time.Duration,
 	key, nextRt RouteID,
 	nextTp uuid.UUID,
-	rPK cipher.PubKey,
+	lPK, rPK cipher.PubKey,
 	lPort, rPort Port,
 ) Rule {
 	rule := Rule(make([]byte, RuleHeaderSize+routeDescriptorSize+4+pkSize))
@@ -397,10 +397,10 @@ func ForwardRule(
 	rule.setNextRouteID(nextRt)
 	rule.setNextTransportID(nextTp)
 
+	rule.setSrcPK(lPK)
+	rule.setSrcPort(lPort)
 	rule.setDstPK(rPK)
-	rule.setSrcPK(cipher.PubKey{})
 	rule.setDstPort(rPort)
-	rule.setSrcPort(lPort)
 
 	return rule
 }

diff --git a/pkg/setup/idreservoir.go b/pkg/setup/idreservoir.go
@@ -166,7 +166,7 @@ func (idr *idReservoir) GenerateRules(fwd, rev routing.Route) (
 			}
 
 			if i == 0 {
-				rule := routing.ForwardRule(route.KeepAlive, rID, nxtRID, hop.TpID, dstPK, srcPort, dstPort)
+				rule := routing.ForwardRule(route.KeepAlive, rID, nxtRID, hop.TpID, srcPK, dstPK, srcPort, dstPort)
 				forwardRules[hop.From] = rule
 			} else {
 				rule := routing.IntermediaryForwardRule(route.KeepAlive, rID, nxtRID, hop.TpID)