[kaffe] CVS kaffe (robilad): Resynced with DNSJava 2.0.0

Kaffe CVS cvs-commits at kaffe.org
Wed Jul 6 17:44:13 PDT 2005


PatchSet 6710 
Date: 2005/07/07 00:37:54
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with DNSJava 2.0.0

Members: 
	ChangeLog:1.4234->1.4235 
	THIRDPARTY:1.35->1.36 
	libraries/javalib/Makefile.am:1.371->1.372 
	libraries/javalib/Makefile.in:1.461->1.462 
	libraries/javalib/all.files:1.142->1.143 
	libraries/javalib/org/xbill/DNS/A6Record.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/AAAARecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/AFSDBRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/APLRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/ARecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Address.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/CNAMERecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Cache.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Client.java:INITIAL->1.1 
	libraries/javalib/org/xbill/DNS/DClass.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/DNAMERecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/DNSInput.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/DNSKEYRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/DNSSEC.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/EmptyRecord.java:INITIAL->1.1 
	libraries/javalib/org/xbill/DNS/ExtendedResolver.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/FindServer.java:1.1->1.2(DEAD) 
	libraries/javalib/org/xbill/DNS/Flags.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/GPOSRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Generator.java:INITIAL->1.1 
	libraries/javalib/org/xbill/DNS/HINFORecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Header.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/ISDNRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Inet6Address.java:1.1->1.2(DEAD) 
	libraries/javalib/org/xbill/DNS/InvalidDClassException.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/InvalidTypeException.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/KEYBase.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/KEYRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/KXRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/LOCRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Lookup.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/MBRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/MDRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/MFRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/MGRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/MINFORecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/MRRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/MXRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Master.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Message.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Mnemonic.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/NAPTRRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/NSAP_PTRRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/NSECRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/NSRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/NULLRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/NXTRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Name.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/NameSet.java:1.1->1.2(DEAD) 
	libraries/javalib/org/xbill/DNS/NameTooLongException.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/OPTRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Opcode.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Options.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/PTRRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/PXRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/RPRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/RRSIGRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/RRset.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/RTRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Rcode.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Record.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/RelativeNameException.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Resolver.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/ResolverConfig.java:INITIAL->1.1 
	libraries/javalib/org/xbill/DNS/ReverseMap.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/SIGBase.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/SIGRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/SOARecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/SRVRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/SSHFPRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Section.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Serial.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/SimpleResolver.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/SingleCompressedNameBase.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/SingleNameBase.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/TCPClient.java:INITIAL->1.1 
	libraries/javalib/org/xbill/DNS/TSIG.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/TSIGRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/TTL.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/TXTRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Tokenizer.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Type.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/U16NameBase.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/UDPClient.java:INITIAL->1.1 
	libraries/javalib/org/xbill/DNS/UNKRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/WKSRecord.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/X25Record.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/Zone.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/ZoneTransferIn.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/dns.java:1.1->1.2(DEAD) 
	libraries/javalib/org/xbill/DNS/security/DNSSECVerifier.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/security/DSAPubKey.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/security/DSASignature.java:1.1->1.2 
	libraries/javalib/org/xbill/DNS/utils/HMAC.java:INITIAL->1.1 
	libraries/javalib/org/xbill/DNS/utils/hmacSigner.java:1.1->1.2(DEAD) 
	libraries/javalib/org/xbill/DNS/utils/md5.java:1.1->1.2(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4234 kaffe/ChangeLog:1.4235
--- kaffe/ChangeLog:1.4234	Wed Jul  6 23:19:52 2005
+++ kaffe/ChangeLog	Thu Jul  7 00:37:54 2005
@@ -1,3 +1,105 @@
+2005-07-07  Dalibor Topic  <robilad at kaffe.org>
+
+        * THIRDPARTY: Updated to DNSJava 2.0.0.
+
+        * libraries/javalib/org/xbill/DNS/A6Record.java,
+        libraries/javalib/org/xbill/DNS/AAAARecord.java,
+        libraries/javalib/org/xbill/DNS/AFSDBRecord.java,
+        libraries/javalib/org/xbill/DNS/APLRecord.java,
+        libraries/javalib/org/xbill/DNS/ARecord.java,
+        libraries/javalib/org/xbill/DNS/Address.java,
+        libraries/javalib/org/xbill/DNS/CNAMERecord.java,
+        libraries/javalib/org/xbill/DNS/Cache.java,
+        libraries/javalib/org/xbill/DNS/Client.java,
+        libraries/javalib/org/xbill/DNS/DClass.java,
+        libraries/javalib/org/xbill/DNS/DNAMERecord.java,
+        libraries/javalib/org/xbill/DNS/DNSInput.java,
+        libraries/javalib/org/xbill/DNS/DNSKEYRecord.java,
+        libraries/javalib/org/xbill/DNS/DNSSEC.java,
+        libraries/javalib/org/xbill/DNS/EmptyRecord.java,
+        libraries/javalib/org/xbill/DNS/ExtendedResolver.java,
+        libraries/javalib/org/xbill/DNS/FindServer.java,
+        libraries/javalib/org/xbill/DNS/Flags.java,
+        libraries/javalib/org/xbill/DNS/GPOSRecord.java,
+        libraries/javalib/org/xbill/DNS/Generator.java,
+        libraries/javalib/org/xbill/DNS/HINFORecord.java,
+        libraries/javalib/org/xbill/DNS/Header.java,
+        libraries/javalib/org/xbill/DNS/ISDNRecord.java,
+        libraries/javalib/org/xbill/DNS/Inet6Address.java,
+        libraries/javalib/org/xbill/DNS/InvalidDClassException.java,
+        libraries/javalib/org/xbill/DNS/InvalidTypeException.java,
+        libraries/javalib/org/xbill/DNS/KEYBase.java,
+        libraries/javalib/org/xbill/DNS/KEYRecord.java,
+        libraries/javalib/org/xbill/DNS/KXRecord.java,
+        libraries/javalib/org/xbill/DNS/LOCRecord.java,
+        libraries/javalib/org/xbill/DNS/Lookup.java,
+        libraries/javalib/org/xbill/DNS/MBRecord.java,
+        libraries/javalib/org/xbill/DNS/MDRecord.java,
+        libraries/javalib/org/xbill/DNS/MFRecord.java,
+        libraries/javalib/org/xbill/DNS/MGRecord.java,
+        libraries/javalib/org/xbill/DNS/MINFORecord.java,
+        libraries/javalib/org/xbill/DNS/MRRecord.java,
+        libraries/javalib/org/xbill/DNS/MXRecord.java,
+        libraries/javalib/org/xbill/DNS/Master.java,
+        libraries/javalib/org/xbill/DNS/Message.java,
+        libraries/javalib/org/xbill/DNS/Mnemonic.java,
+        libraries/javalib/org/xbill/DNS/NAPTRRecord.java,
+        libraries/javalib/org/xbill/DNS/NSAP_PTRRecord.java,
+        libraries/javalib/org/xbill/DNS/NSECRecord.java,
+        libraries/javalib/org/xbill/DNS/NSRecord.java,
+        libraries/javalib/org/xbill/DNS/NULLRecord.java,
+        libraries/javalib/org/xbill/DNS/NXTRecord.java,
+        libraries/javalib/org/xbill/DNS/Name.java,
+        libraries/javalib/org/xbill/DNS/NameSet.java,
+        libraries/javalib/org/xbill/DNS/NameTooLongException.java,
+        libraries/javalib/org/xbill/DNS/OPTRecord.java,
+        libraries/javalib/org/xbill/DNS/Opcode.java,
+        libraries/javalib/org/xbill/DNS/Options.java,
+        libraries/javalib/org/xbill/DNS/PTRRecord.java,
+        libraries/javalib/org/xbill/DNS/PXRecord.java,
+        libraries/javalib/org/xbill/DNS/RPRecord.java,
+        libraries/javalib/org/xbill/DNS/RRSIGRecord.java,
+        libraries/javalib/org/xbill/DNS/RRset.java,
+        libraries/javalib/org/xbill/DNS/RTRecord.java,
+        libraries/javalib/org/xbill/DNS/Rcode.java,
+        libraries/javalib/org/xbill/DNS/Record.java,
+        libraries/javalib/org/xbill/DNS/RelativeNameException.java,
+        libraries/javalib/org/xbill/DNS/Resolver.java,
+        libraries/javalib/org/xbill/DNS/ResolverConfig.java,
+        libraries/javalib/org/xbill/DNS/ReverseMap.java,
+        libraries/javalib/org/xbill/DNS/SIGBase.java,
+        libraries/javalib/org/xbill/DNS/SIGRecord.java,
+        libraries/javalib/org/xbill/DNS/SOARecord.java,
+        libraries/javalib/org/xbill/DNS/SRVRecord.java,
+        libraries/javalib/org/xbill/DNS/SSHFPRecord.java,
+        libraries/javalib/org/xbill/DNS/Section.java,
+        libraries/javalib/org/xbill/DNS/Serial.java,
+        libraries/javalib/org/xbill/DNS/SimpleResolver.java,
+        libraries/javalib/org/xbill/DNS/SingleCompressedNameBase.java,
+        libraries/javalib/org/xbill/DNS/SingleNameBase.java,
+        libraries/javalib/org/xbill/DNS/TCPClient.java,
+        libraries/javalib/org/xbill/DNS/TSIG.java,
+        libraries/javalib/org/xbill/DNS/TSIGRecord.java,
+        libraries/javalib/org/xbill/DNS/TTL.java,
+        libraries/javalib/org/xbill/DNS/TXTRecord.java,
+        libraries/javalib/org/xbill/DNS/Tokenizer.java,
+        libraries/javalib/org/xbill/DNS/Type.java,
+        libraries/javalib/org/xbill/DNS/U16NameBase.java,
+        libraries/javalib/org/xbill/DNS/UDPClient.java,
+        libraries/javalib/org/xbill/DNS/UNKRecord.java,
+        libraries/javalib/org/xbill/DNS/WKSRecord.java,
+        libraries/javalib/org/xbill/DNS/X25Record.java,
+        libraries/javalib/org/xbill/DNS/Zone.java,
+        libraries/javalib/org/xbill/DNS/ZoneTransferIn.java,
+        libraries/javalib/org/xbill/DNS/dns.java,
+        libraries/javalib/org/xbill/DNS/security/DNSSECVerifier.java,
+        libraries/javalib/org/xbill/DNS/security/DSAPubKey.java,
+        libraries/javalib/org/xbill/DNS/security/DSASignature.java,
+        libraries/javalib/org/xbill/DNS/utils/HMAC.java,
+        libraries/javalib/org/xbill/DNS/utils/hmacSigner.java,
+        libraries/javalib/org/xbill/DNS/utils/md5.java:
+	Resynced with DNSJava 2.0.0.
+
 2005-07-06  Dalibor Topic  <robilad at kaffe.org>
 
 	Resynced with GNU inetlib.
Index: kaffe/THIRDPARTY
diff -u kaffe/THIRDPARTY:1.35 kaffe/THIRDPARTY:1.36
--- kaffe/THIRDPARTY:1.35	Mon Jul  4 00:03:36 2005
+++ kaffe/THIRDPARTY	Thu Jul  7 00:37:58 2005
@@ -188,7 +188,7 @@
 
 * org.xbill.DNS
 
-This code has been taken from DNSJava 1.6.4. 
+This code has been taken from DNSJava 2.0.0. 
 
 dnsjava is placed under the BSD license.  Several files are also under
 additional licenses; see the individual files for details.
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.371 kaffe/libraries/javalib/Makefile.am:1.372
--- kaffe/libraries/javalib/Makefile.am:1.371	Wed Jul  6 23:19:56 2005
+++ kaffe/libraries/javalib/Makefile.am	Thu Jul  7 00:37:59 2005
@@ -4996,6 +4996,7 @@
 	org/xbill/DNS/CERTRecord.java \
 	org/xbill/DNS/CNAMERecord.java \
 	org/xbill/DNS/Cache.java \
+	org/xbill/DNS/Client.java \
 	org/xbill/DNS/Compression.java \
 	org/xbill/DNS/Credibility.java \
 	org/xbill/DNS/DClass.java \
@@ -5005,16 +5006,16 @@
 	org/xbill/DNS/DNSOutput.java \
 	org/xbill/DNS/DNSSEC.java \
 	org/xbill/DNS/DSRecord.java \
+	org/xbill/DNS/EmptyRecord.java \
 	org/xbill/DNS/ExtendedFlags.java \
 	org/xbill/DNS/ExtendedResolver.java \
-	org/xbill/DNS/FindServer.java \
 	org/xbill/DNS/Flags.java \
 	org/xbill/DNS/FormattedTime.java \
 	org/xbill/DNS/GPOSRecord.java \
+	org/xbill/DNS/Generator.java \
 	org/xbill/DNS/HINFORecord.java \
 	org/xbill/DNS/Header.java \
 	org/xbill/DNS/ISDNRecord.java \
-	org/xbill/DNS/Inet6Address.java \
 	org/xbill/DNS/InvalidDClassException.java \
 	org/xbill/DNS/InvalidTTLException.java \
 	org/xbill/DNS/InvalidTypeException.java \
@@ -5041,7 +5042,6 @@
 	org/xbill/DNS/NULLRecord.java \
 	org/xbill/DNS/NXTRecord.java \
 	org/xbill/DNS/Name.java \
-	org/xbill/DNS/NameSet.java \
 	org/xbill/DNS/NameTooLongException.java \
 	org/xbill/DNS/OPTRecord.java \
 	org/xbill/DNS/Opcode.java \
@@ -5057,6 +5057,7 @@
 	org/xbill/DNS/RelativeNameException.java \
 	org/xbill/DNS/ResolveThread.java \
 	org/xbill/DNS/Resolver.java \
+	org/xbill/DNS/ResolverConfig.java \
 	org/xbill/DNS/ResolverListener.java \
 	org/xbill/DNS/ReverseMap.java \
 	org/xbill/DNS/SIGBase.java \
@@ -5070,6 +5071,7 @@
 	org/xbill/DNS/SimpleResolver.java \
 	org/xbill/DNS/SingleCompressedNameBase.java \
 	org/xbill/DNS/SingleNameBase.java \
+	org/xbill/DNS/TCPClient.java \
 	org/xbill/DNS/TKEYRecord.java \
 	org/xbill/DNS/TSIG.java \
 	org/xbill/DNS/TSIGRecord.java \
@@ -5080,6 +5082,7 @@
 	org/xbill/DNS/Type.java \
 	org/xbill/DNS/TypedObject.java \
 	org/xbill/DNS/U16NameBase.java \
+	org/xbill/DNS/UDPClient.java \
 	org/xbill/DNS/UNKRecord.java \
 	org/xbill/DNS/Update.java \
 	org/xbill/DNS/Verifier.java \
@@ -5088,8 +5091,7 @@
 	org/xbill/DNS/X25Record.java \
 	org/xbill/DNS/Zone.java \
 	org/xbill/DNS/ZoneTransferException.java \
-	org/xbill/DNS/ZoneTransferIn.java \
-	org/xbill/DNS/dns.java
+	org/xbill/DNS/ZoneTransferIn.java
 org_xbill_DNS_security_SRCS = \
 	org/xbill/DNS/security/CERTConverter.java \
 	org/xbill/DNS/security/DHPubKey.java \
@@ -5100,11 +5102,10 @@
 	org/xbill/DNS/security/RSAPubKey.java \
 	org/xbill/DNS/security/SIG0Signer.java
 org_xbill_DNS_utils_SRCS = \
+	org/xbill/DNS/utils/HMAC.java \
 	org/xbill/DNS/utils/base16.java \
 	org/xbill/DNS/utils/base64.java \
-	org/xbill/DNS/utils/hexdump.java \
-	org/xbill/DNS/utils/hmacSigner.java \
-	org/xbill/DNS/utils/md5.java
+	org/xbill/DNS/utils/hexdump.java
 org_xml_sax_SRCS = \
 	org/xml/sax/AttributeList.java \
 	org/xml/sax/Attributes.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.461 kaffe/libraries/javalib/Makefile.in:1.462
--- kaffe/libraries/javalib/Makefile.in:1.461	Wed Jul  6 23:19:56 2005
+++ kaffe/libraries/javalib/Makefile.in	Thu Jul  7 00:37:59 2005
@@ -5663,6 +5663,7 @@
 	org/xbill/DNS/CERTRecord.java \
 	org/xbill/DNS/CNAMERecord.java \
 	org/xbill/DNS/Cache.java \
+	org/xbill/DNS/Client.java \
 	org/xbill/DNS/Compression.java \
 	org/xbill/DNS/Credibility.java \
 	org/xbill/DNS/DClass.java \
@@ -5672,16 +5673,16 @@
 	org/xbill/DNS/DNSOutput.java \
 	org/xbill/DNS/DNSSEC.java \
 	org/xbill/DNS/DSRecord.java \
+	org/xbill/DNS/EmptyRecord.java \
 	org/xbill/DNS/ExtendedFlags.java \
 	org/xbill/DNS/ExtendedResolver.java \
-	org/xbill/DNS/FindServer.java \
 	org/xbill/DNS/Flags.java \
 	org/xbill/DNS/FormattedTime.java \
 	org/xbill/DNS/GPOSRecord.java \
+	org/xbill/DNS/Generator.java \
 	org/xbill/DNS/HINFORecord.java \
 	org/xbill/DNS/Header.java \
 	org/xbill/DNS/ISDNRecord.java \
-	org/xbill/DNS/Inet6Address.java \
 	org/xbill/DNS/InvalidDClassException.java \
 	org/xbill/DNS/InvalidTTLException.java \
 	org/xbill/DNS/InvalidTypeException.java \
@@ -5708,7 +5709,6 @@
 	org/xbill/DNS/NULLRecord.java \
 	org/xbill/DNS/NXTRecord.java \
 	org/xbill/DNS/Name.java \
-	org/xbill/DNS/NameSet.java \
 	org/xbill/DNS/NameTooLongException.java \
 	org/xbill/DNS/OPTRecord.java \
 	org/xbill/DNS/Opcode.java \
@@ -5724,6 +5724,7 @@
 	org/xbill/DNS/RelativeNameException.java \
 	org/xbill/DNS/ResolveThread.java \
 	org/xbill/DNS/Resolver.java \
+	org/xbill/DNS/ResolverConfig.java \
 	org/xbill/DNS/ResolverListener.java \
 	org/xbill/DNS/ReverseMap.java \
 	org/xbill/DNS/SIGBase.java \
@@ -5737,6 +5738,7 @@
 	org/xbill/DNS/SimpleResolver.java \
 	org/xbill/DNS/SingleCompressedNameBase.java \
 	org/xbill/DNS/SingleNameBase.java \
+	org/xbill/DNS/TCPClient.java \
 	org/xbill/DNS/TKEYRecord.java \
 	org/xbill/DNS/TSIG.java \
 	org/xbill/DNS/TSIGRecord.java \
@@ -5747,6 +5749,7 @@
 	org/xbill/DNS/Type.java \
 	org/xbill/DNS/TypedObject.java \
 	org/xbill/DNS/U16NameBase.java \
+	org/xbill/DNS/UDPClient.java \
 	org/xbill/DNS/UNKRecord.java \
 	org/xbill/DNS/Update.java \
 	org/xbill/DNS/Verifier.java \
@@ -5755,8 +5758,7 @@
 	org/xbill/DNS/X25Record.java \
 	org/xbill/DNS/Zone.java \
 	org/xbill/DNS/ZoneTransferException.java \
-	org/xbill/DNS/ZoneTransferIn.java \
-	org/xbill/DNS/dns.java
+	org/xbill/DNS/ZoneTransferIn.java
 
 org_xbill_DNS_security_SRCS = \
 	org/xbill/DNS/security/CERTConverter.java \
@@ -5769,11 +5771,10 @@
 	org/xbill/DNS/security/SIG0Signer.java
 
 org_xbill_DNS_utils_SRCS = \
+	org/xbill/DNS/utils/HMAC.java \
 	org/xbill/DNS/utils/base16.java \
 	org/xbill/DNS/utils/base64.java \
-	org/xbill/DNS/utils/hexdump.java \
-	org/xbill/DNS/utils/hmacSigner.java \
-	org/xbill/DNS/utils/md5.java
+	org/xbill/DNS/utils/hexdump.java
 
 org_xml_sax_SRCS = \
 	org/xml/sax/AttributeList.java \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.142 kaffe/libraries/javalib/all.files:1.143
--- kaffe/libraries/javalib/all.files:1.142	Wed Jul  6 23:20:00 2005
+++ kaffe/libraries/javalib/all.files	Thu Jul  7 00:38:00 2005
@@ -4314,6 +4314,7 @@
 org/xbill/DNS/CERTRecord.java
 org/xbill/DNS/CNAMERecord.java
 org/xbill/DNS/Cache.java
+org/xbill/DNS/Client.java
 org/xbill/DNS/Compression.java
 org/xbill/DNS/Credibility.java
 org/xbill/DNS/DClass.java
@@ -4323,16 +4324,16 @@
 org/xbill/DNS/DNSOutput.java
 org/xbill/DNS/DNSSEC.java
 org/xbill/DNS/DSRecord.java
+org/xbill/DNS/EmptyRecord.java
 org/xbill/DNS/ExtendedFlags.java
 org/xbill/DNS/ExtendedResolver.java
-org/xbill/DNS/FindServer.java
 org/xbill/DNS/Flags.java
 org/xbill/DNS/FormattedTime.java
 org/xbill/DNS/GPOSRecord.java
+org/xbill/DNS/Generator.java
 org/xbill/DNS/HINFORecord.java
 org/xbill/DNS/Header.java
 org/xbill/DNS/ISDNRecord.java
-org/xbill/DNS/Inet6Address.java
 org/xbill/DNS/InvalidDClassException.java
 org/xbill/DNS/InvalidTTLException.java
 org/xbill/DNS/InvalidTypeException.java
@@ -4359,7 +4360,6 @@
 org/xbill/DNS/NULLRecord.java
 org/xbill/DNS/NXTRecord.java
 org/xbill/DNS/Name.java
-org/xbill/DNS/NameSet.java
 org/xbill/DNS/NameTooLongException.java
 org/xbill/DNS/OPTRecord.java
 org/xbill/DNS/Opcode.java
@@ -4375,6 +4375,7 @@
 org/xbill/DNS/RelativeNameException.java
 org/xbill/DNS/ResolveThread.java
 org/xbill/DNS/Resolver.java
+org/xbill/DNS/ResolverConfig.java
 org/xbill/DNS/ResolverListener.java
 org/xbill/DNS/ReverseMap.java
 org/xbill/DNS/SIGBase.java
@@ -4388,6 +4389,7 @@
 org/xbill/DNS/SimpleResolver.java
 org/xbill/DNS/SingleCompressedNameBase.java
 org/xbill/DNS/SingleNameBase.java
+org/xbill/DNS/TCPClient.java
 org/xbill/DNS/TKEYRecord.java
 org/xbill/DNS/TSIG.java
 org/xbill/DNS/TSIGRecord.java
@@ -4398,6 +4400,7 @@
 org/xbill/DNS/Type.java
 org/xbill/DNS/TypedObject.java
 org/xbill/DNS/U16NameBase.java
+org/xbill/DNS/UDPClient.java
 org/xbill/DNS/UNKRecord.java
 org/xbill/DNS/Update.java
 org/xbill/DNS/Verifier.java
@@ -4407,7 +4410,6 @@
 org/xbill/DNS/Zone.java
 org/xbill/DNS/ZoneTransferException.java
 org/xbill/DNS/ZoneTransferIn.java
-org/xbill/DNS/dns.java
 org/xbill/DNS/security/CERTConverter.java
 org/xbill/DNS/security/DHPubKey.java
 org/xbill/DNS/security/DNSSECVerifier.java
@@ -4416,11 +4418,10 @@
 org/xbill/DNS/security/KEYConverter.java
 org/xbill/DNS/security/RSAPubKey.java
 org/xbill/DNS/security/SIG0Signer.java
+org/xbill/DNS/utils/HMAC.java
 org/xbill/DNS/utils/base16.java
 org/xbill/DNS/utils/base64.java
 org/xbill/DNS/utils/hexdump.java
-org/xbill/DNS/utils/hmacSigner.java
-org/xbill/DNS/utils/md5.java
 org/xml/sax/AttributeList.java
 org/xml/sax/Attributes.java
 org/xml/sax/ContentHandler.java
Index: kaffe/libraries/javalib/org/xbill/DNS/A6Record.java
diff -u kaffe/libraries/javalib/org/xbill/DNS/A6Record.java:1.1 kaffe/libraries/javalib/org/xbill/DNS/A6Record.java:1.2
--- kaffe/libraries/javalib/org/xbill/DNS/A6Record.java:1.1	Wed Jul 21 01:42:30 2004
+++ kaffe/libraries/javalib/org/xbill/DNS/A6Record.java	Thu Jul  7 00:38:03 2005
@@ -3,7 +3,7 @@
 package org.xbill.DNS;
 
 import java.io.*;
-import org.xbill.DNS.utils.*;
+import java.net.*;
 
 /**
  * A6 Record - maps a domain name to an IPv6 address (experimental)
@@ -14,7 +14,7 @@
 public class A6Record extends Record {
 
 private int prefixBits;
-private Inet6Address suffix;
+private InetAddress suffix;
 private Name prefix;
 
 A6Record() {}
@@ -32,10 +32,12 @@
  */
 public
 A6Record(Name name, int dclass, long ttl, int prefixBits,
-	 Inet6Address suffix, Name prefix)
+	 InetAddress suffix, Name prefix)
 {
 	super(name, Type.A6, dclass, ttl);
 	this.prefixBits = checkU8("prefixBits", prefixBits);
+	if (suffix != null && Address.familyOf(suffix) != Address.IPv6)
+		throw new IllegalArgumentException("invalid IPv6 address");
 	this.suffix = suffix;
 	if (prefix != null)
 		this.prefix = checkName("prefix", prefix);
@@ -47,8 +49,9 @@
 	int suffixbits = 128 - prefixBits;
 	int suffixbytes = (suffixbits + 7) / 8;
 	if (prefixBits < 128) {
-		suffix = new Inet6Address(128 - prefixBits,
-					  in.readByteArray(suffixbytes));
+		byte [] bytes = new byte[16];
+		in.readByteArray(bytes, 16 - suffixbytes, suffixbytes);
+		suffix = InetAddress.getByAddress(bytes);
 	}
 	if (prefixBits > 0)
 		prefix = new Name(in);
@@ -60,12 +63,11 @@
 	if (prefixBits > 128) {
 		throw st.exception("prefix bits must be [0..128]");
 	} else if (prefixBits < 128) {
-		try {
-			suffix = new Inet6Address(st.getString());
-		}
-		catch (TextParseException e) {
-			throw st.exception(e.getMessage());
-		}
+		byte [] bytes = Address.toByteArray(st.getString(),
+						    Address.IPv6);
+		if (bytes == null)
+			throw st.exception("invalid IPv6 address");
+		suffix = InetAddress.getByAddress(bytes);
 	}
 	if (prefixBits > 0)
 		prefix = st.getName(origin);
@@ -78,7 +80,7 @@
 	sb.append(prefixBits);
 	if (suffix != null) {
 		sb.append(" ");
-		sb.append(suffix);
+		sb.append(suffix.getHostAddress());
 	}
 	if (prefix != null) {
 		sb.append(" ");
@@ -94,7 +96,7 @@
 }
 
 /** Returns the address suffix */
-public Inet6Address
+public InetAddress
 getSuffix() {
 	return suffix;
 }
@@ -111,7 +113,7 @@
 	if (suffix != null) {
 		int suffixbits = 128 - prefixBits;
 		int suffixbytes = (suffixbits + 7) / 8;
-		byte [] data = suffix.toBytes();
+		byte [] data = suffix.getAddress();
 		out.writeByteArray(data, 16 - suffixbytes, suffixbytes);
 	}
 	if (prefix != null)
Index: kaffe/libraries/javalib/org/xbill/DNS/AAAARecord.java
diff -u kaffe/libraries/javalib/org/xbill/DNS/AAAARecord.java:1.1 kaffe/libraries/javalib/org/xbill/DNS/AAAARecord.java:1.2
--- kaffe/libraries/javalib/org/xbill/DNS/AAAARecord.java:1.1	Wed Jul 21 01:42:30 2004
+++ kaffe/libraries/javalib/org/xbill/DNS/AAAARecord.java	Thu Jul  7 00:38:03 2005
@@ -3,7 +3,7 @@
 package org.xbill.DNS;
 
 import java.io.*;
-import org.xbill.DNS.utils.*;
+import java.net.*;
 
 /**
  * IPv6 Address Record - maps a domain name to an IPv6 address
@@ -13,7 +13,7 @@
 
 public class AAAARecord extends Record {
 
-private Inet6Address address;
+private InetAddress address;
 
 AAAARecord() {}
 
@@ -27,42 +27,41 @@
  * @param address The address suffix
  */
 public
-AAAARecord(Name name, int dclass, long ttl, Inet6Address address) {
+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");
 	this.address = address;
 }
 
 void
 rrFromWire(DNSInput in) throws IOException {
-	address = new Inet6Address(in.readByteArray(16));
+	address = InetAddress.getByAddress(in.readByteArray(16));
 }
 
 void
 rdataFromString(Tokenizer st, Name origin) throws IOException {
-	try {
-		address = new Inet6Address(st.getString());
-	}
-	catch (TextParseException e) {
-		throw st.exception(e.getMessage());
-	}
+	byte [] bytes = Address.toByteArray(st.getString(), Address.IPv6);
+	if (bytes == null)
+		throw st.exception("invalid IPv6 address");
+	address = InetAddress.getByAddress(bytes);
 }
 
 /** Converts rdata to a String */
 String
 rrToString() {
-	return address.toString();
+	return address.getHostAddress();
 }
 
 /** Returns the address */
-public Inet6Address
+public InetAddress
 getAddress() {
 	return address;
 }
 
 void
 rrToWire(DNSOutput out, Compression c, boolean canonical) {
-	byte [] b = address.toBytes();
-	out.writeByteArray(b);
+	out.writeByteArray(address.getAddress());
 }
 
 }
