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

Commit 8975ab63 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Send ciaddr in DHCP server ACK if set by client 

RFC2131#4.3.1 specifies that ciaddr should be set to the "'ciaddr' from
DHCPREQUEST or 0". Previous behavior sets ciaddr if provided by the
client in DHCPREQUEST, so keeping this behavior.

Bug: b/109584964
Test: DhcpServerTest.py debian/macos/win10 renewing test pass
Change-Id: I283e88b1f66f39d24589c5af4518cf9a2e77b95d
parent 9865cc1b

services/net/java/android/net/dhcp/DhcpPacket.java

+4 −4
Original line number Diff line number Diff line
@@ -1281,12 +1281,12 @@ public abstract class DhcpPacket { 
     */

    public static ByteBuffer buildAckPacket(int encap, int transactionId,

        boolean broadcast, Inet4Address serverIpAddr, Inet4Address relayIp, Inet4Address yourIp,

        byte[] mac, Integer timeout, Inet4Address netMask, Inet4Address bcAddr,

        List<Inet4Address> gateways, List<Inet4Address> dnsServers,

        Inet4Address requestClientIp, byte[] mac, Integer timeout, Inet4Address netMask,

        Inet4Address bcAddr, List<Inet4Address> gateways, List<Inet4Address> dnsServers,

        Inet4Address dhcpServerIdentifier, String domainName, boolean metered) {

        DhcpPacket pkt = new DhcpAckPacket(

                transactionId, (short) 0, broadcast, serverIpAddr, relayIp,

                INADDR_ANY /* clientIp */, yourIp, mac);

                transactionId, (short) 0, broadcast, serverIpAddr, relayIp, requestClientIp, yourIp,

                mac);

        pkt.mGateways = gateways;

        pkt.mDnsServers = dnsServers;

        pkt.mLeaseTime = timeout;

services/net/java/android/net/dhcp/DhcpServer.java

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ public class DhcpServer { 
        final int timeout = getLeaseTimeout(lease);

        final ByteBuffer ackPacket = DhcpPacket.buildAckPacket(ENCAP_BOOTP, request.mTransId,

                broadcastFlag, mServingParams.getServerInet4Addr(), request.mRelayIp,

                lease.getNetAddr(), request.mClientMac, timeout,

                lease.getNetAddr(), request.mClientIp, request.mClientMac, timeout,

                mServingParams.getPrefixMaskAsAddress(), mServingParams.getBroadcastAddress(),

                new ArrayList<>(mServingParams.defaultRouters),

                new ArrayList<>(mServingParams.dnsServers),