[bug 794] Ipv4Mask constructor for /yy-notation is wrong

2010-01-21 19:57:34 -08:00
parent c71a96325c
commit c80d247e78
1 changed files with 10 additions and 2 deletions
--- a/src/node/ipv4-address.cc
+++ b/src/node/ipv4-address.cc
@@ -72,8 +72,16 @@ Ipv4Mask::Ipv4Mask (char const *mask)
 {
  if (*mask == ASCII_SLASH)
    {
-      m_mask = static_cast<uint32_t> (atoi (++mask));
-      NS_ASSERT (m_mask <= 32);
+      uint32_t plen = static_cast<uint32_t> (atoi (++mask));
+      NS_ASSERT (plen <= 32);
+      if (plen > 0)
+        {
+          m_mask = 0xffffffff << (32 - plen);
+        }
+      else
+        {
+          m_mask = 0;
+        }
    }
  else
    {