src/main/java/net/pixtaded/crab/Main.java

@@ -17,7 +17,7 @@ public class Main {
             case "help" -> {
                 System.out.println("crab help - print this message.");
                 System.out.println("crab client <ip> <port> [nick] - connect to a server.");
-                System.out.println("crab server <port> [PROXY protocol off/on] - start a server.");
+                System.out.println("crab server <port> - start a server.");
             }
             case "client" -> {
                 CrabClient client;
@@ -31,20 +31,12 @@ public class Main {
             }
             case "server" -> {
                 CrabServer server;
-                if (args.length > 1) {
-                    boolean isProxied = false;
-                    if (args.length > 2)
-                        isProxied = args[2].equals("on") ? true : false;
                 try {
-                        server = new CrabServer(Integer.parseInt(args[1]), isProxied);
+                    server = new CrabServer(Integer.parseInt(args[1]));
                 } catch (NumberFormatException e) {
                     System.err.println("Port is not a number.");
                     return;
                 }
-                } else {
-                    System.err.println("Now enough arguments.");
-                    return;
-                }
                 server.run();
             }
             default -> {

src/main/java/net/pixtaded/crab/server/CrabServer.java

@@ -3,7 +3,6 @@ import net.pixtaded.crab.common.Crab;
 import net.pixtaded.crab.common.Logs;
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Scanner;
@@ -12,7 +11,6 @@ public class CrabServer implements Crab {
 
     private ServerSocket serverSocket;
     private boolean isStopped = false;
-    private boolean isProxied = false;
     private int port;
     private final Database db;
     public Logs cache = new Logs(0, "");
@@ -21,10 +19,9 @@ public class CrabServer implements Crab {
         this.db = new Database("data.db");
     }
 
-    public CrabServer(int port, boolean isProxied) {
+    public CrabServer(int port) {
         this.db = new Database("data.db");
         this.port = port;
-        this.isProxied = isProxied;
     }
 
     @Override
@@ -56,28 +53,11 @@ public class CrabServer implements Crab {
                 System.out.println("Enter a correct port number: ");
             }
         }
-        System.out.print("Enable PROXY protocol? (on/off): ");
-        while (true) {
-            String s = scanner.nextLine();
-            if (s.equals("on")) {
-                this.isProxied = true;
-                break;
-            }
-            if (s.equals("off")) {
-                this.isProxied = false;
-                break;
-            }
-            System.out.println("Enter either \"on\" or \"off\".");
-        }
     }
 
     private void listen() throws IOException {
         Scanner scanner = new Scanner(System.in);
-        if (this.isProxied) {
-            serverSocket = new ServerSocket(port, 0, InetAddress.getLoopbackAddress());
-        } else {
         serverSocket = new ServerSocket(port);
-        }
         System.out.printf("Server successfully started! Listening on port %s.\nTo stop the server, type 'q'.\n", port);
         ServerCLI cli = new ServerCLI(scanner, this);
         new Thread(cli).start();
@@ -102,8 +82,4 @@ public class CrabServer implements Crab {
     public Database getDb() {
         return db;
     }
-
-    public boolean isProxied() {
-        return this.isProxied;
-    }
 }

src/main/java/net/pixtaded/crab/server/ServerThread.java

@@ -7,7 +7,6 @@ import net.pixtaded.crab.common.Util;
 import java.io.*;
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Date;
 
 import static net.pixtaded.crab.common.PID.*;
@@ -38,40 +37,11 @@ public class ServerThread implements Runnable {
                 socket.close();
                 return;
             }
-            String address = socket.getInetAddress().getHostAddress();
-            if (PID[0] == 'P') {
-                if (!this.server.isProxied()) {
-                    System.err.println(address + " tried to use PROXY despite it being off.");
-                    socket.close();
-                    return;
-                }
-                if (Arrays.equals(readUntilChar(' '),"ROXY".getBytes())) {
-                    readUntilChar(' '); // proto
-                    byte source[] = readUntilChar(' ');
-                    address = new String(source);
-                    readUntilChar(' '); // destination IP
-                    readUntilChar(' '); // source port
-                    readUntilChar('\r'); // destination port
-                    if (input.read() != '\n') {
-                        System.err.println("Invalid PROXY packet.");
-                        socket.close();
-                        return;
-                    }
-                } else {
-                    System.err.println("Invalid PROXY packet header.");
-                    socket.close();
-                    return;
-                }
-                PID = readPID();
-		if (PID.length == 0) {
-			socket.close();
-			return;
-		}
-            } 
             switch (PID[0]) {
                 case MESSAGE -> {
                     String msg = new String(input.readNBytes(4096), StandardCharsets.UTF_8).trim();
                     Date date = new Date();
+                    String address = socket.getInetAddress().getHostAddress();
 
                     String s = Sanitizer.sanitizeString(msg, true);
                     String newContent = server.cache.content() + Sanitizer.formatMessage(date.getTime(), address, s);
@@ -98,19 +68,6 @@ public class ServerThread implements Runnable {
         return input.readNBytes(1);
     }
 
-    private byte[] readUntilChar(char c) throws IOException {
-        byte b[] = new byte[256];
-        int i;
-        for (i = 0;; i++) {
-            b[i] = (byte)input.read();
-            if (b[i] == c)
-                break;
-        }
-        byte r[] = new byte[i];
-        System.arraycopy(b, 0, r, 0, i);
-        return r;
-    }
-
     private void sendLogs(byte PID) throws IOException {
         if (PID == LOGS) {
             respond(server.cache.content());