From 06e59e13980026c78d047cb175439c6d0371ba00 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Fri, 17 Feb 2012 12:01:00 -0600
Subject: [PATCH] Fix IPAddr/IPPrefix serialization bugs. (all unit tests pass)

---
 src/IPAddr.cc              |  2 +-
 src/IPAddr.h               |  4 ++--
 src/SerializationFormat.cc | 11 +++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/IPAddr.cc b/src/IPAddr.cc
index b378f58473..09248dadfa 100644
--- a/src/IPAddr.cc
+++ b/src/IPAddr.cc
@@ -104,7 +104,7 @@ string IPAddr::AsString() const
 		char s[INET6_ADDRSTRLEN];
 
 		if ( inet_ntop(AF_INET6, in6.s6_addr, s, INET6_ADDRSTRLEN) == NULL )
-			return "<bad IPv64 address conversion";
+			return "<bad IPv6 address conversion";
 		else
 			return s;
 		}
diff --git a/src/IPAddr.h b/src/IPAddr.h
index d9774b4ba4..c2e57ea7d1 100644
--- a/src/IPAddr.h
+++ b/src/IPAddr.h
@@ -411,8 +411,8 @@ public:
 		{
 		// No self-assignment check here because it's correct without it and
 		// makes the common case faster.
-		prefix = other.Prefix();
-		length = other.Length();
+		prefix = other.prefix;
+		length = other.length;
 		return *this;
 		}
 
diff --git a/src/SerializationFormat.cc b/src/SerializationFormat.cc
index ee1fd8fe44..af3d9b44c2 100644
--- a/src/SerializationFormat.cc
+++ b/src/SerializationFormat.cc
@@ -243,11 +243,10 @@ bool BinarySerializationFormat::Read(IPAddr* addr, const char* tag)
 
 	for ( int i = 0; i < n; ++i )
 		{
-		uint32_t i = 0;
-		if ( ! Read(&i, "addr-part") )
+		if ( ! Read(&raw[i], "addr-part") )
 			return false;
 
-		raw[n] = htonl(i);
+		raw[i] = htonl(raw[i]);
 		}
 
 	if ( n == 1 )
@@ -260,13 +259,13 @@ bool BinarySerializationFormat::Read(IPAddr* addr, const char* tag)
 
 bool BinarySerializationFormat::Read(IPPrefix* prefix, const char* tag)
 	{
-	string s;
+	IPAddr addr;
 	int len;
 
-	if ( ! (Read(&s, tag) && Read(&len, tag)) )
+	if ( ! (Read(&addr, "prefix") && Read(&len, "width")) )
 		return false;
 
-	*prefix = IPPrefix(IPAddr(s), len);
+	*prefix = IPPrefix(addr, len);
 	return true;
 	}