commit e6b00b95b91ff20f13eff9e0442c2ff3281a42c2
parent e628a34bc8c697a655050bf12360f5a1c113c52b
Author: Iván Ávalos <avalos@disroot.org>
Date: Fri, 2 Oct 2026 12:04:44 +0200
cleanup: remove leftovers of the pre-DD92 MHD1 server
Diffstat:
7 files changed, 5 insertions(+), 408 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,6 @@ compile_commands.json
uncrustify.cfg
sync_config.h
sync_config.h.in
-src/sync/sync-httpd
src/sync/sync-httpd2
src/testing/test_sync_api_home/.local/share/taler/auditors/
src/testing/test_sync_api_home/.local/share/taler/exchange-secmod-cs/
diff --git a/Doxyfile b/Doxyfile
@@ -1,246 +0,0 @@
-# Doxyfile 1.5.5
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = "Sync"
-PROJECT_NUMBER = 0.9.3
-OUTPUT_DIRECTORY = doxygen-doc/
-CREATE_SUBDIRS = YES
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class" \
- "The $name widget" \
- "The $name file" \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = YES
-STRIP_FROM_PATH = .
-STRIP_FROM_INC_PATH = src/include
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-QT_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-INHERIT_DOCS = NO
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = YES
-OPTIMIZE_OUTPUT_JAVA = NO
-OPTIMIZE_FOR_FORTRAN = NO
-OPTIMIZE_OUTPUT_VHDL = NO
-BUILTIN_STL_SUPPORT = NO
-CPP_CLI_SUPPORT = NO
-SIP_SUPPORT = NO
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-TYPEDEF_HIDES_STRUCT = NO
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = NO
-EXTRACT_LOCAL_METHODS = YES
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_GROUP_NAMES = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = NO
-GENERATE_TESTLIST = NO
-GENERATE_BUGLIST = NO
-GENERATE_DEPRECATEDLIST= NO
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = YES
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = YES
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = src/
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.c \
- *.h
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS = */test_* */.git/* */perf_* */tls_test_* taler_config.h
-EXCLUDE_SYMBOLS = GNUNET_* JSON_*
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX = TALER_
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-#GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-GENERATE_HTMLHELP = NO
-GENERATE_DOCSET = NO
-DOCSET_FEEDNAME = "Doxygen generated docs"
-DOCSET_BUNDLE_ID = org.doxygen.Project
-HTML_DYNAMIC_SECTIONS = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = YES
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-#GENERATE_LATEX = YES
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = YES
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = YES
-USE_PDFLATEX = YES
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-#GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = YES
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-#GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES = contrib/gnunet.tag \
- contrib/microhttpd.tag
-GENERATE_TAGFILE = contrib/sync.tag
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = NO
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = YES
-CLASS_GRAPH = NO
-COLLABORATION_GRAPH = NO
-GROUP_GRAPHS = NO
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = YES
-CALLER_GRAPH = YES
-GRAPHICAL_HIERARCHY = NO
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 100
-MAX_DOT_GRAPH_DEPTH = 2
-DOT_TRANSPARENT = YES
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = YES
diff --git a/contrib/microhttpd.tag b/contrib/microhttpd.tag
@@ -1,150 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
-<tagfile>
- <compound kind="file">
- <name>microhttpd.h</name>
- <path></path>
- <filename>microhttpd.h</filename>
- <member kind="function">
- <type>enum MHD_Result</type>
- <name>MHD_run</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist>(struct MHD_Daemon *daemon)</arglist>
- </member>
- <member kind="function">
- <type>int</type>
- <name>MHD_get_connection_values</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist>(struct MHD_Connection *connection,
- enum MHD_ValueKind kind,
- MHD_KeyValueIterator iterator,
- void *iterator_cls)
- </arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_YES</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_NO</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_OK</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_ACCEPTED</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_BAD_GATEWAY</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_GATEWAY_TIMEOUT</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_GONE</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_CONFLICT</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_FAILED_DEPENDENCY</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_SERVICE_UNAVAILABLE</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_NOT_FOUND</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_NO_CONTENT</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_METHOD_GET</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_METHOD_PATCH</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_METHOD_PUT</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_METHOD_DELETE</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_METHOD_POST</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_HTTP_VERSION_1_1</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="define">
- <type>#define</type>
- <name>MHD_OPTION_NOTIFY_COMPLETED</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist></arglist>
- </member>
- <member kind="typedef">
- <type>int</type>
- <name>MHD_AccessHandlerCallback</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist>)(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls)</arglist>
- </member>
- <member kind="typedef">
- <type>void</type>
- <name>MHD_RequestCompletedCallback</name>
- <anchorfile>microhttpd.h</anchorfile>
- <arglist>)(void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe)</arglist>
- </member>
- </compound>
-</tagfile>
diff --git a/doc/doxygen/sync.doxy b/doc/doxygen/sync.doxy
@@ -2218,7 +2218,7 @@ SKIP_FUNCTION_MACROS = YES
# the path). If a tag file is not located in the directory in which doxygen is
# run, you must also specify the path to the tagfile here.
-TAGFILES = ../../contrib/gnunet.tag ../../contrib/microhttpd.tag ../../contrib/taler-exchange.tag
+TAGFILES = ../../contrib/gnunet.tag ../../contrib/taler-exchange.tag
# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
# tag file that is based on the input files it reads. See section "Linking to
diff --git a/src/testing/test_sync_api.c b/src/testing/test_sync_api.c
@@ -27,9 +27,11 @@
#include <taler/taler_exchange_service.h>
#include <taler/taler_json_lib.h>
#include <gnunet/gnunet_util_lib.h>
+/* The taler testing library still includes the MHD1 header
+ (microhttpd.h); until that is resolved, include it here too,
+ as the two headers cannot be mixed in one translation unit. */
#include <microhttpd.h>
#include <taler/taler_bank_service.h>
-#include <taler/taler_fakebank_lib.h>
#include <taler/taler_testing_lib.h>
#include <taler/taler_merchant_testing_lib.h>
#include <taler/taler_error_codes.h>
diff --git a/src/testing/test_sync_api.conf b/src/testing/test_sync_api.conf
@@ -17,14 +17,6 @@ DURATION = 14 days
[bank]
HTTP_PORT = 8082
-[libeufin-bank]
-CURRENCY = EUR
-PORT = 8082
-
-[libeufin-bankdb-postgres]
-CONFIG = postgres:///synccheck
-SQL_DIR = $DATADIR/sql/
-
[sync]
CURRENCY = EUR
PORT = 8084
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
@@ -35,7 +35,7 @@
static const struct GNUNET_OS_ProjectData sync_pd = {
.libname = "libsyncutil",
.project_dirname = "sync",
- .binary_name = "sync-httpd",
+ .binary_name = "sync-httpd2",
.env_varname = "SYNC_PREFIX",
.base_config_varname = "SYNC_BASE_CONFIG",
.bug_email = "taler@lists.gnu.org",
