Fix synchronization issues, remove weird/dead code

ibauersachs · ibauersachs · commit 535300f2a118 · 2019-10-28T22:11:54.000+01:00
diff --git a/src/main/java/org/xbill/DNS/DNSSEC.java b/src/main/java/org/xbill/DNS/DNSSEC.java
@@ -677,7 +677,7 @@ private static byte[] DSASignaturefromDNS(byte[] dns) throws DNSSECException, IO
     DNSInput in = new DNSInput(dns);
     DNSOutput out = new DNSOutput();
 
-    int t = in.readU8();
+    /*int t =*/ in.readU8();
 
     byte[] r = in.readByteArray(DSA_LEN);
     int rlen = DSA_LEN;
@@ -737,7 +737,7 @@ private static byte[] DSASignaturetoDNS(byte[] signature, int t) throws IOExcept
     if (tmp != ASN1_SEQ) {
       throw new IOException("Invalid ASN.1 data, expected " + ASN1_SEQ + " got " + tmp);
     }
-    int seqlen = in.readU8();
+    /*int seqlen =*/ in.readU8();
 
     tmp = in.readU8();
     if (tmp != ASN1_INT) {
@@ -859,7 +859,7 @@ private static byte[] ECDSASignaturetoDNS(byte[] signature, ECKeyInfo keyinfo)
     if (tmp != ASN1_SEQ) {
       throw new IOException("Invalid ASN.1 data, expected " + ASN1_SEQ + " got " + tmp);
     }
-    int seqlen = in.readU8();
+    /*int seqlen =*/ in.readU8();
 
     tmp = in.readU8();
     if (tmp != ASN1_INT) {
diff --git a/src/main/java/org/xbill/DNS/Header.java b/src/main/java/org/xbill/DNS/Header.java
@@ -17,30 +17,26 @@ public class Header implements Cloneable {
   private int flags;
   private int[] counts;
 
-  private static Random random = new Random();
+  private static final Random random = new Random();
 
   /** The length of a DNS Header in wire format. */
   public static final int LENGTH = 12;
 
-  private void init() {
-    counts = new int[4];
-    flags = 0;
-    id = -1;
-  }
-
   /**
    * Create a new empty header.
    *
    * @param id The message id
    */
   public Header(int id) {
-    init();
+    this();
     setID(id);
   }
 
   /** Create a new empty header with a random message id */
   public Header() {
-    init();
+    counts = new int[4];
+    flags = 0;
+    id = -1;
   }
 
   /** Parses a Header from a stream containing DNS wire format. */
@@ -90,9 +86,9 @@ static int setFlag(int flags, int bit, boolean value) {
 
     // bits are indexed from left to right
     if (value) {
-      return flags |= (1 << (15 - bit));
+      return flags | (1 << (15 - bit));
     } else {
-      return flags &= ~(1 << (15 - bit));
+      return flags & ~(1 << (15 - bit));
     }
   }
 
@@ -139,10 +135,7 @@ boolean[] getFlags() {
 
   /** Retrieves the message ID */
   public int getID() {
-    if (id >= 0) {
-      return id;
-    }
-    synchronized (this) {
+    synchronized (random) {
       if (id < 0) {
         id = random.nextInt(0xffff);
       }
diff --git a/src/main/java/org/xbill/DNS/Lookup.java b/src/main/java/org/xbill/DNS/Lookup.java
@@ -355,7 +355,7 @@ public void setCache(Cache cache) {
    *
    * @param ndots The ndots value to use, which must be greater than or equal to 0.
    */
-  public void setNdots(int ndots) {
+  public static void setNdots(int ndots) {
     if (ndots < 0) {
       throw new IllegalArgumentException("Illegal ndots value: " + ndots);
     }
diff --git a/src/main/java/org/xbill/DNS/UDPClient.java b/src/main/java/org/xbill/DNS/UDPClient.java
@@ -41,7 +41,7 @@ final class UDPClient extends Client {
             new Runnable() {
               @Override
               public void run() {
-                int n = prng.nextInt();
+                /*int n =*/ prng.nextInt();
                 prng_initializing = false;
               }
             })
diff --git a/src/main/java/org/xbill/DNS/Zone.java b/src/main/java/org/xbill/DNS/Zone.java
@@ -173,7 +173,9 @@ public Zone(Name zone, Record[] records) throws IOException {
   }
 
   private void fromXFR(ZoneTransferIn xfrin) throws IOException, ZoneTransferException {
-    data = new TreeMap<>();
+    synchronized (this) {
+      data = new TreeMap<>();
+    }
 
     origin = xfrin.getName();
     List records = xfrin.run();
diff --git a/src/main/java/org/xbill/DNS/tools/Tools.java b/src/main/java/org/xbill/DNS/tools/Tools.java
@@ -38,6 +38,9 @@ public static void main(String[] args) throws Exception {
       case "xfrin":
         xfrin.main(programArgs);
         break;
+      default:
+        System.out.println("invalid command");
+        break;
     }
   }
 }
diff --git a/src/main/java/org/xbill/DNS/tools/jnamed.java b/src/main/java/org/xbill/DNS/tools/jnamed.java
@@ -443,8 +443,6 @@ byte[] generateReply(Message query, byte[] in, Socket s) {
     }
 
     OPTRecord queryOPT = query.getOPT();
-    if (queryOPT != null && queryOPT.getVersion() > 0) {}
-
     if (s != null) {
       maxLength = 65535;
     } else if (queryOPT != null) {
diff --git a/src/main/java/org/xbill/DNS/tools/update.java b/src/main/java/org/xbill/DNS/tools/update.java
@@ -689,6 +689,6 @@ public static void main(String[] args) {
     } else {
       in = System.in;
     }
-    update u = new update(in);
+    new update(in);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ public void setCache(Cache cache) {`
`355`	`355`	`*`
`356`	`356`	`* @param ndots The ndots value to use, which must be greater than or equal to 0.`
`357`	`357`	`*/`
`358`		`- public void setNdots(int ndots) {`
	`358`	`+ public static void setNdots(int ndots) {`
`359`	`359`	`if (ndots < 0) {`
`360`	`360`	`throw new IllegalArgumentException("Illegal ndots value: " + ndots);`
`361`	`361`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ final class UDPClient extends Client {`
`41`	`41`	`new Runnable() {`
`42`	`42`	`@Override`
`43`	`43`	`public void run() {`
`44`		`- int n = prng.nextInt();`
	`44`	`+ /int n =/ prng.nextInt();`
`45`	`45`	`prng_initializing = false;`
`46`	`46`	`}`
`47`	`47`	`})`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,9 @@ public Zone(Name zone, Record[] records) throws IOException {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`private void fromXFR(ZoneTransferIn xfrin) throws IOException, ZoneTransferException {`
`176`		`- data = new TreeMap<>();`
	`176`	`+ synchronized (this) {`
	`177`	`+ data = new TreeMap<>();`
	`178`	`+ }`
`177`	`179`
`178`	`180`	`origin = xfrin.getName();`
`179`	`181`	`List records = xfrin.run();`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ public static void main(String[] args) throws Exception {`
`38`	`38`	`case "xfrin":`
`39`	`39`	`xfrin.main(programArgs);`
`40`	`40`	`break;`
	`41`	`+ default:`
	`42`	`+ System.out.println("invalid command");`
	`43`	`+ break;`
`41`	`44`	`}`
`42`	`45`	`}`
`43`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -443,8 +443,6 @@ byte[] generateReply(Message query, byte[] in, Socket s) {`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`OPTRecord queryOPT = query.getOPT();`
`446`		`- if (queryOPT != null && queryOPT.getVersion() > 0) {}`
`447`		`-`
`448`	`446`	`if (s != null) {`
`449`	`447`	`maxLength = 65535;`
`450`	`448`	`} else if (queryOPT != null) {`
Original file line number	Diff line number	Diff line change
`@@ -689,6 +689,6 @@ public static void main(String[] args) {`
`689`	`689`	`} else {`
`690`	`690`	`in = System.in;`
`691`	`691`	`}`
`692`		`- update u = new update(in);`
	`692`	`+ new update(in);`
`693`	`693`	`}`
`694`	`694`	`}`