- nsupdate compatibility and a bug fix to the update client.

bwelling · bwelling · commit 1cb01dd06423 · 2001-08-10T04:06:49.000Z
(patch from David Sward <david@berzerked.org>) git-svn-id: http://svn.code.sf.net/p/dnsjava/code/trunk@646 c76caeb1-94fd-44dd-870f-0c9d92034fc1
diff --git a/Changelog b/Changelog
@@ -1,3 +1,6 @@
+8/9/2001
+	- nsupdate compatibility and a bug fix to the update client.
+	  (patch from David Sward <david@berzerked.org>)
 8/8/2001
 	- The results of ANY queries were not properly cached.
 
diff --git a/update.java b/update.java
@@ -79,6 +79,10 @@ public class update {
 			if (operation.equals("server")) {
 				server = st.nextToken();
 				res = new SimpleResolver(server);
+				if (st.hasMoreTokens()) {
+					String portstr = st.nextToken();
+					res.setPort(Short.parseShort(portstr));
+				}
 			}
 
 			else if (operation.equals("key")) {
@@ -234,9 +238,18 @@ else if (operation.equals("assert")) {
 				print("Invalid update");
 				return;
 			}
-			Record r = (Record) updates.nextElement();
-			updzone = new Name(r.getName(), 1);
-			dclass = r.getDClass();
+			Record r = null;
+			while (updates.hasMoreElements()) {
+				r = (Record) updates.nextElement();
+				if (updzone == null)
+					updzone = new Name(r.getName(), 1);
+				if (r.getDClass() != DClass.NONE &&
+				    r.getDClass() != DClass.ANY)
+				{
+					dclass = r.getDClass();
+					break;
+				}
+			}
 		}
 		Record soa = Record.newRecord(updzone, Type.SOA, dclass);
 		query.addRecord(soa, Section.ZONE);
@@ -377,6 +390,11 @@ record = parseRR(st, defaultClass, defaultTTL);
 	name = new Name(s, origin);
 	if (st.hasMoreTokens()) {
 		s = st.nextToken();
+		if ((dclass = DClass.value(s)) >= 0) {
+			if (!st.hasMoreTokens())
+				throw new IOException("Invalid format");
+			s = st.nextToken();
+		}
 		if ((type = Type.value(s)) < 0)
 			throw new IOException("Invalid type: " + s);
 		if (st.hasMoreTokens()) {
@@ -636,7 +654,7 @@ else if (topic.equalsIgnoreCase("send"))
 			"sends and resets the current update packet\n");
 	else if (topic.equalsIgnoreCase("server"))
 		System.out.println(
-			"server <name>\n\n" +
+			"server <name> [port]\n\n" +
 			"server that receives send updates/queries\n");
 	else if (topic.equalsIgnoreCase("show"))
 		System.out.println(

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +8/9/2001
 +	- nsupdate compatibility and a bug fix to the update client.
 +	  (patch from David Sward <[email protected]>)
 /8/2001
 	- The results of ANY queries were not properly cached.