jdk-sandbox: comparison src/jdk.dns.client/share/classes/jdk/dns/client/internal/DnsClient.java

equal deleted inserted replaced

-:b92aac38b046
+:258033faefc9
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.DatagramPacket;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.PortUnreachableException;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.SecureRandom;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 private static final int TRANSACTION_ID_BOUND = 0x10000;
 private List<InetAddress> servers;
 private List<Integer> serverPorts;
 private int timeout;                // initial timeout on UDP and TCP queries in ms
 private int retries;                // number of UDP retries
 private static final SecureRandom random;
 static {
 var pa = (PrivilegedAction<SecureRandom>) () -> JCAUtil.getSecureRandom();
 public DnsClient(List<String> servers, int timeout, int retries) {
 this.timeout = timeout;
 this.retries = retries;
 var serversList = new ArrayList<InetAddress>();
 var serverPortsList = new ArrayList<Integer>();
+if (DEBUG) {
+System.err.println("DNS Client: servers list:" + servers);
+}
 for (String serverString : servers) {
 // Is optional port given?
 int colon = serverString.indexOf(':',
 }
 } // servers
 }
 return new ResourceRecords(msg, msg.length, hdr, false);
+} catch (PortUnreachableException e) {
+if (caughtException == null) {
+caughtException = e;
+}
+doNotRetry[i] = true;
 } catch (IOException e) {
 if (DEBUG) {
 dprint("Caught IOException:" + e);
 }
 if (caughtException == null) {
 caughtException = e;
 }
-// Use reflection to allow pre-1.4 compilation.
-// This won't be needed much longer.
-if (e.getClass().getName().equals(
-"java.net.PortUnreachableException")) {
-doNotRetry[i] = true;
-}
-// doNotRetry set - needs to be added
 } catch (DnsNameNotFoundException e) {
 // This is authoritative, so return immediately
 throw e;
 } catch (DnsCommunicationException e) {
 if (caughtException == null) {
 }
 dc.socket().setSoTimeout(timeoutLeft);
 long start = System.currentTimeMillis();
+dc.socket().receive(ipkt);
 byte[] data = ipkt.getData();
-ByteBuffer bb = ByteBuffer.wrap(data);
+int length = ipkt.getLength();
-dc.read(bb);
 long end = System.currentTimeMillis();
-if (isMatchResponse(data, xid)) {
+if (isMatchResponse(data, length, xid)) {
 return data;
 }
 timeoutLeft = pktTimeout - ((int) (end - start));
 } while (timeoutLeft > minTimeout);
 * exception, if appropriate, based on the response code.
 *
 * Also checks that the domain name, type and class in the response
 * match those in the original query.
 */
-private boolean isMatchResponse(byte[] pkt, int xid)
+private boolean isMatchResponse(byte[] pkt, int length, int xid)
 throws DnsResolverException {
-Header hdr = new Header(pkt, pkt.length);
+Header hdr = new Header(pkt, length);
 if (hdr.query) {
 throw new DnsResolverException("DNS error: expecting response");
 }
 if (!reqs.containsKey(xid)) { // already received, ignore the response
 dprint("XID MATCH:" + xid);
 }
 checkResponseCode(hdr);
 if (!hdr.query && hdr.numQuestions == 1) {
-ResourceRecord rr = new ResourceRecord(pkt, pkt.length,
+ResourceRecord rr = new ResourceRecord(pkt, length,
 Header.HEADER_SIZE, true, false);
 // Retrieve the original query
 ResourceRecord query = reqs.get(xid);
 int qtype = query.getType();
 // enqueue only the first response, responses for retries are ignored.
 //
 queuesLock.lock();
 try {
 if (reqs.containsKey(hdr.xid)) { // enqueue only the first response
-resps.put(hdr.xid, pkt);
+resps.put(hdr.xid, Arrays.copyOf(pkt, length));
 }
 } finally {
 queuesLock.unlock();
 }

branch	aefimov-dns-client-branch
changeset 59101	258033faefc9
parent 58971	465a15dd6bed