Added a MDNS test exec class and did some fixes

src/zutil/net/dns/DNSPacket.java

@@ -67,8 +67,7 @@ public class DNSPacket {
     }
 
 
-    public static DNSPacket read(InputStream in) throws IOException {
+    public static DNSPacket read(BinaryStructInputStream structIn) throws IOException {
-        BinaryStructInputStream structIn = new BinaryStructInputStream(in);
         DNSPacket packet = new DNSPacket();
         structIn.read(packet.header);
 
@@ -90,8 +89,7 @@ public class DNSPacket {
         }
     }
 
-    public void write(OutputStream out) throws IOException {
+    public void write(BinaryStructOutputStream structOut) throws IOException {
-        BinaryStructOutputStream structOut = new BinaryStructOutputStream(out);
         structOut.write(header);
 
         for (DNSPacketQuestion question : questions)

src/zutil/net/dns/DNSPacketQuestion.java

@@ -159,7 +159,7 @@ public class DNSPacketQuestion implements BinaryStruct {
                 if (c > 0)
                     str.append('.');
             }
-            return toString();
+            return str.toString();
         }
 
         public void write(OutputStream out, String domain, BinaryFieldData field) throws IOException {

src/zutil/net/dns/MulticastDNSClient.java

@@ -24,20 +24,32 @@
 
 package zutil.net.dns;
 
+import zutil.ByteUtil;
+import zutil.converter.Converter;
+import zutil.io.MultiPrintStream;
+import zutil.log.LogUtil;
 import zutil.net.threaded.ThreadedUDPNetwork;
 import zutil.net.threaded.ThreadedUDPNetworkThread;
 import zutil.parser.binary.BinaryStructInputStream;
 import zutil.parser.binary.BinaryStructOutputStream;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.InetAddress;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
+ * This class implements a MDNS Client. MDNS is a version
+ * of the DNS protocol but used a Zeroconf application.
+ *
  * Created by Ziver
  */
 public class MulticastDNSClient extends ThreadedUDPNetwork implements ThreadedUDPNetworkThread{
+    private static final Logger logger = LogUtil.getLogger();
+
     private static final String MDNS_MULTICAST_ADDR = "224.0.0.251";
     private static final int    MDNS_MULTICAST_PORT = 5353;
 
@@ -48,24 +60,42 @@ public class MulticastDNSClient extends ThreadedUDPNetwork implements ThreadedUD
     }
 
 
-    public void sendProbe() throws IOException {
+    public void sendProbe(String service) throws IOException {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         BinaryStructOutputStream out = new BinaryStructOutputStream(buffer);
 
-        DNSPacketHeader header = new DNSPacketHeader();
+        DNSPacket dnsPacket = new DNSPacket();
-        header.setDefaultQueryData();
+        dnsPacket.getHeader().setDefaultQueryData();
-        out.write(header);
+        dnsPacket.addQuestion(new DNSPacketQuestion(
+                service,
+                DNSPacketQuestion.QTYPE_A,
+                DNSPacketQuestion.QCLASS_IN));
+        dnsPacket.write(out);
 
-        DatagramPacket packet = new DatagramPacket(
+        DatagramPacket udpPacket = new DatagramPacket(
                 buffer.toByteArray(), buffer.size(),
                 InetAddress.getByName( MDNS_MULTICAST_ADDR ),
                 MDNS_MULTICAST_PORT );
-        send(packet);
+
+        System.out.println("#### Sending Request");
+        System.out.println(ByteUtil.toFormattedString(udpPacket.getData()));
+        MultiPrintStream.out.dump(dnsPacket,3);
+
+        //send(udpPacket);
     }
 
     @Override
     public void receivedPacket(DatagramPacket packet, ThreadedUDPNetwork network) {
-        DNSPacketHeader header = new DNSPacketHeader();
+        try {
-        BinaryStructInputStream.read(header, packet.getData());
+            ByteArrayInputStream buffer = new ByteArrayInputStream(packet.getData(),
+                    packet.getOffset(), packet.getLength());
+            BinaryStructInputStream in = new BinaryStructInputStream(buffer);
+            DNSPacket dnsPacket = DNSPacket.read(in);
+            System.out.println("#### Received response from "+packet.getAddress());
+            System.out.println(ByteUtil.toFormattedString(packet.getData()));
+            MultiPrintStream.out.dump(dnsPacket,3);
+        } catch (IOException e){
+            logger.log(Level.WARNING, null, e);
+        }
     }
 }

src/zutil/net/torrent/TorrentFile.java

@@ -24,14 +24,12 @@
 
 package zutil.net.torrent;
 
-import zutil.Dumpable;
-
 /**
  * This class represents a File for download
  * 
  * @author Ziver
  */
-public class TorrentFile implements Dumpable{
+public class TorrentFile{
 	private String filename;
 	private long length;
 	

src/zutil/parser/binary/BinaryFieldData.java

@@ -2,6 +2,7 @@ package zutil.parser.binary;
 
 
 import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 import zutil.ByteUtil;
@@ -94,7 +95,7 @@ public class BinaryFieldData {
             else if (field.getType() == Integer.class || field.getType() == int.class)
                 field.set(obj, Converter.toInt(data));
             else if (field.getType() == String.class)
-                field.set(obj, new String(data));
+                field.set(obj, new String(data, StandardCharsets.ISO_8859_1));
             else
                 throw new UnsupportedOperationException("Unsupported BinaryStruct field class: "+ field.getClass());
         } catch (IllegalAccessException e){
@@ -124,7 +125,7 @@ public class BinaryFieldData {
             else if (field.getType() == String.class)
                 return ByteUtil.getReverseByteOrder(
                         ByteUtil.getBits(
-                                ((String)(field.get(obj))).getBytes(),
+                                ((String)(field.get(obj))).getBytes(StandardCharsets.ISO_8859_1),
                                 getBitLength(obj)));
             else
                 throw new UnsupportedOperationException("Unsupported BinaryStruct field type: "+ getType());

test/zutil/net/dns/DNSPacketTest.java

@@ -26,6 +26,7 @@ package zutil.net.dns;
 
 import org.junit.Test;
 import zutil.converter.Converter;
+import zutil.parser.binary.BinaryStructInputStream;
 import zutil.parser.binary.BinaryStructOutputStream;
 
 import static org.junit.Assert.assertTrue;
@@ -78,7 +79,8 @@ public class DNSPacketTest {
         packet.getHeader().setDefaultQueryData();
 
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        packet.write(buffer);
+        BinaryStructOutputStream out = new BinaryStructOutputStream(buffer);
+        packet.write(out);
         byte[] data = buffer.toByteArray();
 
         byte[] expected = {
@@ -98,7 +100,8 @@ public class DNSPacketTest {
         packet.addQuestion(new DNSPacketQuestion("appletv.local", QTYPE_A, QCLASS_IN));
 
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        packet.write(buffer);
+        BinaryStructOutputStream out = new BinaryStructOutputStream(buffer);
+        packet.write(out);
         byte[] data = buffer.toByteArray();
 
         byte[] expected = {
@@ -110,7 +113,7 @@ public class DNSPacketTest {
                 0x00, 0x00, // NSCOUNT
                 0x00, 0x00, // ARCOUNT
                 // QUESTION
-                0x07, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x74, 0x76, // "apple"
+                0x07, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x74, 0x76, // "appletv"
                 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, // "local"
                 0x00, // NULL
                 0x00, 0x01, // QTYPE
@@ -119,7 +122,8 @@ public class DNSPacketTest {
         assertArrayEquals(expected, data);
     }
 
-    public void readRespnseDnsPacketTest() throws IOException {
+    @Test
+    public void readResponseDnsPacketTest() throws IOException {
         char[] input = {
                 // HEADER
                 0x00, 0x00, // ID
@@ -129,11 +133,11 @@ public class DNSPacketTest {
                 0x00, 0x00, // NSCOUNT
                 0x00, 0x02, // ARCOUNT
                 // ANSWER RECORD
-                0x07, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x74, 0x76, // FQDN: "apple"
+                0x07, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x74, 0x76, // FQDN: "appletv"
                 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, // FQDN: "local"
                 0x00, // FQDN: NULL
                 0x00, 0x01, // TYPE: A/IPv4
-                0x80, 0x01, // CLASS: IPv4
+                0x00, 0x01, // CLASS: IPv4
                 0x00, 0x00, 0x78, 0x00, // TTL: 30720 seconds
                 0x00, 0x04, // IPv4 length
                 0x99, 0x6d, 0x07, 0x5a, // IPv4:  153.109.7.90
@@ -154,7 +158,8 @@ public class DNSPacketTest {
                 0xc0, 0x0c, 0x00, 0x04, 0x40, 0x00, 0x00, 0x08 // NSEC
         };
         ByteArrayInputStream buffer = new ByteArrayInputStream(Converter.toBytes(input));
-        DNSPacket packet = DNSPacket.read(buffer);
+        BinaryStructInputStream in = new BinaryStructInputStream(buffer);
+        DNSPacket packet = DNSPacket.read(in);
 
         // Assert Header
         assertTrue("flagQueryResponse", packet.getHeader().flagQueryResponse);
@@ -164,10 +169,11 @@ public class DNSPacketTest {
         // Assert Answer
         assertEquals("No Of Answer records", 1, packet.getAnswerRecords().size());
         DNSPacketResource answer = packet.getAnswerRecords().get(0);
+        assertEquals("NAME", "appletv.local", answer.name);
         assertEquals("TYPE", TYPE_A, answer.type);
         assertEquals("CLASS", CLASS_IN, answer.clazz);
         assertEquals("TTL", 30720, answer.ttl);
-        assertEquals("IPv4", new char[]{0x99, 0x6d, 0x07, 0x5a}, answer.data);
+        assertEquals("IPv4", new String(new char[]{0x99, 0x6d, 0x07, 0x5a}), answer.data);
     }
 
 }

test/zutil/net/dns/MulticastDNSClientTest.java

@@ -0,0 +1,17 @@
+package zutil.net.dns;
+
+import java.io.IOException;
+
+/**
+ * Test class for MulticastDNSClient.
+ *
+ * Created by Ziver on 2016-04-26.
+ */
+public class MulticastDNSClientTest {
+
+    public static void main(String[]  args) throws IOException {
+        MulticastDNSClient mdns = new MulticastDNSClient();
+        mdns.start();
+        mdns.sendProbe("apple.local");
+    }
+}