sigmasternchen/CFloor
1
0
Fork 0
mirror of https://github.com/sigmasternchen/CFloor synced 2025-03-15 20:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

preping connection struct for ssl support

Browse source
This commit is contained in:
overflowerror 2019-03-10 21:22:10 +01:00
parent 0d56b113e1
commit e2e744b3a1
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/networking.c
View file

@ -103,7 +103,8 @@ void cleanup() {
headers_free(&(connection->headers)); headers_free(&(connection->headers));
close(connection->fd); close(connection->readfd);
close(connection->writefd);
if (connection->threads.request != 0) { if (connection->threads.request != 0) {
pthread_cancel(connection->threads.request); pthread_cancel(connection->threads.request);
@ -202,8 +203,9 @@ void safeEndConnection(struct connection* connection, bool force) {
stopThread(self, &(connection->threads.response), force); stopThread(self, &(connection->threads.response), force);
stopThread(self, &(connection->threads.helper[0]), force); stopThread(self, &(connection->threads.helper[0]), force);
stopThread(self, &(connection->threads.helper[1]), force); stopThread(self, &(connection->threads.helper[1]), force);
close(connection->fd); close(connection->readfd);
close(connection->writefd);
connection->inUse--; connection->inUse--;
} }
@ -316,7 +318,7 @@ void* requestThread(void* data) {
connection->threads._responseFd = response; connection->threads._responseFd = response;
connection->threads.responseFd = pipefd[1]; connection->threads.responseFd = pipefd[1];
if (startCopyThread(connection->fd, request, true, &(connection->threads.helper[0])) < 0) { if (startCopyThread(connection->readfd, request, true, &(connection->threads.helper[0])) < 0) {
close(request); close(request);
close(connection->threads.requestFd); close(connection->threads.requestFd);
close(response); close(response);
@ -328,7 +330,7 @@ void* requestThread(void* data) {
connection->inUse--; connection->inUse--;
return NULL; return NULL;
} }
if (startCopyThread(response, connection->fd, false, &(connection->threads.helper[1])) < 0) { if (startCopyThread(response, connection->writefd, false, &(connection->threads.helper[1])) < 0) {
close(request); close(request);
close(connection->threads.requestFd); close(connection->threads.requestFd);
close(response); close(response);
@ -403,7 +405,7 @@ void dataHandler(int signo) {
char last = 0; char last = 0;
if (connection->currentHeaderLength > 0) if (connection->currentHeaderLength > 0)
last = connection->currentHeader[connection->currentHeaderLength - 1]; last = connection->currentHeader[connection->currentHeaderLength - 1];
while((tmp = read(connection->fd, &c, 1)) > 0) { while((tmp = read(connection->readfd, &c, 1)) > 0) {
if (last == '\r' && c == '\n') { if (last == '\r' && c == '\n') {
if (dumpHeaderBuffer(&(buffer[0]), length, connection) < 0) { if (dumpHeaderBuffer(&(buffer[0]), length, connection) < 0) {
dropConnection = true; dropConnection = true;
@ -503,7 +505,7 @@ void dataHandler(int signo) {
connection->currentHeader = NULL; connection->currentHeader = NULL;
debug("networking: dropping connection"); debug("networking: dropping connection");
setSIGIO(connection->fd, false); setSIGIO(connection->readfd, false);
connection->state = ABORTED; connection->state = ABORTED;
} }
} }
@ -664,7 +666,8 @@ void* listenThread(void* _bind) {
connection->state = OPENED; connection->state = OPENED;
connection->peer = peer; connection->peer = peer;
connection->bind = bindObj; connection->bind = bindObj;
connection->fd = tmp; connection->readfd = tmp;
connection->writefd = tmp;
connection->metaData = (struct metaData) { connection->metaData = (struct metaData) {
.path = NULL, .path = NULL,
.queryString = NULL .queryString = NULL

3
src/networking.h
View file

@ -44,7 +44,8 @@ struct connection {
struct peer peer; struct peer peer;
struct bind* bind; struct bind* bind;
volatile sig_atomic_t inUse; volatile sig_atomic_t inUse;
int fd; int readfd;
int writefd;
struct metaData metaData; struct metaData metaData;
struct headers headers; struct headers headers;
size_t currentHeaderLength; size_t currentHeaderLength;