barant/ServerCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Zero buffer for test before buffer read.

Browse Source
This commit is contained in:
Brad Arant 2021-09-22 18:08:56 -07:00
parent ec39c1df1a
commit 7e43656c5c
1 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Socket.cpp
View File

@ -15,7 +15,7 @@ namespace core {
Socket::~Socket() { Socket::~Socket() {
free(buffer); free(buffer);
if(descriptor == -1) if(descriptor == -1)
return; return;
onUnregister(); onUnregister();
ePoll.unregisterSocket(this); ePoll.unregisterSocket(this);
coreutils::Log(coreutils::LOG_DEBUG_3) << "Socket destroyed for socket " << descriptor << "."; coreutils::Log(coreutils::LOG_DEBUG_3) << "Socket destroyed for socket " << descriptor << ".";
@ -24,8 +24,8 @@ namespace core {
void Socket::setDescriptor(int descriptor) { void Socket::setDescriptor(int descriptor) {
if((descriptor == -1) && (errno == 24)) { if((descriptor == -1) && (errno == 24)) {
shutdown("Too many files open"); shutdown("Too many files open");
throw coreutils::Exception("Too many files open. Refusing connection."); throw coreutils::Exception("Too many files open. Refusing connection.");
} }
lock.lock(); lock.lock();
coreutils::Log(coreutils::LOG_DEBUG_3) << "Descriptor set to " << descriptor << " for Socket."; coreutils::Log(coreutils::LOG_DEBUG_3) << "Descriptor set to " << descriptor << " for Socket.";
@ -67,23 +67,23 @@ namespace core {
if(event.events & EPOLLRDHUP) { if(event.events & EPOLLRDHUP) {
readHangup = true; readHangup = true;
shutdown("hangup received"); shutdown("hangup received");
lock.unlock(); lock.unlock();
return false; return false;
} }
if(event.events & EPOLLIN) { if(event.events & EPOLLIN) {
coreutils::ZString zbuffer(buffer, length); coreutils::ZString zbuffer(buffer, length);
receiveData(zbuffer); receiveData(zbuffer);
} }
if(event.events & EPOLLWRNORM) { if(event.events & EPOLLWRNORM) {
writeSocket(); writeSocket();
} }
if(event.events & EPOLLHUP) { if(event.events & EPOLLHUP) {
shutdown(); shutdown();
lock.unlock(); lock.unlock();
return false; return false;
} }
lock.unlock(); lock.unlock();
@ -110,40 +110,43 @@ namespace core {
int len; int len;
int error = -1; int error = -1;
for(int ix = 0; ix < buffer.getLength(); ++ix)
buffer[ix] = 0;
if((len = ::read(getDescriptor(), buffer.getData(), buffer.getLength())) >= 0) { if((len = ::read(getDescriptor(), buffer.getData(), buffer.getLength())) >= 0) {
coreutils::ZString zbuffer(buffer.getData(), len); coreutils::ZString zbuffer(buffer.getData(), len);
onDataReceived(zbuffer); onDataReceived(zbuffer);
} }
else { else {
error = errno; error = errno;
switch (error) { switch (error) {
// When a listening socket receives a connection // When a listening socket receives a connection
// request we get one of these. // request we get one of these.
// //
case ENOTCONN: case ENOTCONN:
onDataReceived(blank); onDataReceived(blank);
break; break;
case ECONNRESET: case ECONNRESET:
break; break;
default: default:
throw coreutils::Exception("Error in read of data from socket.", __FILE__, __LINE__, error); throw coreutils::Exception("Error in read of data from socket.", __FILE__, __LINE__, error);
} }
} }
} }
void Socket::writeSocket() { void Socket::writeSocket() {
if(fifo.size() > 0) { if(fifo.size() > 0) {
outlock.lock(); outlock.lock();
::write(descriptor, fifo.front().c_str(), fifo.front().length()); ::write(descriptor, fifo.front().c_str(), fifo.front().length());
fifo.pop(); fifo.pop();
if(shutDown && !needsToWrite()) if(shutDown && !needsToWrite())
delete this; delete this;
outlock.unlock(); outlock.unlock();
} }
} }
@ -167,8 +170,8 @@ namespace core {
coreutils::Log(coreutils::LOG_DEBUG_2) << "Shutdown requested on socket " << descriptor << " with reason " << text << "."; coreutils::Log(coreutils::LOG_DEBUG_2) << "Shutdown requested on socket " << descriptor << " with reason " << text << ".";
shutDown = true; shutDown = true;
reset = false; reset = false;
// if(!needsToWrite()) // if(!needsToWrite())
delete this; delete this;
} }