SHS/cd
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

receive with UTF fix

Browse Source
This commit is contained in:
Пелипенко Иван
2023-03-13 22:13:57 +03:00
parent e1629897ed
commit 24c69edb82
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -3,7 +3,7 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake
project(CD) project(CD)
set(CD_MAJOR 1) set(CD_MAJOR 1)
set(CD_MINOR 1) set(CD_MINOR 1)
set(CD_REVISION 0) set(CD_REVISION 1)
set(CD_SUFFIX ) set(CD_SUFFIX )
set(CD_COMPANY SHS) set(CD_COMPANY SHS)
set(CD_DOMAIN org.SHS) set(CD_DOMAIN org.SHS)

19
libs/core/cdutils_core.cpp
View File

@@ -2,7 +2,6 @@
#include "cdutils_parser.h" #include "cdutils_parser.h"
#include "piconfig.h" #include "piconfig.h"
#include "pifile.h"
#include "piiobytearray.h" #include "piiobytearray.h"
#include "piiostring.h" #include "piiostring.h"
@@ -441,8 +440,7 @@ void CDCore::procReceivedPacket(PIByteArray & ba) {
PIByteArray k; PIByteArray k;
ba >> k; ba >> k;
k << uchar(0); k << uchar(0);
PIString s = PIString::fromUTF8((const char *)k.data()); PIIOByteArray ios(k);
PIIOString ios(&s);
cd_read(&k_, &ios); cd_read(&k_, &ios);
K_Received(); K_Received();
piCoutObj << "K received"; piCoutObj << "K received";
@@ -457,8 +455,7 @@ void CDCore::procReceivedPacket(PIByteArray & ba) {
PIByteArray x; PIByteArray x;
ba >> x; ba >> x;
x << uchar(0); x << uchar(0);
PIString s = PIString::fromUTF8((const char *)x.data()); PIIOByteArray ios(x);
PIIOString ios(&s);
cd_read(&x_, &ios); cd_read(&x_, &ios);
x_selected = x_.collectX(); x_selected = x_.collectX();
X_Received(); X_Received();
@@ -494,8 +491,7 @@ void CDCore::procReceivedPacket(PIByteArray & ba) {
PIByteArray c; PIByteArray c;
ba >> c; ba >> c;
c << uchar(0); c << uchar(0);
PIString s = PIString::fromUTF8((const char *)c.data()); PIIOByteArray ios(c);
PIIOString ios(&s);
cd_read(&c_, &ios); cd_read(&c_, &ios);
C_Received(); C_Received();
} break; } break;
@@ -512,11 +508,10 @@ void CDCore::procReceivedPacket(PIByteArray & ba) {
case CD_MQuery: send(CDType::cdM); break; case CD_MQuery: send(CDType::cdM); break;
case CD_MSend: { case CD_MSend: {
piCoutObj << "M received"; piCoutObj << "M received";
PIByteArray c; PIByteArray m;
ba >> c; ba >> m;
c << uchar(0); m << uchar(0);
PIString s = PIString::fromUTF8((const char *)c.data()); PIIOByteArray ios(m);
PIIOString ios(&s);
cd_read(&m_, &ios); cd_read(&m_, &ios);
M_Received(); M_Received();
} break; } break;