Index: kaffe/libraries/javalib/org/xbill/DNS/AFSDBRecord.java
diff -u kaffe/libraries/javalib/org/xbill/DNS/AFSDBRecord.java:1.1 kaffe/libraries/javalib/org/xbill/DNS/AFSDBRecord.java:1.2
--- kaffe/libraries/javalib/org/xbill/DNS/AFSDBRecord.java:1.1	Wed Jul 21 01:42:30 2004
+++ kaffe/libraries/javalib/org/xbill/DNS/AFSDBRecord.java	Thu Jul  7 00:38:03 2005
@@ -2,9 +2,6 @@
 
 package org.xbill.DNS;
 
-import java.io.*;
-import org.xbill.DNS.utils.*;
-
 /**
  * AFS Data Base Record - maps a domain name to the name of an AFS cell
  * database server.
Index: kaffe/libraries/javalib/org/xbill/DNS/APLRecord.java
diff -u kaffe/libraries/javalib/org/xbill/DNS/APLRecord.java:1.1 kaffe/libraries/javalib/org/xbill/DNS/APLRecord.java:1.2
--- kaffe/libraries/javalib/org/xbill/DNS/APLRecord.java:1.1	Wed Jul 21 01:42:30 2004
+++ kaffe/libraries/javalib/org/xbill/DNS/APLRecord.java	Thu Jul  7 00:38:03 2005
@@ -8,19 +8,17 @@
 import org.xbill.DNS.utils.*;
 
 /**
- * APL - Address Prefix List.
+ * APL - Address Prefix List.  See RFC 3123.
  *
  * @author Brian Wellington
  */
 
