Commit graph

26 commits

Author SHA1 Message Date
Felix Walter
973f35d132 Implement status report support in AAP 2.0
This enables AAP 2.0 clients to receive status reports with a new ADU
flag (as we already deliver BIBE bundles). Moreover, it allows clients
to set a report-to EID and sets all of the status report flags on newly
created bundles in case a report-to EID is provided.

Closes: #241

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2025-06-05 17:13:17 +02:00
Felix Walter
cb06c1a646 bundle7: Fix shadowFunction warnings by cppcheck
Sometimes we had local variables named the same as functions.

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2024-09-11 10:15:34 +02:00
Felix Walter
742d0d3c5f Fix variableScope warnings by cppcheck
This reduces the scope of several variables.

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2024-09-11 10:12:44 +02:00
Felix Walter
bde39aac81 bundle7/reports: Use the proper test for BIBE draft v1 compatibility
See also the previous changes to application_agent.c. If this macro is
set to 0 in config.mk, we do not want to enable the compatibility
behavior.

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2023-10-26 14:45:52 +02:00
Felix Walter
26e91ad69e Remove config.h: Move all definitions to individual headers
This moves all definitions from config.h to individual header files and
makes them configurable (i.e., does not define when already defined).

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2023-09-29 14:43:21 +02:00
Felix Walter
7330c79b52 style: Spacing, indentation, long lines, continuations
This harmonizes several style issues found by `checkpatch.pl` when using
strict mode.

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2023-07-25 13:15:05 +02:00
Felix Walter
d9f1180836 bundle7: Suppress cppcheck false positive
Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2023-06-08 10:47:47 +02:00
Felix Walter
63368aa8d8 bundle7/reports: Explicitly free if no bytes were written
This would be implicit behavior by `realloc` which we make explicit to
improve clarity of the code.

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2023-06-08 10:47:47 +02:00
Felix Walter
3cd89eb6a5 bundle, agents: Switch time unit to milliseconds
...to align with the general decision to make DTN timestamps
millisecond-based.

See: #53

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2023-05-11 16:59:13 +02:00
Felix Walter
2fc9e11b7e bundle: Fix potential uint wrap-around in expiration time calculation
We were taking the current time value in milliseconds and sometimes
subtracting larger values from it. This cleans up the calculations to
always determine the expiration time as uint64_t and compare it against
the current uint64_t timestamp.

It further removes the unnecessary "current timestamp" parameter in
`bundle_get_expiration_time_s` (we now store the reception time with the
bundle, so, do not need this anymore) and avoids a integer wrap-around
case in the function.

Note that the current time cancels out in the age block-based
calculation as we can use the reception timestamp there and offset it by
the calculated relative remaining lifetime.

Found by Clang's UB sanitizer.

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2023-05-10 14:31:17 +02:00
Felix Walter
081871945f bundle_processor: Fix memleak and CBOR issue in BIBE AR handling
There were actually two issues here:
- The latter part of `adu.payload` was copied and the field just
  replaced by the copy (`buf`) without freeing the previous value.
- Always a constant length of 2 bytes were skipped, but one of the
  fields skipped is the record type code which is a CBOR unsigned
  integer with valid values up to 255, thus, _either_ one or two bytes
  long.

This adds a pointer to the first byte of record-specific data in the
parsed byte string and leverages its value to skip the correct amount of
bytes using `memmove`. (As we do not need the ADU afterwards, we can
destructively overwrite it and hand the remaining BPDU to the BIBE
agent.)

See: https://www.rfc-editor.org/rfc/rfc9171#name-administrative-records

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2022-08-26 12:41:01 +02:00
Georg Alexander Murzik
298431c68f Insert SPDX license expression comments into our .c, .h, .py, and .sh code
ud3tn is available under multiple licenses and we want to reflect this in
our source code. But which license information should appear first and how
can we manage this efficiently in the future? The Linux Kernel uses SPDX
expressions instead of boilerplate sections. This seems to be a great
approach, so we do the same here.

Signed-off-by: Georg Alexander Murzik <georg.murzik@d3tn.com>
2022-02-20 16:24:38 +01:00
Felix Walter
0625c07cbb
Merge branch 'feature/39-implement-bibe'
See !43
2022-01-26 21:04:34 +01:00
Tobias Nöthlich
49ecf30c3f Refactor BIBE processing on lower layer
With this commit, the lower layer no longer parses the BPDU before sending
it to the upper layer. This also removes the neccessity to re-serialize
the BPDU in the bundle_processor.c file. The lower layer does however
still check whether the BPDU is valid and discards it if it is
malformed in any way.

Signed-off-by: Tobias Nöthlich <tobias.noethlich@d3tn.com>
2022-01-26 21:04:02 +01:00
Tobias Nöthlich
4c871a28a3 Address potential memory leak in reports.c
There was an issue in reports.c, that an error at specific points in
the code could lead to already malloc'ed fields not being freed properly.

This commit fixes this issue by introducing the function
free_record_fields() which frees all potentially malloc'ed fields in
the bundle_administrative_records struct before the struct itself
is freed.

