* Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
*/
- /*
- $Revision: 1.6 $
- $Date: 2009/02/06 10:25:54 $
- $Author: faust $
- */
-
-//---------------------------------------------------------------------------
+#include "netunit.h"
-#include "stg/netunit.h"
#include "stg/servconf_types.h"
#include "stg/common.h"
#include "stg/blowfish.h"
+#include <algorithm> // std::min
+
#include <cstdio>
#include <cerrno>
#include <cstring>
#include <sys/socket.h>
#include <netinet/in.h>
+using namespace STG;
+
namespace
{
port(p),
login(l),
password(pwd),
- outerSocket(-1),
- RxCallBack(NULL),
- dataRxCallBack(NULL)
+ outerSocket(-1)
{
}
//---------------------------------------------------------------------------
int NETTRANSACT::Connect()
{
-int ret;
-
outerSocket = socket(PF_INET, SOCK_STREAM, 0);
if (outerSocket < 0)
{
struct sockaddr_in outerAddr;
memset(&outerAddr, 0, sizeof(outerAddr));
-struct hostent he;
-struct hostent * phe;
-
-unsigned long ip;
-ip = inet_addr(server.c_str());
+unsigned long ip = inet_addr(server.c_str());
if (ip == INADDR_NONE)
{
- phe = gethostbyname(server.c_str());
+ struct hostent * phe = gethostbyname(server.c_str());
if (phe == NULL)
{
errorMsg = "DNS error.\nCan not reslove " + server;
return st_dns_err;
}
+ struct hostent he;
memcpy(&he, phe, sizeof(he));
- ip = *((long*)he.h_addr_list[0]);
+ ip = *((long *)he.h_addr_list[0]);
}
+
outerAddr.sin_family = AF_INET;
outerAddr.sin_port = htons(port);
outerAddr.sin_addr.s_addr = ip;
-ret = connect(outerSocket, (struct sockaddr*)&outerAddr, sizeof(outerAddr));
-
-if (ret < 0)
+if (connect(outerSocket, (struct sockaddr *)&outerAddr, sizeof(outerAddr)) < 0)
{
errorMsg = CONNECT_FAILED;
close(outerSocket);
return st_conn_fail;
}
+
return st_ok;
}
//---------------------------------------------------------------------------
-int NETTRANSACT::Disconnect()
+void NETTRANSACT::Disconnect()
{
close(outerSocket);
-return 0;
}
//---------------------------------------------------------------------------
-int NETTRANSACT::Transact(const char * data)
+int NETTRANSACT::Transact(const std::string & request, CALLBACK callback, void * data)
{
int ret;
if ((ret = TxHeader()) != st_ok)
return ret;
}
-if ((ret = TxData(data)) != st_ok)
+if ((ret = TxData(request)) != st_ok)
{
Disconnect();
return ret;
}
-if ((ret = RxDataAnswer()) != st_ok)
+if ((ret = RxDataAnswer(callback, data)) != st_ok)
{
Disconnect();
return ret;
//---------------------------------------------------------------------------
int NETTRANSACT::TxHeader()
{
-int ret;
-ret = send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0);
-if (ret <= 0)
+if (send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0) <= 0)
{
errorMsg = SEND_HEADER_ERROR;
return st_send_fail;
//---------------------------------------------------------------------------
int NETTRANSACT::RxHeaderAnswer()
{
-char buffer[sizeof(STG_HEADER)+1];
-int ret;
+char buffer[sizeof(STG_HEADER) + 1];
-ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0);
-if (ret <= 0)
+if (recv(outerSocket, buffer, strlen(OK_HEADER), 0) <= 0)
{
printf("Receive header answer error: '%s'\n", strerror(errno));
errorMsg = RECV_HEADER_ANSWER_ERROR;
int NETTRANSACT::TxLogin()
{
char loginZ[ADM_LOGIN_LEN];
-int ret;
-
memset(loginZ, 0, ADM_LOGIN_LEN);
strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
-ret = send(outerSocket, loginZ, ADM_LOGIN_LEN, 0);
-if (ret <= 0)
+if (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 0)
{
errorMsg = SEND_LOGIN_ERROR;
return st_send_fail;
//---------------------------------------------------------------------------
int NETTRANSACT::RxLoginAnswer()
{
-char buffer[sizeof(OK_LOGIN)+1];
-int ret;
+char buffer[sizeof(OK_LOGIN) + 1];
-ret = recv(outerSocket, buffer, strlen(OK_LOGIN), 0);
-if (ret <= 0)
+if (recv(outerSocket, buffer, strlen(OK_LOGIN), 0) <= 0)
{
printf("Receive login answer error: '%s'\n", strerror(errno));
errorMsg = RECV_LOGIN_ANSWER_ERROR;
int NETTRANSACT::TxLoginS()
{
char loginZ[ADM_LOGIN_LEN];
-char ct[ENC_MSG_LEN];
-int ret;
-
memset(loginZ, 0, ADM_LOGIN_LEN);
strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
for (int j = 0; j < ADM_LOGIN_LEN / ENC_MSG_LEN; j++)
{
- EncodeString(ct, loginZ + j*ENC_MSG_LEN, &ctx);
- ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
- if (ret <= 0)
+ char ct[ENC_MSG_LEN];
+ EncodeString(ct, loginZ + j * ENC_MSG_LEN, &ctx);
+ if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0)
{
errorMsg = SEND_LOGIN_ERROR;
return st_send_fail;
//---------------------------------------------------------------------------
int NETTRANSACT::RxLoginSAnswer()
{
-char buffer[sizeof(OK_LOGINS)+1];
-int ret;
+char buffer[sizeof(OK_LOGINS) + 1];
-ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0);
-if (ret <= 0)
+if (recv(outerSocket, buffer, strlen(OK_LOGINS), 0) <= 0)
{
printf("Receive secret login answer error: '%s'\n", strerror(errno));
errorMsg = RECV_LOGIN_ANSWER_ERROR;
}
}
//---------------------------------------------------------------------------
-int NETTRANSACT::TxData(const char * text)
+int NETTRANSACT::TxData(const std::string & 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;
EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
-for (j = 0; j < n; j++)
+size_t pos = 0;
+while (pos < text.size())
{
- strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
+ char textZ[ENC_MSG_LEN];
+ if (text.size() - pos < ENC_MSG_LEN)
+ memset(textZ, 0, ENC_MSG_LEN);
+ strncpy(textZ, text.c_str() + pos, std::min(ENC_MSG_LEN, (int)(text.size() - pos)));
+ char ct[ENC_MSG_LEN];
EncodeString(ct, textZ, &ctx);
- ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
- if (ret <= 0)
+ if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0)
{
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);
-
-EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
-
-EncodeString(ct, textZ, &ctx);
-ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
-if (ret <= 0)
- {
- errorMsg = SEND_DATA_ERROR;
- return st_send_fail;
+ pos += ENC_MSG_LEN;
}
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.c_str(), 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;
-EnDecodeInit(passwd, PASSWD_LEN, &ctx);
-
-for (int j = 0; j < l; j++)
- {
- strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN);
- EncodeString(buffS, buff, &ctx);
- send(outerSocket, buffS, ENC_MSG_LEN, 0);
- }
-
-return 0;
-}
-//---------------------------------------------------------------------------
-int NETTRANSACT::RxDataAnswer()
+int NETTRANSACT::RxDataAnswer(CALLBACK callback, void * data)
{
BLOWFISH_CTX ctx;
EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
bool final = false;
size_t pos = 0;
- for (; pos < ENC_MSG_LEN && buffer[pos] != 0; pos++);
+ for (; pos < ENC_MSG_LEN && buffer[pos] != 0; pos++) ;
if (pos < ENC_MSG_LEN && buffer[pos] == 0)
final = true;
if (chunk.length() > MAX_XML_CHUNK_LENGTH || final)
{
- if (RxCallBack != NULL)
- if (!RxCallBack(dataRxCallBack, chunk, final))
+ if (callback)
+ if (!callback(chunk, final, data))
return st_xml_parse_error;
chunk.clear();
}
return st_ok;
}
}
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetRxCallback(void * data, RxCallback_t cb)
-{
-RxCallBack = cb;
-dataRxCallBack = data;
-}
-//---------------------------------------------------------------------------
-const std::string & NETTRANSACT::GetError() const
-{
-return errorMsg;
-}
-//---------------------------------------------------------------------------
git.stg.codes / stg.git / blobdiff