Bugfix/datalink init and cleanup consistency by skarg · Pull Request #1380 · bacnet-stack/bacnet-stack

skarg · 2026-06-09T15:56:36Z

No description provided.

…pps application sources where dlenv_init() is also present.

…default datalink initialization in protocol-specific init functions. Skip default datalink init and task when task callback is set.

…in functions to ensure consistency across applications

…rce files

Copilot

Pull request overview

This PR aims to make datalink initialization and teardown more consistent across the stack by centralizing cleanup behind dlenv_cleanup() and by decoupling bacnet_port_task() from compile-time datalink selection via a configurable periodic-task callback.

Changes:

Added dlenv_cleanup() (wrapper around datalink_cleanup()) and updated many apps to register it with atexit() instead of calling datalink_cleanup() directly.
Added bacnet_port_task_callback_set() and refactored bacnet_port_task() to invoke a configured callback (with defaults set during bacnet_port_init() when no custom callback is provided).
Adjusted server-basic and blinkt apps to initialize via dlenv_init(), register cleanup, and route periodic maintenance via bacnet_port_task_callback_set(dlenv_maintenance_timer).

Reviewed changes

Copilot reviewed 59 out of 59 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
src/bacnet/datalink/dlenv.h	Exports new `dlenv_cleanup()` API.
src/bacnet/datalink/dlenv.c	Implements `dlenv_cleanup()` as a `datalink_cleanup()` wrapper.
src/bacnet/basic/server/bacnet_port.h	Adds exported `bacnet_port_task_callback_set()` declaration.
src/bacnet/basic/server/bacnet_port.c	Introduces callback-driven `bacnet_port_task()` and default callback wiring in `bacnet_port_init()`.
src/bacnet/basic/server/bacnet_port_mstp.c	Removes direct datalink init from Network Port object init routine.
src/bacnet/basic/server/bacnet_port_ipv6.c	Removes direct datalink init from Network Port object init routine.
src/bacnet/basic/server/bacnet_port_ipv4.c	Removes direct datalink init from Network Port object init routine.
src/bacnet/basic/server/bacnet_port_bzll.c	Removes direct datalink init from Network Port object init routine.
apps/you-are/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/writepropm/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/writeprop/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/writegroup/main.c	Removes direct datalink header include; switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/writefile/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/writebdt/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/whoisrouter/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/whois/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/whohas/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/who-am-i/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/whatisnetnum/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/uptransfer/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/uevent/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/ucov/main.c	Removes direct datalink header include; switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/timesync/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/server/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/server-mini/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/server-discover/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/server-client/main.c	Removes direct datalink header include; switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/server-basic/main.c	Uses `dlenv_init()` + `dlenv_cleanup()` and routes periodic maintenance via `bacnet_port_task_callback_set(dlenv_maintenance_timer)`.
apps/scov/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/sc-hub/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/remove-list-element/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/reinit/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/readrange/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/readpropm/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/readprop/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/readfile/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/readfdt/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/readbdt/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/ptransfer/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/piface/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/netnumis/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/modbus-gateway/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/initrouter/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/iamrouter/main.c	Removes direct datalink header include; switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/iam/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/getevent/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/gateway2/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/gateway/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/event/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/error/main.c	Removes direct datalink header include; switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/epics/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/delete-object/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/dcc/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/create-object/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/blinkt/main.c	Removes direct datalink header include; uses `dlenv_init()` + `dlenv_cleanup()` and routes periodic maintenance via `bacnet_port_task_callback_set(dlenv_maintenance_timer)`.
apps/apdu/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/add-list-element/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/ack-alarm/main.c	Switches `atexit()` cleanup to `dlenv_cleanup()`.
apps/abort/main.c	Removes direct datalink header include; switches `atexit()` cleanup to `dlenv_cleanup()`.

…v_cleanup function from dlenv.c and dlenv.h

…oved consistency

… when no callback is set

skarg added 4 commits June 9, 2026 10:46

Add dlenv_cleanup function for proper datalink cleanup

ec40300

replaced atexit(datalink_cleanup) with atexit(dlenv_cleanup) in all a…

3d0079e

…pps application sources where dlenv_init() is also present.

Implement callback mechanism for BACnet Basic task execution. Remove …

c69660d

…default datalink initialization in protocol-specific init functions. Skip default datalink init and task when task callback is set.

Refactor datalink initialization and cleanup in BACnet Basic based ma…

7a8cadf

…in functions to ensure consistency across applications

skarg linked an issue Jun 9, 2026 that may be closed by this pull request

Double datalink initialization in some of the example apps (mainly regarding MSTP) #1372

Closed

Remove unused datalink header inclusion from multiple application sou…

bb26b56

…rce files

skarg requested a review from Copilot June 9, 2026 16:07

Copilot started reviewing on behalf of skarg June 9, 2026 16:08 View session

Copilot AI reviewed Jun 9, 2026

View reviewed changes

Comment thread src/bacnet/basic/server/bacnet_port.c

Comment thread src/bacnet/basic/server/bacnet_port.c

skarg added 6 commits June 9, 2026 12:56

Fix variable type for elapsed_seconds in bacnet_port_task function

b6ade99

Revert the dlenv_cleanup() additions and datalink.h removals.

711dd47

Restore dlenv.h inclusion in application source files and remove dlen…

c04914c

…v_cleanup function from dlenv.c and dlenv.h

Enhance datalink initialization in bacnet_port_init function for impr…

cdac379

…oved consistency

revert BACnet Basic datalink initialization removal

5dcc456

Improve datalink task handling by ensuring default tasks are executed…

3746c1e

… when no callback is set

skarg merged commit 1d7e00f into master Jun 9, 2026
36 checks passed

skarg deleted the bugfix/datalink-init-and-cleanup-consistency branch June 9, 2026 19:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bugfix/datalink init and cleanup consistency#1380

Bugfix/datalink init and cleanup consistency#1380
skarg merged 11 commits into
masterfrom
bugfix/datalink-init-and-cleanup-consistency

skarg commented Jun 9, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

skarg commented Jun 9, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants