uvos/SerialPortMultiplexer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: uvos:5df7c881b918a827ce38804ab385cad6d5051531
Branches Tags
uvos:master
..
compare: uvos:56d5798cb12035e2165c0518e4310847ecd93fde
Branches Tags
uvos:master

No commits in common. "5df7c881b918a827ce38804ab385cad6d5051531" and "56d5798cb12035e2165c0518e4310847ecd93fde" have entirely different histories.
5df7c881b9 ... 56d5798cb1

6 changed files with 638 additions and 743 deletions
Download patch file Download diff file Expand all files Collapse all files

184
Socket.cpp
View file

@ -2,15 +2,15 @@
#include "Socket.h" #include "Socket.h"
#include <sys/types.h> // For data types #include <sys/types.h> // For data types
#include <sys/socket.h> // For socket(), connect(), send(), and recv() #include <sys/socket.h> // For socket(), connect(), send(), and recv()
#include <netdb.h> // For gethostbyname() #include <netdb.h> // For gethostbyname()
#include <arpa/inet.h> // For inet_addr() #include <arpa/inet.h> // For inet_addr()
#include <unistd.h> // For close() #include <unistd.h> // For close()
#include <netinet/in.h> // For sockaddr_in #include <netinet/in.h> // For sockaddr_in
#include <netinet/tcp.h> // TCP_KEEPCNT #include <netinet/tcp.h> // TCP_KEEPCNT
#include <fcntl.h> #include <fcntl.h>
typedef void raw_type; // Type used for raw data on this platform typedef void raw_type; // Type used for raw data on this platform
#include <errno.h> // For errno #include <errno.h> // For errno
@ -19,34 +19,28 @@ using namespace std;
// SocketException Code // SocketException Code
SocketException::SocketException(const string &message, bool inclSysMsg) SocketException::SocketException(const string &message, bool inclSysMsg)
: userMessage(message) : userMessage(message) {
{ if (inclSysMsg) {
if (inclSysMsg)
{
userMessage.append(": "); userMessage.append(": ");
userMessage.append(strerror(errno)); userMessage.append(strerror(errno));
} }
} }
SocketException::~SocketException() noexcept (true) SocketException::~SocketException() noexcept (true) {
{
} }
const char *SocketException::what() const char *SocketException::what(){
{
return userMessage.c_str(); return userMessage.c_str();
} }
// Function to fill in address structure given an address and port // Function to fill in address structure given an address and port
static void fillAddr(const string &address, unsigned short port, static void fillAddr(const string &address, unsigned short port,
sockaddr_in &addr) sockaddr_in &addr) {
{
memset(&addr, 0, sizeof(addr)); // Zero out address structure memset(&addr, 0, sizeof(addr)); // Zero out address structure
addr.sin_family = AF_INET; // Internet address addr.sin_family = AF_INET; // Internet address
hostent *host; // Resolve name hostent *host; // Resolve name
if ((host = gethostbyname(address.c_str())) == NULL) if ((host = gethostbyname(address.c_str())) == NULL) {
{
// strerror() will not work for gethostbyname() and hstrerror() // strerror() will not work for gethostbyname() and hstrerror()
// is supposedly obsolete // is supposedly obsolete
throw SocketException("Failed to resolve name (gethostbyname())"); throw SocketException("Failed to resolve name (gethostbyname())");
@ -58,18 +52,15 @@ static void fillAddr(const string &address, unsigned short port,
// Socket Code // Socket Code
Socket::Socket(int type, int protocol) Socket::Socket(int type, int protocol) {
{
// Make a new socket // Make a new socket
if ((sockDesc = socket(PF_INET, type, protocol)) < 0) if ((sockDesc = socket(PF_INET, type, protocol)) < 0) {
{
throw SocketException("Socket creation failed (socket())", true); throw SocketException("Socket creation failed (socket())", true);
} }
} }
Socket::Socket(int sockDesc) Socket::Socket(int sockDesc) {
{
this->sockDesc = sockDesc; this->sockDesc = sockDesc;
} }
@ -79,32 +70,27 @@ Socket::~Socket()
sockDesc = -1; sockDesc = -1;
} }
string Socket::getLocalAddress() string Socket::getLocalAddress() {
{
sockaddr_in addr; sockaddr_in addr;
unsigned int addr_len = sizeof(addr); unsigned int addr_len = sizeof(addr);
if (getsockname(sockDesc, (sockaddr *) &addr, (socklen_t *) &addr_len) < 0) if (getsockname(sockDesc, (sockaddr *) &addr, (socklen_t *) &addr_len) < 0) {
{
throw SocketException("Fetch of local address failed (getsockname())", true); throw SocketException("Fetch of local address failed (getsockname())", true);
} }
return inet_ntoa(addr.sin_addr); return inet_ntoa(addr.sin_addr);
} }
unsigned short Socket::getLocalPort() unsigned short Socket::getLocalPort() {
{
sockaddr_in addr; sockaddr_in addr;
unsigned int addr_len = sizeof(addr); unsigned int addr_len = sizeof(addr);
if (getsockname(sockDesc, (sockaddr *) &addr, (socklen_t *) &addr_len) < 0) if (getsockname(sockDesc, (sockaddr *) &addr, (socklen_t *) &addr_len) < 0) {
{
throw SocketException("Fetch of local port failed (getsockname())", true); throw SocketException("Fetch of local port failed (getsockname())", true);
} }
return ntohs(addr.sin_port); return ntohs(addr.sin_port);
} }
void Socket::setLocalPort(unsigned short localPort) void Socket::setLocalPort(unsigned short localPort) {
{
// Bind the socket to its port // Bind the socket to its port
sockaddr_in localAddr; sockaddr_in localAddr;
memset(&localAddr, 0, sizeof(localAddr)); memset(&localAddr, 0, sizeof(localAddr));
@ -112,21 +98,18 @@ void Socket::setLocalPort(unsigned short localPort)
localAddr.sin_addr.s_addr = htonl(INADDR_ANY); localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
localAddr.sin_port = htons(localPort); localAddr.sin_port = htons(localPort);
if (bind(sockDesc, (sockaddr *) &localAddr, sizeof(sockaddr_in)) < 0) if (bind(sockDesc, (sockaddr *) &localAddr, sizeof(sockaddr_in)) < 0) {
{
throw SocketException("Set of local port failed (bind())", true); throw SocketException("Set of local port failed (bind())", true);
} }
} }
void Socket::setLocalAddressAndPort(const string &localAddress, void Socket::setLocalAddressAndPort(const string &localAddress,
unsigned short localPort) unsigned short localPort) {
{
// Get the address of the requested host // Get the address of the requested host
sockaddr_in localAddr; sockaddr_in localAddr;
fillAddr(localAddress, localPort, localAddr); fillAddr(localAddress, localPort, localAddr);
if (bind(sockDesc, (sockaddr *) &localAddr, sizeof(sockaddr_in)) < 0) if (bind(sockDesc, (sockaddr *) &localAddr, sizeof(sockaddr_in)) < 0) {
{
throw SocketException("Set of local address and port failed (bind())", true); throw SocketException("Set of local address and port failed (bind())", true);
} }
} }
@ -149,15 +132,12 @@ void Socket::setKeepalive()
void Socket::setBlocking(bool flag) void Socket::setBlocking(bool flag)
{ {
int flags = fcntl(sockDesc, F_GETFL, 0); int flags = fcntl(sockDesc, F_GETFL, 0);
if( !flag ) if( !flag ) flags = flags | O_NONBLOCK;
flags = flags | O_NONBLOCK; else flags = flags & ~O_NONBLOCK;
else
flags = flags & ~O_NONBLOCK;
fcntl(sockDesc, F_SETFL, flags); fcntl(sockDesc, F_SETFL, flags);
} }
void Socket::cleanUp() void Socket::cleanUp() {
{
} }
@ -167,8 +147,7 @@ int Socket::getFD()
} }
unsigned short Socket::resolveService(const string &service, unsigned short Socket::resolveService(const string &service,
const string &protocol) const string &protocol) {
{
struct servent *serv; /* Structure containing service information */ struct servent *serv; /* Structure containing service information */
if ((serv = getservbyname(service.c_str(), protocol.c_str())) == NULL) if ((serv = getservbyname(service.c_str(), protocol.c_str())) == NULL)
@ -180,32 +159,27 @@ unsigned short Socket::resolveService(const string &service,
// CommunicatingSocket Code // CommunicatingSocket Code
CommunicatingSocket::CommunicatingSocket(int type, int protocol) CommunicatingSocket::CommunicatingSocket(int type, int protocol)
: Socket(type, protocol) : Socket(type, protocol) {
{
} }
CommunicatingSocket::CommunicatingSocket(int newConnSD) : Socket(newConnSD) CommunicatingSocket::CommunicatingSocket(int newConnSD) : Socket(newConnSD) {
{
} }
void CommunicatingSocket::connect(const string &foreignAddress, void CommunicatingSocket::connect(const string &foreignAddress,
unsigned short foreignPort) unsigned short foreignPort) {
{
// Get the address of the requested host // Get the address of the requested host
sockaddr_in destAddr; sockaddr_in destAddr;
fillAddr(foreignAddress, foreignPort, destAddr); fillAddr(foreignAddress, foreignPort, destAddr);
// Try to connect to the given port // Try to connect to the given port
if (::connect(sockDesc, (sockaddr *) &destAddr, sizeof(destAddr)) < 0) if (::connect(sockDesc, (sockaddr *) &destAddr, sizeof(destAddr)) < 0) {
{
throw SocketException("Connect failed (connect())", true); throw SocketException("Connect failed (connect())", true);
} }
} }
void CommunicatingSocket::send(const void *buffer, int bufferLen) void CommunicatingSocket::send(const void *buffer, int bufferLen)
{
if (::send(sockDesc, (raw_type *) buffer, bufferLen, 0) < 0)
{ {
if (::send(sockDesc, (raw_type *) buffer, bufferLen, 0) < 0) {
throw SocketException("Send failed (send())", true); throw SocketException("Send failed (send())", true);
} }
} }
@ -215,34 +189,29 @@ int CommunicatingSocket::recv(void *buffer, int bufferLen)
int rtn; int rtn;
if ((rtn = ::recv(sockDesc, (raw_type *) buffer, bufferLen, MSG_DONTWAIT)) < 0 ) if ((rtn = ::recv(sockDesc, (raw_type *) buffer, bufferLen, MSG_DONTWAIT)) < 0 )
{ {
if(errno == EWOULDBLOCK || errno == EAGAIN) if(errno == EWOULDBLOCK || errno == EAGAIN) return -1;
return -1; else throw SocketException("Received failed (recv())", true);
else
throw SocketException("Received failed (recv())", true);
} }
return rtn; return rtn;
} }
string CommunicatingSocket::getForeignAddress() string CommunicatingSocket::getForeignAddress()
{ {
sockaddr_in addr; sockaddr_in addr;
unsigned int addr_len = sizeof(addr); unsigned int addr_len = sizeof(addr);
if (getpeername(sockDesc, (sockaddr *) &addr,(socklen_t *) &addr_len) < 0) if (getpeername(sockDesc, (sockaddr *) &addr,(socklen_t *) &addr_len) < 0) {
{
throw SocketException("Fetch of foreign address failed (getpeername())", true); throw SocketException("Fetch of foreign address failed (getpeername())", true);
} }
return inet_ntoa(addr.sin_addr); return inet_ntoa(addr.sin_addr);
} }
unsigned short CommunicatingSocket::getForeignPort() unsigned short CommunicatingSocket::getForeignPort() {
{
sockaddr_in addr; sockaddr_in addr;
unsigned int addr_len = sizeof(addr); unsigned int addr_len = sizeof(addr);
if (getpeername(sockDesc, (sockaddr *) &addr, (socklen_t *) &addr_len) < 0) if (getpeername(sockDesc, (sockaddr *) &addr, (socklen_t *) &addr_len) < 0) {
{
throw SocketException("Fetch of foreign port failed (getpeername())", true); throw SocketException("Fetch of foreign port failed (getpeername())", true);
} }
return ntohs(addr.sin_port); return ntohs(addr.sin_port);
@ -252,20 +221,16 @@ unsigned short CommunicatingSocket::getForeignPort()
TCPSocket::TCPSocket() TCPSocket::TCPSocket()
: CommunicatingSocket(SOCK_STREAM, : CommunicatingSocket(SOCK_STREAM,
IPPROTO_TCP) IPPROTO_TCP) {
{
} }
TCPSocket::TCPSocket(const string &foreignAddress, unsigned short foreignPort, bool keepalive) TCPSocket::TCPSocket(const string &foreignAddress, unsigned short foreignPort, bool keepalive)
: CommunicatingSocket(SOCK_STREAM, IPPROTO_TCP) : CommunicatingSocket(SOCK_STREAM, IPPROTO_TCP) {
{
connect(foreignAddress, foreignPort); connect(foreignAddress, foreignPort);
if(keepalive) if(keepalive) setKeepalive();
setKeepalive();
} }
TCPSocket::TCPSocket(int newConnSD) : CommunicatingSocket(newConnSD) TCPSocket::TCPSocket(int newConnSD) : CommunicatingSocket(newConnSD) {
{
} }
// TCPServerSocket Code // TCPServerSocket Code
@ -297,18 +262,15 @@ TCPSocket* TCPServerSocket::accept()
if(newConnSD > 0) if(newConnSD > 0)
{ {
newSocket = new TCPSocket(newConnSD); newSocket = new TCPSocket(newConnSD);
if(keepalive) if(keepalive) newSocket->setKeepalive();
newSocket->setKeepalive();
} }
return newSocket; return newSocket;
} }
void TCPServerSocket::setListen(int queueLen) void TCPServerSocket::setListen(int queueLen) {
{ if (listen(sockDesc, queueLen) < 0) {
if (listen(sockDesc, queueLen) < 0)
{
throw SocketException("Set listening socket failed (listen())", true); throw SocketException("Set listening socket failed (listen())", true);
} }
} }
@ -316,27 +278,23 @@ void TCPServerSocket::setListen(int queueLen)
// UDPSocket Code // UDPSocket Code
UDPSocket::UDPSocket() : CommunicatingSocket(SOCK_DGRAM, UDPSocket::UDPSocket() : CommunicatingSocket(SOCK_DGRAM,
IPPROTO_UDP) IPPROTO_UDP) {
{
setBroadcast(); setBroadcast();
} }
UDPSocket::UDPSocket(unsigned short localPort) : UDPSocket::UDPSocket(unsigned short localPort) :
CommunicatingSocket(SOCK_DGRAM, IPPROTO_UDP) CommunicatingSocket(SOCK_DGRAM, IPPROTO_UDP) {
{
setLocalPort(localPort); setLocalPort(localPort);
setBroadcast(); setBroadcast();
} }
UDPSocket::UDPSocket(const string &localAddress, unsigned short localPort) UDPSocket::UDPSocket(const string &localAddress, unsigned short localPort)
: CommunicatingSocket(SOCK_DGRAM, IPPROTO_UDP) : CommunicatingSocket(SOCK_DGRAM, IPPROTO_UDP) {
{
setLocalAddressAndPort(localAddress, localPort); setLocalAddressAndPort(localAddress, localPort);
setBroadcast(); setBroadcast();
} }
void UDPSocket::setBroadcast() void UDPSocket::setBroadcast() {
{
// If this fails, we'll hear about it when we try to send. This will allow // If this fails, we'll hear about it when we try to send. This will allow
// system that cannot broadcast to continue if they don't plan to broadcast // system that cannot broadcast to continue if they don't plan to broadcast
int broadcastPermission = 1; int broadcastPermission = 1;
@ -344,17 +302,14 @@ void UDPSocket::setBroadcast()
(raw_type *) &broadcastPermission, sizeof(broadcastPermission)); (raw_type *) &broadcastPermission, sizeof(broadcastPermission));
} }
void UDPSocket::disconnect() void UDPSocket::disconnect() {
{
sockaddr_in nullAddr; sockaddr_in nullAddr;
memset(&nullAddr, 0, sizeof(nullAddr)); memset(&nullAddr, 0, sizeof(nullAddr));
nullAddr.sin_family = AF_UNSPEC; nullAddr.sin_family = AF_UNSPEC;
// Try to disconnect // Try to disconnect
if (::connect(sockDesc, (sockaddr *) &nullAddr, sizeof(nullAddr)) < 0) if (::connect(sockDesc, (sockaddr *) &nullAddr, sizeof(nullAddr)) < 0) {
{ if (errno != EAFNOSUPPORT) {
if (errno != EAFNOSUPPORT)
{
throw SocketException("Disconnect failed (connect())", true); throw SocketException("Disconnect failed (connect())", true);
} }
} }
@ -362,26 +317,23 @@ void UDPSocket::disconnect()
void UDPSocket::sendTo(const void *buffer, int bufferLen, void UDPSocket::sendTo(const void *buffer, int bufferLen,
const string &foreignAddress, unsigned short foreignPort) const string &foreignAddress, unsigned short foreignPort)
{ {
sockaddr_in destAddr; sockaddr_in destAddr;
fillAddr(foreignAddress, foreignPort, destAddr); fillAddr(foreignAddress, foreignPort, destAddr);
// Write out the whole buffer as a single message. // Write out the whole buffer as a single message.
if (sendto(sockDesc, (raw_type *) buffer, bufferLen, 0, if (sendto(sockDesc, (raw_type *) buffer, bufferLen, 0,
(sockaddr *) &destAddr, sizeof(destAddr)) != bufferLen) (sockaddr *) &destAddr, sizeof(destAddr)) != bufferLen) {
{
throw SocketException("Send failed (sendto())", true); throw SocketException("Send failed (sendto())", true);
} }
} }
int UDPSocket::recvFrom(void *buffer, int bufferLen, string &sourceAddress, int UDPSocket::recvFrom(void *buffer, int bufferLen, string &sourceAddress,
unsigned short &sourcePort) unsigned short &sourcePort) {
{
sockaddr_in clntAddr; sockaddr_in clntAddr;
socklen_t addrLen = sizeof(clntAddr); socklen_t addrLen = sizeof(clntAddr);
int rtn; int rtn;
if ((rtn = recvfrom(sockDesc, (raw_type *) buffer, bufferLen, MSG_DONTWAIT, (sockaddr *) &clntAddr, if ((rtn = recvfrom(sockDesc, (raw_type *) buffer, bufferLen, MSG_DONTWAIT, (sockaddr *) &clntAddr, (socklen_t *) &addrLen)) < 0)
(socklen_t *) &addrLen)) < 0)
{ {
throw SocketException("Receive failed (recvfrom())", true); throw SocketException("Receive failed (recvfrom())", true);
} }
@ -391,39 +343,33 @@ int UDPSocket::recvFrom(void *buffer, int bufferLen, string &sourceAddress,
return rtn; return rtn;
} }
void UDPSocket::setMulticastTTL(unsigned char multicastTTL) void UDPSocket::setMulticastTTL(unsigned char multicastTTL) {
{
if (setsockopt(sockDesc, IPPROTO_IP, IP_MULTICAST_TTL, if (setsockopt(sockDesc, IPPROTO_IP, IP_MULTICAST_TTL,
(raw_type *) &multicastTTL, sizeof(multicastTTL)) < 0) (raw_type *) &multicastTTL, sizeof(multicastTTL)) < 0) {
{
throw SocketException("Multicast TTL set failed (setsockopt())", true); throw SocketException("Multicast TTL set failed (setsockopt())", true);
} }
} }
void UDPSocket::joinGroup(const string &multicastGroup) void UDPSocket::joinGroup(const string &multicastGroup) {
{
struct ip_mreq multicastRequest; struct ip_mreq multicastRequest;
multicastRequest.imr_multiaddr.s_addr = inet_addr(multicastGroup.c_str()); multicastRequest.imr_multiaddr.s_addr = inet_addr(multicastGroup.c_str());
multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY); multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY);
if (setsockopt(sockDesc, IPPROTO_IP, IP_ADD_MEMBERSHIP, if (setsockopt(sockDesc, IPPROTO_IP, IP_ADD_MEMBERSHIP,
(raw_type *) &multicastRequest, (raw_type *) &multicastRequest,
sizeof(multicastRequest)) < 0) sizeof(multicastRequest)) < 0) {
{
throw SocketException("Multicast group join failed (setsockopt())", true); throw SocketException("Multicast group join failed (setsockopt())", true);
} }
} }
void UDPSocket::leaveGroup(const string &multicastGroup) void UDPSocket::leaveGroup(const string &multicastGroup) {
{
struct ip_mreq multicastRequest; struct ip_mreq multicastRequest;
multicastRequest.imr_multiaddr.s_addr = inet_addr(multicastGroup.c_str()); multicastRequest.imr_multiaddr.s_addr = inet_addr(multicastGroup.c_str());
multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY); multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY);
if (setsockopt(sockDesc, IPPROTO_IP, IP_DROP_MEMBERSHIP, if (setsockopt(sockDesc, IPPROTO_IP, IP_DROP_MEMBERSHIP,
(raw_type *) &multicastRequest, (raw_type *) &multicastRequest,
sizeof(multicastRequest)) < 0) sizeof(multicastRequest)) < 0) {
{
throw SocketException("Multicast group leave failed (setsockopt())", true); throw SocketException("Multicast group leave failed (setsockopt())", true);
} }
} }

