lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Increase readability

Browse Source
This commit is contained in:
Lorenz Stechauner
2020-11-30 18:26:50 +01:00
parent 6e21f0fbd4
commit bb7f95f8db
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/client.cpp
View File

@@ -274,7 +274,8 @@ bool connection_handler(const char *preprefix, const char *col1, const char *col
host.erase(pos, host.length() - pos); host.erase(pos, host.length() - pos);
} }
/*FILE *name = popen(("dig @8.8.8.8 +time=1 -x " + socket->getPeerAddress()->toString() + /*
FILE *name = popen(("dig @8.8.8.8 +time=1 -x " + socket->getPeerAddress()->toString() +
" | grep -oP \"^[^;].*\\t\\K([^ ]*)\\w\"").c_str(), "r"); " | grep -oP \"^[^;].*\\t\\K([^ ]*)\\w\"").c_str(), "r");
char hostbuffer[1024]; char hostbuffer[1024];
memset(hostbuffer, 0, 1024); memset(hostbuffer, 0, 1024);
@@ -282,7 +283,8 @@ bool connection_handler(const char *preprefix, const char *col1, const char *col
hostbuffer[size - 1] = 0; // remove \n hostbuffer[size - 1] = 0; // remove \n
if (size <= 1) { if (size <= 1) {
sprintf(hostbuffer, "%s", socket->getPeerAddress()->toString().c_str()); sprintf(hostbuffer, "%s", socket->getPeerAddress()->toString().c_str());
}*/ }
*/
sprintf(buffer, "[\x1B[1m%s\x1B[0m][%i]%s[%s][%i]%s ", host.c_str(), socket->getSocketPort(), col1, sprintf(buffer, "[\x1B[1m%s\x1B[0m][%i]%s[%s][%i]%s ", host.c_str(), socket->getSocketPort(), col1,
info->host.c_str(), socket->getPeerPort(), col2); info->host.c_str(), socket->getPeerPort(), col2);
@@ -405,7 +407,10 @@ bool connection_handler(const char *preprefix, const char *col1, const char *col
stds pipes = procopen(cmd.c_str()); stds pipes = procopen(cmd.c_str());
childpid = pipes.pid; childpid = pipes.pid;
long len = req->isExistingField("Content-Length") ? strtol(req->getField("Content-Length").c_str(), nullptr, 10) : (req->getMethod() == "POST" || req->getMethod() == "PUT")?-1:0; long len = req->isExistingField("Content-Length")
? strtol(req->getField("Content-Length").c_str(), nullptr, 10)
: ((req->getMethod() == "POST" || req->getMethod() == "PUT") ? -1 : 0);
socket->receive(pipes.stdin, len); socket->receive(pipes.stdin, len);
fclose(pipes.stdin); fclose(pipes.stdin);
@@ -502,7 +507,7 @@ bool connection_handler(const char *preprefix, const char *col1, const char *col
if (childpid > 0) { if (childpid > 0) {
waitpid(childpid, nullptr, 0); waitpid(childpid, nullptr, 0);
} }
respond: respond:
HttpStatusCode status = req->getStatusCode(); HttpStatusCode status = req->getStatusCode();