mirror of
https://gitlab.com/d3tn/ud3tn.git
synced 2026-08-18 13:09:11 +02:00
87be9749af
This makes µD3TN behave the same as v0.13.0 when executed without an
additional commandline argument. A new commandline argument `-d` /
`--external-dispatch` is added, which enables the use of external BDMs.
The default forwarding implementation is now again provided using the
v0.13 code, extracted from e1621765a4 and
adapted to the new agent-based forwarding implementation.
Central changes to the old code include:
- A new "Routing Agent" that handles incoming configuration commands,
FIB updates, and BDM dispatch requests.
- The use of the BDM authorization flag to authorize contact
configuration commands.
- The Contact Manager now only triggers the creation and removal of
links / FIB entries; bundle dispatch is triggered through the FIB and
BDM callback functions of the Routing Agent.
- The fragmentation logic is adapted to store the original bundle along
with an offset and length value, instead of pre-creating and storing
the fragments.
- The bundle re-scheduling logic integrated into the Routing Agent is
simplified and does not support changing the fragmentation parameters.
A new function is added to the Router that searches for a new route
for such fragments that were already scheduled at some point,
considering them as un-fragmentable bundle with overridden fragment
offset and length.
Signed-off-by: Felix Walter <felix.walter@d3tn.com>
115 lines
3.7 KiB
Makefile
115 lines
3.7 KiB
Makefile
include mk/toolchain.mk
|
|
|
|
# COMPONENTS
|
|
|
|
EXTERNAL_INCLUDES += -Iexternal/nanopb \
|
|
-Iexternal/tinycbor/src \
|
|
-Iexternal/util/include \
|
|
-Igenerated
|
|
|
|
$(eval $(call addComponentWithRules,components/aap))
|
|
$(eval $(call addComponentWithRules,components/aap2))
|
|
$(eval $(call addComponentWithRules,components/agents))
|
|
$(eval $(call addComponentWithRules,components/agents/$(PLATFORM)))
|
|
$(eval $(call addComponentWithRules,components/bundle6))
|
|
$(eval $(call addComponentWithRules,components/bundle7))
|
|
$(eval $(call addComponentWithRules,components/cla))
|
|
$(eval $(call addComponentWithRules,components/cla/$(PLATFORM)))
|
|
$(eval $(call addComponentWithRules,components/platform/$(PLATFORM)))
|
|
$(eval $(call addComponentWithRules,components/routing/compat))
|
|
$(eval $(call addComponentWithRules,components/spp))
|
|
$(eval $(call addComponentWithRules,components/ud3tn))
|
|
|
|
ifndef DISABLE_SQLITE_STORAGE
|
|
$(eval $(call addComponentWithRules,components/agents/storage))
|
|
$(eval $(call addComponentWithRules,components/cla/storage))
|
|
$(eval $(call addComponentWithRules,generated/agents/storage))
|
|
endif
|
|
|
|
NANOPB_SOURCES := \
|
|
pb_common.c \
|
|
pb_encode.c \
|
|
pb_decode.c
|
|
|
|
# Allow nanopb to do malloc(). We use pointer-based strings and lists; see
|
|
# also components/aap2/aap2.options.
|
|
CPPFLAGS += -DPB_ENABLE_MALLOC
|
|
|
|
$(eval $(call addComponentWithRules,external/nanopb,$(NANOPB_SOURCES)))
|
|
|
|
TINYCBOR_SOURCES := \
|
|
cborerrorstrings.c \
|
|
cborencoder.c \
|
|
cborencoder_close_container_checked.c \
|
|
cborparser.c \
|
|
cborparser_dup_string.c \
|
|
cborpretty.c \
|
|
cborpretty_stdio.c \
|
|
cbortojson.c
|
|
|
|
$(eval $(call addComponentWithRules,external/tinycbor/src,$(TINYCBOR_SOURCES)))
|
|
$(eval $(call addComponentWithRules,external/util/src))
|
|
|
|
$(eval $(call addComponentWithRules,generated/aap2))
|
|
|
|
# LIB
|
|
|
|
$(eval $(call generateComponentRules,components/daemon))
|
|
$(eval $(call generateComponentRules,test/unit))
|
|
$(eval $(call generateComponentRules,test/decoder))
|
|
|
|
build/$(PLATFORM)/libud3tn.so: LIBS = $(LIBS_libud3tn.so)
|
|
build/$(PLATFORM)/libud3tn.so: $(LIBS_libud3tn.so) | build/$(PLATFORM)
|
|
$(call cmd,linklib)
|
|
|
|
# STATIC LIB
|
|
|
|
build/$(PLATFORM)/libud3tn.a: LIBS = $(LIBS_libud3tn.so)
|
|
build/$(PLATFORM)/libud3tn.a: $(LIBS_libud3tn.so) | build/$(PLATFORM)
|
|
$(call cmd,arcat)
|
|
|
|
# EXECUTABLE
|
|
|
|
$(eval $(call addComponent,ud3tn,components/daemon))
|
|
|
|
build/$(PLATFORM)/ud3tn: LIBS = $(LIBS_ud3tn)
|
|
build/$(PLATFORM)/ud3tn: $(LIBS_ud3tn) | build/$(PLATFORM)
|
|
$(call cmd,link)
|
|
|
|
# TEST EXECUTABLE
|
|
|
|
$(eval $(call generateComponentRules,external/unity/src))
|
|
$(eval $(call generateComponentRules,external/unity/extras/fixture/src))
|
|
|
|
$(eval $(call addComponent,testud3tn,external/unity/src))
|
|
$(eval $(call addComponent,testud3tn,external/unity/extras/fixture/src))
|
|
|
|
$(eval $(call addComponent,testud3tn,test/unit))
|
|
|
|
build/$(PLATFORM)/testud3tn: LDFLAGS += $(LDFLAGS_EXECUTABLE)
|
|
# 64 bit support has to be enabled first.
|
|
build/$(PLATFORM)/testud3tn: CPPFLAGS += -DUNITY_SUPPORT_64
|
|
build/$(PLATFORM)/testud3tn: EXTERNAL_INCLUDES += -Itest/unit
|
|
build/$(PLATFORM)/testud3tn: EXTERNAL_INCLUDES += -Iexternal/unity/src
|
|
build/$(PLATFORM)/testud3tn: EXTERNAL_INCLUDES += -Iexternal/unity/extras/fixture/src
|
|
build/$(PLATFORM)/testud3tn: LIBS = $(LIBS_testud3tn)
|
|
build/$(PLATFORM)/testud3tn: $(LIBS_testud3tn) | build/$(PLATFORM)
|
|
$(call cmd,link)
|
|
|
|
# DECODER EXECUTABLE
|
|
|
|
$(eval $(call addComponent,ud3tndecode,test/decoder))
|
|
|
|
build/$(PLATFORM)/ud3tndecode: build/$(PLATFORM)/libud3tn.a
|
|
build/$(PLATFORM)/ud3tndecode: LDFLAGS += $(LDFLAGS_EXECUTABLE)
|
|
build/$(PLATFORM)/ud3tndecode: LIBS = $(LIBS_ud3tndecode) build/$(PLATFORM)/libud3tn.a
|
|
build/$(PLATFORM)/ud3tndecode: $(LIBS_ud3tndecode) | build/$(PLATFORM)
|
|
$(call cmd,link)
|
|
|
|
# GENERAL RULES
|
|
|
|
build/$(PLATFORM): | build
|
|
$(call cmd,mkdir)
|
|
|
|
build:
|
|
$(call cmd,mkdir)
|