-public class APLRecord extends Record {
-
-public static class AddressFamily {
-	private AddressFamily() {}
+/*
+ * Note: this currently uses the same constants as the Address class;
+ * this could change if more constants are defined for APL records.
+ */
 
-	public static final int IPv4 = 1;
-	public static final int IPv6 = 2;
-}
+public class APLRecord extends Record {
 
 public static class Element {
 	public final int family;
@@ -28,7 +26,6 @@
 	public final int prefixLength;
 	public final Object address;
 
-
 	private
 	Element(int family, boolean negative, Object address, int prefixLength)
 	{
@@ -43,29 +40,18 @@
 	}
 
 	/**
-	 * Creates an APL element corresponding to an IPv4 prefix.
+	 * Creates an APL element corresponding to an IPv4 or IPv6 prefix.
 	 * @param negative Indicates if this prefix is a negation.
-	 * @param address The IPv4 address.
-	 * @param negative The prefix length.
+	 * @param address The IPv4 or IPv6 address.
+	 * @param prefixLength The length of this prefix, in bits.
 	 * @throws IllegalArgumentException The prefix length is invalid.
 	 */
 	public
 	Element(boolean negative, InetAddress address, int prefixLength) {
-		this(AddressFamily.IPv4, negative, address, prefixLength);
+		this(Address.familyOf(address), negative, address,
+		     prefixLength);
 	}
 
-	/**
-	 * Creates an APL element corresponding to an IPv6 prefix.
-	 * @param negative Indicates if this prefix is a negation.
-	 * @param address The IPv6 address.
-	 * @param negative The prefix length.
-	 * @throws IllegalArgumentException The prefix length is invalid.
-	 */
-	public
-	Element(boolean negative, Inet6Address address, int prefixLength) {
-		this(AddressFamily.IPv6, negative, address, prefixLength);
-	}
-	
 	public String
 	toString() {
 		StringBuffer sb = new StringBuffer();
@@ -73,16 +59,25 @@
 			sb.append("!");
 		sb.append(family);
 		sb.append(":");
-		if (family == AddressFamily.IPv4)
+		if (family == Address.IPv4 || family == Address.IPv6)
 			sb.append(((InetAddress) address).getHostAddress());
-		else if (family == AddressFamily.IPv6)
-			sb.append((Inet6Address) address);
 		else
 			sb.append(base16.toString((byte []) address));
 		sb.append("/");
 		sb.append(prefixLength);
 		return sb.toString();
 	}
+
+	public boolean
+	equals(Object arg) {
+		if (arg == null || !(arg instanceof Element))
+			return false;
+		Element elt = (Element) arg;
+		return (family == elt.family &&
+			negative == elt.negative &&
+			prefixLength == elt.prefixLength &&
+			address.equals(elt.address));
+	}
 }
 
 private List elements;
@@ -98,8 +93,8 @@
 validatePrefixLength(int family, int prefixLength) {
 	if (prefixLength < 0 || prefixLength >= 256)
 		return false;
-	if ((family == AddressFamily.IPv4 && prefixLength > 32) ||
-	    (family == AddressFamily.IPv6 && prefixLength > 128))
+	if ((family == Address.IPv4 && prefixLength > 32) ||
+	    (family == Address.IPv6 && prefixLength > 128))
 		return false;
 	return true;
 }
@@ -118,8 +113,8 @@
 			throw new IllegalArgumentException("illegal element");
 		}
 		Element element = (Element) o;
-		if (element.family != AddressFamily.IPv4 &&
-		    element.family != AddressFamily.IPv6)
+		if (element.family != Address.IPv4 &&
+		    element.family != Address.IPv6)
 		{
 			throw new IllegalArgumentException("unknown family");
 		}
@@ -155,14 +150,10 @@
 			throw new WireParseException("invalid prefix length");
 		}
 
