From 481f19e3552d819bf176ada75aca8dc9633f35a5 Mon Sep 17 00:00:00 2001
From: bkii <bkii@10.0.0.123>
Date: Wed, 11 Sep 2019 19:44:33 -0700
Subject: [PATCH] Almost done
---
.../BRE_KNO_MCC_PC2_Controller.java | 31 ++++++++++++-------
...E_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java | 4 +++
...BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java | 1 -
...E_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java | 4 +--
4 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_Controller.java b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_Controller.java
index 4fe8b8c7f2..4c9717d923 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_Controller.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_Controller.java
@@ -9,6 +9,7 @@ import java.util.logging.Logger;
public class BRE_KNO_MCC_PC2_Controller
{
+
static boolean keepRunningMainThread = true;
static BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver pc2_pc1_receiver;
static BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender pc2_pc3_sender;
@@ -31,33 +32,39 @@ public class BRE_KNO_MCC_PC2_Controller
pc2_pc1_receiver.resetSavedMCASTMessagesList();
pc2_pc1_receiver.setKeepRunning(true); //use this to terminate thread instead of killing it by hard
pc2_pc1_receiver.setNetworkData(mcastIPPC1, portPC1);
- pc2_pc1_receiver.start();
+ pc2_pc1_receiver.start();
pc2_pc3_sender = new BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender();
pc2_pc3_sender.setNetworkSettinigs(ipPC3, portPC3);
- pc2_pc3_sender.start();
-
- pc2_pc3_receiver = new BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver();
- pc2_pc3_receiver.setNetworkSettings(portPC3);
- pc2_pc3_receiver.start();
+ pc2_pc3_sender.setKeepRunning(true);
+ pc2_pc3_receiver = new BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver();
+ pc2_pc3_receiver.setNetworkSettings(2344);
+ pc2_pc3_receiver.setKeepRunning(true);
+ if (!pc2_pc3_sender.isAlive())
+ {
+ pc2_pc3_sender.isAlive();
+ }
+
+
while (keepRunningMainThread)
- {
+ {
List<Pdu> tempSet = pc2_pc1_receiver.getMCASTMessagesToSend();
if (!tempSet.isEmpty())
{
- pc2_pc3_sender.setKeepRunning(true);
- pc2_pc3_sender.setListToSend(tempSet);
-
if (!pc2_pc3_sender.isAlive())
- {
+ {
+ pc2_pc3_sender.start();
}
-
+ pc2_pc3_sender.setListToSend(tempSet);
+
if (!pc2_pc3_receiver.isAlive())
{
+ pc2_pc3_receiver.start();
}
}
+
else
{
try
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java
index 73804f6087..fa7eaff8b6 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java
@@ -53,4 +53,8 @@ public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver extends Thread
public void setNetworkSettings(int port){
portPC3 = port;
}
+
+ public void setKeepRunning(boolean k){
+ keepRunning = k;
+ }
}
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java
index 09d1c0b278..f85a0adf7a 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java
@@ -16,7 +16,6 @@ import java.util.logging.Logger;
public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender extends Thread
{
-
static Mutex mutex = new Mutex();
static List<Pdu> messagesToSend = new ArrayList();
static boolean keepRunning = false;
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java
index 56fc85b510..360beff740 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Brennenstuhl/BRE_KNO_MCC/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java
@@ -104,10 +104,10 @@ public class BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver
//Sending via UNICAST
String message = ("PC3: Packet with InternID " + internID + " received.");
- DatagramPacket packet = new DatagramPacket(message.getBytes(), message.length(), ipPC2, portPC3);
+ DatagramPacket packet = new DatagramPacket(message.getBytes(), message.length(), ipPC2, 2344);
try
{
- DatagramSocket socket = new DatagramSocket(portPC3);
+ DatagramSocket socket = new DatagramSocket(2344);
socket.send(packet);
}
catch (IOException ex)
--
GitLab