From 67fe5a62ef8f55544e20e35b3526d28181f014a2 Mon Sep 17 00:00:00 2001
From: Peter <Peter@172.20.147.130>
Date: Fri, 3 Aug 2018 14:21:33 -0700
Subject: [PATCH] Severson Assignment 2
---
.../homework2/Severson/SeversonAssignment2_Client.java | 8 ++++++++
.../homework2/Severson/SeversonAssingment2_Server.java | 7 +++++++
2 files changed, 15 insertions(+)
diff --git a/deliverables/src/MV3500Cohort2018JulySeptember/homework2/Severson/SeversonAssignment2_Client.java b/deliverables/src/MV3500Cohort2018JulySeptember/homework2/Severson/SeversonAssignment2_Client.java
index c9a54f923b..09272cd1fd 100644
--- a/deliverables/src/MV3500Cohort2018JulySeptember/homework2/Severson/SeversonAssignment2_Client.java
+++ b/deliverables/src/MV3500Cohort2018JulySeptember/homework2/Severson/SeversonAssignment2_Client.java
@@ -31,28 +31,34 @@ public class SeversonAssignment2_Client {
try {
+ //Bring up dialogue box to confirm that client wants the connection
String message = "Waiting for Client Confirmation";
int confirm = JOptionPane.showConfirmDialog(null, message);
int count = 0;
+ //If the client confirms, establish and count connections
if (confirm == JOptionPane.YES_OPTION) {
while (true) {
System.out.println("TcpClient creating socket...");
+ //Set up socket to the server
Socket socket = new Socket(LOCALHOST, 2317);
count++;
+ //Set up streams to read messages from server
InputStream is = socket.getInputStream();
InputStreamReader isr = new InputStreamReader(is);
BufferedReader br = new BufferedReader(isr);
+ //Read and print server messages
String serverMessage = br.readLine();
System.out.println("==================================================");
System.out.println("Successful Connection | Number: " + count);
System.out.println("The message the server sent was " + serverMessage);
+ //Set up streams and send messages to server
OutputStream os = socket.getOutputStream();
PrintStream ps = new PrintStream(os);
ps.println("-- Thank you!");
@@ -62,6 +68,8 @@ public class SeversonAssignment2_Client {
} else {
//--------------------------------------------------------------
+ //If Client refuses connection, set up socket, send server a messages
+ //informing that the client refused, and close the socket.
Socket socket = new Socket(LOCALHOST, 2317);
OutputStream os = socket.getOutputStream();
PrintStream ps = new PrintStream(os);
diff --git a/deliverables/src/MV3500Cohort2018JulySeptember/homework2/Severson/SeversonAssingment2_Server.java b/deliverables/src/MV3500Cohort2018JulySeptember/homework2/Severson/SeversonAssingment2_Server.java
index 8d3a00526c..9d2c934fe6 100644
--- a/deliverables/src/MV3500Cohort2018JulySeptember/homework2/Severson/SeversonAssingment2_Server.java
+++ b/deliverables/src/MV3500Cohort2018JulySeptember/homework2/Severson/SeversonAssingment2_Server.java
@@ -28,19 +28,24 @@ public class SeversonAssingment2_Server {
try {
+ //Instantiate server socket
ServerSocket serverSocket = new ServerSocket(2317);
while (true) {
+ //Server waits for client connection, prints once its accepted
Socket clientConnection = serverSocket.accept();
System.out.println("TcpServer has started...");
+ //Set up streams to send data to the client
OutputStream os = clientConnection.getOutputStream();
PrintStream ps = new PrintStream(os);
+ //Send message to client
ps.println("-- Welcome to my Server");
//--------------------------------------------------------------
+ //Set up input streams to receive message from client and print the message to the window
InputStream is = clientConnection.getInputStream();
InputStreamReader isr = new InputStreamReader(is);
BufferedReader br = new BufferedReader(isr);
@@ -49,6 +54,7 @@ public class SeversonAssingment2_Server {
System.out.println("The message the server sent was " + serverMessage);
//--------------------------------------------------------------
+ //Get port and IP address info and print to information
InetAddress localAddress = clientConnection.getLocalAddress();
InetAddress remoteAddress = clientConnection.getInetAddress();
@@ -58,6 +64,7 @@ public class SeversonAssingment2_Server {
System.out.println("Socket pair: (( " + localAddress.toString() + ", " + localPort + " ), ( "
+ remoteAddress.toString() + ", " + remotePort + " ))");
+ //Close connection
ps.flush();
clientConnection.close();
--
GitLab