# HG changeset patch
# User Peter J. Scheibel <scheibel1@llnl.gov>
# Date 1346049491 25200
# Node ID c57bd30c65cfb91c524cb8df2f54278e4fc564c7
# Parent  4e780b4a0969469486767d2bca0b7188b27825e3
bug 1486 - Segfaults in nix-vector-routing with bridges

diff -r 4e780b4a0969 -r c57bd30c65cf RELEASE_NOTES
--- a/RELEASE_NOTES	Sun Aug 26 23:28:25 2012 -0700
+++ b/RELEASE_NOTES	Sun Aug 26 23:38:11 2012 -0700
@@ -74,6 +74,7 @@
  - bug 1475 - "test.py --list" should sort the output
  - bug 1476 - TestCase::GetName () should not be private
  - bug 1477 - Click doesn't work with raw sockets
+ - bug 1486 - Segfaults in nix-vector-routing with bridges
  - bug 1489 - Jakes Log component is missing
  - fixed bug with multiple LCs in UL BSR
  - fixed bug with lena-dual-stripe crashes with --homeUesHomeEnbRatio=2
diff -r 4e780b4a0969 -r c57bd30c65cf src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
--- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc	Sun Aug 26 23:28:25 2012 -0700
+++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc	Sun Aug 26 23:38:11 2012 -0700
@@ -319,7 +319,7 @@
                       continue;
                     }
                   Ptr<Channel> chBridged = ndBridged->GetChannel ();
-                  if (channel == 0)
+                  if (chBridged == 0)
                     {
                       continue;
                     }