*/
//---------------------------------------------------------------------------
-#include <stdio.h>
-#include <string.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <unistd.h>
-#include "netunit.h"
-#include "common.h"
+#include <cstdio>
+#include <cstring>
+
+#include "stg/netunit.h"
+#include "stg/common.h"
//---------------------------------------------------------------------------
RxCallBack(NULL),
dataRxCallBack(NULL)
{
- memset(server, 0, SERVER_NAME_LEN);
- memset(login, 0, ADM_LOGIN_LEN);
- memset(password, 0, ADM_PASSWD_LEN);
- memset(errorMsg, 0, MAX_ERR_STR_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()
outerSocket = socket(PF_INET, SOCK_STREAM, 0);
if (outerSocket < 0)
{
- strcpy(errorMsg, CREATE_SOCKET_ERROR);
+ errorMsg = CREATE_SOCKET_ERROR;
return st_conn_fail;
}
struct hostent * phe;
unsigned long ip;
-ip = inet_addr(server);
+ip = inet_addr(server.c_str());
if (ip == INADDR_NONE)
{
- phe = gethostbyname(server);
+ phe = gethostbyname(server.c_str());
if (phe == NULL)
{
- sprintf(errorMsg, "DNS error.\nCan not reslove %s", server);
+ errorMsg = "DNS error.\nCan not reslove " + server;
return st_dns_err;
}
if (ret < 0)
{
- strcpy(errorMsg, CONNECT_FAILED);
+ errorMsg = CONNECT_FAILED;
close(outerSocket);
return st_conn_fail;
}
ret = send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0);
if (ret <= 0)
{
- strcpy(errorMsg, SEND_HEADER_ERROR);
+ errorMsg = SEND_HEADER_ERROR;
return st_send_fail;
}
ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0);
if (ret <= 0)
{
- strcpy(errorMsg, RECV_HEADER_ANSWER_ERROR);
+ errorMsg = RECV_HEADER_ANSWER_ERROR;
return st_recv_fail;
}
{
if (strncmp(ERR_HEADER, buffer, strlen(ERR_HEADER)) == 0)
{
- strcpy(errorMsg, INCORRECT_HEADER);
+ errorMsg = INCORRECT_HEADER;
return st_header_err;
}
else
{
- strcpy(errorMsg, UNKNOWN_ERROR);
+ errorMsg = UNKNOWN_ERROR;
return st_unknown_err;
}
}
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)
{
- strcpy(errorMsg, SEND_LOGIN_ERROR);
+ errorMsg = SEND_LOGIN_ERROR;
return st_send_fail;
}
int NETTRANSACT::RxLoginAnswer()
{
char buffer[sizeof(OK_LOGIN)+1];
-int ret;//, we;
+int ret;
ret = recv(outerSocket, buffer, strlen(OK_LOGIN), 0);
if (ret <= 0)
{
- strcpy(errorMsg, RECV_LOGIN_ANSWER_ERROR);
+ errorMsg = RECV_LOGIN_ANSWER_ERROR;
return st_recv_fail;
}
{
if (strncmp(ERR_LOGIN, buffer, strlen(ERR_LOGIN)) == 0)
{
- strcpy(errorMsg, INCORRECT_LOGIN);
+ errorMsg = INCORRECT_LOGIN;
return st_login_err;
}
else
{
- strcpy(errorMsg, UNKNOWN_ERROR);
+ errorMsg = UNKNOWN_ERROR;
return st_unknown_err;
}
}
int NETTRANSACT::TxLoginS()
{
char loginZ[ADM_LOGIN_LEN];
-char ct[ENC_MSG_LEN];
-int ret;
memset(loginZ, 0, ADM_LOGIN_LEN);
-strncpy(loginZ, login, ADM_LOGIN_LEN);
-
BLOWFISH_CTX ctx;
-EnDecryptInit(password, PASSWD_LEN, &ctx);
-
-for (int j = 0; j < ADM_LOGIN_LEN / ENC_MSG_LEN; j++)
+InitContext(password.c_str(), PASSWD_LEN, &ctx);
+EncryptString(loginZ, login.c_str(), std::min<int>(login.length() + 1, ADM_LOGIN_LEN), &ctx);
+if (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 0)
{
- Encrypt(ct, loginZ + j*ENC_MSG_LEN, &ctx);
- ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
- if (ret <= 0)
- {
- strcpy(errorMsg, SEND_LOGIN_ERROR);
- return st_send_fail;
- }
+ errorMsg = SEND_LOGIN_ERROR;
+ return st_send_fail;
}
-
return st_ok;
}
//---------------------------------------------------------------------------
ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0);
if (ret <= 0)
{
- strcpy(errorMsg, RECV_LOGIN_ANSWER_ERROR);
+ errorMsg = RECV_LOGIN_ANSWER_ERROR;
return st_recv_fail;
}
{
if (strncmp(ERR_LOGINS, buffer, strlen(ERR_LOGINS)) == 0)
{
- strcpy(errorMsg, INCORRECT_LOGIN);
+ errorMsg = INCORRECT_LOGIN;
return st_logins_err;
}
else
{
- strcpy(errorMsg, UNKNOWN_ERROR);
+ errorMsg = UNKNOWN_ERROR;
return st_unknown_err;
}
}
//---------------------------------------------------------------------------
int NETTRANSACT::TxData(const char * text)
{
-char textZ[ENC_MSG_LEN];
-char ct[ENC_MSG_LEN];
-int ret;
-int j;
-
-int n = strlen(text) / ENC_MSG_LEN;
-int r = strlen(text) % ENC_MSG_LEN;
-
BLOWFISH_CTX ctx;
-EnDecryptInit(password, PASSWD_LEN, &ctx);
-
-for (j = 0; j < n; j++)
- {
- strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
- Encrypt(ct, textZ, &ctx);
- ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
- if (ret <= 0)
- {
- strcpy(errorMsg, SEND_DATA_ERROR);
- return st_send_fail;
- }
- }
-
-memset(textZ, 0, ENC_MSG_LEN);
-if (r)
- strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
-
-EnDecryptInit(password, PASSWD_LEN, &ctx);
-
-Encrypt(ct, textZ, &ctx);
-ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
-if (ret <= 0)
+InitContext(password.c_str(), PASSWD_LEN, &ctx);
+size_t length = strlen(text);
+char buffer[length + 9];
+memset(buffer, 0, sizeof(buffer));
+EncryptString(buffer, text, length + 1, &ctx);
+if (send(outerSocket, buffer, sizeof(buffer), 0) <= 0)
{
- strcpy(errorMsg, SEND_DATA_ERROR);
+ errorMsg = SEND_DATA_ERROR;
return st_send_fail;
}
-
return st_ok;
}
//---------------------------------------------------------------------------
-int NETTRANSACT::TxData(char * data)
-{
-char buff[ENC_MSG_LEN];
-char buffS[ENC_MSG_LEN];
-char passwd[ADM_PASSWD_LEN];
-
-memset(passwd, 0, ADM_PASSWD_LEN);
-strncpy(passwd, password, ADM_PASSWD_LEN);
-memset(buff, 0, ENC_MSG_LEN);
-
-int l = strlen(data)/ENC_MSG_LEN;
-if (strlen(data)%ENC_MSG_LEN)
- l++;
-
-BLOWFISH_CTX ctx;
-EnDecryptInit(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);
- send(outerSocket, buffS, ENC_MSG_LEN, 0);
- }
-
-return 0;
-}
-//---------------------------------------------------------------------------
int NETTRANSACT::RxDataAnswer()
{
int n = 0;
char buffer[ENC_MSG_LEN + 1];
BLOWFISH_CTX ctx;
-EnDecryptInit(password, PASSWD_LEN, &ctx);
+InitContext(password.c_str(), PASSWD_LEN, &ctx);
while (1)
{
if (ret <= 0)
{
close(outerSocket);
- strcpy(errorMsg, RECV_DATA_ANSWER_ERROR);
+ errorMsg = RECV_DATA_ANSWER_ERROR;
return st_recv_fail;
}
if (n == ENC_MSG_LEN)
{
-
n = 0;
- Decrypt(buffer, bufferS, &ctx);
+ DecryptBlock(buffer, bufferS, &ctx);
buffer[ENC_MSG_LEN] = 0;
answerList.push_back(buffer);
//---------------------------------------------------------------------------
void NETTRANSACT::SetLogin(const char * l)
{
-strncpy(login, l, ADM_LOGIN_LEN);
+login = l;
}
//---------------------------------------------------------------------------
void NETTRANSACT::SetPassword(const char * p)
{
-strncpy(password, p, ADM_PASSWD_LEN);
+password = p;
}
//---------------------------------------------------------------------------
void NETTRANSACT::SetServer(const char * serverName)
{
-strncpy(server, serverName, SERVER_NAME_LEN);
+server = serverName;
}
//---------------------------------------------------------------------------
void NETTRANSACT::SetServerPort(short unsigned p)
dataRxCallBack = data;
}
//---------------------------------------------------------------------------
-char * NETTRANSACT::GetError()
+const std::string & NETTRANSACT::GetError() const
{
return errorMsg;
}
git.stg.codes / stg.git / blobdiff