*/
//---------------------------------------------------------------------------
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <unistd.h>
+
+#include "stg/netunit.h"
+#include "stg/common.h"
+#include "stg/blowfish.h"
#include <cstdio>
+#include <cerrno>
#include <cstring>
-#include "netunit.h"
-#include "common.h"
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <unistd.h>
//---------------------------------------------------------------------------
#define RECV_HEADER_ANSWER_ERROR "Recv header answer error!"
//---------------------------------------------------------------------------
-NETTRANSACT::NETTRANSACT()
- : port(0),
+NETTRANSACT::NETTRANSACT(const std::string & s, uint16_t p,
+ const std::string & l, const std::string & pwd)
+ : server(s),
+ port(p),
+ login(l),
+ password(pwd),
outerSocket(-1),
RxCallBack(NULL),
dataRxCallBack(NULL)
{
- memset(login, 0, ADM_LOGIN_LEN);
- memset(password, 0, ADM_PASSWD_LEN);
-}
-//-----------------------------------------------------------------------------
-void NETTRANSACT::EnDecryptInit(const char * passwd, int, BLOWFISH_CTX *ctx)
-{
-unsigned char * keyL = NULL;
-
-keyL = new unsigned char[PASSWD_LEN];
-
-memset(keyL, 0, PASSWD_LEN);
-
-strncpy((char *)keyL, passwd, PASSWD_LEN);
-
-Blowfish_Init(ctx, keyL, PASSWD_LEN);
-
-delete[] keyL;
-}
-//-----------------------------------------------------------------------------
-void NETTRANSACT::Encrypt(char * d, const char * s, BLOWFISH_CTX *ctx)
-{
-EncodeString(d, s, ctx);
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::Decrypt(char * d, const char * s, BLOWFISH_CTX *ctx)
-{
-DecodeString(d, s, ctx);
}
//---------------------------------------------------------------------------
int NETTRANSACT::Connect()
ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0);
if (ret <= 0)
{
+ printf("Receive header answer error: '%s'\n", strerror(errno));
errorMsg = RECV_HEADER_ANSWER_ERROR;
return st_recv_fail;
}
int ret;
memset(loginZ, 0, ADM_LOGIN_LEN);
-strncpy(loginZ, login, ADM_LOGIN_LEN);
+strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
ret = send(outerSocket, loginZ, ADM_LOGIN_LEN, 0);
if (ret <= 0)
ret = recv(outerSocket, buffer, strlen(OK_LOGIN), 0);
if (ret <= 0)
{
+ printf("Receive login answer error: '%s'\n", strerror(errno));
errorMsg = RECV_LOGIN_ANSWER_ERROR;
return st_recv_fail;
}
int ret;
memset(loginZ, 0, ADM_LOGIN_LEN);
-strncpy(loginZ, login, ADM_LOGIN_LEN);
+strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
BLOWFISH_CTX ctx;
-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
for (int j = 0; j < ADM_LOGIN_LEN / ENC_MSG_LEN; j++)
{
- Encrypt(ct, loginZ + j*ENC_MSG_LEN, &ctx);
+ EncodeString(ct, loginZ + j*ENC_MSG_LEN, &ctx);
ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
if (ret <= 0)
{
ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0);
if (ret <= 0)
{
+ printf("Receive secret login answer error: '%s'\n", strerror(errno));
errorMsg = RECV_LOGIN_ANSWER_ERROR;
return st_recv_fail;
}
int r = strlen(text) % ENC_MSG_LEN;
BLOWFISH_CTX ctx;
-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
for (j = 0; j < n; j++)
{
strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
- Encrypt(ct, textZ, &ctx);
+ EncodeString(ct, textZ, &ctx);
ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
if (ret <= 0)
{
if (r)
strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
-Encrypt(ct, textZ, &ctx);
+EncodeString(ct, textZ, &ctx);
ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
if (ret <= 0)
{
char passwd[ADM_PASSWD_LEN];
memset(passwd, 0, ADM_PASSWD_LEN);
-strncpy(passwd, password, ADM_PASSWD_LEN);
+strncpy(passwd, password.c_str(), ADM_PASSWD_LEN);
memset(buff, 0, ENC_MSG_LEN);
int l = strlen(data)/ENC_MSG_LEN;
l++;
BLOWFISH_CTX ctx;
-EnDecryptInit(passwd, PASSWD_LEN, &ctx);
+EnDecodeInit(passwd, PASSWD_LEN, &ctx);
for (int j = 0; j < l; j++)
{
strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN);
- Encrypt(buffS, buff, &ctx);
+ EncodeString(buffS, buff, &ctx);
send(outerSocket, buffS, ENC_MSG_LEN, 0);
}
//---------------------------------------------------------------------------
int NETTRANSACT::RxDataAnswer()
{
-int n = 0;
-int ret;
-char bufferS[ENC_MSG_LEN];
-char buffer[ENC_MSG_LEN + 1];
-
BLOWFISH_CTX ctx;
-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
-while (1)
+while (true)
{
- ret = recv(outerSocket, &bufferS[n++], 1, 0);
- if (ret <= 0)
+ char bufferS[ENC_MSG_LEN];
+ size_t toRead = ENC_MSG_LEN;
+ while (toRead > 0)
{
- close(outerSocket);
- errorMsg = RECV_DATA_ANSWER_ERROR;
- return st_recv_fail;
+ int ret = recv(outerSocket, &bufferS[ENC_MSG_LEN - toRead], toRead, 0);
+ if (ret <= 0)
+ {
+ printf("Receive data error: '%s'\n", strerror(errno));
+ close(outerSocket);
+ errorMsg = RECV_DATA_ANSWER_ERROR;
+ return st_recv_fail;
+ }
+ toRead -= ret;
}
- if (n == ENC_MSG_LEN)
- {
-
- n = 0;
- Decrypt(buffer, bufferS, &ctx);
- buffer[ENC_MSG_LEN] = 0;
+ char buffer[ENC_MSG_LEN + 1];
+ DecodeString(buffer, bufferS, &ctx);
+ buffer[ENC_MSG_LEN] = 0;
- answerList.push_back(buffer);
+ answerList.push_back(buffer);
- for (int j = 0; j < ENC_MSG_LEN; j++)
+ for (size_t i = 0; i < ENC_MSG_LEN; i++)
+ {
+ if (buffer[i] == 0)
{
- if (buffer[j] == 0)
- {
- if (RxCallBack)
- if (st_ok != RxCallBack(dataRxCallBack, &answerList))
- {
- return st_xml_parse_error;
- }
- return st_ok;
- }
+ if (RxCallBack)
+ if (st_ok != RxCallBack(dataRxCallBack, &answerList))
+ return st_xml_parse_error;
+ return st_ok;
}
}
}
}
//---------------------------------------------------------------------------
-void NETTRANSACT::SetLogin(const char * l)
-{
-strncpy(login, l, ADM_LOGIN_LEN);
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetPassword(const char * p)
-{
-strncpy(password, p, ADM_PASSWD_LEN);
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetServer(const char * serverName)
-{
-server = serverName;
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetServerPort(short unsigned p)
-{
-port = p;
-}
-//---------------------------------------------------------------------------
void NETTRANSACT::SetRxCallback(void * data, RxCallback_t cb)
{
RxCallBack = cb;
git.stg.codes / stg.git / blobdiff