#include "stg/servconf_types.h"
#include "stg/common.h"
#include "stg/blowfish.h"
+#include "stg/bfstream.h"
#include <algorithm> // std::min
#include <cstdio>
#include <cerrno>
#include <cstring>
+#include <cassert>
#include <netdb.h>
#include <arpa/inet.h>
namespace
{
-const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048;
+struct ReadState
+{
+ bool final;
+ NETTRANSACT::CALLBACK callback;
+ void * callbackData;
+ NETTRANSACT * nt;
+};
}
localPort(0),
login(l),
password(pwd),
- outerSocket(-1)
+ sock(-1)
{
}
//---------------------------------------------------------------------------
localPort(lp),
login(l),
password(pwd),
- outerSocket(-1)
+ sock(-1)
{
}
//---------------------------------------------------------------------------
+NETTRANSACT::~NETTRANSACT()
+{
+Disconnect();
+}
+//---------------------------------------------------------------------------
int NETTRANSACT::Connect()
{
-outerSocket = socket(PF_INET, SOCK_STREAM, 0);
-if (outerSocket < 0)
+sock = socket(PF_INET, SOCK_STREAM, 0);
+if (sock < 0)
{
errorMsg = CREATE_SOCKET_ERROR;
return st_conn_fail;
localAddr.sin_port = htons(localPort);
localAddr.sin_addr.s_addr = ip;
- if (bind(outerSocket, (struct sockaddr *)&localAddr, sizeof(localAddr)) < 0)
+ if (bind(sock, (struct sockaddr *)&localAddr, sizeof(localAddr)) < 0)
{
errorMsg = BIND_FAILED;
- close(outerSocket);
return st_conn_fail;
}
}
outerAddr.sin_port = htons(port);
outerAddr.sin_addr.s_addr = ip;
-if (connect(outerSocket, (struct sockaddr *)&outerAddr, sizeof(outerAddr)) < 0)
+if (connect(sock, (struct sockaddr *)&outerAddr, sizeof(outerAddr)) < 0)
{
errorMsg = CONNECT_FAILED;
- close(outerSocket);
return st_conn_fail;
}
//---------------------------------------------------------------------------
void NETTRANSACT::Disconnect()
{
-close(outerSocket);
+if (sock != -1)
+ {
+ shutdown(sock, SHUT_RDWR);
+ close(sock);
+ sock = -1;
+ }
}
//---------------------------------------------------------------------------
int NETTRANSACT::Transact(const std::string & request, CALLBACK callback, void * data)
{
int ret;
if ((ret = TxHeader()) != st_ok)
- {
- Disconnect();
return ret;
- }
if ((ret = RxHeaderAnswer()) != st_ok)
- {
- Disconnect();
return ret;
- }
if ((ret = TxLogin()) != st_ok)
- {
- Disconnect();
return ret;
- }
if ((ret = RxLoginAnswer()) != st_ok)
- {
- Disconnect();
return ret;
- }
if ((ret = TxLoginS()) != st_ok)
- {
- Disconnect();
return ret;
- }
if ((ret = RxLoginSAnswer()) != st_ok)
- {
- Disconnect();
return ret;
- }
if ((ret = TxData(request)) != st_ok)
- {
- Disconnect();
return ret;
- }
if ((ret = RxDataAnswer(callback, data)) != st_ok)
- {
- Disconnect();
return ret;
- }
return st_ok;
}
//---------------------------------------------------------------------------
int NETTRANSACT::TxHeader()
{
-if (send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0) <= 0)
+if (!WriteAll(sock, STG_HEADER, strlen(STG_HEADER)))
{
errorMsg = SEND_HEADER_ERROR;
return st_send_fail;
{
char buffer[sizeof(STG_HEADER) + 1];
-if (recv(outerSocket, buffer, strlen(OK_HEADER), 0) <= 0)
+if (!ReadAll(sock, buffer, strlen(OK_HEADER)))
{
printf("Receive header answer error: '%s'\n", strerror(errno));
errorMsg = RECV_HEADER_ANSWER_ERROR;
}
if (strncmp(OK_HEADER, buffer, strlen(OK_HEADER)) == 0)
- {
return st_ok;
+
+if (strncmp(ERR_HEADER, buffer, strlen(ERR_HEADER)) == 0)
+ {
+ errorMsg = INCORRECT_HEADER;
+ return st_header_err;
}
else
{
- if (strncmp(ERR_HEADER, buffer, strlen(ERR_HEADER)) == 0)
- {
- errorMsg = INCORRECT_HEADER;
- return st_header_err;
- }
- else
- {
- errorMsg = UNKNOWN_ERROR;
- return st_unknown_err;
- }
+ errorMsg = UNKNOWN_ERROR;
+ return st_unknown_err;
}
}
//---------------------------------------------------------------------------
int NETTRANSACT::TxLogin()
{
-char loginZ[ADM_LOGIN_LEN];
-memset(loginZ, 0, ADM_LOGIN_LEN);
+char loginZ[ADM_LOGIN_LEN + 1];
+memset(loginZ, 0, ADM_LOGIN_LEN + 1);
strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
-if (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 0)
+if (!WriteAll(sock, loginZ, ADM_LOGIN_LEN))
{
errorMsg = SEND_LOGIN_ERROR;
return st_send_fail;
{
char buffer[sizeof(OK_LOGIN) + 1];
-if (recv(outerSocket, buffer, strlen(OK_LOGIN), 0) <= 0)
+if (!ReadAll(sock, buffer, strlen(OK_LOGIN)))
{
printf("Receive login answer error: '%s'\n", strerror(errno));
errorMsg = RECV_LOGIN_ANSWER_ERROR;
}
if (strncmp(OK_LOGIN, buffer, strlen(OK_LOGIN)) == 0)
- {
return st_ok;
+
+if (strncmp(ERR_LOGIN, buffer, strlen(ERR_LOGIN)) == 0)
+ {
+ errorMsg = INCORRECT_LOGIN;
+ return st_login_err;
}
else
{
- if (strncmp(ERR_LOGIN, buffer, strlen(ERR_LOGIN)) == 0)
- {
- errorMsg = INCORRECT_LOGIN;
- return st_login_err;
- }
- else
- {
- errorMsg = UNKNOWN_ERROR;
- return st_unknown_err;
- }
+ errorMsg = UNKNOWN_ERROR;
+ return st_unknown_err;
}
}
//---------------------------------------------------------------------------
int NETTRANSACT::TxLoginS()
{
-char loginZ[ADM_LOGIN_LEN];
-memset(loginZ, 0, ADM_LOGIN_LEN);
+char loginZ[ADM_LOGIN_LEN + 1];
+memset(loginZ, 0, ADM_LOGIN_LEN + 1);
+
BLOWFISH_CTX ctx;
InitContext(password.c_str(), PASSWD_LEN, &ctx);
-EncryptString(loginZ, login.c_str(), std::min(login.length(), ADM_LOGIN_LEN), &ctx);
-if (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 0)
+EncryptString(loginZ, login.c_str(), std::min<size_t>(login.length() + 1, ADM_LOGIN_LEN), &ctx);
+if (!WriteAll(sock, loginZ, ADM_LOGIN_LEN))
{
errorMsg = SEND_LOGIN_ERROR;
return st_send_fail;
}
+
return st_ok;
}
//---------------------------------------------------------------------------
{
char buffer[sizeof(OK_LOGINS) + 1];
-if (recv(outerSocket, buffer, strlen(OK_LOGINS), 0) <= 0)
+if (!ReadAll(sock, buffer, strlen(OK_LOGINS)))
{
printf("Receive secret login answer error: '%s'\n", strerror(errno));
errorMsg = RECV_LOGIN_ANSWER_ERROR;
}
if (strncmp(OK_LOGINS, buffer, strlen(OK_LOGINS)) == 0)
- {
return st_ok;
+
+if (strncmp(ERR_LOGINS, buffer, strlen(ERR_LOGINS)) == 0)
+ {
+ errorMsg = INCORRECT_LOGIN;
+ return st_logins_err;
}
else
{
- if (strncmp(ERR_LOGINS, buffer, strlen(ERR_LOGINS)) == 0)
- {
- errorMsg = INCORRECT_LOGIN;
- return st_logins_err;
- }
- else
- {
- errorMsg = UNKNOWN_ERROR;
- return st_unknown_err;
- }
+ errorMsg = UNKNOWN_ERROR;
+ return st_unknown_err;
}
}
//---------------------------------------------------------------------------
int NETTRANSACT::TxData(const std::string & text)
{
-BLOWFISH_CTX ctx;
-InitContext(password.c_str(), PASSWD_LEN, &ctx);
-char buffer[text.length()];
-EncryptString(buffer, text.c_str(), text.length(), &ctx);
-if (send(outerSocket, buffer, text.length(), 0) <= 0)
+STG::ENCRYPT_STREAM stream(password, TxCrypto, this);
+stream.Put(text.c_str(), text.length() + 1, true);
+if (!stream.IsOk())
{
errorMsg = SEND_DATA_ERROR;
return st_send_fail;
}
+
return st_ok;
}
//---------------------------------------------------------------------------
int NETTRANSACT::RxDataAnswer(CALLBACK callback, void * data)
{
-BLOWFISH_CTX ctx;
-InitContext(password.c_str(), PASSWD_LEN, &ctx);
-
-std::string chunk;
-while (true)
+ReadState state = {false, callback, data, this};
+STG::DECRYPT_STREAM stream(password, RxCrypto, &state);
+while (!state.final)
{
- char bufferS[ENC_MSG_LEN];
- size_t toRead = ENC_MSG_LEN;
- while (toRead > 0)
+ char buffer[1024];
+ ssize_t res = read(sock, buffer, sizeof(buffer));
+ if (res < 0)
{
- 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;
+ printf("Receive data error: '%s'\n", strerror(errno));
+ errorMsg = RECV_DATA_ANSWER_ERROR;
+ return st_recv_fail;
}
+ stream.Put(buffer, res, res == 0);
+ if (!stream.IsOk())
+ return st_xml_parse_error;
+ }
- char buffer[ENC_MSG_LEN];
- DecryptBlock(buffer, bufferS, &ctx);
-
- bool final = false;
- size_t pos = 0;
- for (; pos < ENC_MSG_LEN && buffer[pos] != 0; pos++) ;
- if (pos < ENC_MSG_LEN && buffer[pos] == 0)
- final = true;
-
- if (pos > 0)
- chunk.append(&buffer[0], &buffer[pos]);
+return st_ok;
+}
+//---------------------------------------------------------------------------
+bool NETTRANSACT::TxCrypto(const void * block, size_t size, void * data)
+{
+assert(data != NULL);
+NETTRANSACT & nt = *static_cast<NETTRANSACT *>(data);
+if (!WriteAll(nt.sock, block, size))
+ return false;
+return true;
+}
+//---------------------------------------------------------------------------
+bool NETTRANSACT::RxCrypto(const void * block, size_t size, void * data)
+{
+assert(data != NULL);
+ReadState & state = *static_cast<ReadState *>(data);
- if (chunk.length() > MAX_XML_CHUNK_LENGTH || final)
+const char * buffer = static_cast<const char *>(block);
+for (size_t pos = 0; pos < size; ++pos)
+ if (buffer[pos] == 0)
{
- if (callback)
- if (!callback(chunk, final, data))
- return st_xml_parse_error;
- chunk.clear();
+ state.final = true;
+ size = pos; // Adjust string size
}
- if (final)
- return st_ok;
- }
+if (state.callback)
+ if (!state.callback(std::string(buffer, size), state.final, state.callbackData))
+ return false;
+
+return true;
}
git.stg.codes / stg.git / blobdiff