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

Merge "Change the logic of getting ntp server" am: 7024d9205b

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

Change-Id: Icc4bc5711db083a14cb15443ebc6fbf046042c58
This commit is contained in:
Dan Zhang
2020-07-29 04:42:37 +00:00
committed by Automerger Merge Worker
parent d2ca7e8b1e 7024d9205b
commit bb601496d3
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/net/SntpClient.java
View File

@@ -25,6 +25,7 @@ import com.android.internal.util.TrafficStatsConstants;
import java.net.DatagramPacket; import java.net.DatagramPacket;
import java.net.DatagramSocket; import java.net.DatagramSocket;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays; import java.util.Arrays;
/** /**
@@ -86,21 +87,26 @@ public class SntpClient {
* Sends an SNTP request to the given host and processes the response. * Sends an SNTP request to the given host and processes the response.
* *
* @param host host name of the server. * @param host host name of the server.
* @param timeout network timeout in milliseconds. * @param timeout network timeout in milliseconds. the timeout doesn't include the DNS lookup
* time, and it applies to each individual query to the resolved addresses of
* the NTP server.
* @param network network over which to send the request. * @param network network over which to send the request.
* @return true if the transaction was successful. * @return true if the transaction was successful.
*/ */
public boolean requestTime(String host, int timeout, Network network) { public boolean requestTime(String host, int timeout, Network network) {
final Network networkForResolv = network.getPrivateDnsBypassingCopy(); final Network networkForResolv = network.getPrivateDnsBypassingCopy();
InetAddress address = null;
try { try {
address = networkForResolv.getByName(host); final InetAddress[] addresses = networkForResolv.getAllByName(host);
} catch (Exception e) { for (int i = 0; i < addresses.length; i++) {
if (requestTime(addresses[i], NTP_PORT, timeout, networkForResolv)) return true;
}
} catch (UnknownHostException e) {
Log.w(TAG, "Unknown host: " + host);
EventLogTags.writeNtpFailure(host, e.toString()); EventLogTags.writeNtpFailure(host, e.toString());
if (DBG) Log.d(TAG, "request time failed: " + e);
return false;
} }
return requestTime(address, NTP_PORT, timeout, networkForResolv);
if (DBG) Log.d(TAG, "request time failed");
return false;
} }
public boolean requestTime(InetAddress address, int port, int timeout, Network network) { public boolean requestTime(InetAddress address, int port, int timeout, Network network) {
@@ -139,10 +145,11 @@ public class SntpClient {
final long originateTime = readTimeStamp(buffer, ORIGINATE_TIME_OFFSET); final long originateTime = readTimeStamp(buffer, ORIGINATE_TIME_OFFSET);
final long receiveTime = readTimeStamp(buffer, RECEIVE_TIME_OFFSET); final long receiveTime = readTimeStamp(buffer, RECEIVE_TIME_OFFSET);
final long transmitTime = readTimeStamp(buffer, TRANSMIT_TIME_OFFSET); final long transmitTime = readTimeStamp(buffer, TRANSMIT_TIME_OFFSET);
final long referenceTime = readTimeStamp(buffer, REFERENCE_TIME_OFFSET);
/* Do validation according to RFC */ /* Do validation according to RFC */
// TODO: validate originateTime == requestTime. // TODO: validate originateTime == requestTime.
checkValidServerReply(leap, mode, stratum, transmitTime); checkValidServerReply(leap, mode, stratum, transmitTime, referenceTime);
long roundTripTime = responseTicks - requestTicks - (transmitTime - receiveTime); long roundTripTime = responseTicks - requestTicks - (transmitTime - receiveTime);
// receiveTime = originateTime + transit + skew // receiveTime = originateTime + transit + skew
@@ -218,7 +225,7 @@ public class SntpClient {
} }
private static void checkValidServerReply( private static void checkValidServerReply(
byte leap, byte mode, int stratum, long transmitTime) byte leap, byte mode, int stratum, long transmitTime, long referenceTime)
throws InvalidServerReplyException { throws InvalidServerReplyException {
if (leap == NTP_LEAP_NOSYNC) { if (leap == NTP_LEAP_NOSYNC) {
throw new InvalidServerReplyException("unsynchronized server"); throw new InvalidServerReplyException("unsynchronized server");
@@ -232,6 +239,9 @@ public class SntpClient {
if (transmitTime == 0) { if (transmitTime == 0) {
throw new InvalidServerReplyException("zero transmitTime"); throw new InvalidServerReplyException("zero transmitTime");
} }
if (referenceTime == 0) {
throw new InvalidServerReplyException("zero reference timestamp");
}
} }
/** /**