sem/netwerk-programming-eindopdracht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'Mick'

Browse Source 
* Mick:
  Abbreviated Connect function into the listen function on the sessionController
This commit is contained in:
MickWerf
2020-05-18 14:26:57 +02:00
parent 8dee45a844 94ecff6799
commit 725c13db30
1 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
core/src/netwerkprog/game/server/controllers/SessionController.java
View File

@@ -6,8 +6,6 @@ import netwerkprog.game.server.data.DataParser;
import netwerkprog.game.util.Controller; import netwerkprog.game.util.Controller;
import netwerkprog.game.util.ServerData; import netwerkprog.game.util.ServerData;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
@@ -19,43 +17,44 @@ public class SessionController extends Controller {
private DataParser parser; private DataParser parser;
private ArrayList<ServerClient> clients = new ArrayList<>(); private ArrayList<ServerClient> clients = new ArrayList<>();
private HashMap<String, Thread> clientThreads = new HashMap<>(); private HashMap<String, Thread> clientThreads = new HashMap<>();
private boolean listening;
public SessionController() { public SessionController() {
this.listening = true;
} }
public void connect() { // public void connect() {
try { // try {
this.serverSocket = new ServerSocket(ServerData.port()); // this.serverSocket = new ServerSocket(ServerData.port());
System.out.println("[SERVER] listening on port " + ServerData.port()); // System.out.println("[SERVER] listening on port " + ServerData.port());
Socket socket = serverSocket.accept(); // Socket socket = serverSocket.accept();
//
System.out.println("[SERVER] got new client on " + socket.getInetAddress().getHostAddress()); // System.out.println("[SERVER] got new client on " + socket.getInetAddress().getHostAddress());
DataOutputStream outputStream = new DataOutputStream(socket.getOutputStream()); // DataOutputStream outputStream = new DataOutputStream(socket.getOutputStream());
DataInputStream inputStream = new DataInputStream(socket.getInputStream()); // DataInputStream inputStream = new DataInputStream(socket.getInputStream());
//
outputStream.writeUTF("Enter username: "); // outputStream.writeUTF("Enter username: ");
String username = inputStream.readUTF(); // String username = inputStream.readUTF();
//
System.out.println("[SERVER] got username " + username); // System.out.println("[SERVER] got username " + username);
ServerClient serverClient = new ServerClient(username, socket, this); // ServerClient serverClient = new ServerClient(username, socket, this);
//
Thread t = new Thread(serverClient); // Thread t = new Thread(serverClient);
t.start(); // t.start();
//
clientThreads.put(username, t); // clientThreads.put(username, t);
this.clients.add(serverClient); // this.clients.add(serverClient);
//
sendMessage(username, "--- Welcome! ---\nPeople online : " + clients.size()); // sendMessage(username, "--- Welcome! ---\nPeople online : " + clients.size());
//
clients.forEach(yeet -> sendToEveryoneExcept(username, username + " joined the server! [" + socket.getInetAddress().getHostAddress() + "]")); // clients.forEach(yeet -> sendToEveryoneExcept(username, username + " joined the server! [" + socket.getInetAddress().getHostAddress() + "]"));
//
//
this.serverSocket.close(); // this.serverSocket.close();
} catch (IOException e) { // } catch (IOException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
} // }
public void sendToEveryone(String text) { public void sendToEveryone(String text) {
for (ServerClient serverClient : clients) { for (ServerClient serverClient : clients) {
@@ -92,21 +91,21 @@ public class SessionController extends Controller {
@Override @Override
public void run() { public void run() {
boolean running = true; while (listening) {
while (running) { listen();
System.out.println("Session thread active.");
connect();
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
} }
} }
public void listen() { public void listen() {
try {
this.serverSocket = new ServerSocket(ServerData.port());
System.out.println("[SERVER] listening on port " + ServerData.port());
Socket socket = serverSocket.accept();
this.serverSocket.close();
} catch (IOException ex) {
ex.printStackTrace();
}
} }
//will most likely be removed. //will most likely be removed.