From 693884e8217c6d7b1dad204fd9d17b54fafbbcba Mon Sep 17 00:00:00 2001
From: cs2017 <cs2017@DESKTOP-C0KH063.ern.nps.edu>
Date: Wed, 7 Mar 2018 14:17:17 -0800
Subject: [PATCH] AngelBlank update of Receiver and Sender A
---
.../ABEspduReceiverA.java | 20 +++++++++++++++----
.../ABEspduSenderA.java | 4 ++--
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverA.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverA.java
index 1f815104f0..94a4176ac0 100644
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverA.java
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverA.java
@@ -1,10 +1,13 @@
-
import java.net.*;
import java.util.*;
import edu.nps.moves.disutil.*;
import edu.nps.moves.dis.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
/**
* Receives PDUs from the network in IEEE format.
@@ -18,7 +21,7 @@ public class ABEspduReceiverA {
* somewhat outdated--PDUs can be larger--but this is a reasonable starting point
*/
public static final int MAX_PDU_SIZE = 8192;
- public static final String GROUP = "239.1.2.3";
+ public static final String GROUP = "239.1.2.4";
public static void main(String args[]) {
MulticastSocket socket;
DatagramPacket packet;
@@ -29,12 +32,19 @@ public class ABEspduReceiverA {
try {
// Create TCP Bridge
- ServerSocket serverSocket = new ServerSocket(2999);
+ System.out.println("Creating Bridge.");
+ ServerSocket serverSocket = new ServerSocket(2999);
+ Socket clientConnection = serverSocket.accept();
+ OutputStream os = clientConnection.getOutputStream();
+ PrintStream ps = new PrintStream(os);
+ //ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ //DataOutputStream dos = new DataOutputStream(baos);
+ System.out.println("Bridging Complete.");
// Specify the socket to receive data
- socket = new MulticastSocket(3000);
+ socket = new MulticastSocket(3100);
socket.setBroadcast(true);
address = InetAddress.getByName(GROUP);
@@ -46,6 +56,8 @@ public class ABEspduReceiverA {
packet = new DatagramPacket(buffer, buffer.length);
socket.receive(packet);
+
+ ps.println(packet);
List<Pdu> pduBundle = pduFactory.getPdusFromBundle(packet.getData());
System.out.println("Bundle size is " + pduBundle.size());
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduSenderA.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduSenderA.java
index 700c93ecee..7789921a31 100644
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduSenderA.java
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduSenderA.java
@@ -21,10 +21,10 @@ public class ABEspduSenderA
public enum NetworkMode{UNICAST, MULTICAST, BROADCAST};
/** default multicast group we send on */
- public static final String DEFAULT_MULTICAST_GROUP="239.1.2.3";
+ public static final String DEFAULT_MULTICAST_GROUP="239.1.2.4";
/** Port we send on */
- public static final int DIS_DESTINATION_PORT = 3000;
+ public static final int DIS_DESTINATION_PORT = 3100;
/** Possible system properties, passed in via -Dattr=val
* networkMode: unicast, broadcast, multicast
--
GitLab