commit d6d8a7ef491a2313649061392e7c3e0c4e1ce9d9
author Sangho Shin <sangho@onlab.us> Tue Oct 28 14:51:03 2014 -0700
committer Sangho Shin <sangho@onlab.us> Tue Oct 28 14:51:42 2014 -0700
tree 767229c5572dfb81840fbf090092c0caebb70eb2
parent b4b8a7143c5185ff043143820572db89d0eb4a8b

- Fix a bug of segment stitching when there are more than one adjacencySid in label stack

Change-Id: Ie14156a7bdecc47caf012c866093c0c938bbc424

src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java

diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
index 7def639..2d90495 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
@@ -726,8 +726,8 @@
 
         // Output action
         if (srcMac != null && dstMac != null) {
-            ModifyDstMacAction setDstAction = new ModifyDstMacAction(MACAddress.valueOf(srcMac));
-            ModifySrcMacAction setSrcAction = new ModifySrcMacAction(MACAddress.valueOf(dstMac));
+            ModifyDstMacAction setDstAction = new ModifyDstMacAction(MACAddress.valueOf(dstMac));
+            ModifySrcMacAction setSrcAction = new ModifySrcMacAction(MACAddress.valueOf(srcMac));
             OutputAction outportAction = new OutputAction(PortNumber.uint32(num));
 
             actions.add(setDstAction);
@@ -1449,6 +1449,7 @@
                 if (prevAdjacencySid != null) {
                     if (isAdjacencySidNeighborOf(prevNodeId, prevAdjacencySid, nodeId)) {
                         prevAdjacencySid = null;
+                        prevNodeId = nodeId;
                         continue;
                     }
                     prevAdjacencySid = null;