andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes #5054: IpV4Subnet.contains() always returns true for single-address subnets.

Browse Source 
Motivation:
See #5054 and to fix remaining issue stopping Netty 3.10.6.Final being released.

Modification:
Copied IpToInt from Netty 4 and contains() functions.

Result:
Now issue #5054 shown examples are doing what they are expected to do.
This commit is contained in:
Guido Medina 2016-06-25 15:03:51 +01:00 committed by Norman Maurer
parent c9f963dc8e
commit 38e048c33f
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java
View File

@ -15,8 +15,6 @@
*/
package org.jboss.netty.handler.ipfilter;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.util.internal.StringUtil;
import java.net.InetAddress;
@ -44,13 +42,8 @@ import java.util.StringTokenizer;
*/
public class IpV4Subnet implements IpSet, Comparable<IpV4Subnet> {
private static final InternalLogger logger =
InternalLoggerFactory.getInstance(IpV4Subnet.class);
private static final int SUBNET_MASK = 0x80000000;
private static final int BYTE_ADDRESS_MASK = 0xFF;
private InetAddress inetAddress;
private int subnet;
@ -142,13 +135,13 @@ public class IpV4Subnet implements IpSet, Comparable<IpV4Subnet> {
* @return the integer representation
*/
private static int toInt(InetAddress inetAddress1) {
byte[] address = inetAddress1.getAddress();
int net = 0;
for (byte addres : address) {
net <<= 8;
net |= addres & BYTE_ADDRESS_MASK;
}
return net;
byte[] octets = inetAddress1.getAddress();
assert octets.length == 4;
return (octets[0] & 0xff) << 24 |
(octets[1] & 0xff) << 16 |
(octets[2] & 0xff) << 8 |
octets[3] & 0xff;
}
/** Sets the BaseAdress of the Subnet. */
@ -210,10 +203,6 @@ public class IpV4Subnet implements IpSet, Comparable<IpV4Subnet> {
* set network.
*/
public boolean contains(InetAddress inetAddress1) {
if (mask == -1) {
// ANY
return true;
}
return (toInt(inetAddress1) & mask) == subnet;
}