Compile uSocketsMock as C

This commit is contained in:
Alex Hultman
2019-06-10 01:19:18 +02:00
parent 72ad34075e
commit 5098ec279f
4 changed files with 12 additions and 11 deletions
+2 -1
View File
@@ -1,6 +1,7 @@
default:
# Fuzzing is only available with clang++
clang++ -DUWS_NO_ZLIB -DLIBUS_NO_SSL -std=c++17 -fsanitize=address,fuzzer -O3 -I../src -I../uSockets/src uSocketsMock.c MockedHelloWorld.cpp -o MockedHelloWorld
clang -DLIBUS_NO_SSL -c -O3 uSocketsMock.c
clang++ -DUWS_NO_ZLIB -DLIBUS_NO_SSL -std=c++17 -fsanitize=undefined,fuzzer -O3 -I../src -I../uSockets/src uSocketsMock.o MockedHelloWorld.cpp -o MockedHelloWorld
# Purely "unit tests"
clang++ -std=c++17 -fsanitize=address,fuzzer -O3 WebSocket.cpp -o WebSocket
clang++ -std=c++17 -fsanitize=address,fuzzer -O3 Http.cpp -o Http
+1 -1
View File
@@ -3,7 +3,7 @@
#include "helpers.h"
/* This function pushes data to the uSockets mock */
extern void us_loop_read_mocked_data(struct us_loop *loop, char *data, unsigned int size);
extern "C" void us_loop_read_mocked_data(struct us_loop *loop, char *data, unsigned int size);
uWS::TemplatedApp<false> *app;
+3 -3
View File
@@ -11,7 +11,7 @@ struct us_loop {
};
struct us_loop *us_create_loop(int default_hint, void (*wakeup_cb)(struct us_loop *loop), void (*pre_cb)(struct us_loop *loop), void (*post_cb)(struct us_loop *loop), unsigned int ext_size) {
return (struct us_loop *) malloc(sizeof(us_loop) + ext_size);
return (struct us_loop *) malloc(sizeof(struct us_loop) + ext_size);
}
void us_loop_free(struct us_loop *loop) {
@@ -38,7 +38,7 @@ struct us_socket_context {
};
struct us_socket_context *us_create_socket_context(struct us_loop *loop, int ext_size) {
struct us_socket_context *socket_context = (struct us_socket_context *) malloc(sizeof(us_socket_context) + ext_size);
struct us_socket_context *socket_context = (struct us_socket_context *) malloc(sizeof(struct us_socket_context) + ext_size);
socket_context->loop = loop;
@@ -169,7 +169,7 @@ void us_loop_read_mocked_data(struct us_loop *loop, char *data, unsigned int siz
int socket_ext_size = loop->listen_socket->socket_ext_size;
/* Create a socket with information from the listen socket */
struct us_socket *s = (struct us_socket *) malloc(sizeof(us_socket) + socket_ext_size);
struct us_socket *s = (struct us_socket *) malloc(sizeof(struct us_socket) + socket_ext_size);
s->context = loop->listen_socket->context;
/* Emit open event */