From e69ab31dd2ae80ab7ef049ab72bbf943403b418f Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 8 Aug 2016 20:53:47 +0200
Subject: [PATCH] Small fix

---
 src/zutil/ByteUtil.java                   | 18 ++++++++++++++----
 src/zutil/net/dns/MulticastDNSClient.java |  4 ++--
 test/zutil/net/dns/DNSPacketTest.java     |  6 ++----
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/zutil/ByteUtil.java b/src/zutil/ByteUtil.java
index 47a7842..4b046db 100755
--- a/src/zutil/ByteUtil.java
+++ b/src/zutil/ByteUtil.java
@@ -197,11 +197,21 @@ public class ByteUtil {
      * @return A multiline String with human readable HEX and ASCII
      */
     public static String toFormattedString(byte[] data){
+        return toFormattedString(data, 0, data.length);
+    }
+
+    /**
+     * Presents a binary array in HEX and ASCII
+     *
+     * @param       data     The source binary data to format
+     * @return A multiline String with human readable HEX and ASCII
+     */
+    public static String toFormattedString(byte[] data, int offset, int length){
         StringBuffer output = new StringBuffer();
 
         //000  XX XX XX XX XX XX XX XX  '........'
-        int maxOffset = (""+data.length).length();
-        for(int offset=0; offset<data.length; offset+=8){
+        int maxOffset = (""+length).length();
+        for(; offset<length; offset+=8){
             if(offset != 0)
                 output.append('\n');
 
@@ -215,7 +225,7 @@ public class ByteUtil {
 
             // HEX
             for(int i=0; i<8; ++i){
-                if(offset+i < data.length)
+                if(offset+i < length)
                     output.append(Converter.toHexString(data[offset+i]));
                 else
                     output.append("  ");
@@ -226,7 +236,7 @@ public class ByteUtil {
             // ACII
             output.append('\'');
             for(int i=0; i<8; ++i){
-                if(offset+i < data.length)
+                if(offset+i < length)
                     if( 32 <= data[offset+i] && data[offset+i] <= 126 )
                         output.append((char)data[offset+i]);
                     else
diff --git a/src/zutil/net/dns/MulticastDNSClient.java b/src/zutil/net/dns/MulticastDNSClient.java
index 462628d..a14e8df 100755
--- a/src/zutil/net/dns/MulticastDNSClient.java
+++ b/src/zutil/net/dns/MulticastDNSClient.java
@@ -77,7 +77,7 @@ public class MulticastDNSClient extends ThreadedUDPNetwork implements ThreadedUD
                 MDNS_MULTICAST_PORT );
 
         System.out.println("#### Sending Request");
-        System.out.println(ByteUtil.toFormattedString(udpPacket.getData()));
+        System.out.println(ByteUtil.toFormattedString(udpPacket.getData(), udpPacket.getOffset(), udpPacket.getLength()));
         MultiPrintStream.out.dump(dnsPacket,3);
 
         //send(udpPacket);
@@ -91,7 +91,7 @@ public class MulticastDNSClient extends ThreadedUDPNetwork implements ThreadedUD
             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()));
+            System.out.println(ByteUtil.toFormattedString(packet.getData(), packet.getOffset(), packet.getLength()));
             MultiPrintStream.out.dump(dnsPacket,3);
         } catch (IOException e){
             logger.log(Level.WARNING, null, e);
diff --git a/test/zutil/net/dns/DNSPacketTest.java b/test/zutil/net/dns/DNSPacketTest.java
index e884bb7..6a0f3bc 100755
--- a/test/zutil/net/dns/DNSPacketTest.java
+++ b/test/zutil/net/dns/DNSPacketTest.java
@@ -34,10 +34,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import static org.junit.Assert.*;
-import static zutil.net.dns.DNSPacketQuestion.QCLASS_IN;
-import static zutil.net.dns.DNSPacketQuestion.QTYPE_A;
-import static zutil.net.dns.DNSPacketResource.CLASS_IN;
-import static zutil.net.dns.DNSPacketResource.TYPE_A;
+import static zutil.net.dns.DNSPacketQuestion.*;
+import static zutil.net.dns.DNSPacketResource.*;
 
 /**
  * Created by Ziver