*
*/
-#include "mem_config.h"
-
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
-#ifdef HAVE_POLL_H
-# include <poll.h>
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
#include <string>
+#ifdef HAVE_POLL_H
+# include <poll.h>
+#endif
+
+#ifndef HAVE_MSG_NOSIGNAL
+# define MSG_NOSIGNAL 0
+#endif
namespace libtest {
SimpleClient::SimpleClient(const std::string& hostname_, in_port_t port_) :
+ _is_connected(false),
_hostname(hostname_),
_port(port_),
sock_fd(INVALID_SOCKET),
fds[0].events= event_;
fds[0].revents= 0;
- int ready_fds= poll(fds, 1, 5000);
+ int timeout= 5000;
+ if (_is_connected == false)
+ {
+ timeout= timeout * 30;
+ }
+
+ int ready_fds= poll(fds, 1, timeout);
if (ready_fds == -1)
{
return false;
}
+ _is_connected= true;
if (fds[0].revents & event_)
{
return true;
hints.ai_socktype= SOCK_STREAM;
hints.ai_protocol= IPPROTO_TCP;
- char service[NI_MAXSERV];
- (void)snprintf(service, NI_MAXSERV, "%d", _port);
+ libtest::vchar_t service;
+ service.resize(NI_MAXSERV);
+ (void)snprintf(&service[0], service.size(), "%d", _port);
int getaddrinfo_error;
- if ((getaddrinfo_error= getaddrinfo(_hostname.c_str(), service, &hints, &ai)) != 0)
+ if ((getaddrinfo_error= getaddrinfo(_hostname.c_str(), &service[0], &hints, &ai)) != 0)
{
if (getaddrinfo_error != EAI_SYSTEM)
{
void SimpleClient::close_socket()
{
- close(sock_fd);
- sock_fd= INVALID_SOCKET;
+ if (sock_fd != INVALID_SOCKET)
+ {
+ close(sock_fd);
+ sock_fd= INVALID_SOCKET;
+ }
}
bool SimpleClient::instance_connect()
{
+ _is_connected= false;
struct addrinfo *ai;
if ((ai= lookup()))
{
{
if (connect(sock_fd, address_info_next->ai_addr, address_info_next->ai_addrlen) == SOCKET_ERROR)
{
+ switch (errno)
+ {
+ case EINTR:
+ close_socket();
+ continue;
+
+ case EINPROGRESS: // nonblocking mode - first return
+ case EALREADY: // nonblocking mode - subsequent returns
+ continue; // Jump to while() and continue on
+
+
+ case ECONNREFUSED:
+ default:
+ break;
+ }
+
close_socket();
_error= strerror(errno);
}
}
else
{
- fatal_message(strerror(errno));
+ FATAL(strerror(errno));
}
address_info_next= address_info_next->ai_next;
}
return true;
}
-bool SimpleClient::message(const std::string& arg)
+bool SimpleClient::message(const char* ptr, const size_t len)
{
if (is_valid())
{
if (ready(POLLOUT))
{
off_t offset= 0;
- const char* ptr= arg.c_str();
- size_t len= arg.size();
-
do
{
ssize_t nw= send(sock_fd, ptr + offset, len - offset, MSG_NOSIGNAL);
bool SimpleClient::send_message(const std::string& arg)
{
- if (message(arg) == true)
+ if (message(arg.c_str(), arg.size()) == true)
+ {
+ return message("\r\n", 2);
+ }
+
+ return false;
+}
+
+bool SimpleClient::send_data(const libtest::vchar_t& message_, libtest::vchar_t& response_)
+{
+ requested_message++;
+ if (message(&message_[0], message_.size()))
{
- return message("\r\n");
+ return response(response_);
}
return false;
return false;
}
+bool SimpleClient::response(libtest::vchar_t& response_)
+{
+ response_.clear();
+
+ if (is_valid())
+ {
+ if (ready(POLLIN))
+ {
+ bool more= true;
+ char buffer[2];
+ buffer[1]= 0;
+ do
+ {
+ ssize_t nr= recv(sock_fd, buffer, 1, MSG_NOSIGNAL);
+ if (nr == -1)
+ {
+ if (errno != EINTR)
+ {
+ _error= strerror(errno);
+ return false;
+ }
+ }
+ else if (nr == 0)
+ {
+ close_socket();
+ more= false;
+ }
+ else
+ {
+ response_.reserve(response_.size() + nr +1);
+ fatal_assert(nr == 1);
+ if (buffer[0] == '\n')
+ {
+ more= false;
+ }
+ response_.insert(response_.end(), buffer, buffer +nr);
+ }
+ } while (more);
+
+ return response_.size();
+ }
+ }
+
+ fatal_assert(_error.size());
+ return false;
+}
+
bool SimpleClient::response(std::string& response_)
{
response_.clear();
return false;
}
}
+ else if (nr == 0)
+ {
+ close_socket();
+ more= false;
+ }
else
{
fatal_assert(nr == 1);