server client read command

client/src/main/java/com/uqac/rthoni/com/java_rmi/client/ClientApplication.java

@@ -7,6 +7,6 @@ public class ClientApplication {
 
     public static void run(String host, int port, String inputFile, String outputFile)
     {
-        System.out.println(String.format("Connecting to %1s:%2d...", host, port));
+        System.out.println(String.format("Connecting to %s:%d...", host, port));
     }
 }

server/src/main/java/com/uqac/rthoni/com/java_rmi/server/ServerApplication.java

@@ -1,13 +1,104 @@
 package com.uqac.rthoni.com.java_rmi.server;
 
+import com.uqac.rthoni.java_rmi.common.Command;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+
 /**
  * Created by robin on 9/15/16.
  */
 public class ServerApplication {
 
+    public static String ipToString(InetAddress ip) {
+        String ipString = ip.toString();
+        if (!ipString.isEmpty() && ipString.startsWith("/")) {
+            ipString = ipString.substring(1);
+        }
+        return ipString;
+    }
+
+    public static String getFullIp(InetAddress ip) {
+        try {
+            InetAddress address = InetAddress.getByName(ip.toString().split("/")[1]);
+            return String.format("%s/%s", address.getCanonicalHostName(), ipToString(ip));
+        }
+        catch (Exception e) {
+            return ipToString(ip);
+        }
+    }
+
     public static void run(int port, String sourceDir, String classDir, String logFile)
     {
-        String ip = "0.0.0.0";
-        System.out.println(String.format("Listening for clients on %1s:%2d...", ip, port));
+        String host = "0.0.0.0";
+        InetAddress ip = null;
+        try {
+            ip = InetAddress.getByName(host);
+        }
+        catch (Exception e) {
+        }
+        if (ip == null) {
+            System.err.format("Failed to resolve '%s'\n", host);
+            System.exit(1);
+        }
+        String ipString = ipToString(ip);
+
+        try {
+            ServerSocket serverSocket = new ServerSocket(port, 1, ip);
+            System.out.format("Listening for clients on %s:%d...\n", ipString, port);
+            runServer(serverSocket);
+        } catch (IOException e) {
+            System.err.format("Failed to listen on %s:%d: %s\n", ipString, port, e.getMessage());
+        }
+    }
+
+    public static void runServer(ServerSocket serverSocket)
+    {
+        boolean stop = false;
+        while (!stop) {
+            Socket client;
+            try {
+                client = serverSocket.accept();
+            }
+            catch (Exception e) {
+                System.err.format("Failed to accept client: %s\n", e.getMessage());
+                break;
+            }
+            String ipString = getFullIp(client.getInetAddress());
+            System.out.format("New client: %s:%d\n", ipString, client.getPort());
+            try {
+                handleClient(client);
+            } catch (Exception e) {
+                System.out.format("Error when handling client: %s\n", e.getMessage());
+            }
+            try {
+                client.close();
+            } catch (Exception e) {
+            }
+            System.out.format("Client disconnected: %s:%d\n", ipString, client.getPort());
+        }
+    }
+
+    private static void handleClient(Socket client)
+    {
+        String str;
+        try {
+            BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream()));
+            str = in.readLine();
+        } catch (IOException e) {
+            System.err.format("Failed to read from client: %s", e.getMessage());
+            return;
+        }
+        Command command = Command.fromString(str);
+        if (command == null) {
+            System.err.format("Failed to deserialize command: %s\n", str);
+        }
+        else {
+            System.out.format("Received command: %s\n", command.getCommandName());
+        }
     }
 }

src/main/java/com/uqac/rthoni/java_rmi/Main.java

@@ -14,20 +14,20 @@ public class Main {
         PrintStream printStream = (error ? System.err : System.out);
 
         printStream.println("Usage:");
-        printStream.println(String.format("%1s server port source_dir class_dir log_file", name));
+        printStream.format("%s server port source_dir class_dir log_file\n", name);
         printStream.println("\tPut the program in server mode");
         printStream.println("\tport: the port to listen on [1-65535]");
         printStream.println("\tsource_dir: the folder to search for java files");
         printStream.println("\tclass_dir: the folder to build java files");
         printStream.println("\tlog_file: the file to log events");
-        printStream.println(String.format("%1s client hostname port input_file output_file", name));
+        printStream.format("%s client hostname port input_file output_file\n", name);
         printStream.println("\tPut the program in client mode");
         printStream.println("\thost: the remote server ip or hostname");
         printStream.println("\tport: the port to connect on [1-65535]");
         printStream.println("\tinput_file: the command file to use");
         printStream.println("\toutput_file: the file to output command results");
-        printStream.println(String.format("%1s --help", name));
-        printStream.println(String.format("%1s -h", name));
+        printStream.format("%s --help\n", name);
+        printStream.format("%s -h\n", name);
         printStream.println("\tPrint this help and exit");
 
         if (error) {