18
Socket.h
View file

@ -9,8 +9,7 @@
/** /**
* Signals a problem with the execution of a socket call. * Signals a problem with the execution of a socket call.
*/ */
class SocketException : public std::exception class SocketException : public std::exception {
{
public: public:
/** /**
* Construct a SocketException with a explanatory message. * Construct a SocketException with a explanatory message.
@ -38,8 +37,7 @@ private:
/** /**
* Base class representing basic communication endpoint * Base class representing basic communication endpoint
*/ */
class Socket class Socket {
{
public: public:
/** /**
* Close and deallocate this socket * Close and deallocate this socket
@ -122,8 +120,7 @@ protected:
/** /**
* Socket which is able to connect, send, and receive * Socket which is able to connect, send, and receive
*/ */
class CommunicatingSocket : public Socket class CommunicatingSocket : public Socket {
{
public: public:
/** /**
* Establish a socket connection with the given foreign * Establish a socket connection with the given foreign
@ -176,8 +173,7 @@ protected:
/** /**
* TCP socket for communication with other TCP sockets * TCP socket for communication with other TCP sockets
*/ */
class TCPSocket : public CommunicatingSocket class TCPSocket : public CommunicatingSocket {
{
public: public:
/** /**
* Construct a TCP socket with no connection * Construct a TCP socket with no connection
@ -206,8 +202,7 @@ private:
/** /**
* TCP socket class for servers * TCP socket class for servers
*/ */
class TCPServerSocket : public Socket class TCPServerSocket : public Socket {
{
public: public:
/** /**
* Construct a TCP socket for use with a server, accepting connections * Construct a TCP socket for use with a server, accepting connections
@ -248,8 +243,7 @@ private:
/** /**
* UDP socket class * UDP socket class
*/ */
class UDPSocket : public CommunicatingSocket class UDPSocket : public CommunicatingSocket {
{
public: public:
/** /**
* Construct a UDP socket * Construct a UDP socket

28
clienthandler.h
View file

@ -14,6 +14,7 @@ private:
CommunicatingSocket *_socket; CommunicatingSocket *_socket;
bool _disconnected = false; bool _disconnected = false;
public: public:
void cleanUp(); void cleanUp();
@ -55,8 +56,7 @@ bool ClientHandler::run(std::vector<ClientHandler>* clients, int serial, bool ve
try try
{ {
reclen = _socket->recv(buffer.data(), 4096); reclen = _socket->recv(buffer.data(), 4096);
if(verbose) if(verbose) std::cout<<"Recived "<<reclen<<" bytes\n";
std::cout<<"Recived "<<reclen<<" bytes\n";
} }
catch (SocketException &e) catch (SocketException &e)
{ {
@ -65,39 +65,29 @@ bool ClientHandler::run(std::vector<ClientHandler>* clients, int serial, bool ve
} }
if(reclen > 0) if(reclen > 0)
{ {
if(!_isBroadcasting && reclen >= 5 && strncmp( buffer.data(), "bcst:", 5) == 0) if(!_isBroadcasting && reclen >= 5 && strncmp( buffer.data(), "bcst:", 5) == 0) _isBroadcasting = true;
_isBroadcasting = true;
if(_isBroadcasting) if(_isBroadcasting)
{ {
if(verbose) if(verbose) std::cout<<"Boradcasting "<<reclen<<" bytes\n";
std::cout<<"Boradcasting "<<reclen<<" bytes\n"; for(ClientHandler& item : *clients) if(operator!=(item))item.write(buffer.data(), reclen);
for(ClientHandler& item : *clients)
if(operator!=(item))
item.write(buffer.data(), reclen);
char* newline = std::find(buffer.begin(), buffer.end(), '\n'); char* newline = std::find(buffer.begin(), buffer.end(), '\n');
if(newline != std::end(buffer)) if(newline != std::end(buffer)) _isBroadcasting = false;
_isBroadcasting = false;
} }
else else
{ {
if(verbose) if(verbose) std::cout<<"wrote "<<reclen<<" bytes to serial\n";
std::cout<<"wrote "<<reclen<<" bytes to serial\n";
if(sWrite(serial, buffer.data(), reclen) < 0 && (errno != EAGAIN || errno != EWOULDBLOCK)) if(sWrite(serial, buffer.data(), reclen) < 0 && (errno != EAGAIN || errno != EWOULDBLOCK))
{ {
throw serialIoException(serial, errno); throw serialIoException(serial, errno);
} }
} }
} }
else if(reclen == 0) else if(reclen == 0) _disconnected = true;
_disconnected = true;
return !_disconnected; return !_disconnected;
} }
bool ClientHandler::isDisconnected() bool ClientHandler::isDisconnected(){return _disconnected;}
{
return _disconnected;
}
void ClientHandler::write(const char* buffer, const size_t len) void ClientHandler::write(const char* buffer, const size_t len)
{ {

50
main.cpp
View file

@ -60,24 +60,18 @@ static int parseCmdArgs(int argc, char** argv, Config *config)
} }
else if (std::string(argv[i]) == "--serialport" || std::string(argv[i]) == "-p") else if (std::string(argv[i]) == "--serialport" || std::string(argv[i]) == "-p")
{ {
if(argc > i) if(argc > i) config->portFileName = argv[i+1];
config->portFileName = argv[i+1]; else return -1;
else
return -1;
} }
else if (std::string(argv[i]) == "--port" || std::string(argv[i]) == "-P") else if (std::string(argv[i]) == "--port" || std::string(argv[i]) == "-P")
{ {
if(argc > i) if(argc > i) config->port = atoi(argv[i+1]);
config->port = atoi(argv[i+1]); else return -1;
else
return -1;
} }
else if (std::string(argv[i]) == "--baud" || std::string(argv[i]) == "-b") else if (std::string(argv[i]) == "--baud" || std::string(argv[i]) == "-b")
{ {
if(argc > i) if(argc > i) config->baud = atoi(argv[i+1]);
config->baud = atoi(argv[i+1]); else return -1;
else
return -1;
} }
else if (std::string(argv[i]) == "--sinkless" || std::string(argv[i]) == "-s" ) else if (std::string(argv[i]) == "--sinkless" || std::string(argv[i]) == "-s" )
{ {
@ -100,8 +94,7 @@ static int parseCmdArgs(int argc, char** argv, Config *config)
return 0; return 0;
} }
void acceptThreadFunction( TCPServerSocket* servSock, std::vector<ClientHandler>* clients, std::mutex* clientsMutex, void acceptThreadFunction( TCPServerSocket* servSock, std::vector<ClientHandler>* clients, std::mutex* clientsMutex, int pollQue )
int pollQue )
{ {
while(!stop) while(!stop)
{ {
@ -134,8 +127,7 @@ int openSerialPort(const Config& config)
std::cout<<"Opeing serial port failed\n"; std::cout<<"Opeing serial port failed\n";
tcflush(serial, TCIOFLUSH); tcflush(serial, TCIOFLUSH);
} }
else else std::cout<<"Sinkless mode\n";
std::cout<<"Sinkless mode\n";
return serial; return serial;
} }
@ -185,9 +177,7 @@ int main(int argc, char* argv[])
if(!config.noSerial) if(!config.noSerial)
{ {
if(serial == -1) if(serial == -1)
{
return 1; return 1;
}
else else
{ {
struct epoll_event ev = {}; struct epoll_event ev = {};
@ -246,17 +236,7 @@ int main(int argc, char* argv[])
catch(serialIoException& ex) catch(serialIoException& ex)
{ {
close(serial); close(serial);
serial = serialPortReconnect(config, ex.what()); serialPortReconnect(config, ex.what());
if(serial < 0)
{
std::cerr<<"Serial port connection has failed with: "<<strerror(errno)<<'\n';
return 2;
}
struct epoll_event ev = {};
ev.events = EPOLLIN;
ev.data.fd = -1;
epoll_ctl(pollQue, EPOLL_CTL_ADD, serial, &ev);
} }
} }
if((ev.events & (EPOLLHUP | EPOLLERR)) || client->isDisconnected()) if((ev.events & (EPOLLHUP | EPOLLERR)) || client->isDisconnected())
@ -274,17 +254,7 @@ int main(int argc, char* argv[])
if(readlen < 0 && (errno != EAGAIN || errno != EWOULDBLOCK)) if(readlen < 0 && (errno != EAGAIN || errno != EWOULDBLOCK))
{ {
close(serial); close(serial);
serial = serialPortReconnect(config, strerror(errno)); serialPortReconnect(config, strerror(errno));
if(serial < 0)
{
std::cerr<<"Serial port connection has failed with: "<<strerror(errno)<<'\n';
return 2;
}
struct epoll_event ev = {};
ev.events = EPOLLIN;
ev.data.fd = -1;
epoll_ctl(pollQue, EPOLL_CTL_ADD, serial, &ev);
} }
if(config.verbose) if(config.verbose)
{ {

14
serial_io.cpp
View file

@ -2,18 +2,14 @@
ssize_t sWrite(int port, char string[], size_t length) ssize_t sWrite(int port, char string[], size_t length)
{ {
if(port != -1) if(port != -1) return write(port, string, length);
return write(port, string, length); else return 0;
else
return 0;
} }
ssize_t sWrite(int port, const char string[], size_t length) ssize_t sWrite(int port, const char string[], size_t length)
{ {
if(port != -1) if(port != -1) return write(port, string, length);
return write(port, string, length); else return 0;
else
return 0;
} }
ssize_t sRead(int port, void *buf, size_t count) ssize_t sRead(int port, void *buf, size_t count)
@ -24,7 +20,7 @@ ssize_t sRead(int port, void *buf, size_t count)
#ifdef __cplusplus #ifdef __cplusplus
void printRates() void printRates()
{ {
std::cout<<"Rates:\n"\ std::cout<<"Rates:\n"\
<<"Unchanged 0\n" \ <<"Unchanged 0\n" \
<<"B50 "<<B50<<'\n'\ <<"B50 "<<B50<<'\n'\
<<"B75 "<<B75<<'\n'\ <<"B75 "<<B75<<'\n'\

5
serial_io.h
View file

@ -29,12 +29,11 @@ int serialport_init(const char* device, int baud = BAUDRATE, bool block = false)
#ifdef __cplusplus #ifdef __cplusplus
class serialIoException: public std::runtime_error class serialIoException: public std::runtime_error
{ {
public: public:
int fd; int fd;
int errorNumber; int errorNumber;
serialIoException(int fd_, int errorNumber_): serialIoException(int fd_, int errorNumber_):
std::runtime_error("file descriptor error, fd: " + std::to_string(fd_) + " error: " + strerror(errorNumber_) + "\n"), std::runtime_error("file descriptor error, fd: " + std::to_string(fd_) + " error: " + strerror(errorNumber_) + "\n"), fd(fd_), errorNumber(errorNumber_)
fd(fd_), errorNumber(errorNumber_)
{} {}
}; };
#endif #endif