diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/Assignment2UML.pdf b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/Assignment2UML.pdf new file mode 100644 index 0000000000000000000000000000000000000000..5959a5366fbe169473ab0e966e8b308562ab8347 Binary files /dev/null and b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/Assignment2UML.pdf differ diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/BoronClient.java b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/BoronClient.java index d9c0bd74e8483c575a56c490b983453cb87acb5f..cd592c14405358245fefa22e05d5093a1e9ea548 100644 --- a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/BoronClient.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/BoronClient.java @@ -76,11 +76,12 @@ public class BoronClient { // connections. Socket socket = new Socket(LOCALHOST, 2317); + // Sends messages back to server OutputStream os = socket.getOutputStream(); OutputStreamWriter osw = new OutputStreamWriter(os); BufferedWriter bw = new BufferedWriter(osw); - // Now hook everything up (i.e. set up the streams), Java style: + // Messages from server InputStream is = socket.getInputStream(); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); @@ -92,12 +93,11 @@ public class BoronClient { bw.flush(); - // Read a single line written by the server. We'd do things a bit differently if there were many - //lines to be read from the server instead of one only. + // Reads line from the server String serverMessage = br.readLine(); System.out.println(serverMessage); - } // end while(true) + } } catch (IOException e) { System.err.println("Problem with BoronClient networking:"); // describe what is happening System.err.println("Error: " + e); diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/BoronServer.java b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/BoronServer.java index 5f8034fa9deb78b2bf3a053b08d69b1c294169c9..1c7da25a435494b8efdf0d243a4da37671278b94 100644 --- a/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/BoronServer.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/homework2/Boron/BoronServer.java @@ -16,8 +16,6 @@ public class BoronServer { public static void main(String[] args) { try { - // ServerSocket waits for a connection from a client. Notice that it is outside the loop; ServerSocket - // needs to be made only once. System.out.println("BoronServer has started..."); // it helps debugging to put this on console first ServerSocket serverSocket = new ServerSocket(2317); @@ -27,7 +25,6 @@ public class BoronServer { int localPort, remotePort; // Server is up and waiting (i.e. "blocked" or paused) Loop, infinitely, waiting for client connections. - // Stop the program somewhere else. while (true) { // block until connected to a client @@ -37,6 +34,8 @@ public class BoronServer { os = clientConnection.getOutputStream(); ps = new PrintStream(os); + + // Messages from the client InputStream is = clientConnection.getInputStream(); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); @@ -44,6 +43,8 @@ public class BoronServer { System.out.println("We received a message from a client..."); System.out.println("Client: " + receivedInput); + + //Message pushed to client ps.println("Server: Acknowleged, message received"); // this gets sent back to client! // Print some information locally about the Socket connection. @@ -71,4 +72,4 @@ public class BoronServer { } } } -} +} \ No newline at end of file diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCann Output.PNG b/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCann Output.PNG new file mode 100644 index 0000000000000000000000000000000000000000..062734a8bbe048eabece2807438b1f67934af06c Binary files /dev/null and b/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCann Output.PNG differ diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCannServer.java b/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCannServer.java index 91c1d4b7d880d51022ddfe6be6169ad6023dfc1b..a2e06119396cb305302b527b8efae31e88007eac 100644 --- a/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCannServer.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCannServer.java @@ -42,8 +42,8 @@ public class McCannServer { ps = new PrintStream(os); Scanner keyboard = new Scanner(System.in); ps.println("What is your name?"); // this gets sent back to client! - String message = keyboard.nextLine(); - ps.println(message); + //String message = keyboard.nextLine(); + // ps.println(message); // Print some information locally about the Socket connection. // This includes the port and IP numbers on both sides (the socket pair). diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCann_ServerOutput.PNG b/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCann_ServerOutput.PNG new file mode 100644 index 0000000000000000000000000000000000000000..0a8d436766be93e6656e0ffeb047e61241223481 Binary files /dev/null and b/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCann_ServerOutput.PNG differ diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCann_WireShark_output.PNG b/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCann_WireShark_output.PNG new file mode 100644 index 0000000000000000000000000000000000000000..c71132a64fea5ab71255f8d5951ff3e3e1e6bbb0 Binary files /dev/null and b/assignments/src/MV3500Cohort2019JulySeptember/homework2/McCann_WireShark_output.PNG differ