Added trace logging of message content

Enabled easier debugging by logging decrypted messages when the trace level is enabled.

Author: andylintner

pom.xml

@@ -45,12 +45,6 @@
 			<version>0.1.0</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.10</version>
-		</dependency>
-
 		<dependency>
 			<groupId>javax.json</groupId>
 			<artifactId>javax.json-api</artifactId>
@@ -69,6 +63,12 @@
 			<version>3.4.1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.4</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

src/main/java/com/beowulfe/hap/impl/http/impl/BinaryHandler.java

@@ -5,8 +5,10 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageCodec;
 
+import java.io.ByteArrayOutputStream;
 import java.util.List;
 
+import org.apache.commons.io.HexDump;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,6 +31,7 @@ protected void encode(ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out)
 		if (started) {
 			byte[] b = new byte[msg.readableBytes()];
 			msg.readBytes(b);
+			traceData("Sending data", b, ctx);
 			out.writeBytes(connection.encryptResponse(b));
 		} else {
 			out.writeBytes(msg);
@@ -41,6 +44,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in,
 		byte[] b = new byte[in.readableBytes()];
 		in.readBytes(b);
 		byte[] decrypted = connection.decryptRequest(b);
+		traceData("Received data", decrypted, ctx);
 		out.add(Unpooled.copiedBuffer(decrypted));
 		started = true;
 	}
@@ -51,5 +55,16 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
 		logger.error("Exception in binary handler", cause);
 		super.exceptionCaught(ctx, cause);
 	}
+	
+	private void traceData(String msg, byte[] b, ChannelHandlerContext ctx) throws Exception {
+		if (logger.isTraceEnabled()) {
+			try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+				HexDump.dump(b, 0, stream, 0);
+				stream.flush();
+				logger.trace(String.format("%s [%s]:\n%s\n", msg, ctx.channel().remoteAddress().toString(),
+						stream.toString()));
+			}
+		}
+	}
 
 }