From b3d7b7212bd1edfbc35c6f9d72e4459333bb0957 Mon Sep 17 00:00:00 2001
From: winklejo65774 <winklejo65774@th-nuernberg.de>
Date: Mon, 15 Oct 2018 17:24:47 +0200
Subject: [PATCH] Endstand Aufgabe 1 und Aufgabe 2

---
 .../Aufg1_Sockets_Client.py                      | 16 ++++++++++++++++
 .../Aufg1_Sockets_Server.py                      | 14 ++++++--------
 .../Aufg2_Sockets_Client.py                      | 14 ++++++++++++--
 .../Aufg2_Sockets_Server.py                      | 14 ++++++++++++++
 4 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 mEIM-Praktikum_Webentwicklung/Aufg1_Sockets_Client.py
 create mode 100644 mEIM-Praktikum_Webentwicklung/Aufg2_Sockets_Server.py

diff --git a/mEIM-Praktikum_Webentwicklung/Aufg1_Sockets_Client.py b/mEIM-Praktikum_Webentwicklung/Aufg1_Sockets_Client.py
new file mode 100644
index 0000000..171e725
--- /dev/null
+++ b/mEIM-Praktikum_Webentwicklung/Aufg1_Sockets_Client.py
@@ -0,0 +1,16 @@
+import socket
+
+myclient = socket.socket()
+hostname = socket.gethostname()
+port = 22445
+
+myclient.connect((hostname, port))
+
+msg_to_server = input("Aufgabe 1: Bitte geben Sie eine Nachricht ein: ")
+
+myclient.send(msg_to_server.encode('utf-8'))
+converted_msg = myclient.recv(1024)
+print("Erhaltener string: ", converted_msg.decode('utf-8'))
+
+myclient.close()
+
diff --git a/mEIM-Praktikum_Webentwicklung/Aufg1_Sockets_Server.py b/mEIM-Praktikum_Webentwicklung/Aufg1_Sockets_Server.py
index aecbbfe..f674bc3 100644
--- a/mEIM-Praktikum_Webentwicklung/Aufg1_Sockets_Server.py
+++ b/mEIM-Praktikum_Webentwicklung/Aufg1_Sockets_Server.py
@@ -1,15 +1,13 @@
 import socket
 
 myserver = socket.socket()
-hostname = myserver.gethostname()
-port = 12345
+hostname = socket.gethostname()
+port = 22445
 myserver.bind((hostname, port))
 myserver.listen()
 
-while True:
-    (connection, addr) = myserver.accept()
-    msg_from_client = myserver.recv(1024)
-    in_capital_letters = msg_from_client.upper()
-    connection.send(in_capital_letters.encode('utf-8'))
-    connection.close()
+(connection, addr) = myserver.accept()
+msg_from_client = connection.recv(1024).decode('utf-8')
+in_capital_letters = msg_from_client.upper()
+connection.send(in_capital_letters.encode('utf-8'))
 
diff --git a/mEIM-Praktikum_Webentwicklung/Aufg2_Sockets_Client.py b/mEIM-Praktikum_Webentwicklung/Aufg2_Sockets_Client.py
index 18cb558..21a5ad4 100644
--- a/mEIM-Praktikum_Webentwicklung/Aufg2_Sockets_Client.py
+++ b/mEIM-Praktikum_Webentwicklung/Aufg2_Sockets_Client.py
@@ -1,8 +1,18 @@
 import socket
 
 myclient = socket.socket()
-hostname = myserver.gethostname()
-port = 12345
+hostname = socket.gethostname()
+port = 33221
 
 myclient.connect((hostname, port))
 
+while True:
+    msg_to_server = input("Aufgabe 2: Bitte geben Sie eine Nachricht ein: ")
+
+    if msg_to_server != "STOP":
+        myclient.send(msg_to_server.encode('utf-8'))
+        converted_msg = myclient.recv(1024).decode('utf-8')
+        print("Erhaltener string: ", converted_msg)
+    else:
+        myclient.close()
+        break
\ No newline at end of file
diff --git a/mEIM-Praktikum_Webentwicklung/Aufg2_Sockets_Server.py b/mEIM-Praktikum_Webentwicklung/Aufg2_Sockets_Server.py
new file mode 100644
index 0000000..5f1df19
--- /dev/null
+++ b/mEIM-Praktikum_Webentwicklung/Aufg2_Sockets_Server.py
@@ -0,0 +1,14 @@
+import socket
+
+myserver = socket.socket()
+hostname = socket.gethostname()
+port = 33221
+myserver.bind((hostname, port))
+myserver.listen()
+
+(connection, addr) = myserver.accept()
+
+while True:
+    msg_from_client = connection.recv(1024).decode('utf-8')
+    in_capital_letters = msg_from_client.upper()
+    connection.send(in_capital_letters.encode('utf-8'))
\ No newline at end of file