Compare commits

..

No commits in common. "aa1ad0a0802e9baf66f4df561ec07490c54d63f4" and "fa4e843c300db075e449a63750584b144ca0773d" have entirely different histories.

6 changed files with 6 additions and 49 deletions

3
.gitmodules vendored
View File

@ -22,6 +22,3 @@
[submodule "deps/openssl_src"] [submodule "deps/openssl_src"]
path = deps/openssl_src path = deps/openssl_src
url = https://github.com/openssl/openssl.git url = https://github.com/openssl/openssl.git
[submodule "deps/dht"]
path = deps/dht
url = https://github.com/jech/dht.git

View File

@ -3,9 +3,9 @@
MAKEFLAGS += --warn-undefined-variables MAKEFLAGS += --warn-undefined-variables
MAKEFLAGS += --no-builtin-rules MAKEFLAGS += --no-builtin-rules
VERSION_CODE := 25 VERSION_CODE := 24
VERSION_NUMBER := 0.0.22-wip VERSION_NUMBER := 0.0.21
VERSION_NAME := This looks like a good place. VERSION_NAME := What are we even doing here?
SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460000.zip SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460000.zip
LIBUV_URL := https://dist.libuv.org/dist/v1.48.0/libuv-v1.48.0.tar.gz LIBUV_URL := https://dist.libuv.org/dist/v1.48.0/libuv-v1.48.0.tar.gz
@ -250,7 +250,6 @@ APP_OBJS := $(call get_objs,APP_SOURCES)
$(APP_OBJS): CFLAGS += \ $(APP_OBJS): CFLAGS += \
-Ideps/base64c/include \ -Ideps/base64c/include \
-Ideps/crypt_blowfish \ -Ideps/crypt_blowfish \
-Ideps/dht \
-Ideps/libbacktrace \ -Ideps/libbacktrace \
-Ideps/libsodium \ -Ideps/libsodium \
-Ideps/libsodium/src/libsodium/include \ -Ideps/libsodium/src/libsodium/include \
@ -588,9 +587,6 @@ $(MINIUNZIP_OBJS): CFLAGS += \
-Ideps/zlib \ -Ideps/zlib \
-Wno-maybe-uninitialized -Wno-maybe-uninitialized
DHT_SOURCES := deps/dht/dht.c
DHT_OBJS := $(call get_objs,DHT_SOURCES)
LDFLAGS += \ LDFLAGS += \
-pthread \ -pthread \
-lm -lm
@ -637,7 +633,6 @@ all: $(BUILD_TYPES)
ALL_APP_OBJS := \ ALL_APP_OBJS := \
$(APP_OBJS) \ $(APP_OBJS) \
$(BLOWFISH_OBJS) \ $(BLOWFISH_OBJS) \
$(DHT_OBJS) \
$(LIBBACKTRACE_OBJS) \ $(LIBBACKTRACE_OBJS) \
$(MINIUNZIP_OBJS) \ $(MINIUNZIP_OBJS) \
$(PICOHTTPPARSER_OBJS) \ $(PICOHTTPPARSER_OBJS) \

1
deps/dht vendored

@ -1 +0,0 @@
Subproject commit 111230894416d400c9a1e038a033586bfeaafc93

2
deps/libbacktrace vendored

@ -1 +1 @@
Subproject commit 0dd27b95f9f2c11b4a89db5f185a888af912838e Subproject commit 7e2b7da3d6568d2e4e78658f22e701746a48d7e1

View File

@ -1,34 +0,0 @@
#include <stddef.h>
#include <stdio.h>
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <windows.h>
#include <winsock.h>
#include <ws2tcpip.h>
#else
#include <netinet/in.h>
#include <sys/socket.h>
#endif
#include "dht.h"
int dht_sendto(int sockfd, const void *buf, int len, int flags, const struct sockaddr *to, int tolen)
{
return -1;
}
int dht_blacklisted(const struct sockaddr *sa, int salen)
{
return 0;
}
void dht_hash(void *hash_return, int hash_size, const void *v1, int len1, const void *v2, int len2, const void *v3, int len3)
{
}
int dht_random_bytes(void *buf, size_t size)
{
return 0;
}

View File

@ -1,2 +1,2 @@
#define VERSION_NUMBER "0.0.22-wip" #define VERSION_NUMBER "0.0.21"
#define VERSION_NAME "This looks like a good place." #define VERSION_NAME "What are we even doing here?"