Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3e5492c authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Move shared methods to net shared lib" am: 14da6114 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3baac3770814ea1aba213e54430c44308b0c07bc
parents 6c7dcfec 14da6114

packages/Connectivity/framework/src/android/net/IpPrefix.java

+5 −3
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.util.Pair;



import com.android.net.module.util.NetUtils;



import java.net.Inet4Address;

import java.net.Inet6Address;

import java.net.InetAddress;
@@ -59,7 +61,7 @@ public final class IpPrefix implements Parcelable { 
            throw new IllegalArgumentException(

                    "IpPrefix has " + address.length + " bytes which is neither 4 nor 16");

        }

        NetworkUtils.maskRawAddress(address, prefixLength);

        NetUtils.maskRawAddress(address, prefixLength);

    }



    /**
@@ -190,7 +192,7 @@ public final class IpPrefix implements Parcelable { 
        if (addrBytes == null || addrBytes.length != this.address.length) {

            return false;

        }

        NetworkUtils.maskRawAddress(addrBytes, prefixLength);

        NetUtils.maskRawAddress(addrBytes, prefixLength);

        return Arrays.equals(this.address, addrBytes);

    }
@@ -204,7 +206,7 @@ public final class IpPrefix implements Parcelable { 
    public boolean containsPrefix(@NonNull IpPrefix otherPrefix) {

        if (otherPrefix.getPrefixLength() < prefixLength) return false;

        final byte[] otherAddress = otherPrefix.getRawAddress();

        NetworkUtils.maskRawAddress(otherAddress, prefixLength);

        NetUtils.maskRawAddress(otherAddress, prefixLength);

        return Arrays.equals(otherAddress, address);

    }

packages/Connectivity/framework/src/android/net/NetworkUtils.java

+0 −41
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import java.math.BigInteger; 
import java.net.Inet4Address;

import java.net.InetAddress;

import java.net.SocketException;

import java.net.UnknownHostException;

import java.util.Locale;

import java.util.TreeSet;
@@ -231,46 +230,6 @@ public class NetworkUtils { 
        return InetAddress.parseNumericAddress(addrString);

    }



    /**

     *  Masks a raw IP address byte array with the specified prefix length.

     */

    public static void maskRawAddress(byte[] array, int prefixLength) {

        if (prefixLength < 0 || prefixLength > array.length * 8) {

            throw new RuntimeException("IP address with " + array.length +

                    " bytes has invalid prefix length " + prefixLength);

        }



        int offset = prefixLength / 8;

        int remainder = prefixLength % 8;

        byte mask = (byte)(0xFF << (8 - remainder));



        if (offset < array.length) array[offset] = (byte)(array[offset] & mask);



        offset++;



        for (; offset < array.length; offset++) {

            array[offset] = 0;

        }

    }



    /**

     * Get InetAddress masked with prefixLength.  Will never return null.

     * @param address the IP address to mask with

     * @param prefixLength the prefixLength used to mask the IP

     */

    public static InetAddress getNetworkPart(InetAddress address, int prefixLength) {

        byte[] array = address.getAddress();

        maskRawAddress(array, prefixLength);



        InetAddress netPart = null;

        try {

            netPart = InetAddress.getByAddress(array);

        } catch (UnknownHostException e) {

            throw new RuntimeException("getNetworkPart error - " + e.toString());

        }

        return netPart;

    }



    /**

     * Returns the implicit netmask of an IPv4 address, as was the custom before 1993.

     */