Added logging to help debug COPS message handling.

Change-Id: I47c67821e55666f9a67928efdc45e31b25b9d5c2
Signed-off-by: Steven Pisarski <s.pisarski@cablelabs.com>

diff --git a/packetcable-driver/src/main/java/org/umu/cops/stack/COPSMsg.java b/packetcable-driver/src/main/java/org/umu/cops/stack/COPSMsg.java
index 6f4f7b4c4188737e5bc96a5fc81a0dbdb1e73a59..ee7b10a2d39a04377aa568c7ce8e453a2ddb060d 100644 (file)
--- a/packetcable-driver/src/main/java/org/umu/cops/stack/COPSMsg.java
+++ b/packetcable-driver/src/main/java/org/umu/cops/stack/COPSMsg.java
@@ -6,6 +6,9 @@
 
 package org.umu.cops.stack;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.Socket;
@@ -15,6 +18,8 @@ import java.net.Socket;
  */
 abstract public class COPSMsg {
 
+    private static final Logger logger = LoggerFactory.getLogger(COPSMsg.class);
+
     /**
      * The COPS header that is associated with all COPS messages
      */
@@ -42,7 +47,7 @@ abstract public class COPSMsg {
      * @throws   IOException
      */
     public final void writeData(final Socket socket) throws IOException {
-        // checkSanity();
+        logger.info("Writing data for OPCode - " + _hdr.getOpCode());
         _hdr.writeData(socket, _hdr.getHdrLength() + getDataLength());
         writeBody(socket);
     }

diff --git a/packetcable-driver/src/main/java/org/umu/cops/stack/COPSMsgParser.java b/packetcable-driver/src/main/java/org/umu/cops/stack/COPSMsgParser.java
index 61544e741d3520a052ad4e206d193d2f0928f3b5..84279912d9ee4b888db90f82c1f944ed09d836e3 100644 (file)
--- a/packetcable-driver/src/main/java/org/umu/cops/stack/COPSMsgParser.java
+++ b/packetcable-driver/src/main/java/org/umu/cops/stack/COPSMsgParser.java
@@ -6,6 +6,8 @@
 
 package org.umu.cops.stack;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.umu.cops.stack.COPSHeader.Flag;
 import org.umu.cops.stack.COPSHeader.OPCode;
 
@@ -20,6 +22,8 @@ import java.util.Date;
 
 public class COPSMsgParser {
 
+    public final static Logger logger = LoggerFactory.getLogger(COPSMsgParser.class);
+
     /**
      * Transforms a COPS message streaming in from a Socket connection into a COPSMsg object
      * @param socket - the socket
@@ -40,6 +44,7 @@ public class COPSMsgParser {
      * @throws IOException
      */
     private static COPSHeaderData readHeader(final Socket socket) throws IOException {
+        logger.info("Reading COPS Header");
         final byte[] data = new byte[8];
         final int bytesRead = readData(socket, data, 8);
         if (bytesRead != 8) throw new IOException("Expected 8 bytes, read in " + bytesRead);
@@ -89,6 +94,7 @@ public class COPSMsgParser {
     }
 
     private static COPSMsg readBody(final Socket socket, final COPSHeaderData hdrData) throws IOException, COPSException {
+        logger.info("Reading COPS Body of type - " + hdrData.header.getOpCode());
         final int expectedBytes = hdrData.msgByteCount - hdrData.header.getHdrLength();
         final byte[] buffer = new byte[expectedBytes];
         final int nread = readData(socket, buffer, expectedBytes);

diff --git a/packetcable-driver/src/main/java/org/umu/cops/stack/COPSUtil.java b/packetcable-driver/src/main/java/org/umu/cops/stack/COPSUtil.java
index 6edd4322fc868a9290f8b63e836bade330001148..81acff906ed3c6d31fa6601c31fd3f21b7e1f16c 100644 (file)
--- a/packetcable-driver/src/main/java/org/umu/cops/stack/COPSUtil.java
+++ b/packetcable-driver/src/main/java/org/umu/cops/stack/COPSUtil.java
@@ -34,7 +34,7 @@ public class COPSUtil {
      * @throws   IOException
      */
     public static void writeData(final Socket socket, final byte[] data, final int len) throws IOException {
-        logger.info("Writing COPS data");
+        logger.trace("Writing COPS data");
         socket.getOutputStream().write(data, 0, len);
     }