#include <arpa/inet.h>
#include <string.h>
+#include "stg/common.h"
+#include "stg/netunit.h"
#include "request.h"
-#include "common.h"
-#include "netunit.h"
#define FN_LEN (512)
#define REQ_STR_LEN (300)
char str[10024];
r[0] = 0;
-if (!req->strReq.res_empty())
+if (!req->strReq.empty())
{
sprintf(str, "%s", req->strReq.const_data().c_str());
strcat(r, str);
NETTRANSACT nt;
nt.SetServer(r->server.const_data().c_str());
-nt.SetServerPort(r->port);
+nt.SetServerPort(r->port.const_data());
nt.SetLogin(r->admLogin.const_data().c_str());
nt.SetPassword(r->admPasswd.const_data().c_str());
nt.SetRxCallback(NULL, ParseReply);
//-----------------------------------------------------------------------------
int CheckParameters(REQUEST * req)
{
-int a = !req->admLogin.res_empty()
- && !req->admPasswd.res_empty()
- && !req->server.res_empty()
- && !req->port.res_empty();
+int a = !req->admLogin.empty()
+ && !req->admPasswd.empty()
+ && !req->server.empty()
+ && !req->port.empty();
-int b = !req->fileReq.res_empty()
- || !req->strReq.res_empty();
+int b = !req->fileReq.empty()
+ || !req->strReq.empty();
return a && b;
}