홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Pavlin Radoslavov
211f4e56 1 parent 379ff9b1

Removed extra IpAddress.toInt() calls, which are not needed. 

Change-Id: Ic295d0e4ca963b15eb4ebf905d6360e457832c8f
Inline Side-by-side
Showing 2 changed files with 14 additions and 14 deletions
...@@ -147,9 +147,9 @@ public class PeerConnectivityManager { ...@@ -147,9 +147,9 @@ public class PeerConnectivityManager {
147 TrafficSelector selector = DefaultTrafficSelector.builder() 147 TrafficSelector selector = DefaultTrafficSelector.builder()
148 .matchEthType(Ethernet.TYPE_IPV4) 148 .matchEthType(Ethernet.TYPE_IPV4)
149 .matchIPProtocol(IPv4.PROTOCOL_TCP) 149 .matchIPProtocol(IPv4.PROTOCOL_TCP)
150 - .matchIPSrc(IpPrefix.valueOf(bgpdAddress.toInt(), 150 + .matchIPSrc(IpPrefix.valueOf(bgpdAddress,
151 IpPrefix.MAX_INET_MASK_LENGTH)) 151 IpPrefix.MAX_INET_MASK_LENGTH))
152 - .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress.toInt(), 152 + .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress,
153 IpPrefix.MAX_INET_MASK_LENGTH)) 153 IpPrefix.MAX_INET_MASK_LENGTH))
154 .matchTcpDst((short) BgpConstants.BGP_PORT) 154 .matchTcpDst((short) BgpConstants.BGP_PORT)
155 .build(); 155 .build();
...@@ -170,9 +170,9 @@ public class PeerConnectivityManager { ...@@ -170,9 +170,9 @@ public class PeerConnectivityManager {
170 selector = DefaultTrafficSelector.builder() 170 selector = DefaultTrafficSelector.builder()
171 .matchEthType(Ethernet.TYPE_IPV4) 171 .matchEthType(Ethernet.TYPE_IPV4)
172 .matchIPProtocol(IPv4.PROTOCOL_TCP) 172 .matchIPProtocol(IPv4.PROTOCOL_TCP)
173 - .matchIPSrc(IpPrefix.valueOf(bgpdAddress.toInt(), 173 + .matchIPSrc(IpPrefix.valueOf(bgpdAddress,
174 IpPrefix.MAX_INET_MASK_LENGTH)) 174 IpPrefix.MAX_INET_MASK_LENGTH))
175 - .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress.toInt(), 175 + .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress,
176 IpPrefix.MAX_INET_MASK_LENGTH)) 176 IpPrefix.MAX_INET_MASK_LENGTH))
177 .matchTcpSrc((short) BgpConstants.BGP_PORT) 177 .matchTcpSrc((short) BgpConstants.BGP_PORT)
178 .build(); 178 .build();
...@@ -190,9 +190,9 @@ public class PeerConnectivityManager { ...@@ -190,9 +190,9 @@ public class PeerConnectivityManager {
190 selector = DefaultTrafficSelector.builder() 190 selector = DefaultTrafficSelector.builder()
191 .matchEthType(Ethernet.TYPE_IPV4) 191 .matchEthType(Ethernet.TYPE_IPV4)
192 .matchIPProtocol(IPv4.PROTOCOL_TCP) 192 .matchIPProtocol(IPv4.PROTOCOL_TCP)
193 - .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress.toInt(), 193 + .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress,
194 IpPrefix.MAX_INET_MASK_LENGTH)) 194 IpPrefix.MAX_INET_MASK_LENGTH))
195 - .matchIPDst(IpPrefix.valueOf(bgpdAddress.toInt(), 195 + .matchIPDst(IpPrefix.valueOf(bgpdAddress,
196 IpPrefix.MAX_INET_MASK_LENGTH)) 196 IpPrefix.MAX_INET_MASK_LENGTH))
197 .matchTcpDst((short) BgpConstants.BGP_PORT) 197 .matchTcpDst((short) BgpConstants.BGP_PORT)
198 .build(); 198 .build();
...@@ -210,9 +210,9 @@ public class PeerConnectivityManager { ...@@ -210,9 +210,9 @@ public class PeerConnectivityManager {
210 selector = DefaultTrafficSelector.builder() 210 selector = DefaultTrafficSelector.builder()
211 .matchEthType(Ethernet.TYPE_IPV4) 211 .matchEthType(Ethernet.TYPE_IPV4)
212 .matchIPProtocol(IPv4.PROTOCOL_TCP) 212 .matchIPProtocol(IPv4.PROTOCOL_TCP)
213 - .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress.toInt(), 213 + .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress,
214 IpPrefix.MAX_INET_MASK_LENGTH)) 214 IpPrefix.MAX_INET_MASK_LENGTH))
215 - .matchIPDst(IpPrefix.valueOf(bgpdAddress.toInt(), 215 + .matchIPDst(IpPrefix.valueOf(bgpdAddress,
216 IpPrefix.MAX_INET_MASK_LENGTH)) 216 IpPrefix.MAX_INET_MASK_LENGTH))
217 .matchTcpSrc((short) BgpConstants.BGP_PORT) 217 .matchTcpSrc((short) BgpConstants.BGP_PORT)
218 .build(); 218 .build();
...@@ -280,9 +280,9 @@ public class PeerConnectivityManager { ...@@ -280,9 +280,9 @@ public class PeerConnectivityManager {
280 TrafficSelector selector = DefaultTrafficSelector.builder() 280 TrafficSelector selector = DefaultTrafficSelector.builder()
281 .matchEthType(Ethernet.TYPE_IPV4) 281 .matchEthType(Ethernet.TYPE_IPV4)
282 .matchIPProtocol(IPv4.PROTOCOL_ICMP) 282 .matchIPProtocol(IPv4.PROTOCOL_ICMP)
283 - .matchIPSrc(IpPrefix.valueOf(bgpdAddress.toInt(), 283 + .matchIPSrc(IpPrefix.valueOf(bgpdAddress,
284 IpPrefix.MAX_INET_MASK_LENGTH)) 284 IpPrefix.MAX_INET_MASK_LENGTH))
285 - .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress.toInt(), 285 + .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress,
286 IpPrefix.MAX_INET_MASK_LENGTH)) 286 IpPrefix.MAX_INET_MASK_LENGTH))
287 .build(); 287 .build();
288 288
...@@ -300,9 +300,9 @@ public class PeerConnectivityManager { ...@@ -300,9 +300,9 @@ public class PeerConnectivityManager {
300 selector = DefaultTrafficSelector.builder() 300 selector = DefaultTrafficSelector.builder()
301 .matchEthType(Ethernet.TYPE_IPV4) 301 .matchEthType(Ethernet.TYPE_IPV4)
302 .matchIPProtocol(IPv4.PROTOCOL_ICMP) 302 .matchIPProtocol(IPv4.PROTOCOL_ICMP)
303 - .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress.toInt(), 303 + .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress,
304 IpPrefix.MAX_INET_MASK_LENGTH)) 304 IpPrefix.MAX_INET_MASK_LENGTH))
305 - .matchIPDst(IpPrefix.valueOf(bgpdAddress.toInt(), 305 + .matchIPDst(IpPrefix.valueOf(bgpdAddress,
306 IpPrefix.MAX_INET_MASK_LENGTH)) 306 IpPrefix.MAX_INET_MASK_LENGTH))
307 .build(); 307 .build();
308 308
......
...@@ -1241,8 +1241,8 @@ public class BgpSession extends SimpleChannelHandler { ...@@ -1241,8 +1241,8 @@ public class BgpSession extends SimpleChannelHandler {
1241 } 1241 }
1242 address <<= extraShift; 1242 address <<= extraShift;
1243 IpPrefix prefix = 1243 IpPrefix prefix =
1244 - IpPrefix.valueOf(IpAddress.valueOf((int) address).toInt(), 1244 + IpPrefix.valueOf(IpAddress.valueOf((int) address),
1245 - (short) prefixBitlen); 1245 + prefixBitlen);
1246 result.add(prefix); 1246 result.add(prefix);
1247 } 1247 }
1248 1248
......