TCPSocket inherits from both Socket and TLS, both declaring receiveData()
as unrelated sibling methods - only Socket::receiveData was virtual, so
TLS::receiveData (SSL_read) was never reached regardless of TLS config,
and even when reached its result was never forwarded to onDataReceived
(that call was commented out). Added an explicit TCPSocket::receiveData
override dispatching to TLS::receiveData or Socket::receiveData based on
tlsInfo, and completed TLS::receiveData to actually return/forward the
decrypted bytes.
Write path did not exist at all. Added Socket::sendData() as a new
virtual hook mirroring receiveData, routed Socket::writeSocket() through
it instead of a raw ::write(), added TLS::sendData() (SSL_write, same
error-handling style as the existing TLS methods), and TCPSocket::sendData()
dispatching the same way the read side does.
Also fixed: a queued write in writeSocket() was being popped off the fifo
as if sent even when shutDown was true and nothing was actually written;
removed a dead empty if(tlsInfo){} stub in onDataReceived, no longer
needed now dispatch happens one level up; replaced leftover debug
std::cout lines with proper Log() calls matching the rest of the file.
Verified via full local compile: all 20 .cpp files build clean, link
into libServerCore.a, and nm confirms the new/fixed symbols are correctly
defined in the right object files.
208 lines
6.0 KiB
C++
208 lines
6.0 KiB
C++
#include "Socket.h"
|
|
#include "EPoll.h"
|
|
#include "Exception.h"
|
|
#include "Log.h"
|
|
#include "ZString.h"
|
|
|
|
namespace core
|
|
{
|
|
|
|
void sigpipe_handler(int unused) {}
|
|
|
|
Socket::Socket(EPoll &ePoll, std::string text) : ePoll(ePoll), text(text) {
|
|
coreutils::Log(coreutils::LOG_DEBUG_2) << "Socket object created [" << text << "].";
|
|
buffer = (char *)malloc(4096);
|
|
length = 4096;
|
|
}
|
|
|
|
Socket::~Socket() {
|
|
shutDown = true;
|
|
onUnregister();
|
|
disableSocket();
|
|
coreutils::Log(coreutils::LOG_DEBUG_4) << "Free on socket " << descriptor;
|
|
free(buffer);
|
|
if(descriptor == -1)
|
|
return;
|
|
close(descriptor);
|
|
coreutils::Log(coreutils::LOG_DEBUG_1) << text << " has ended (" << descriptor << ").";
|
|
}
|
|
|
|
void Socket::setDescriptor(int descriptor)
|
|
{
|
|
if ((descriptor == -1) && (errno == 24))
|
|
{
|
|
shutdown("Too many files open");
|
|
throw coreutils::Exception("Too many files open. Refusing connection.");
|
|
}
|
|
coreutils::Log(coreutils::LOG_DEBUG_1) << text << " has started (" << descriptor << ").";
|
|
if(descriptor < 3)
|
|
throw coreutils::Exception("Descriptor out of range", __FILE__, __LINE__);
|
|
this->descriptor = descriptor;
|
|
onRegister();
|
|
enableSocket();
|
|
onRegistered();
|
|
}
|
|
|
|
int Socket::getDescriptor()
|
|
{
|
|
return descriptor;
|
|
}
|
|
|
|
void Socket::setBufferSize(int length)
|
|
{
|
|
this->length = length;
|
|
buffer = (char *)realloc(buffer, length);
|
|
}
|
|
|
|
int Socket::getBufferSize()
|
|
{
|
|
return length;
|
|
}
|
|
|
|
void Socket::onRegister() {}
|
|
|
|
void Socket::onRegistered() {}
|
|
|
|
void Socket::onUnregister() {}
|
|
|
|
void Socket::onUnregistered() {}
|
|
|
|
bool Socket::eventReceived(struct epoll_event event, long long eventId) {
|
|
coreutils::Log(coreutils::LOG_DEBUG_1) << "Event process beginning for socket " << getDescriptor();
|
|
if(inHandler)
|
|
coreutils::Log(coreutils::LOG_DEBUG_2) << "inHandler was already true.";
|
|
inHandler = true;
|
|
if(event.events & EPOLLRDHUP) {
|
|
coreutils::Log(coreutils::LOG_DEBUG_2) << "EPOLLRDHUP";
|
|
readHangup = true;
|
|
shutdown("hangup received");
|
|
}
|
|
if(event.events & EPOLLIN) {
|
|
coreutils::Log(coreutils::LOG_DEBUG_2) << "EPOLLIN";
|
|
coreutils::ZString zbuffer(buffer, length);
|
|
lock.lock();
|
|
receiveData(zbuffer);
|
|
if(!shutDown) {
|
|
inHandler = false;
|
|
lock.unlock();
|
|
resetSocket();
|
|
}
|
|
}
|
|
if(event.events & EPOLLWRNORM) {
|
|
coreutils::Log(coreutils::LOG_DEBUG_2) << "EPOLLWRNORM";
|
|
writeSocket();
|
|
inHandler = false;
|
|
resetSocket();
|
|
}
|
|
inHandler = false;
|
|
coreutils::Log(coreutils::LOG_DEBUG_1) << "Event process ending for socket " << getDescriptor();
|
|
return !shutDown;
|
|
}
|
|
|
|
void Socket::connectionRequest() {}
|
|
|
|
void Socket::onDataReceived(std::string data) {
|
|
throw coreutils::Exception("Need to override onDataReceived.", __FILE__, __LINE__, -1);
|
|
}
|
|
|
|
void Socket::onDataReceived(coreutils::ZString &data) {
|
|
onDataReceived(std::string(data.getData(), data.getLength()));
|
|
}
|
|
|
|
void Socket::receiveData(coreutils::ZString &buffer) {
|
|
coreutils::ZString blank("");
|
|
if(buffer.getLength() <= 0)
|
|
throw coreutils::Exception("Request to receive data with a zero buffer length.", __FILE__, __LINE__, -1);
|
|
int len;
|
|
int error = -1;
|
|
if((len = ::read(getDescriptor(), buffer.getData(), buffer.getLength())) >= 0) {
|
|
coreutils::ZString zbuffer(buffer.getData(), len);
|
|
// coreutils::Log(coreutils::LOG_DEBUG_1) << zbuffer;
|
|
onDataReceived(zbuffer);
|
|
} else {
|
|
error = errno;
|
|
switch (error) {
|
|
|
|
// When a listening socket receives a connection
|
|
// request we get one of these.
|
|
|
|
case ENOTCONN:
|
|
connectionRequest();
|
|
break;
|
|
|
|
case ECONNRESET:
|
|
break;
|
|
|
|
default:
|
|
throw coreutils::Exception("Error in read of data from socket.", __FILE__, __LINE__, error);
|
|
}
|
|
}
|
|
}
|
|
|
|
int Socket::sendData(const char *data, int length) {
|
|
return ::write(descriptor, data, length);
|
|
}
|
|
|
|
void Socket::writeSocket() {
|
|
outlock.lock();
|
|
// coreutils::Log(coreutils::LOG_DEBUG_3) << "writing data to socket " << getDescriptor();
|
|
if(fifo.size() > 0) {
|
|
if(!shutDown) {
|
|
sendData(fifo.front().c_str(), fifo.front().length());
|
|
fifo.pop();
|
|
}
|
|
}
|
|
outlock.unlock();
|
|
}
|
|
|
|
int Socket::write(std::string data) {
|
|
outlock.lock();
|
|
fifo.emplace(data);
|
|
outlock.unlock();
|
|
if(lock.try_lock()) {
|
|
resetSocket();
|
|
lock.unlock();
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
void Socket::output(std::stringstream &out)
|
|
{
|
|
out << "|" << descriptor << "|";
|
|
}
|
|
|
|
bool Socket::needsToWrite()
|
|
{
|
|
return fifo.size() > 0;
|
|
}
|
|
|
|
void Socket::shutdown(std::string text) {
|
|
coreutils::Log(coreutils::LOG_DEBUG_2) << "Shutdown requested from " << this->text << " (" << descriptor << ") with reason: " << text << ".";
|
|
shutDown = true;
|
|
reset = false;
|
|
}
|
|
|
|
void Socket::enableSocket() {
|
|
struct epoll_event event;
|
|
event.data.ptr = this;
|
|
event.events = EPOLLIN | EPOLLRDHUP | EPOLLONESHOT | EPOLLET;
|
|
epoll_ctl(ePoll.getDescriptor(), EPOLL_CTL_ADD, getDescriptor(), &event);
|
|
}
|
|
|
|
void Socket::disableSocket() {
|
|
epoll_ctl(ePoll.getDescriptor(), EPOLL_CTL_DEL, getDescriptor(), NULL);
|
|
}
|
|
|
|
void Socket::resetSocket() {
|
|
struct epoll_event event;
|
|
event.data.ptr = this;
|
|
event.events = EPOLLIN | EPOLLRDHUP | EPOLLONESHOT | EPOLLET;
|
|
if(fifo.size() > 0)
|
|
event.events |= EPOLLWRNORM;
|
|
if(!shutDown)
|
|
epoll_ctl(ePoll.getDescriptor(), EPOLL_CTL_MOD, getDescriptor(), &event);
|
|
}
|
|
|
|
|
|
}
|