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

restructure

Browse source
This commit is contained in:
overflowerror 2019-03-05 11:45:28 +01:00
parent 0242fe26e8
commit 16a8e6c9a5
4 changed files with 108 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -23,7 +23,7 @@ obj/networking.o: src/networking.h src/headers.h src/linked.h src/logging.h src/
obj/linked.o: src/linked.h
obj/logging.o: src/logging.h
obj/signals.o: src/signals.h
obj/headers.o: src/headers.h
obj/headers.o: src/headers.h src/misc.h
obj/%.o: src/%.c obj
$(CC) $(CFLAGS) -c -o $@ $<

62
src/headers.c
View file

@ -2,6 +2,7 @@
#include <string.h>
#include "headers.h"
#include "misc.h"
int headers_find(struct headers* headers, const char* key) {
for (int i = 0; i < headers->number; i++) {
@ -122,3 +123,64 @@ void headers_free(struct headers* headers) {
if (headers->headers != NULL)
free(headers->headers);
}
int headers_metadata(struct metaData* metaData, char* header) {
char* _method = strtok(header, " ");
if (_method == NULL)
return HEADERS_PARSE_ERROR;
char* _path = strtok(NULL, " ");
if (_path == NULL)
return HEADERS_PARSE_ERROR;
char* _httpVersion = strtok(NULL, " ");
if (_httpVersion == NULL)
return HEADERS_PARSE_ERROR;
char* _null = strtok(NULL, " ");
if (_null != NULL)
return HEADERS_PARSE_ERROR;
_path = strtok(_path, "#");
int tmp = strlen(_path);
_path = strtok(_path, "?");
char* _queryString = "";
if (tmp > strlen(_path)) {
_queryString = _path + strlen(_path) + 1;
}
enum method method;
if (strcmp(_method, "GET") == 0)
method = GET;
else if (strcmp(_method, "POST") == 0)
method = POST;
else if (strcmp(_method, "PUT") == 0)
method = PUT;
else
return HEADERS_PARSE_ERROR;
enum httpVersion httpVersion;
if (strcmp(_httpVersion, "HTTP/1.0") == 0)
httpVersion = HTTP10;
else if (strcmp(_httpVersion, "HTTP/1.1") == 0)
httpVersion = HTTP11;
else
return HEADERS_PARSE_ERROR;
char* path = malloc(strlen(_path) + 1);
if (path == NULL) {
return HEADERS_ALLOC_ERROR;
}
char* queryString = malloc(strlen(_queryString) + 1);
if (queryString == NULL) {
free(path);
return HEADERS_ALLOC_ERROR;
}
metaData->method = method;
metaData->httpVersion = httpVersion;
metaData->path = path;
metaData->queryString = queryString;
return HEADERS_SUCCESS;
}

5
src/headers.h
View file

@ -1,6 +1,9 @@
#ifndef HEADERS_H
#define HEADERS_H
#include "misc.h"
#define HEADERS_SUCCESS (0)
#define HEADERS_PARSE_ERROR (-1)
#define HEADERS_ALLOC_ERROR (-2)
#define HEADERS_END (-3)
@ -20,4 +23,6 @@ int headers_mod(struct headers* headers, char* key, char* value);
int headers_parse(struct headers* headers, const char* currentHeader, size_t length);
void headers_free(struct headers* headers);
int headers_metadata(struct metaData* metaData, char* header);
#endif

120
src/networking.c
View file

@ -18,6 +18,31 @@
struct networkingConfig networkingConfig;
static inline long timespecDiffMs(struct timespec start, struct timespec end) {
return (end.tv_sec - start.tv_sec) * 1000 + (end.tv_nsec / 1000000 - start.tv_nsec / 1000000);
}
static inline struct timespec getTime() {
struct timespec time;
// no need to check result; none of the errors can happen
clock_gettime(TIMING_CLOCK, &time);
return time;
}
static inline long timespacAgeMs(struct timespec start) {
return timespecDiffMs(start, getTime());
}
void updateTiming(struct connection* connection, bool stateChange) {
struct timespec time = getTime();
connection->timing.lastUpdate = time;
if (stateChange)
connection->timing.states[connection->state] = time;
}
linkedList_t connectionList;
linkedList_t connectionsToFree;
@ -32,14 +57,11 @@ void cleanup() {
while(link != NULL) {
length++;
struct timespec time;
// no need to check result; none of the errors can happen
clock_gettime(TIMING_CLOCK, &time);
bool unlink = false;
struct connection* connection = link->data;
long diffms = (time.tv_sec - connection->timing.lastUpdate.tv_sec) * 1000 + (time.tv_nsec / 1000000 - connection->timing.lastUpdate.tv_nsec / 1000000);
long diffms = timespacAgeMs(connection->timing.lastUpdate);
if (connection->state != OPENED) {
unlink = true;
@ -135,69 +157,13 @@ int dumpHeaderBuffer(char* buffer, size_t size, struct connection* connection) {
return 0;
}
#define SUCCESS (0)
#define ALLOC_ERROR (-1)
#define OTHER_ERROR (-2)
int setMetaData(struct metaData* metaData, char* header) {
char* _method = strtok(header, " ");
if (_method == NULL)
return OTHER_ERROR;
char* _path = strtok(NULL, " ");
if (_path == NULL)
return OTHER_ERROR;
char* _httpVersion = strtok(NULL, " ");
if (_httpVersion == NULL)
return OTHER_ERROR;
char* _null = strtok(NULL, " ");
if (_null != NULL)
return OTHER_ERROR;
_path = strtok(_path, "#");
int tmp = strlen(_path);
_path = strtok(_path, "?");
char* _queryString = "";
if (tmp > strlen(_path)) {
_queryString = _path + strlen(_path) + 1;
}
enum method method;
if (strcmp(_method, "GET") == 0)
method = GET;
else if (strcmp(_method, "POST") == 0)
method = POST;
else if (strcmp(_method, "PUT") == 0)
method = PUT;
else
return OTHER_ERROR;
enum httpVersion httpVersion;
if (strcmp(_httpVersion, "HTTP/1.0") == 0)
httpVersion = HTTP10;
else if (strcmp(_httpVersion, "HTTP/1.1") == 0)
httpVersion = HTTP11;
else
return OTHER_ERROR;
char* path = malloc(strlen(_path) + 1);
if (path == NULL) {
return ALLOC_ERROR;
}
char* queryString = malloc(strlen(_queryString) + 1);
if (queryString == NULL) {
free(path);
return ALLOC_ERROR;
}
void requestHandlerThread(struct connection* connection) {
metaData->method = method;
metaData->httpVersion = httpVersion;
metaData->path = path;
metaData->queryString = queryString;
}
return SUCCESS;
void startRequestHandler(struct connection* connection) {
connection->inUse++;
}
#define BUFFER_LENGTH (64)
@ -234,14 +200,16 @@ void dataHandler(int signo) {
int tmp;
updateTiming(connection, false);
if (connection->metaData.path == NULL) {
tmp = setMetaData(&(connection->metaData), connection->currentHeader);
if (tmp == ALLOC_ERROR) {
tmp = headers_metadata(&(connection->metaData), connection->currentHeader);
if (tmp == HEADERS_ALLOC_ERROR) {
error("networking: couldn't allocate memory for meta data: %s", strerror(errno));
error("networking: aborting request");
dropConnection = true;
break;
} else if (tmp == OTHER_ERROR) {
} else if (tmp == HEADERS_PARSE_ERROR) {
error("networking: error while reading header line");
error("networking: aborting request");
dropConnection = true;
@ -251,7 +219,10 @@ void dataHandler(int signo) {
tmp = headers_parse(&(connection->headers), connection->currentHeader, connection->currentHeaderLength);
if (tmp == HEADERS_END) {
debug("networking: headers complete");
return;
connection->state = PROCESSING;
updateTiming(connection, true);
startRequestHandler(connection);
break;
} else if (tmp == HEADERS_ALLOC_ERROR) {
error("networking: couldn't allocate memory for header: %s", strerror(errno));
error("networking: aborting request");
@ -325,17 +296,6 @@ void* dataThread(void* ignore) {
}
}
void updateTiming(struct connection* connection, bool stateChange) {
struct timespec time;
// no need to check result; none of the errors can happen
clock_gettime(TIMING_CLOCK, &time);
connection->timing.lastUpdate = time;
if (stateChange)
connection->timing.states[connection->state] = time;
}
void* listenThread(void* _bind) {
signal_block_all();