|
|
|
|
@ -1,5 +1,6 @@
|
|
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2010-2013 by Jonathan Naylor G4KLX
|
|
|
|
|
* Copyright (C) 2019 by Thomas A. Early N7TAE
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
@ -17,37 +18,21 @@
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "TCPReaderWriterClient.h"
|
|
|
|
|
//#include "UDPReaderWriter.h"
|
|
|
|
|
#include <cstdio>
|
|
|
|
|
#include <cerrno>
|
|
|
|
|
#include <cassert>
|
|
|
|
|
#include <cstring>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CTCPReaderWriterClient::CTCPReaderWriterClient(const std::string &address, unsigned int port, const std::string &localAddress) :
|
|
|
|
|
CTCPReaderWriterClient::CTCPReaderWriterClient(const std::string &address, int family, const std::string &port) :
|
|
|
|
|
m_address(address),
|
|
|
|
|
m_family(family),
|
|
|
|
|
m_port(port),
|
|
|
|
|
m_localAddress(localAddress),
|
|
|
|
|
m_fd(-1)
|
|
|
|
|
{
|
|
|
|
|
assert(address.size());
|
|
|
|
|
assert(port > 0U);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CTCPReaderWriterClient::CTCPReaderWriterClient(int fd) :
|
|
|
|
|
m_address(),
|
|
|
|
|
m_port(0U),
|
|
|
|
|
m_localAddress(),
|
|
|
|
|
m_fd(fd)
|
|
|
|
|
{
|
|
|
|
|
assert(fd >= 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CTCPReaderWriterClient::CTCPReaderWriterClient() :
|
|
|
|
|
m_address(),
|
|
|
|
|
m_port(0U),
|
|
|
|
|
m_localAddress(),
|
|
|
|
|
m_fd(-1)
|
|
|
|
|
CTCPReaderWriterClient::CTCPReaderWriterClient() : m_fd(-1)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -55,104 +40,87 @@ CTCPReaderWriterClient::~CTCPReaderWriterClient()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool CTCPReaderWriterClient::open(const std::string& address, unsigned int port, const std::string& localAddress)
|
|
|
|
|
bool CTCPReaderWriterClient::open(const std::string &address, int family, const std::string &port)
|
|
|
|
|
{
|
|
|
|
|
m_address = address;
|
|
|
|
|
m_port = port;
|
|
|
|
|
m_localAddress = localAddress;
|
|
|
|
|
m_address = address;
|
|
|
|
|
m_family = family;
|
|
|
|
|
m_port = port;
|
|
|
|
|
|
|
|
|
|
return open();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool CTCPReaderWriterClient::open()
|
|
|
|
|
{
|
|
|
|
|
if (m_fd != -1)
|
|
|
|
|
if (m_fd != -1) {
|
|
|
|
|
fprintf(stderr, "ERROR: port for '%s' is already open!\n", m_address.c_str());
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
if (0 == m_address.size() || m_port == 0U)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
m_fd = ::socket(PF_INET, SOCK_STREAM, 0);
|
|
|
|
|
if (m_fd < 0) {
|
|
|
|
|
fprintf(stderr, "Cannot create the TCP client socket, err=%d\n", errno);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (m_localAddress.size()) {
|
|
|
|
|
sockaddr_in addr;
|
|
|
|
|
::memset(&addr, 0x00, sizeof(struct sockaddr_in));
|
|
|
|
|
addr.sin_family = AF_INET;
|
|
|
|
|
addr.sin_port = 0U;
|
|
|
|
|
addr.sin_addr.s_addr = ::inet_addr(m_localAddress.c_str());
|
|
|
|
|
if (addr.sin_addr.s_addr == INADDR_NONE) {
|
|
|
|
|
fprintf(stderr, "The address is invalid - %s\n", m_localAddress.c_str());
|
|
|
|
|
close();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (::bind(m_fd, (sockaddr*)&addr, sizeof(sockaddr_in)) == -1) {
|
|
|
|
|
fprintf(stderr, "Cannot bind the TCP client address, err=%d\n", errno);
|
|
|
|
|
close();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
if (0 == m_address.size() || 0 == m_port.size() || 0 == std::stoul(m_port)) {
|
|
|
|
|
fprintf(stderr, "ERROR: '%s:%s' is malformed!\n", m_address.c_str(), m_port.c_str());
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sockaddr_in addr;
|
|
|
|
|
::memset(&addr, 0x00, sizeof(struct sockaddr_in));
|
|
|
|
|
addr.sin_family = AF_INET;
|
|
|
|
|
addr.sin_port = htons(m_port);
|
|
|
|
|
addr.sin_addr = lookup(m_address);
|
|
|
|
|
if (AF_INET!=m_family || AF_INET6!=m_family || AF_UNSPEC!=m_family) {
|
|
|
|
|
fprintf(stderr, "ERROR: family must be AF_INET, AF_INET6 or AF_UNSPEC\n");
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (addr.sin_addr.s_addr == INADDR_NONE) {
|
|
|
|
|
close();
|
|
|
|
|
return false;
|
|
|
|
|
struct addrinfo hints;
|
|
|
|
|
memset(&hints, 0, sizeof(struct addrinfo));
|
|
|
|
|
hints.ai_family = AF_UNSPEC;
|
|
|
|
|
hints.ai_socktype = SOCK_STREAM;
|
|
|
|
|
//hints.ai_flags = AI_PASSIVE;
|
|
|
|
|
hints.ai_protocol = IPPROTO_TCP;
|
|
|
|
|
|
|
|
|
|
struct addrinfo *res;
|
|
|
|
|
int s = EAI_AGAIN;
|
|
|
|
|
int count = 0;
|
|
|
|
|
while (EAI_AGAIN==s and count++<20) {
|
|
|
|
|
// connecting to a server, so we can wait until it's ready
|
|
|
|
|
s = getaddrinfo(m_address.c_str(), m_port.c_str(), &hints, &res);
|
|
|
|
|
std::this_thread::sleep_for(std::chrono::seconds(3));
|
|
|
|
|
}
|
|
|
|
|
if (s != 0) {
|
|
|
|
|
fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(s));
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (::connect(m_fd, (sockaddr*)&addr, sizeof(struct sockaddr_in)) == -1) {
|
|
|
|
|
fprintf(stderr, "Cannot connect the TCP client socket, err=%d\n", errno);
|
|
|
|
|
close();
|
|
|
|
|
return false;
|
|
|
|
|
struct addrinfo *rp;
|
|
|
|
|
for (rp = res; rp != NULL; rp = rp->ai_next) {
|
|
|
|
|
m_fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
|
|
|
|
|
if (m_fd == -1)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (connect(m_fd, rp->ai_addr, rp->ai_addrlen)) {
|
|
|
|
|
close();
|
|
|
|
|
continue;
|
|
|
|
|
} else {
|
|
|
|
|
char buf[INET6_ADDRSTRLEN];
|
|
|
|
|
if (inet_ntop(rp->ai_family, rp->ai_addr, buf, INET6_ADDRSTRLEN))
|
|
|
|
|
fprintf(stderr, "Successfully connected %s to %s:%s\n", m_address.c_str(), buf, m_port.c_str());
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
freeaddrinfo(res);
|
|
|
|
|
|
|
|
|
|
int noDelay = 1;
|
|
|
|
|
if (::setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char *)&noDelay, sizeof(noDelay)) == -1) {
|
|
|
|
|
fprintf(stderr, "Cannot set the TCP client socket option, err=%d\n", errno);
|
|
|
|
|
close();
|
|
|
|
|
return false;
|
|
|
|
|
if (rp == NULL) {
|
|
|
|
|
fprintf(stderr, "Could not connect to any system returned by %s\n", m_address.c_str());
|
|
|
|
|
m_fd = -1;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int CTCPReaderWriterClient::read(unsigned char* buffer, unsigned int length, unsigned int secs, unsigned int msecs)
|
|
|
|
|
int CTCPReaderWriterClient::read(unsigned char* buffer, unsigned int length)
|
|
|
|
|
{
|
|
|
|
|
assert(buffer != NULL);
|
|
|
|
|
assert(length > 0U);
|
|
|
|
|
assert(m_fd != -1);
|
|
|
|
|
|
|
|
|
|
// Check that the recv() won't block
|
|
|
|
|
fd_set readFds;
|
|
|
|
|
FD_ZERO(&readFds);
|
|
|
|
|
FD_SET(m_fd, &readFds);
|
|
|
|
|
|
|
|
|
|
// Return after timeout
|
|
|
|
|
timeval tv;
|
|
|
|
|
tv.tv_sec = secs;
|
|
|
|
|
tv.tv_usec = msecs * 1000;
|
|
|
|
|
|
|
|
|
|
int ret = ::select(m_fd + 1, &readFds, NULL, NULL, &tv);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
fprintf(stderr, "Error returned from TCP client select, err=%d\n", errno);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!FD_ISSET(m_fd, &readFds))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
ssize_t len = ::recv(m_fd, (char*)buffer, length, 0);
|
|
|
|
|
if (len == 0) {
|
|
|
|
|
return -2;
|
|
|
|
|
} else if (len < 0) {
|
|
|
|
|
ssize_t len = recv(m_fd, buffer, length, 0);
|
|
|
|
|
if (len < 0) {
|
|
|
|
|
fprintf(stderr, "Error returned from recv, err=%d\n", errno);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
@ -160,7 +128,7 @@ int CTCPReaderWriterClient::read(unsigned char* buffer, unsigned int length, uns
|
|
|
|
|
return len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int CTCPReaderWriterClient::readLine(std::string& line, unsigned int secs)
|
|
|
|
|
int CTCPReaderWriterClient::readLine(std::string& line)
|
|
|
|
|
{
|
|
|
|
|
//maybe there is a better way to do this like reading blocks, pushing them for later calls
|
|
|
|
|
//Nevermind, we'll read one char at a time for the time being.
|
|
|
|
|
@ -171,7 +139,7 @@ int CTCPReaderWriterClient::readLine(std::string& line, unsigned int secs)
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
resultCode = read(&c, 1, secs);
|
|
|
|
|
resultCode = read(&c, 1);
|
|
|
|
|
if(resultCode == 1){
|
|
|
|
|
line += c;
|
|
|
|
|
len++;
|
|
|
|
|
@ -202,7 +170,6 @@ bool CTCPReaderWriterClient::writeLine(const std::string& line)
|
|
|
|
|
if(lineCopy.size() > 0 && lineCopy.at(lineCopy.size() - 1) != '\n')
|
|
|
|
|
lineCopy.append("\n");
|
|
|
|
|
|
|
|
|
|
//stupidly write one char after the other
|
|
|
|
|
size_t len = lineCopy.size();
|
|
|
|
|
bool result = true;
|
|
|
|
|
for(size_t i = 0; i < len && result; i++){
|
|
|
|
|
@ -220,24 +187,3 @@ void CTCPReaderWriterClient::close()
|
|
|
|
|
m_fd = -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
in_addr CTCPReaderWriterClient::lookup(const std::string &hostname)
|
|
|
|
|
{
|
|
|
|
|
in_addr addr;
|
|
|
|
|
in_addr_t address = ::inet_addr(hostname.c_str());
|
|
|
|
|
if (address != in_addr_t(-1)) {
|
|
|
|
|
addr.s_addr = address;
|
|
|
|
|
return addr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct hostent* hp = ::gethostbyname(hostname.c_str());
|
|
|
|
|
if (hp != NULL) {
|
|
|
|
|
::memcpy(&addr, hp->h_addr_list[0], sizeof(struct in_addr));
|
|
|
|
|
return addr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fprintf(stderr, "Cannot find address for host %s", hostname.c_str());
|
|
|
|
|
|
|
|
|
|
addr.s_addr = INADDR_NONE;
|
|
|
|
|
return addr;
|
|
|
|
|
}
|
|
|
|
|
|
Tom Early
7 years ago