Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2015-10-29 07:57:13 +00:00
committed by Android (Google) Code Review
parent 2658cb002a 7611f1cdb4
commit a2cc04736d
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/net/java/android/net/dhcp/DhcpClient.java
View File

@@ -417,9 +417,10 @@ public class DhcpClient extends BaseDhcpStateMachine {
encap, mTransactionId, getSecs(), clientAddress, encap, mTransactionId, getSecs(), clientAddress,
DO_UNICAST, mHwAddr, requestedAddress, DO_UNICAST, mHwAddr, requestedAddress,
serverAddress, REQUESTED_PARAMS, null); serverAddress, REQUESTED_PARAMS, null);
String serverStr = (serverAddress != null) ? serverAddress.getHostAddress() : null;
String description = "DHCPREQUEST ciaddr=" + clientAddress.getHostAddress() + String description = "DHCPREQUEST ciaddr=" + clientAddress.getHostAddress() +
" request=" + requestedAddress.getHostAddress() + " request=" + requestedAddress.getHostAddress() +
" to=" + serverAddress.getHostAddress(); " serverid=" + serverStr;
return transmitPacket(packet, description, to); return transmitPacket(packet, description, to);
} }
@@ -822,7 +823,8 @@ public class DhcpClient extends BaseDhcpStateMachine {
public void enter() { public void enter() {
super.enter(); super.enter();
if (!setIpAddress(mDhcpLease.ipAddress) || if (!setIpAddress(mDhcpLease.ipAddress) ||
!connectUdpSock((mDhcpLease.serverAddress))) { (mDhcpLease.serverAddress != null &&
!connectUdpSock((mDhcpLease.serverAddress)))) {
notifyFailure(); notifyFailure();
// There's likely no point in going into DhcpInitState here, we'll probably just // There's likely no point in going into DhcpInitState here, we'll probably just
// repeat the transaction, get the same IP address as before, and fail. // repeat the transaction, get the same IP address as before, and fail.
@@ -878,11 +880,15 @@ public class DhcpClient extends BaseDhcpStateMachine {
} }
protected boolean sendPacket() { protected boolean sendPacket() {
// Not specifying a SERVER_IDENTIFIER option is a violation of RFC 2131, but...
// http://b/25343517 . Try to make things work anyway by using broadcast renews.
Inet4Address to = (mDhcpLease.serverAddress != null) ?
mDhcpLease.serverAddress : INADDR_BROADCAST;
return sendRequestPacket( return sendRequestPacket(
(Inet4Address) mDhcpLease.ipAddress.getAddress(), // ciaddr (Inet4Address) mDhcpLease.ipAddress.getAddress(), // ciaddr
INADDR_ANY, // DHCP_REQUESTED_IP INADDR_ANY, // DHCP_REQUESTED_IP
INADDR_ANY, // DHCP_SERVER_IDENTIFIER null, // DHCP_SERVER_IDENTIFIER
(Inet4Address) mDhcpLease.serverAddress); // packet destination address to); // packet destination address
} }
protected void receivePacket(DhcpPacket packet) { protected void receivePacket(DhcpPacket packet) {