commit ebc70513370c6cd064b08eabd6793d9f4b8042d1
author Pavlin Radoslavov <pavlin@onlab.us> Wed Apr 09 18:19:19 2014 -0700
committer Gerrit Code Review <gerrit2@onos-services> Thu Apr 10 06:47:32 2014 -0700
tree 97b9b81dc18b7b5acdf933b08e6ee6085c80ce34
parent 45233db454b00bbea57a1ff94a1b6693d07db739

Fix issues found by FindBugs: BC_IMPOSSIBLE_INSTANCEOF

http://findbugs.sourceforge.net/bugDescriptions.html#BC_IMPOSSIBLE_INSTANCEOF

* Fixed TCP/UDP/ICMP packet casting issue
  The issue is fixed by using the IP packet payload to test
  it whether it is TCP/UDP/ICMP
* Fixed a typo: unknwon -> unknown
* Added an additional log output if the type of the IPv4 payload is unknown.

Change-Id: I9f6a42d4058d7793ba0233bd0311c2c6df590900

src/main/java/net/onrc/onos/core/packet/Ethernet.java

diff --git a/src/main/java/net/onrc/onos/core/packet/Ethernet.java b/src/main/java/net/onrc/onos/core/packet/Ethernet.java
index 93ae2a6..fe09bd0 100644
--- a/src/main/java/net/onrc/onos/core/packet/Ethernet.java
+++ b/src/main/java/net/onrc/onos/core/packet/Ethernet.java
@@ -430,25 +430,26 @@
             sb.append("\nnw_proto: ");
             sb.append(p.getProtocol());
 
-            if (pkt instanceof TCP) {
+            IPacket payload = (IPacket) pkt.getPayload();
+            if (payload instanceof TCP) {
                 sb.append("\ntp_src: ");
-                sb.append(((TCP) pkt).getSourcePort());
+                sb.append(((TCP) payload).getSourcePort());
                 sb.append("\ntp_dst: ");
-                sb.append(((TCP) pkt).getDestinationPort());
+                sb.append(((TCP) payload).getDestinationPort());
 
-            } else if (pkt instanceof UDP) {
+            } else if (payload instanceof UDP) {
                 sb.append("\ntp_src: ");
-                sb.append(((UDP) pkt).getSourcePort());
+                sb.append(((UDP) payload).getSourcePort());
                 sb.append("\ntp_dst: ");
-                sb.append(((UDP) pkt).getDestinationPort());
-            }
-
-            if (pkt instanceof ICMP) {
-                ICMP icmp = (ICMP) pkt;
+                sb.append(((UDP) payload).getDestinationPort());
+            } else if (payload instanceof ICMP) {
+                ICMP icmp = (ICMP) payload;
                 sb.append("\nicmp_type: ");
                 sb.append(icmp.getIcmpType());
                 sb.append("\nicmp_code: ");
                 sb.append(icmp.getIcmpCode());
+            } else {
+                sb.append("\nunknown IPv4 packet");
             }
 
         } else if (pkt instanceof DHCP) {
@@ -459,9 +460,8 @@
             sb.append("\nllc packet");
         } else if (pkt instanceof BPDU) {
             sb.append("\nbpdu packet");
-        } else sb.append("\nunknwon packet");
+        } else sb.append("\nunknown packet");
 
         return sb.toString();
     }
-
 }