commit cec3885c43191e7a329eb06af1da5adbc909846d
author Vince Lehman <vslehman@memphis.edu> Tue Mar 31 13:21:38 2015 -0500
committer Vince Lehman <vslehman@memphis.edu> Wed Apr 01 08:31:07 2015 -0700
tree 1f89d74a7c27a8b6babe72ff17dd6ca98c9a5359
parent fb2adee9688acc89d5711c83cc6acde0ca1f2ef7

route: Add sorting tiebreaker to NexthopList

refs: #2715

Change-Id: Ida39efcec9c6eb976edaffb235450ee30565c493

src/route/nexthop-list.cpp

diff --git a/src/route/nexthop-list.cpp b/src/route/nexthop-list.cpp
index 7002ad8..28f3f85 100644
--- a/src/route/nexthop-list.cpp
+++ b/src/route/nexthop-list.cpp
@@ -1,7 +1,8 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014  University of Memphis,
- *                     Regents of the University of California
+ * Copyright (c) 2014-2015,  The University of Memphis,
+ *                           Regents of the University of California,
+ *                           Arizona Board of Regents.
  *
  * This file is part of NLSR (Named-data Link State Routing).
  * See AUTHORS.md for complete list of NLSR authors and contributors.
@@ -16,10 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- *
- * \author A K M Mahmudul Hoque <ahoque1@memphis.edu>
- *
  **/
+
 #include <iostream>
 
 #include "common.hpp"
@@ -49,7 +48,15 @@
 static bool
 nextHopSortingComparator(const NextHop& nh1, const NextHop& nh2)
 {
-  return nh1.getRouteCost() < nh2.getRouteCost();
+  if (nh1.getRouteCostAsAdjustedInteger() < nh2.getRouteCostAsAdjustedInteger()) {
+    return true;
+  }
+  else if (nh1.getRouteCostAsAdjustedInteger() == nh2.getRouteCostAsAdjustedInteger()) {
+    return nh1.getConnectingFaceUri() < nh2.getConnectingFaceUri();
+  }
+  else {
+    return false;
+  }
 }
 
 /**