From 3464fa18b5a398053d0176b9f2a119de222f0c5a Mon Sep 17 00:00:00 2001
From: coltonfetterolf <52981302+coltonfetterolf@users.noreply.github.com>
Date: Mon, 9 Sep 2019 20:05:42 -0700
Subject: [PATCH] Corrected improper rename of classes.
---
.../Fetterolf/FetterolfPduListenerSaver.java | 123 ++++++++--------
.../Fetterolf/FetterolfPduReceiver.java | 133 +++++++++---------
.../Fetterolf/FetterolfPduSender.java | 124 +++++++---------
3 files changed, 177 insertions(+), 203 deletions(-)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduListenerSaver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduListenerSaver.java
index 3d7cc5f11b..817f479fc1 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduListenerSaver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduListenerSaver.java
@@ -9,81 +9,76 @@ import java.io.IOException;
import java.util.Scanner;
/**
- * PduSaver.java created on Aug 21, 2019
- * MOVES Institute Naval Postgraduate School, Monterey, CA, USA www.nps.edu
+ * PduSaver.java created on Aug 21, 2019 MOVES Institute Naval Postgraduate
+ * School, Monterey, CA, USA www.nps.edu
*
* @author Mike Bailey, jmbailey@nps.edu
* @version $Id$
*/
-public class PduListenerSaver
-{
- private final static String DEFAULT_OUTPUTDIR = "pduLog";
- private final static String MCAST_ADDR = "239.1.2.3";
- private final static int DIS_PORT = 3000;
+public class FetterolfPduListenerSaver {
- private enum mystate
- {
- RUNNING,
- PAUSED;
- }
+ private final static String DEFAULT_OUTPUTDIR = "pduLog";
+ private final static String MCAST_ADDR = "239.1.2.3";
+ private final static int DIS_PORT = 3000;
- public static void main(String[] args)
- {
- String outDir = DEFAULT_OUTPUTDIR;
- String mcast = MCAST_ADDR;
- int port = DIS_PORT;
-
- System.out.println("DisExamplesOpenDis7.PduListenerSaver started...");
-
- switch (args.length) {
- case 0:
- break;
- case 1:
- outDir = args[0];
- break;
- case 3:
- outDir = args[0];
- mcast = args[1];
- port = Integer.parseInt(args[2]);
- break;
- default:
- System.err.println("Usage: PduListener() or PduListener(\"outputdir\") or PduListener(\"outputdir\",\"multicast address\", ipPort");
- System.exit(1);
+ private enum mystate {
+ RUNNING,
+ PAUSED;
}
- System.out.println("Beginning pdu save to directory " + outDir);
- try {
- Recorder recorder = new Recorder(outDir, mcast, port);
+ public static void main(String[] args) {
+ String outDir = DEFAULT_OUTPUTDIR;
+ String mcast = MCAST_ADDR;
+ int port = DIS_PORT;
- recorder.startResume();
- mystate state = mystate.RUNNING;
- System.out.println("* recorder.startResume(), state=RUNNING, recording in progress...");
- Scanner scan = new Scanner(System.in);
+ System.out.println("DisExamplesOpenDis7.PduListenerSaver started...");
- while (true) {
- System.out.println("Warning: you must quit when complete, otherwise recorded PDUs are lost!");
- System.out.println("Type p/enter to pause, r/enter to resume, q/enter to stop recording, save and quit");
- String line = scan.nextLine();
- if (line.equalsIgnoreCase("p") && state == mystate.RUNNING) {
- recorder.stopPause();
- state = mystate.PAUSED;
- System.out.println("* recorder.stopPause(), state=PAUSED, recording paused...");
- }
- else if (line.equalsIgnoreCase("r") && state == mystate.PAUSED) {
- recorder.startResume();
- state = mystate.RUNNING;
- System.out.println("* recorder.startResume(), state=RUNNING, recording in progress...");
+ switch (args.length) {
+ case 0:
+ break;
+ case 1:
+ outDir = args[0];
+ break;
+ case 3:
+ outDir = args[0];
+ mcast = args[1];
+ port = Integer.parseInt(args[2]);
+ break;
+ default:
+ System.err.println("Usage: PduListener() or PduListener(\"outputdir\") or PduListener(\"outputdir\",\"multicast address\", ipPort");
+ System.exit(1);
}
- else if (line.equalsIgnoreCase("q")) {
- recorder.end();
- System.out.println("* recorder.end(), recording complete.");
- break;
+
+ System.out.println("Beginning pdu save to directory " + outDir);
+ try {
+ Recorder recorder = new Recorder(outDir, mcast, port);
+
+ recorder.startResume();
+ mystate state = mystate.RUNNING;
+ System.out.println("* recorder.startResume(), state=RUNNING, recording in progress...");
+ Scanner scan = new Scanner(System.in);
+
+ while (true) {
+ System.out.println("Warning: you must quit when complete, otherwise recorded PDUs are lost!");
+ System.out.println("Type p/enter to pause, r/enter to resume, q/enter to stop recording, save and quit");
+ String line = scan.nextLine();
+ if (line.equalsIgnoreCase("p") && state == mystate.RUNNING) {
+ recorder.stopPause();
+ state = mystate.PAUSED;
+ System.out.println("* recorder.stopPause(), state=PAUSED, recording paused...");
+ } else if (line.equalsIgnoreCase("r") && state == mystate.PAUSED) {
+ recorder.startResume();
+ state = mystate.RUNNING;
+ System.out.println("* recorder.startResume(), state=RUNNING, recording in progress...");
+ } else if (line.equalsIgnoreCase("q")) {
+ recorder.end();
+ System.out.println("* recorder.end(), recording complete.");
+ break;
+ }
+ }
+ System.out.println("Ending pdu save to " + recorder.getLogFile());
+ } catch (IOException ex) {
+ System.err.println("*** Exception: " + ex.getClass().getSimpleName() + ": " + ex.getLocalizedMessage());
}
- }
- System.out.println("Ending pdu save to "+recorder.getLogFile());
- }
- catch (IOException ex) {
- System.err.println("*** Exception: " + ex.getClass().getSimpleName() + ": " + ex.getLocalizedMessage());
}
- }
}
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java
index 2993f70cdd..9140a5699b 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java
@@ -8,87 +8,82 @@ import edu.nps.moves.dis7.enumerations.*;
import edu.nps.moves.dis7.util.*;
import java.util.ArrayList;
-public class AllPduReceiver
-{
- public static final int DEFAULT_MULTICAST_PORT = AllPduSender.DEFAULT_MULTICAST_PORT;
- public static final String DEFAULT_MULTICAST_ADDRESS = AllPduSender.DEFAULT_MULTICAST_ADDRESS;
- public static final boolean USE_FAST_ESPDU = false;
+public class FetterolfPduReceiver {
- public static void main(String args[])
- {
- PduFactory factory;
- MulticastSocket socket;
- InetAddress address;
- DatagramPacket packet;
+ public static final int DEFAULT_MULTICAST_PORT = FetterolfPduReceiver.DEFAULT_MULTICAST_PORT;
+ public static final String DEFAULT_MULTICAST_ADDRESS = FetterolfPduReceiver.DEFAULT_MULTICAST_ADDRESS;
+ public static final boolean USE_FAST_ESPDU = false;
- try {
- System.out.println("DisExamplesOpenDis7.AllPduReceiver started...");
- if (args.length == 2) {
- socket = new MulticastSocket(Integer.parseInt(args[0]));
- address = InetAddress.getByName(args[1]);
- }
- else {
- System.out.println("Usage: AllPduReceiver <port> <multicast group>");
- System.out.println("Default: AllPduReceiver " + DEFAULT_MULTICAST_PORT + " " + DEFAULT_MULTICAST_ADDRESS);
- socket = new MulticastSocket(DEFAULT_MULTICAST_PORT);
- address = InetAddress.getByName(DEFAULT_MULTICAST_ADDRESS);
- }
- socket.joinGroup(address);
+ public static void main(String args[]) {
+ PduFactory factory;
+ MulticastSocket socket;
+ InetAddress address;
+ DatagramPacket packet;
- factory = new PduFactory();
+ try {
+ System.out.println("DisExamplesOpenDis7.AllPduReceiver started...");
+ if (args.length == 2) {
+ socket = new MulticastSocket(Integer.parseInt(args[0]));
+ address = InetAddress.getByName(args[1]);
+ } else {
+ System.out.println("Usage: AllPduReceiver <port> <multicast group>");
+ System.out.println("Default: AllPduReceiver " + DEFAULT_MULTICAST_PORT + " " + DEFAULT_MULTICAST_ADDRESS);
+ socket = new MulticastSocket(DEFAULT_MULTICAST_PORT);
+ address = InetAddress.getByName(DEFAULT_MULTICAST_ADDRESS);
+ }
+ socket.joinGroup(address);
- while (true) // Loop infinitely, receiving datagrams
- {
- byte buffer[] = new byte[1500]; // typical MTU size
+ factory = new PduFactory();
- packet = new DatagramPacket(buffer, buffer.length); // reset
+ while (true) // Loop infinitely, receiving datagrams
+ {
+ byte buffer[] = new byte[1500]; // typical MTU size
- socket.receive(packet);
+ packet = new DatagramPacket(buffer, buffer.length); // reset
- Pdu pdu = factory.createPdu(packet.getData());
- if (pdu != null)
- {
- DISPDUType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
- String currentPduTypeName = pdu.getClass().getName();
- DISProtocolFamily currentProtocolFamilyID = pdu.getProtocolFamily(); //short currentProtocolFamilyID = pdu.getProtocolFamily();
- String currentPduFamilyName = pdu.getClass().getSuperclass().getSimpleName();
+ socket.receive(packet);
- StringBuilder message = new StringBuilder();
- message.append("received DIS PDU ");
- if (currentPduType.getValue() < 10)
- message.append(" "); // column spacing
- message.append(currentPduType.getValue());
- String currentPduTypePadded = String.format("%-34s", currentPduType); // - indicates right padding of whitespace
- message.append(" " ).append(currentPduTypePadded);
- String currentPduTypeNamePadded = String.format("%-49s", currentPduTypeName); // - indicates right padding of whitespace
- message.append(" of type ").append(currentPduTypeNamePadded); // package.class name
- message.append(" (protocolFamily ").append(currentProtocolFamilyID);
- // message.append(" ").append(currentPduFamilyName); // class name is also available
- message.append(")");
- System.out.println(message.toString());
+ Pdu pdu = factory.createPdu(packet.getData());
+ if (pdu != null) {
+ DISPDUType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
+ String currentPduTypeName = pdu.getClass().getName();
+ DISProtocolFamily currentProtocolFamilyID = pdu.getProtocolFamily(); //short currentProtocolFamilyID = pdu.getProtocolFamily();
+ String currentPduFamilyName = pdu.getClass().getSuperclass().getSimpleName();
- switch (currentPduType) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DISPDUType
- {
- case COMMENT:
- CommentPdu commentPdu = (CommentPdu)pdu; // cast to precise type
- ArrayList<VariableDatum> payloadList = (ArrayList)commentPdu.getVariableDatums();
- for (VariableDatum variableDatum : payloadList)
+ StringBuilder message = new StringBuilder();
+ message.append("received DIS PDU ");
+ if (currentPduType.getValue() < 10) {
+ message.append(" "); // column spacing
+ }
+ message.append(currentPduType.getValue());
+ String currentPduTypePadded = String.format("%-34s", currentPduType); // - indicates right padding of whitespace
+ message.append(" ").append(currentPduTypePadded);
+ String currentPduTypeNamePadded = String.format("%-49s", currentPduTypeName); // - indicates right padding of whitespace
+ message.append(" of type ").append(currentPduTypeNamePadded); // package.class name
+ message.append(" (protocolFamily ").append(currentProtocolFamilyID);
+ // message.append(" ").append(currentPduFamilyName); // class name is also available
+ message.append(")");
+ System.out.println(message.toString());
+
+ switch (currentPduType) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DISPDUType
{
- String nextComment = new String(variableDatum.getVariableDatumValue()); // convert byte[] to String
- System.out.println("\"" + nextComment + "\"");
+ case COMMENT:
+ CommentPdu commentPdu = (CommentPdu) pdu; // cast to precise type
+ ArrayList<VariableDatum> payloadList = (ArrayList) commentPdu.getVariableDatums();
+ for (VariableDatum variableDatum : payloadList) {
+ String nextComment = new String(variableDatum.getVariableDatumValue()); // convert byte[] to String
+ System.out.println("\"" + nextComment + "\"");
+ }
}
+ } else {
+ System.out.println("received packet but pdu is null, packet.getData().length=" + packet.getData().length + ", error...");
+ }
}
+ } catch (IOException e) {
+ System.out.println("Problem with DisExamplesOpenDis7.AllPduReceiver, see exception trace:");
+ System.out.println(e);
+ } finally {
+ System.out.println("DisExamplesOpenDis7.AllPduReceiver complete.");
}
- else
- System.out.println("received packet but pdu is null, packet.getData().length=" + packet.getData().length + ", error...");
- }
- }
- catch (IOException e) {
- System.out.println("Problem with DisExamplesOpenDis7.AllPduReceiver, see exception trace:");
- System.out.println(e);
- }
- finally {
- System.out.println("DisExamplesOpenDis7.AllPduReceiver complete.");
}
- }
}
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java
index 8f34644e9e..af97291ed0 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java
@@ -8,68 +8,67 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * This is an example that sends many/most types of PDUs. Useful for testing standards
- * compliance or getting a full set of PDUs. It also writes the generated PDUs to an XML file.
- * Adapted from OpenDIS library example package edu.nps.moves.examples
+ * This is an example that sends many/most types of PDUs. Useful for testing
+ * standards compliance or getting a full set of PDUs. It also writes the
+ * generated PDUs to an XML file. Adapted from OpenDIS library example package
+ * edu.nps.moves.examples
*
* @author DMcG
* @version $Id:$
*/
-public class AllPduSender
-{
- /** Default multicast group address we send on. */
+public class FetterolfPduSender {
+
+ /**
+ * Default multicast group address we send on.
+ */
public static final String DEFAULT_MULTICAST_ADDRESS = "239.1.2.3";
-
- /** Default multicast port used, matches Wireshark DIS capture default */
- public static final int DEFAULT_MULTICAST_PORT = 3000;
-
+
+ /**
+ * Default multicast port used, matches Wireshark DIS capture default
+ */
+ public static final int DEFAULT_MULTICAST_PORT = 3000;
+
private int port;
InetAddress multicastAddress;
- public AllPduSender(int port, String multicast) {
- try
- {
+ public FetterolfPduSender(int port, String multicast) {
+ try {
this.port = port;
multicastAddress = InetAddress.getByName(multicast);
- if (!multicastAddress.isMulticastAddress())
- {
+ if (!multicastAddress.isMulticastAddress()) {
System.out.println("Not a multicast address: " + multicast);
}
- }
- catch (UnknownHostException e) {
+ } catch (UnknownHostException e) {
System.out.println("Unable to open socket: " + e);
}
}
- public void run()
- {
- System.out.println("DisExamplesOpenDis7.AllPduSender started...");
- try
- {
+ public void run() {
+ System.out.println("DisExamplesOpenDis7.AllPduSender started...");
+ try {
System.out.println("Generate PDUs and note issues, if any...");
List<Pdu> generatedPdusList = new ArrayList<>();
// Loop through all the enumerated PDU types, create a PDU for each type,
// add that PDU to generatedPdusList, and send each one
- for (DISPDUType pdu : DISPDUType.values())
- {
+ for (DISPDUType pdu : DISPDUType.values()) {
// System.out.println("PDU " + pdu.getValue() + " " + pdu.name() + " " + pdu.getDescription()); // diagnostic
Pdu aPdu = null; // edu.​nps.​moves7.​dis.PDU superclass for all PDUs, in preparation for custom assignment
-
+
try {
switch (pdu) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DISPDUType
{
case OTHER: // 0
- System.out.println ("*** Note: DISPDUType." + pdu.name() + " not supported"); // TODO why was this received?
+ System.out.println("*** Note: DISPDUType." + pdu.name() + " not supported"); // TODO why was this received?
// nothing to send
break;
case ENTITY_STATE: // 1
aPdu = new EntityStatePdu();
-
+
EntityStatePdu espdu = (EntityStatePdu) aPdu;
- EntityMarking entityMarking = new EntityMarking ();
+ EntityMarking entityMarking = new EntityMarking();
entityMarking.setCharacters("AllPduSender".getBytes()); //entityMarking.setCharacters(Byte.valueOf("0")); // 11 characters max?
espdu.setMarking(entityMarking);
@@ -82,73 +81,67 @@ public class AllPduSender
// TODO how to set azimuth, i.e. course direction over ground?
break;
-
//added in different PDUs from the jar file.
-
case COLLISION:
aPdu = new CollisionPdu();
break;
-
+
case TRANSMITTER:
aPdu = new TransmitterPdu();
break;
-
+
case ACKNOWLEDGE:
aPdu = new AcknowledgePdu();
break;
-
+
case RECEIVER:
aPdu = new ReceiverPdu();
break;
case COMMENT:
// aPdu = new CommentPdu(); // default for this switch logic
-
+
// see Garrett Loffelman and Pete Severson's code for OpenDis version 4 example
// https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/tree/master/assignments/src/MV3500Cohort2018JulySeptember/projects/LoeffelmanSeverson
-
- CommentPdu newCommentPdu = new CommentPdu();
+ CommentPdu newCommentPdu = new CommentPdu();
ArrayList<VariableDatum> payloadList = new ArrayList<VariableDatum>();
-
+
ArrayList<String> commentsList = new ArrayList<>();
commentsList.add("Hello CommentPDU");
commentsList.add("Here is a new message");
-
- if (!commentsList.isEmpty())
+
+ if (!commentsList.isEmpty()) {
System.out.println("Preparing CommentPDU:");
+ }
- for (String comment : commentsList)
- {
+ for (String comment : commentsList) {
VariableDatum newVariableDatum = new VariableDatum();
- newVariableDatum.setVariableDatumValue (comment.getBytes()); // conversion
- newVariableDatum.setVariableDatumLength(comment.getBytes().length * 8); // bits, not bytes, see spec and javadoc
+ newVariableDatum.setVariableDatumValue(comment.getBytes()); // conversion
+ newVariableDatum.setVariableDatumLength(comment.getBytes().length * 8); // bits, not bytes, see spec and javadoc
// alternatively, you do not need to set this and the marshaller will figure it out from the byte array
// (see javadoc for VariableDatum.setVariableDatumLength())
payloadList.add(newVariableDatum);
System.out.println(" \"" + comment + "\"");
}
newCommentPdu.setVariableDatums(payloadList);
-
+
aPdu = newCommentPdu; // hand off for sending
break;
//commented out this warning message
// default:
// System.out.println("*** Warning: PDU " + pdu.getValue() + " " + pdu + " not supported, created or sent ");
- // code generation block for this class follows:
+ // code generation block for this class follows:
// System.out.println(" case " + pdu + ": // " + pdu.getValue());
// System.out.println(" aPdu = new " + pdu.getDescription().replace(" ","").replace("-","").replace("/","") +
// "Pdu();");
// System.out.println(" break;");
// System.out.println();
}
- if (aPdu != null)
- {
+ if (aPdu != null) {
generatedPdusList.add(aPdu);
- }
- }
- catch (Exception e)
- {
+ }
+ } catch (Exception e) {
System.out.print("Exception thrown for PDU " + pdu.getValue() + " " + pdu);
System.out.print(Arrays.toString(e.getStackTrace()));
// continue looping
@@ -161,15 +154,13 @@ public class AllPduSender
MulticastSocket socket = new MulticastSocket(DEFAULT_MULTICAST_PORT);
socket.joinGroup(localMulticastAddress);
- for (int idx = 0; idx < generatedPdusList.size(); idx++)
- {
+ for (int idx = 0; idx < generatedPdusList.size(); idx++) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(baos);
byte[] buffer;
Pdu aPdu = generatedPdusList.get(idx);
- try
- {
+ try {
aPdu.marshal(dos);
buffer = baos.toByteArray();
@@ -181,10 +172,9 @@ public class AllPduSender
}
String currentPduTypeValuePadded = String.format("%2s", aPdu.getPduType().getValue());
String currentPduTypePadded = String.format("%-34s", aPdu.getPduType()); // - indicates right padding of whitespace
- System.out.print ("Sent DIS PDU " + currentPduTypeValuePadded + " " + currentPduTypePadded );
+ System.out.print("Sent DIS PDU " + currentPduTypeValuePadded + " " + currentPduTypePadded);
System.out.println(" of type " + aPdu.getClass().getName());
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
System.out.println("Marshaling error" + ex);
}
}
@@ -192,25 +182,19 @@ public class AllPduSender
//PduContainer container = new PduContainer();
//container.setPdus(generatedPdus);
//container.marshallToXml("examplePdus.xml");
- }
- catch (IOException e)
- {
+ } catch (IOException e) {
System.out.println(e);
}
}
- public static void main(String args[])
- {
- if (args.length == 2)
- {
- AllPduSender sender = new AllPduSender(Integer.parseInt(args[0]), args[1]);
+ public static void main(String args[]) {
+ if (args.length == 2) {
+ FetterolfPduSender sender = new FetterolfPduSender(Integer.parseInt(args[0]), args[1]);
sender.run();
- }
- else
- {
+ } else {
System.out.println("Usage: AllPduSender <port> <multicast group>");
System.out.println("Default: AllPduSender " + DEFAULT_MULTICAST_PORT + " " + DEFAULT_MULTICAST_ADDRESS);
- AllPduSender sender = new AllPduSender(DEFAULT_MULTICAST_PORT, DEFAULT_MULTICAST_ADDRESS);
+ FetterolfPduSender sender = new FetterolfPduSender(DEFAULT_MULTICAST_PORT, DEFAULT_MULTICAST_ADDRESS);
sender.run();
}
System.out.println("DisExamplesOpenDis7.AllPduSender complete.");
--
GitLab