Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: small change to how clients connect

Browse Source
This commit is contained in:
aleandro
2026-06-14 20:33:32 +02:00
parent 9f985c8ea9
commit e27a2e1b0c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java
+4 -2
View File
@@ -2,6 +2,7 @@ package it.polimi.ingsw.gc14;
import it.polimi.ingsw.gc14.Controller.ClientController; import it.polimi.ingsw.gc14.Controller.ClientController;
import it.polimi.ingsw.gc14.Model.GamePackage.GameStages; import it.polimi.ingsw.gc14.Model.GamePackage.GameStages;
import it.polimi.ingsw.gc14.Network.IClient;
import it.polimi.ingsw.gc14.Network.NetworkConfig; import it.polimi.ingsw.gc14.Network.NetworkConfig;
import it.polimi.ingsw.gc14.Network.InterfaceResolver; import it.polimi.ingsw.gc14.Network.InterfaceResolver;
import it.polimi.ingsw.gc14.Network.RMI.Client.RMIClient; import it.polimi.ingsw.gc14.Network.RMI.Client.RMIClient;
@@ -174,6 +175,7 @@ public class ClientLauncherTUI {
view.setUsername(username); view.setUsername(username);
controller.setMyUsername(username); controller.setMyUsername(username);
IClient client;
if (networkStr.equals("rmi")) { if (networkStr.equals("rmi")) {
String myIP; String myIP;
try { try {
@@ -183,7 +185,7 @@ public class ClientLauncherTUI {
return false; return false;
} }
System.setProperty("java.rmi.server.hostname", myIP); System.setProperty("java.rmi.server.hostname", myIP);
RMIClient client = new RMIClient(controller, ip, NetworkConfig.RMI_PORT, myIP); client = new RMIClient(controller, ip, NetworkConfig.RMI_PORT, myIP);
ErrorType err = client.connect(username, nPlayers); ErrorType err = client.connect(username, nPlayers);
if (err != null) { if (err != null) {
terminal.writer().print("\033[H\033[2J"); terminal.writer().print("\033[H\033[2J");
@@ -195,7 +197,7 @@ public class ClientLauncherTUI {
controller.setClient(client); controller.setClient(client);
} else if (networkStr.equals("tcp")) { } else if (networkStr.equals("tcp")) {
TCPClient client = new TCPClient(controller, ip, NetworkConfig.TCP_PORT, NetworkConfig.HEARTBEAT_PORT); client = new TCPClient(controller, ip, NetworkConfig.TCP_PORT, NetworkConfig.HEARTBEAT_PORT);
ErrorType err = client.connect(username, nPlayers); ErrorType err = client.connect(username, nPlayers);
if (err != null) { if (err != null) {
terminal.writer().print("\033[H\033[2J"); terminal.writer().print("\033[H\033[2J");
src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginFXMLController.java
+4 -2
View File
@@ -2,6 +2,7 @@ package it.polimi.ingsw.gc14.View.GUI;
import it.polimi.ingsw.gc14.Controller.ClientController; import it.polimi.ingsw.gc14.Controller.ClientController;
import it.polimi.ingsw.gc14.ErrorType; import it.polimi.ingsw.gc14.ErrorType;
import it.polimi.ingsw.gc14.Network.IClient;
import it.polimi.ingsw.gc14.Network.NetworkConfig; import it.polimi.ingsw.gc14.Network.NetworkConfig;
import it.polimi.ingsw.gc14.Network.InterfaceResolver; import it.polimi.ingsw.gc14.Network.InterfaceResolver;
import it.polimi.ingsw.gc14.Network.RMI.Client.RMIClient; import it.polimi.ingsw.gc14.Network.RMI.Client.RMIClient;
@@ -159,8 +160,9 @@ public class LoginFXMLController {
/** Connects to the server using the selected protocol and transitions to the waiting state on success. */ /** Connects to the server using the selected protocol and transitions to the waiting state on success. */
private void connect(String nome, String ip, int numPlayers, String localInterface) { private void connect(String nome, String ip, int numPlayers, String localInterface) {
IClient client;
if (isRMI) { if (isRMI) {
RMIClient client = new RMIClient(controller, ip, NetworkConfig.RMI_PORT, localInterface); client = new RMIClient(controller, ip, NetworkConfig.RMI_PORT, localInterface);
ErrorType serverResponse = client.connect(nome, numPlayers); ErrorType serverResponse = client.connect(nome, numPlayers);
if (serverResponse == null) { if (serverResponse == null) {
controller.setClient(client); controller.setClient(client);
@@ -172,7 +174,7 @@ public class LoginFXMLController {
}); });
} }
} else { } else {
TCPClient client = new TCPClient(controller, ip, NetworkConfig.TCP_PORT, NetworkConfig.HEARTBEAT_PORT); client = new TCPClient(controller, ip, NetworkConfig.TCP_PORT, NetworkConfig.HEARTBEAT_PORT);
ErrorType serverResponse = client.connect(nome, numPlayers); ErrorType serverResponse = client.connect(nome, numPlayers);
if (serverResponse == null) { if (serverResponse == null) {
controller.setClient(client); controller.setClient(client);