-		if (family == AddressFamily.IPv4) {
-			data = parseAddress(data, 4);
-			String s = Address.toDottedQuad(data);
-			InetAddress addr = Address.getByName(s);
-			element = new Element(negative, addr, prefix);
-		} else if (family == AddressFamily.IPv6) {
-			data = parseAddress(data, 16);
-			Inet6Address addr = new Inet6Address(data);
+		if (family == Address.IPv4 || family == Address.IPv6) {
+			data = parseAddress(data,
+					    Address.addressLength(family));
+			InetAddress addr = InetAddress.getByAddress(data);
 			element = new Element(negative, addr, prefix);
 		} else {
 			element = new Element(family, negative, data, prefix);
@@ -207,9 +198,8 @@
 		catch (NumberFormatException e) {
 			throw st.exception("invalid family");
 		}
-		if (family != 1 && family != 2) {
+		if (family != Address.IPv4 && family != Address.IPv6)
 			throw st.exception("unknown family");
-		}
 
 		try {
 			prefix = Integer.parseInt(prefixString);
@@ -222,24 +212,13 @@
 			throw st.exception("invalid prefix length");
 		}
 
-		if (family == AddressFamily.IPv4) {
-			if (!Address.isDottedQuad(addressString)) {
-				throw st.exception("invalid IPv4 address " +
-						   addressString);
-			}
-			InetAddress address = Address.getByName(addressString);
-			elements.add(new Element(negative, address, prefix));
-		} else if (family == AddressFamily.IPv6) {
-			Inet6Address address = null;
-			try {
-				address = new Inet6Address(addressString);
-			} catch (TextParseException e) {
-				throw st.exception(e.getMessage());
-			}
-			elements.add(new Element(negative, address, prefix));
-		} else {
-			throw new IllegalStateException();
-		}
+		byte [] bytes = Address.toByteArray(addressString, family);
+		if (bytes == null)
+			throw st.exception("invalid IP address " +
+					   addressString);
+
+		InetAddress address = InetAddress.getByAddress(bytes);
+		elements.add(new Element(negative, address, prefix));
 	}
 	st.unget();
 }
