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

Do not use shard object file anymore

Browse Source
This commit is contained in:
Lorenz Stechauner
2022-12-10 01:49:16 +01:00
parent 0f75aeea7a
commit 88346fe722
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -1,16 +1,20 @@
CC=gcc CC=gcc
CFLAGS=-std=gnu11 -Wall -Wno-unused-but-set-variable CFLAGS=-std=gnu11 -Wno-unused-but-set-variable -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_POSIX_C_SOURCE=200809L
LIBS=-lssl -lcrypto -lmagic -lz -lmaxminddb -lbrotlienc LDFLAGS=-lssl -lcrypto -lmagic -lz -lmaxminddb -lbrotlienc
DEBIAN_OPTS=-D CACHE_MAGIC_FILE="\"/usr/share/file/magic.mgc\"" -D PHP_FPM_SOCKET="\"/var/run/php/php7.4-fpm.sock\"" DEBIAN_OPTS=-D CACHE_MAGIC_FILE="\"/usr/share/file/magic.mgc\"" -D PHP_FPM_SOCKET="\"/var/run/php/php7.4-fpm.sock\""
.PHONY: all prod debug default permit clean test .PHONY: all prod debug default debian permit clean test
all: prod all: prod
default: bin bin/lib bin/libsesimos.so bin/sesimos default: bin bin/lib bin/sesimos
prod: CFLAGS += -O3 prod: CFLAGS += -O3
prod: default prod: default
debug: CFLAGS += -Wall -pedantic
debug: default debug: default
debian: CFLAGS += $(DEBIAN_OPTS) debian: CFLAGS += $(DEBIAN_OPTS)
debian: prod debian: prod
@ -34,15 +38,13 @@ bin/%.o: src/%.c
$(CC) -c -o $@ $(CFLAGS) $< $(CC) -c -o $@ $(CFLAGS) $<
bin/lib/%.o: src/lib/%.c bin/lib/%.o: src/lib/%.c
$(CC) -c -o $@ $(CFLAGS) -fPIC $< $(CC) -c -o $@ $(CFLAGS) $<
bin/libsesimos.so: bin/lib/cache.o bin/lib/compress.o bin/lib/config.o bin/lib/fastcgi.o bin/lib/geoip.o \ bin/sesimos: bin/server.o bin/client.o \
bin/lib/cache.o bin/lib/compress.o bin/lib/config.o bin/lib/fastcgi.o bin/lib/geoip.o \
bin/lib/http.o bin/lib/http_static.o bin/lib/rev_proxy.o bin/lib/sock.o bin/lib/uri.o \ bin/lib/http.o bin/lib/http_static.o bin/lib/rev_proxy.o bin/lib/sock.o bin/lib/uri.o \
bin/lib/utils.o bin/lib/websocket.o bin/lib/utils.o bin/lib/websocket.o
$(CC) -o $@ --shared -fPIC $(CFLAGS) $^ $(LIBS) $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
bin/sesimos: bin/server.o bin/client.o
$(CC) -o $@ $^ $(CFLAGS) -Lbin -lsesimos -Wl,-rpath=$(shell pwd)/bin $(LIBS)
bin/server.o: src/server.h src/defs.h src/client.h src/lib/cache.h src/lib/config.h src/lib/sock.h \ bin/server.o: src/server.h src/defs.h src/client.h src/lib/cache.h src/lib/config.h src/lib/sock.h \

4
src/lib/websocket.c
View File

@ -15,8 +15,8 @@
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
static const char *ws_key_uuid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
volatile sig_atomic_t terminate = 0; static volatile sig_atomic_t terminate = 0;
void ws_terminate(int _) { void ws_terminate(int _) {
terminate = 1; terminate = 1;

2
src/lib/websocket.h
View File

@ -13,8 +13,6 @@
#define WS_TIMEOUT 3600 #define WS_TIMEOUT 3600
const char *ws_key_uuid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
typedef struct { typedef struct {
unsigned char f_fin:1; unsigned char f_fin:1;
unsigned char f_rsv1:1; unsigned char f_rsv1:1;

2
src/server.c
View File

@ -6,8 +6,6 @@
* @date 2020-12-03 * @date 2020-12-03
*/ */
#define _POSIX_C_SOURCE 199309L
#include "defs.h" #include "defs.h"
#include "server.h" #include "server.h"
#include "client.h" #include "client.h"