From 3082a87a9a3cecc9da28ae021325375dbb4b074a Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Wed, 5 Sep 2018 10:50:24 -0700
Subject: [PATCH] also report pdu family (from superclass)

---
 .../src/DisExamples/PduReceiver.java          | 14 ++++----
 .../DisExamples/PduReceiverTerminalLog.txt    | 32 +++++++++----------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/CourseExamples/src/DisExamples/PduReceiver.java b/CourseExamples/src/DisExamples/PduReceiver.java
index 4ff5cd98c0..48e6502194 100644
--- a/CourseExamples/src/DisExamples/PduReceiver.java
+++ b/CourseExamples/src/DisExamples/PduReceiver.java
@@ -41,17 +41,19 @@ public class PduReceiver
                 Pdu pdu = factory.createPdu (packet.getData());
 				if (pdu != null)
 				{
-					short pduType        = pdu.getPduType();
-					String pduTypeName   = pdu.getClass().getName();
-					short protocolFamily = pdu.getProtocolFamily(); // TODO get string enumeration
+					short  currentPduType          = pdu.getPduType();
+					String currentPduTypeName      = pdu.getClass().getName();
+					short  currentProtocolFamilyID = pdu.getProtocolFamily();
+					String currentPduFamilyName    = pdu.getClass().getSuperclass().getSimpleName();
 					
 					StringBuilder message = new StringBuilder();
 					message.append("received DIS PDU: ");
 					message.append("pduType ");
-					if (pduType < 10)
+					if (currentPduType < 10)
 						message.append(" ");
-					message.append(pduType).append(" ").append(pduTypeName);
-					message.append(", protocolFamily=").append(protocolFamily);
+					message.append(currentPduType).append(" ").append(currentPduTypeName);
+					message.append(", protocolFamily ").append(currentProtocolFamilyID);
+					message.append(" ").append(currentPduFamilyName);
 				    System.out.println(message.toString());
 				}
 				else System.out.println("received packet but pdu is null, packet.getData().length=" + packet.getData().length + ", error...");
diff --git a/CourseExamples/src/DisExamples/PduReceiverTerminalLog.txt b/CourseExamples/src/DisExamples/PduReceiverTerminalLog.txt
index 084b6ab770..59e0c5eabb 100644
--- a/CourseExamples/src/DisExamples/PduReceiverTerminalLog.txt
+++ b/CourseExamples/src/DisExamples/PduReceiverTerminalLog.txt
@@ -1,19 +1,19 @@
 run:
 DisExamples.PduReceiver started...
-received DIS PDU: pduType 15 edu.nps.moves.dis.AcknowledgePdu, protocolFamily=5
-received DIS PDU: pduType 16 edu.nps.moves.dis.ActionRequestPdu, protocolFamily=5
-received DIS PDU: pduType  4 edu.nps.moves.dis.CollisionPdu, protocolFamily=1
-received DIS PDU: pduType 22 edu.nps.moves.dis.CommentPdu, protocolFamily=5
-received DIS PDU: pduType 11 edu.nps.moves.dis.CreateEntityPdu, protocolFamily=5
-received DIS PDU: pduType  3 edu.nps.moves.dis.DetonationPdu, protocolFamily=2
-received DIS PDU: pduType  1 edu.nps.moves.dis.EntityStatePdu, protocolFamily=1
-received DIS PDU: pduType  2 edu.nps.moves.dis.FirePdu, protocolFamily=2
-received DIS PDU: pduType 12 edu.nps.moves.dis.RemoveEntityPdu, protocolFamily=5
-received DIS PDU: pduType  9 edu.nps.moves.dis.RepairCompletePdu, protocolFamily=3
-received DIS PDU: pduType 10 edu.nps.moves.dis.RepairResponsePdu, protocolFamily=3
-received DIS PDU: pduType  8 edu.nps.moves.dis.ResupplyCancelPdu, protocolFamily=3
-received DIS PDU: pduType  6 edu.nps.moves.dis.ResupplyOfferPdu, protocolFamily=3
+received DIS PDU: pduType 15 edu.nps.moves.dis.AcknowledgePdu, protocolFamily 5 SimulationManagementFamilyPdu
+received DIS PDU: pduType 16 edu.nps.moves.dis.ActionRequestPdu, protocolFamily 5 SimulationManagementFamilyPdu
+received DIS PDU: pduType  4 edu.nps.moves.dis.CollisionPdu, protocolFamily 1 EntityInformationFamilyPdu
+received DIS PDU: pduType 22 edu.nps.moves.dis.CommentPdu, protocolFamily 5 SimulationManagementFamilyPdu
+received DIS PDU: pduType 11 edu.nps.moves.dis.CreateEntityPdu, protocolFamily 5 SimulationManagementFamilyPdu
+received DIS PDU: pduType  3 edu.nps.moves.dis.DetonationPdu, protocolFamily 2 WarfareFamilyPdu
+received DIS PDU: pduType  1 edu.nps.moves.dis.EntityStatePdu, protocolFamily 1 EntityInformationFamilyPdu
+received DIS PDU: pduType  2 edu.nps.moves.dis.FirePdu, protocolFamily 2 WarfareFamilyPdu
+received DIS PDU: pduType 12 edu.nps.moves.dis.RemoveEntityPdu, protocolFamily 5 SimulationManagementFamilyPdu
+received DIS PDU: pduType  9 edu.nps.moves.dis.RepairCompletePdu, protocolFamily 3 LogisticsFamilyPdu
+received DIS PDU: pduType 10 edu.nps.moves.dis.RepairResponsePdu, protocolFamily 3 LogisticsFamilyPdu
+received DIS PDU: pduType  8 edu.nps.moves.dis.ResupplyCancelPdu, protocolFamily 3 LogisticsFamilyPdu
+received DIS PDU: pduType  6 edu.nps.moves.dis.ResupplyOfferPdu, protocolFamily 3 LogisticsFamilyPdu
 received packet but pdu is null, packet.getData().length=1500, error...
-received DIS PDU: pduType  5 edu.nps.moves.dis.ServiceRequestPdu, protocolFamily=3
-received DIS PDU: pduType 13 edu.nps.moves.dis.StartResumePdu, protocolFamily=5
-received DIS PDU: pduType 14 edu.nps.moves.dis.StopFreezePdu, protocolFamily=5
+received DIS PDU: pduType  5 edu.nps.moves.dis.ServiceRequestPdu, protocolFamily 3 LogisticsFamilyPdu
+received DIS PDU: pduType 13 edu.nps.moves.dis.StartResumePdu, protocolFamily 5 SimulationManagementFamilyPdu
+received DIS PDU: pduType 14 edu.nps.moves.dis.StopFreezePdu, protocolFamily 5 SimulationManagementFamilyPdu
-- 
GitLab