Removed extra IpAddress.toInt() calls, which are not needed.
Change-Id: Ic295d0e4ca963b15eb4ebf905d6360e457832c8f
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java
index fb594e4..ec0f48a 100644
--- a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java
+++ b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java
@@ -147,9 +147,9 @@
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchEthType(Ethernet.TYPE_IPV4)
.matchIPProtocol(IPv4.PROTOCOL_TCP)
- .matchIPSrc(IpPrefix.valueOf(bgpdAddress.toInt(),
+ .matchIPSrc(IpPrefix.valueOf(bgpdAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
- .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+ .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
.matchTcpDst((short) BgpConstants.BGP_PORT)
.build();
@@ -170,9 +170,9 @@
selector = DefaultTrafficSelector.builder()
.matchEthType(Ethernet.TYPE_IPV4)
.matchIPProtocol(IPv4.PROTOCOL_TCP)
- .matchIPSrc(IpPrefix.valueOf(bgpdAddress.toInt(),
+ .matchIPSrc(IpPrefix.valueOf(bgpdAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
- .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+ .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
.matchTcpSrc((short) BgpConstants.BGP_PORT)
.build();
@@ -190,9 +190,9 @@
selector = DefaultTrafficSelector.builder()
.matchEthType(Ethernet.TYPE_IPV4)
.matchIPProtocol(IPv4.PROTOCOL_TCP)
- .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+ .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
- .matchIPDst(IpPrefix.valueOf(bgpdAddress.toInt(),
+ .matchIPDst(IpPrefix.valueOf(bgpdAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
.matchTcpDst((short) BgpConstants.BGP_PORT)
.build();
@@ -210,9 +210,9 @@
selector = DefaultTrafficSelector.builder()
.matchEthType(Ethernet.TYPE_IPV4)
.matchIPProtocol(IPv4.PROTOCOL_TCP)
- .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+ .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
- .matchIPDst(IpPrefix.valueOf(bgpdAddress.toInt(),
+ .matchIPDst(IpPrefix.valueOf(bgpdAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
.matchTcpSrc((short) BgpConstants.BGP_PORT)
.build();
@@ -280,9 +280,9 @@
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchEthType(Ethernet.TYPE_IPV4)
.matchIPProtocol(IPv4.PROTOCOL_ICMP)
- .matchIPSrc(IpPrefix.valueOf(bgpdAddress.toInt(),
+ .matchIPSrc(IpPrefix.valueOf(bgpdAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
- .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+ .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
.build();
@@ -300,9 +300,9 @@
selector = DefaultTrafficSelector.builder()
.matchEthType(Ethernet.TYPE_IPV4)
.matchIPProtocol(IPv4.PROTOCOL_ICMP)
- .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+ .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
- .matchIPDst(IpPrefix.valueOf(bgpdAddress.toInt(),
+ .matchIPDst(IpPrefix.valueOf(bgpdAddress,
IpPrefix.MAX_INET_MASK_LENGTH))
.build();
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSession.java b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSession.java
index 4151ec3..af67f1a 100644
--- a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSession.java
+++ b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSession.java
@@ -1241,8 +1241,8 @@
}
address <<= extraShift;
IpPrefix prefix =
- IpPrefix.valueOf(IpAddress.valueOf((int) address).toInt(),
- (short) prefixBitlen);
+ IpPrefix.valueOf(IpAddress.valueOf((int) address),
+ prefixBitlen);
result.add(prefix);
}