picloud next iteration

libs/cloud/picloudclient.cpp

@@ -18,9 +18,12 @@
 */
 
 #include "picloudclient.h"
+#include "picloudtcp.h"
 
 
 PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode), eth(PIEthernet::TCP_Client) {
+	tcp.setRole(PICloud::TCP::Client);
+	setName("cloud_client");
 }
 
 
@@ -30,15 +33,32 @@ PICloudClient::~PICloudClient() {
 }
 
 
+void PICloudClient::setServerName(const PIString & server_name) {
+	setName("cloud_client__" + server_name);
+	tcp.setServerName(server_name);
+}
+
+
 bool PICloudClient::openDevice() {
+	piCout << "PICloudClient open device" << path();
+	bool op = eth.connect(path(), false);
+	if (op) {
+		CONNECTL(&eth, disconnected, [this](bool){opened_ = false;});
+		CONNECTU(&eth, threadedReadEvent, this, readed);
+		eth.startThreadedRead();
+		tcp.sendStart(&eth);
+		return true;
+	}
+	eth.close();
 	return false;
 }
 
 
 bool PICloudClient::closeDevice() {
-	return false;
+	return eth.close();
 }
 
+
 int PICloudClient::readDevice(void * read_to, int max_size) {
 	return eth.read(read_to, max_size);
 }
@@ -47,3 +67,8 @@ int PICloudClient::readDevice(void * read_to, int max_size) {
 int PICloudClient::writeDevice(const void * data, int max_size) {
 	return eth.write(data, max_size);
 }
+
+
+void PICloudClient::readed(uchar *data, int size) {
+
+}

libs/cloud/picloudserver.cpp

@@ -21,6 +21,10 @@
 
 
 PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode), eth(PIEthernet::TCP_Client) {
+	PIString name = "cloud_server_" + PIString::fromNumber(randomi()%1000);
+	tcp.setRole(PICloud::TCP::Server);
+	tcp.setServerName(name);
+	setName(name);
 }
 
 
@@ -36,8 +40,9 @@ bool PICloudServer::openDevice() {
 	if (op) {
 		CONNECTL(&eth, disconnected, [this](bool){opened_ = false;});
 		CONNECTU(&eth, threadedReadEvent, this, readed);
+		CONNECTL(&eth, connected, [this](){tcp.sendStart(&eth);});
 		eth.startThreadedRead();
-		sendStart();
+		tcp.sendStart(&eth);
 		return true;
 	}
 	eth.close();
@@ -60,12 +65,6 @@ int PICloudServer::writeDevice(const void * data, int max_size) {
 }
 
 
-void PICloudServer::sendStart() {
-
-}
-
-
-
 PICloudServer::Client::Client(PICloudServer * srv) : server(srv) {
 
 }

libs/cloud/picloudtcp.cpp

@@ -20,23 +20,70 @@
 #include "picloudtcp.h"
 #include "picrypt.h"
 #include "pichunkstream.h"
+#include "piethernet.h"
 
 
 const char hash_def_key[] = "_picrypt_";
 
 
-PIByteArray & operator <<(PIByteArray & s, const PICloud::Header & v) {
-	s << v.version << v.type << v.sname;
-	return s;
-}
-
-
-PIByteArray & operator >>(PIByteArray & s, PICloud::Header & v) {
-	s >> v.version >> v.type >> v.sname;
-	return s;
+PICloud::TCP::Header::Header() {
+	version = Version_1;
 }
 
 
 PICloud::TCP::TCP() {
 }
 
+
+void PICloud::TCP::setRole(PICloud::TCP::Role r) {
+	header.role = r;
+}
+
+
+void PICloud::TCP::setServerName(const PIString & server_name) {
+	sname = server_name;
+}
+
+
+void PICloud::TCP::sendStart(PIEthernet * eth) {
+	header.type = PICloud::TCP::Connect;
+	PIByteArray ba;
+	ba << header << sname;
+	eth->send(ba);
+}
+
+
+PIPair<PICloud::TCP::Type, PICloud::TCP::Role> PICloud::TCP::parseHeader(PIByteArray & ba) {
+	PIPair<PICloud::TCP::Type, PICloud::TCP::Role> ret;
+	ret.first = Invalid;
+	if (ba.size() < sizeof(Header)) return ret;
+	PICloud::TCP::Header hdr;
+	ba >> hdr;
+	if (hdr.version != header.version) {
+		piCout << "[PICloud]" << "invalid TCP version!";
+		return ret;
+	}
+	ret.first = (Type)hdr.type;
+	ret.second = (Role)hdr.role;
+	return ret;
+}
+
+
+PIByteArray PICloud::TCP::parseData(PIByteArray & ba) {
+	if (header.role == Server) {
+		PIString client;
+		ba >> client;
+		return ba;
+	}
+	if (header.role == Client) {
+		return ba;
+	}
+	return PIByteArray();
+}
+
+
+PIString PICloud::TCP::parseConnect(PIByteArray & ba) {
+	PIString ret;
+	ba >> ret;
+	return ret;
+}