From f3d8a3313bd33406f6905292192ccd39b11588e9 Mon Sep 17 00:00:00 2001
From: cs2017 <cs2017@DESKTOP-C0KH063.ern.nps.edu>
Date: Tue, 6 Mar 2018 08:48:43 -0800
Subject: [PATCH] Angelopoulos/Blankenbeker Final Project
---
projects/Assignments/homework3/ABEspduReceiverA.java | 8 ++++----
projects/Assignments/homework3/ABEspduReceiverB.java | 10 ++++++----
projects/Assignments/homework3/ABEspduSenderA.java | 2 +-
projects/Assignments/homework3/ABEspduSenderB.java | 4 ++--
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/projects/Assignments/homework3/ABEspduReceiverA.java b/projects/Assignments/homework3/ABEspduReceiverA.java
index 77eb741712..7b28b2b368 100644
--- a/projects/Assignments/homework3/ABEspduReceiverA.java
+++ b/projects/Assignments/homework3/ABEspduReceiverA.java
@@ -19,7 +19,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 void main(String args[]) {
MulticastSocket socket;
DatagramPacket packet;
@@ -28,11 +28,11 @@ public class ABEspduReceiverA {
try {
// Specify the socket to receive data
- socket = new MulticastSocket(3001);
+ socket = new MulticastSocket(3000);
socket.setBroadcast(true);
- //address = InetAddress.getByName(EspduSender.DEFAULT_MULTICAST_GROUP);
- //socket.joinGroup(address);
+ address = InetAddress.getByName(GROUP);
+ socket.joinGroup(address);
// Loop infinitely, receiving datagrams
while (true) {
diff --git a/projects/Assignments/homework3/ABEspduReceiverB.java b/projects/Assignments/homework3/ABEspduReceiverB.java
index 2a287b34f2..c19654ecc6 100644
--- a/projects/Assignments/homework3/ABEspduReceiverB.java
+++ b/projects/Assignments/homework3/ABEspduReceiverB.java
@@ -4,7 +4,6 @@ import java.net.*;
import java.util.*;
import edu.nps.moves.disutil.*;
-
import edu.nps.moves.dis.*;
/**
@@ -19,6 +18,8 @@ public class ABEspduReceiverB {
* 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 void main(String args[]) {
MulticastSocket socket;
@@ -28,11 +29,12 @@ public class ABEspduReceiverB {
try {
// Specify the socket to receive data
- socket = new MulticastSocket(3001);
+ socket = new MulticastSocket(3000);
socket.setBroadcast(true);
- //address = InetAddress.getByName(EspduSender.DEFAULT_MULTICAST_GROUP);
- //socket.joinGroup(address);
+
+ address = InetAddress.getByName(GROUP);
+ socket.joinGroup(address);
// Loop infinitely, receiving datagrams
while (true) {
diff --git a/projects/Assignments/homework3/ABEspduSenderA.java b/projects/Assignments/homework3/ABEspduSenderA.java
index e59aecbe25..d3cd751089 100644
--- a/projects/Assignments/homework3/ABEspduSenderA.java
+++ b/projects/Assignments/homework3/ABEspduSenderA.java
@@ -50,7 +50,7 @@ public static void main(String args[])
// Default settings. These are used if no system properties are set.
// If system properties are passed in, these are over ridden.
int port = DIS_DESTINATION_PORT;
- NetworkMode mode = NetworkMode.BROADCAST;
+ NetworkMode mode = NetworkMode.MULTICAST;
InetAddress destinationIp = null;
try
diff --git a/projects/Assignments/homework3/ABEspduSenderB.java b/projects/Assignments/homework3/ABEspduSenderB.java
index 774ae91035..4e373aa924 100644
--- a/projects/Assignments/homework3/ABEspduSenderB.java
+++ b/projects/Assignments/homework3/ABEspduSenderB.java
@@ -20,7 +20,7 @@ public class ABEspduSenderB
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.3";
/** Port we send on */
public static final int DIS_DESTINATION_PORT = 3000;
@@ -50,7 +50,7 @@ public static void main(String args[])
// Default settings. These are used if no system properties are set.
// If system properties are passed in, these are over ridden.
int port = DIS_DESTINATION_PORT;
- NetworkMode mode = NetworkMode.BROADCAST;
+ NetworkMode mode = NetworkMode.MULTICAST;
InetAddress destinationIp = null;
try
--
GitLab