From ec179e638b1a89a82dd737f3079d574b0dfcdca2 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 22 Sep 2012 08:12:58 +0000
Subject: [PATCH] reference: SocketClient and SocketServer changed to use
 Core:TcpSocket

git-svn-id: svn://ultimatepp.org/upp/trunk@5382 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 reference/SocketClient/SocketClient.cpp | 44 +++++++++++----------
 reference/SocketServer/SocketServer.cpp | 52 ++++++++++++-------------
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/reference/SocketClient/SocketClient.cpp b/reference/SocketClient/SocketClient.cpp
index 1a5e78fd1..5020970d6 100644
--- a/reference/SocketClient/SocketClient.cpp
+++ b/reference/SocketClient/SocketClient.cpp
@@ -1,21 +1,23 @@
-#include <Web/Web.h>
-
-using namespace Upp;
-
-String Request(const String& r)
-{
-	Socket s;
-	if(!ClientSocket(s, CommandLine().GetCount() ? CommandLine()[0] : "127.0.0.1", 3214)) {
-		Cout() << "Unable to connect to server!\n";
-		SetExitCode(1);
-		return Null;
-	}
-	s.Write(r + '\n');
-	return s.ReadUntil('\n');
-}
-
-CONSOLE_APP_MAIN
-{
-	Cout() << Request("time") << '\n';
-	Cout() << Request("33") << '\n';
-}
+#include <Core/Core.h>
+
+using namespace Upp;
+
+String Request(const String& r)
+{
+	TcpSocket s;
+	if(!s.Connect(CommandLine().GetCount() ? CommandLine()[0] : "127.0.0.1", 3214)) {
+		Cout() << "Unable to connect to server!\n";
+		SetExitCode(1);
+		return Null;
+	}
+	s.Put(r + '\n');
+	return s.GetLine();
+}
+
+// Start reference/SocketServer before starting this program
+
+CONSOLE_APP_MAIN
+{
+	Cout() << Request("time") << '\n';
+	Cout() << Request("33") << '\n';
+}
diff --git a/reference/SocketServer/SocketServer.cpp b/reference/SocketServer/SocketServer.cpp
index 2efc19d8d..59704bbd6 100644
--- a/reference/SocketServer/SocketServer.cpp
+++ b/reference/SocketServer/SocketServer.cpp
@@ -1,26 +1,26 @@
-#include <Web/Web.h>
-
-using namespace Upp;
-
-CONSOLE_APP_MAIN
-{
-	Socket server;
-	if(!ServerSocket(server, 3214)) {
-		Cout() << "Unable to initialize server socket!\n";
-		SetExitCode(1);
-		return;
-	}
-	Cout() << "Waiting for requests..\n";
-	for(;;) {
-		Socket s;
-		if(server.Accept(s)) {
-			String w = s.ReadUntil('\n');
-			Cout() << "Request: " << w << " from: " << s.GetPeerAddr() << '\n';
-			if(w == "time")
-				s.Write(AsString(GetSysTime()));
-			else
-				s.Write(AsString(3 * atoi(~w)));
-			s.Write("\n");
-		}
-	}
-}
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	TcpSocket server;
+	if(!server.Listen(3214, 5)) {
+		Cout() << "Unable to initialize server socket!\n";
+		SetExitCode(1);
+		return;
+	}
+	Cout() << "Waiting for requests..\n";
+	for(;;) {
+		TcpSocket s;
+		if(s.Accept(server)) {
+			String w = s.GetLine();
+			Cout() << "Request: " << w << " from: " << s.GetPeerAddr() << '\n';
+			if(w == "time")
+				s.Put(AsString(GetSysTime()));
+			else
+				s.Put(AsString(3 * atoi(~w)));
+			s.Put("\n");
+		}
+	}
+}