@@ -277,13 +256,11 @@
 		Element element = (Element) it.next();
 		int length = 0;
 		byte [] data;
-		if (element.family == AddressFamily.IPv4) {
+		if (element.family == Address.IPv4 ||
+		    element.family == Address.IPv6)
+		{
 			InetAddress addr = (InetAddress) element.address;
 			data = addr.getAddress();
-			length = addressLength(data);
-		} else if (element.family == AddressFamily.IPv6) {
-			Inet6Address addr = (Inet6Address) element.address;
-			data = addr.toBytes();
 			length = addressLength(data);
 		} else {
 			data = (byte []) element.address;
Index: kaffe/libraries/javalib/org/xbill/DNS/ARecord.java
diff -u kaffe/libraries/javalib/org/xbill/DNS/ARecord.java:1.1 kaffe/libraries/javalib/org/xbill/DNS/ARecord.java:1.2
--- kaffe/libraries/javalib/org/xbill/DNS/ARecord.java:1.1	Wed Jul 21 01:42:30 2004
+++ kaffe/libraries/javalib/org/xbill/DNS/ARecord.java	Thu Jul  7 00:38:03 2005
@@ -4,7 +4,6 @@
 
 import java.net.*;
 import java.io.*;
-import org.xbill.DNS.utils.*;
 
 /**
  * Address Record - maps a domain name to an Internet address
@@ -24,29 +23,21 @@
 }
 
 private static final int
-fromBytes(byte b1, byte b2, byte b3, byte b4) {
-	return (((b1 & 0xFF) << 24) |
-		((b2 & 0xFF) << 16) |
-		((b3 & 0xFF) << 8) |
-		(b4 & 0xFF));
-}
-
-private static final int
 fromArray(byte [] array) {
-	return (fromBytes(array[0], array[1], array[2], array[3]));
+	return (((array[0] & 0xFF) << 24) |
+		((array[1] & 0xFF) << 16) |
+		((array[2] & 0xFF) << 8) |
+		(array[3] & 0xFF));
 }
 
-private static final String
-toDottedQuad(int addr) {
-	StringBuffer sb = new StringBuffer();
-	sb.append(((addr >>> 24) & 0xFF));
-	sb.append(".");
-	sb.append(((addr >>> 16) & 0xFF));
-	sb.append(".");
-	sb.append(((addr >>> 8) & 0xFF));
-	sb.append(".");
-	sb.append((addr & 0xFF));
-	return sb.toString();
+private static final byte []
+toArray(int addr) {
+	byte [] bytes = new byte[4];
+	bytes[0] = (byte) ((addr >>> 24) & 0xFF);
+	bytes[1] = (byte) ((addr >>> 16) & 0xFF);
+	bytes[2] = (byte) ((addr >>> 8) & 0xFF);
+	bytes[3] = (byte) (addr & 0xFF);
+	return bytes;
 }
 
 /**
@@ -56,6 +47,8 @@
 public
 ARecord(Name name, int dclass, long ttl, InetAddress address) {
 	super(name, Type.A, dclass, ttl);
+	if (Address.familyOf(address) != Address.IPv4)
+		throw new IllegalArgumentException("invalid IPv4 address");
 	addr = fromArray(address.getAddress());
 }
 
@@ -67,44 +60,24 @@
 void
 rdataFromString(Tokenizer st, Name origin) throws IOException {
 	String s = st.getString();
-	try {
-		InetAddress address;
-		if (s.equals("@me@")) {
-			address = InetAddress.getLocalHost();
-			if (address.equals(InetAddress.getByName("127.0.0.1")))
-			{
-				String msg = "InetAddress.getLocalHost() is " +
-					     "broken.  Don't use @me at .";
-				throw new RuntimeException(msg);
-			}
-			addr = fromArray(address.getAddress());
-		}
-	}
-	catch (UnknownHostException e) {
-		throw st.exception("invalid address");
-	}
-
-	int [] array = Address.toArray(s);
+	byte [] array = Address.toByteArray(s, Address.IPv4);
 	if (array == null)
 		throw st.exception("invalid dotted quad");
-	addr = fromBytes((byte)array[0], (byte)array[1], (byte)array[2],
-			 (byte)array[3]);
+	addr = fromArray(array);
 }
 
 /** Converts rdata to a String */
 String
 rrToString() {
-	return (toDottedQuad(addr));
+	return (Address.toDottedQuad(toArray(addr)));
 }
 
 /** Returns the Internet address */
 public InetAddress
 getAddress() {
-	String s = toDottedQuad(addr);
 	try {
-		return InetAddress.getByName(s);
-	}
-	catch (UnknownHostException e) {
+		return InetAddress.getByAddress(toArray(addr));
+	} catch (UnknownHostException e) {
 		return null;
 	}
 }
Index: kaffe/libraries/javalib/org/xbill/DNS/Address.java
diff -u kaffe/libraries/javalib/org/xbill/DNS/Address.java:1.1 kaffe/libraries/javalib/org/xbill/DNS/Address.java:1.2
--- kaffe/libraries/javalib/org/xbill/DNS/Address.java:1.1	Wed Jul 21 01:42:30 2004
+++ kaffe/libraries/javalib/org/xbill/DNS/Address.java	Thu Jul  7 00:38:03 2005
@@ -3,6 +3,8 @@
 package org.xbill.DNS;
 
 import java.net.*;
+import java.net.Inet6Address;

*** Patch too long, truncated ***



More information about the kaffe mailing list