add show command, catch socket exception, don't send empty update

bwelling · bwelling · commit 99ef7ebd11a8 · 2000-02-10T20:52:37.000Z
git-svn-id: http://svn.code.sf.net/p/dnsjava/code/trunk@503 c76caeb1-94fd-44dd-870f-0c9d92034fc1
diff --git a/update.java b/update.java
@@ -158,6 +158,10 @@ else if (operation.equals("send")) {
 				query.getHeader().setOpcode(Opcode.UPDATE);
 			}
 
+			else if (operation.equals("show")) {
+				print(query);
+			}
+
 			else if (operation.equals("query"))
 				doQuery(st);
 
@@ -195,11 +199,18 @@ else if (operation.equals("assert")) {
 		catch (InterruptedIOException iioe) {
 			System.out.println("Operation timed out");
 		}
+		catch (SocketException se) {
+			System.out.println("Socket error");
+		}
 	}
 }
 
 void
 sendUpdate() throws IOException {
+	if (query.getHeader().getCount(Section.UPDATE) == 0) {
+		print("Empty update message.  Ignoring.");
+		return;
+	}
 	if (query.getHeader().getCount(Section.ZONE) == 0) {
 		Name updzone;
 		if (zone != null)
@@ -512,7 +523,7 @@ else if ((section = Section.value(field)) >= 0) {
 		      "add      assert   class    delete   echo     file\n" +
 		      "glue     help     log      key      edns     origin\n" +
 		      "port     prohibit query    quit     require  send\n" +
-		      "server   tcp      ttl      zone     #\n");
+		      "server   show     tcp      ttl      zone     #\n");
 
 	else if (topic.equalsIgnoreCase("add"))
 		System.out.println(
@@ -605,6 +616,10 @@ else if (topic.equalsIgnoreCase("server"))
 		System.out.println(
 			"server <name>\n\n" +
 			"server that receives send updates/queries\n");
+	else if (topic.equalsIgnoreCase("show"))
+		System.out.println(
+			"show\n\n" +
+			"shows the current update packet\n");
 	else if (topic.equalsIgnoreCase("tcp"))
 		System.out.println(
 			"tcp\n\n" +
