refactoring PICrypt, add PIStreamPackerConfig, delete piclientserver_config

libs/io_utils/pistreampacker.cpp

@@ -24,7 +24,6 @@
 #include "pistreampacker.h"
 
 #include "piiodevice.h"
-#include "piliterals_bytes.h"
 #ifdef __GNUC__
 #  pragma GCC diagnostic pop
 #endif
@@ -49,28 +48,10 @@
 
 
 PIStreamPacker::PIStreamPacker(PIIODevice * dev): PIObject() {
-	crypt_frag = crypt_size = false;
-	aggressive_optimization = true;
-	packet_size             = -1;
-	size_crypted_size       = sizeof(int);
-	crypt_frag_size         = 1_MiB;
-	max_packet_size         = 1400;
-	packet_sign             = 0xAFBE;
-	assignDevice(dev);
+	packet_size = -1;
+	if (dev) assignDevice(dev);
 }
 
-
-void PIStreamPacker::setCryptSizeEnabled(bool on) {
-	crypt_size = on;
-	if (crypt_size) {
-		PIByteArray ba;
-		ba << int(0);
-		size_crypted_size = cryptData(ba).size_s();
-	} else
-		size_crypted_size = sizeof(int);
-}
-
-
 void PIStreamPacker::clear() {
 	packet.clear();
 	packet_size = -1;
@@ -129,7 +110,7 @@ void PIStreamPacker::received(const PIByteArray & data) {
 	stream.append(data);
 	// piCout << "rec" << data.size();
 	while (!stream.isEmpty()) {
-		int hdr_size = sizeof(packet_sign) + size_crypted_size;
+		int hdr_size = sizeof(packet_sign) + sizeCryptedSize();
 		if (packet_size < 0) {
 			if (stream.size_s() < hdr_size) return;
 			ushort sign(0);
@@ -143,8 +124,8 @@ void PIStreamPacker::received(const PIByteArray & data) {
 			}
 			int sz = -1;
 			if (crypt_size) {
-				PIByteArray crsz((uint)size_crypted_size);
-				memcpy(crsz.data(), stream.data(2), size_crypted_size);
+				PIByteArray crsz(sizeCryptedSize());
+				memcpy(crsz.data(), stream.data(2), crsz.size());
 				crsz = decryptData(crsz);
 				if (crsz.size() < sizeof(sz)) {
 					if (aggressive_optimization)
@@ -155,7 +136,7 @@ void PIStreamPacker::received(const PIByteArray & data) {
 				}
 				crsz >> sz;
 			} else {
-				memcpy(&sz, stream.data(2), size_crypted_size);
+				memcpy(&sz, stream.data(2), sizeCryptedSize());
 			}
 			if (sz < 0) {
 				if (aggressive_optimization)
@@ -212,10 +193,17 @@ void PIStreamPacker::received(const PIByteArray & data) {
 
 
 void PIStreamPacker::assignDevice(PIIODevice * dev) {
-	if (!dev) return;
+	if (!dev) {
+		piCoutObj << "Error! device is NULL";
+		return;
+	}
 	if (!dev->infoFlags()[PIIODevice::Reliable]) {
 		piCoutObj << "Warning! Not recommended to use with non-reliable" << dev;
 	}
 	CONNECT2(void, const uchar *, ssize_t, dev, threadedReadEvent, this, received);
 	CONNECT1(void, PIByteArray, this, sendRequest, dev, write);
 }
+
+uint PIStreamPacker::sizeCryptedSize() {
+	return sizeof(int) + (crypt_size ? cryptSizeAddition() : 0);
+}