Signed-off-by: Tobias Nöthlich <tobias.noethlich@d3tn.com>
2022-01-26 21:04:02 +01:00
Tobias Nöthlich
aa384211f4 Move check for compatibility flag
As discussed, checking for the BIBE compatibility flag is not really
config and should instead be handled in the correspinding implementation
files.

This commit moves the check for the flag from the config.h file to
reports.c and bibe_proto.c.

Signed-off-by: Tobias Nöthlich <tobias.noethlich@d3tn.com>
2022-01-26 21:04:02 +01:00
Felix Walter
26580de896 Remove the hal_time dependencies in bundle6 and bundle7
Based on a contribution by @mnitsch, 351e1dae9.

This removes `hal_*` dependencies in the bundle processing components,
with the goal that these parts can be re-used without depending on the
uD3TN core functions and underlying system state. The required variables
are passed as function arguments from the uD3TN core components.

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2022-01-22 11:12:32 +01:00
Tobias Nöthlich
e7fa9ff420 Fix posix build errors
Declaring the array ar_bibe_bytes[ar_size] in the bibe_encode_header
function caused a warning, which when building with type=release gets
treated as an error.

This commit fixes this issue by allocating the buffer using malloc()
instead of declaring an array. It also fixes some oversights creating
type mismatches in bibe_proto.c and reports.c.

Signed-off-by: Tobias Nöthlich <tobias.noethlich@d3tn.com>
2021-12-10 14:51:14 +01:00
Tobias Nöthlich
1e1f24b2d3 Fix stylecheck errors and warnings
This commit remedies code smells introduced by implementing the BIBE
convergence layer adapter.

Signed-off-by: Tobias Nöthlich <tobias.noethlich@d3tn.com>
2021-11-29 13:07:12 +01:00
Tobias Nöthlich
ca765ba8ad Ensure compatibility to first draft of BIBE
Some DTN implementations still run a BIBE implementation based on the
first draft of the BIBE specification. This means, that the BIBE
administrative records generated by these implementations still use
the typecode 7 instead of the more recent typecode 3.

This commit adds the CFLAG BIBE_CL_DRAFT_1_COMPATIBILITY, which sets
the BIBE administrative record type code used by µD3TN to 7, to allow
interoperability with DTNs using older BIBE implementations.

Signed-off-by: Tobias Nöthlich <tobias.noethlich@d3tn.com>
2021-11-29 11:55:18 +01:00
Tobias Nöthlich
22f4a43d62 Fix wrong payload in BIBE adu
So far the BIBE payload of the adu forwarded from the bundle processor
has been the whole administrative record instead of just the BPDU.

This commit remedies this oversight by discarding the administrative
record and just encoding and forwarding the BIBE PDU.

For the encoding to work flawlessly another value has been added to the
bibe_protocol_data_unit struct. The unsigned long payload_length stores
the length of the byte string comprising the encapsulated bundle, so
it's easier to calculate the size of the buffer needed for the cbor
operations.

Signed-off-by: Tobias Nöthlich <tobias.noethlich@d3tn.com>
2021-11-02 15:13:51 +01:00
Tobias Nöthlich
c320e6ae8b Add a BPDU parser to reports.c
Based on the specifications of draft-ietf-dtn-bibect-03 and using the
data structures added in earlier commits, a parser for Bundle-in-Bundle
Encapsulation Protocol Data Units has been implemented.

Signed-off-by: Tobias Nöthlich <tobias.noethlich@d3tn.com>
2021-10-25 15:51:14 +02:00
Felix Walter
6e54d35fda Pass a proper sequence number upon local bundle creation
This adds the bundle sequence number as an argument to the bundle
creation functions and passes a sequence number which increases when
multiple bundles are generated by the application agent with the same
creation timestamp.

Fixes: #59

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2021-07-22 17:51:26 +02:00
Maximilian Nitsch
2a981e86e2 Change DTN timestamp to milliseconds
To be compatible with the latest version of BPv7, the internal
representation of DTN timestamps, for both uD3TN and the Python library,
is changed to milliseconds.
For compatibility reasons, a conversion to seconds is performed during
the de-/serialization of BPv6.
Furthermore, additional test cases are added and the creation_time_ms of
the test bundle is set to a non-trivial timestamp.

Also, the Python functions for converting POSIX timestamps to DTN
timestamps are removed, as there is now a distinction between BPv6 and
BPv7 DTN timestamps. The conversion is now done in the corresponding BP
implementations themselves.

Signed-off-by: Maximilian Nitsch <maximilian.nitsch@d3tn.com>
2021-01-14 14:42:55 +01:00
Felix Walter
fb4238a97d Adapt core include path from upcn/ to ud3tn/
This moves all headers from upcn/ to ud3tn/ and adapts the #include
statements accordingly.

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2020-11-17 15:51:10 +01:00
Felix Walter
0ce4bee910
Initial import of uPCN v0.8.0 source code
This is the initial commit for uD3TN. uD3TN is a fork of uPCN v0.8.0,
which will be developed and maintained in a public Git repository.

For questions concerning the history of and code provided with uPCN,
please get in touch with us via: contact <at> d3tn <dot> com

Signed-off-by: Felix Walter <felix.walter@d3tn.com>
2020-11-14 11:56:40 +01:00