support ipv4 address

spwei · spwei · commit 1cca738c3c29 · 2020-08-24T17:14:48.000+08:00
diff --git a/src/main/java/org/xbill/DNS/AAAARecord.java b/src/main/java/org/xbill/DNS/AAAARecord.java
@@ -25,8 +25,8 @@ public class AAAARecord extends Record {
    */
   public AAAARecord(Name name, int dclass, long ttl, InetAddress address) {
     super(name, Type.AAAA, dclass, ttl);
-    if (Address.familyOf(address) != Address.IPv6) {
-      throw new IllegalArgumentException("invalid IPv6 address");
+    if (Address.familyOf(address) != Address.IPv4 && Address.familyOf(address) != Address.IPv6) {
+      throw new IllegalArgumentException("invalid IPv4/IPv6 address");
     }
     this.address = address.getAddress();
   }
@@ -52,13 +52,7 @@ protected String rrToString() {
     }
     if (addr.getAddress().length == 4) {
       // Deal with Java's broken handling of mapped IPv4 addresses.
-      StringBuilder sb = new StringBuilder("0:0:0:0:0:ffff:");
-      int high = ((address[12] & 0xFF) << 8) + (address[13] & 0xFF);
-      int low = ((address[14] & 0xFF) << 8) + (address[15] & 0xFF);
-      sb.append(Integer.toHexString(high));
-      sb.append(':');
-      sb.append(Integer.toHexString(low));
-      return sb.toString();
+      return "::ffff:" + addr.getHostAddress();
     }
     return addr.getHostAddress();
   }
diff --git a/src/test/java/org/xbill/DNS/AAAARecordTest.java b/src/test/java/org/xbill/DNS/AAAARecordTest.java
@@ -85,14 +85,15 @@ void ctor_4arg() {
 
     // a relative name
     assertThrows(RelativeNameException.class, () -> new AAAARecord(m_rn, DClass.IN, m_ttl, m_addr));
+  }
 
-    // an IPv4 address
+  @Test
+  void ctor_v4() {
     try {
-      new AAAARecord(m_an, DClass.IN, m_ttl, InetAddress.getByName("192.168.0.1"));
-      fail("IllegalArgumentException not thrown");
-    } catch (IllegalArgumentException e) {
-    } catch (UnknownHostException e) {
-      fail(e.getMessage());
+      AAAARecord ar = new AAAARecord(m_an, DClass.IN, m_ttl, InetAddress.getByName("192.168.1.1"));
+      assertEquals("::ffff:192.168.1.1", ar.rrToString());
+    } catch (UnknownHostException ignore){
+
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ public class AAAARecord extends Record {`
`25`	`25`	`*/`
`26`	`26`	`public AAAARecord(Name name, int dclass, long ttl, InetAddress address) {`
`27`	`27`	`super(name, Type.AAAA, dclass, ttl);`
`28`		`- if (Address.familyOf(address) != Address.IPv6) {`
`29`		`- throw new IllegalArgumentException("invalid IPv6 address");`
	`28`	`+ if (Address.familyOf(address) != Address.IPv4 && Address.familyOf(address) != Address.IPv6) {`
	`29`	`+ throw new IllegalArgumentException("invalid IPv4/IPv6 address");`
`30`	`30`	`}`
`31`	`31`	`this.address = address.getAddress();`
`32`	`32`	`}`
`@@ -52,13 +52,7 @@ protected String rrToString() {`
`52`	`52`	`}`
`53`	`53`	`if (addr.getAddress().length == 4) {`
`54`	`54`	`// Deal with Java's broken handling of mapped IPv4 addresses.`
`55`		`- StringBuilder sb = new StringBuilder("0:0:0:0:0:ffff:");`
`56`		`- int high = ((address[12] & 0xFF) << 8) + (address[13] & 0xFF);`
`57`		`- int low = ((address[14] & 0xFF) << 8) + (address[15] & 0xFF);`
`58`		`- sb.append(Integer.toHexString(high));`
`59`		`- sb.append(':');`
`60`		`- sb.append(Integer.toHexString(low));`
`61`		`- return sb.toString();`
	`55`	`+ return "::ffff:" + addr.getHostAddress();`
`62`	`56`	`}`
`63`	`57`	`return addr.getHostAddress();`
`64`	`58`	`}`