From 0828b032ce5726929edee1ea05434dbde6e9530b Mon Sep 17 00:00:00 2001 From: 3013050 <3013050@stud.hs-mannheim.de> Date: Tue, 21 Oct 2025 22:22:25 +0200 Subject: [PATCH] final final --- vs.pu01/src/main/java/vs/DiscoveryServer.java | 48 ------------------- vs.pu01/src/main/java/vs/Main.java | 11 ----- vs.pu01/src/main/java/vs/Server.java | 2 +- vs.pu01/src/main/java/vs/SyslogUdpServer.java | 46 ------------------ vs.pu01/src/main/java/vs/testClient.py | 20 -------- 5 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 vs.pu01/src/main/java/vs/DiscoveryServer.java delete mode 100644 vs.pu01/src/main/java/vs/Main.java delete mode 100644 vs.pu01/src/main/java/vs/SyslogUdpServer.java delete mode 100644 vs.pu01/src/main/java/vs/testClient.py diff --git a/vs.pu01/src/main/java/vs/DiscoveryServer.java b/vs.pu01/src/main/java/vs/DiscoveryServer.java deleted file mode 100644 index 973791f..0000000 --- a/vs.pu01/src/main/java/vs/DiscoveryServer.java +++ /dev/null @@ -1,48 +0,0 @@ -package vs; - -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; - - -public class DiscoveryServer implements Runnable { - private static final int BUFSIZE = 512; - - DatagramPacket packetInDiscover = new DatagramPacket(new byte[BUFSIZE], BUFSIZE); - - private final int port; - - public DiscoveryServer(int port) { - this.port = port; - } - - @Override - public void run() { - System.out.println("Discovery running on " + port); - - try (DatagramSocket discoverySocket = new DatagramSocket(port)) { - // discoverySocket.setReuseAddress(true); - discoverySocket.setBroadcast(true); - - while (true) { - byte[] buffer = new byte[256]; - DatagramPacket packetIn = new DatagramPacket(buffer, buffer.length); - discoverySocket.receive(packetIn); - - InetAddress clientAddress = packetIn.getAddress(); - int clientPort = packetIn.getPort(); - System.out.println("DISCOVERY from " + clientAddress.getHostAddress() + ":" + clientPort); - - - DatagramPacket packetOut = new DatagramPacket(new byte[256], 256); - packetOut.setSocketAddress(packetIn.getSocketAddress()); - packetOut.setData(new byte[0]); - packetOut.setLength(0); - - discoverySocket.send(packetOut); - } - } catch (Exception e) { - e.printStackTrace(); - } - } -} \ No newline at end of file diff --git a/vs.pu01/src/main/java/vs/Main.java b/vs.pu01/src/main/java/vs/Main.java deleted file mode 100644 index 299fa30..0000000 --- a/vs.pu01/src/main/java/vs/Main.java +++ /dev/null @@ -1,11 +0,0 @@ -package vs; - -public class Main { - private static final int SYSLOG_PORT = 514; - private static final int DISCOVERY_PORT = 8888; - - public static void main(String[] args) { - new Thread(new DiscoveryServer(DISCOVERY_PORT), "discovery").start(); - new Thread(new SyslogUdpServer(SYSLOG_PORT), "syslog").start(); - } -} \ No newline at end of file diff --git a/vs.pu01/src/main/java/vs/Server.java b/vs.pu01/src/main/java/vs/Server.java index 9ee4f9b..0b3c9b3 100644 --- a/vs.pu01/src/main/java/vs/Server.java +++ b/vs.pu01/src/main/java/vs/Server.java @@ -54,7 +54,7 @@ public class Server { } String receivedSyslog = new String(packetIn.getData(), 0, packetIn.getLength()); - System.out.println(receivedSyslog); + System.out.println(packetIn.getAddress() + ": " + receivedSyslog); } } diff --git a/vs.pu01/src/main/java/vs/SyslogUdpServer.java b/vs.pu01/src/main/java/vs/SyslogUdpServer.java deleted file mode 100644 index 890c083..0000000 --- a/vs.pu01/src/main/java/vs/SyslogUdpServer.java +++ /dev/null @@ -1,46 +0,0 @@ -package vs; - -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; - - -public class SyslogUdpServer implements Runnable { - private final int port; - private static final int MAX_MESSAGE_LENGTH = 1024; - - public SyslogUdpServer(int port) { - this.port = port; - } - - @Override - public void run() { - System.out.println("Syslog running on " + port + "\n"); - try (DatagramSocket syslogSocket = new DatagramSocket(port)) { - syslogSocket.setReuseAddress(true); - byte[] buffer = new byte[MAX_MESSAGE_LENGTH + 1]; - while (true) { - DatagramPacket packet = new DatagramPacket(buffer, buffer.length); - syslogSocket.receive(packet); - - int len = packet.getLength(); - InetAddress clientAddress = packet.getAddress(); - - - if (len > MAX_MESSAGE_LENGTH) { - System.err.println("Dropped oversized UDP syslog (" + len + " > " + MAX_MESSAGE_LENGTH - + ") from " + clientAddress.getHostAddress() + ":" + packet.getPort()); - continue; - } - - // Nachricht decodieren und mit Sender-Info ausgeben - String message = new String(packet.getData(), 0, len).trim(); - System.out.println("SYSLOG from " + clientAddress.getHostAddress() - + ":" + packet.getPort() + " -> " + message); - } - } catch (Exception e) { - // Einfaches Fehler-Logging auf die Konsole - e.printStackTrace(); - } - } -} \ No newline at end of file diff --git a/vs.pu01/src/main/java/vs/testClient.py b/vs.pu01/src/main/java/vs/testClient.py deleted file mode 100644 index 1e0397f..0000000 --- a/vs.pu01/src/main/java/vs/testClient.py +++ /dev/null @@ -1,20 +0,0 @@ -import socket - -# Simple one-shot version -sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) -sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1) -sock.settimeout(10) - -try: - sock.sendto(b"DISCOVER", ('255.255.255.255', 8888)) - print("Broadcast sent, waiting for response...") - - data, addr = sock.recvfrom(1024) - print(f"Response from {addr}: {data.decode()}") - -except socket.timeout: - print("No response received") -except Exception as e: - print(f"Error: {e}") -finally: - sock.close() \ No newline at end of file