merge with HEAD

2008-04-17 15:54:35 -07:00
parent f4cff0e194 254057bd80
commit 35170aed54
20 changed files with 135 additions and 110 deletions
--- a/src/node/address.cc
+++ b/src/node/address.cc
@@ -111,9 +111,10 @@ ATTRIBUTE_HELPER_CPP (Address);

 bool operator == (const Address &a, const Address &b)
 {
-  NS_ASSERT (a.m_type == b.m_type || 
-	     a.m_type == 0 || 
-	     b.m_type == 0);
+  if (a.m_type != b.m_type)
+    {
+      return false;
+    }
  NS_ASSERT (a.GetLength() == b.GetLength());  
  return memcmp (a.m_data, b.m_data, a.m_len) == 0;
 }