mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-22 21:01:00 +02:00
Code Issues Projects Releases Wiki Activity

Added support for IPv6 to IpAddressSerializer and IpPrefixSerializer.

Browse Source
This commit is contained in:
Pavlin Radoslavov 2014-10-31 21:14:14 -07:00
parent af5ff79583
commit b139f4d947
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/store/serializers/src/main/java/org/onlab/onos/store/serializers/IpAddressSerializer.java
View File

@ -46,8 +46,13 @@ public class IpAddressSerializer extends Serializer<IpAddress> {
final int octLen = input.readInt();
byte[] octs = new byte[octLen];
input.readBytes(octs);
// TODO: Add support for reading/writing the IP version
return IpAddress.valueOf(IpAddress.Version.INET, octs);
// Use the address size to decide whether it is IPv4 or IPv6 address
if (octLen == IpAddress.INET_BYTE_LENGTH) {
return IpAddress.valueOf(IpAddress.Version.INET, octs);
}
if (octLen == IpAddress.INET6_BYTE_LENGTH) {
return IpAddress.valueOf(IpAddress.Version.INET6, octs);
}
return null; // Shouldn't be reached
}
}

10
core/store/serializers/src/main/java/org/onlab/onos/store/serializers/IpPrefixSerializer.java
View File

@ -52,7 +52,13 @@ public final class IpPrefixSerializer extends Serializer<IpPrefix> {
byte[] octs = new byte[octLen];
input.readBytes(octs);
int prefLen = input.readInt();
// TODO: Add support for reading/writing the IP version
return IpPrefix.valueOf(IpAddress.Version.INET, octs, prefLen);
// Use the address size to decide whether it is IPv4 or IPv6 address
if (octLen == IpAddress.INET_BYTE_LENGTH) {
return IpPrefix.valueOf(IpAddress.Version.INET, octs, prefLen);
}
if (octLen == IpAddress.INET6_BYTE_LENGTH) {
return IpPrefix.valueOf(IpAddress.Version.INET6, octs, prefLen);
}
return null; // Shouldn't be reached
}
}