From 0dec80fae7ecfdeea929ca8f656473afef74a991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Thu, 26 May 2022 04:43:08 +0200 Subject: [PATCH] Add functions to enable/disable debug logging (#280) * Add "bip_debug_disable()" * Add "bvlc_debug_disable()" * Add setters for BIP_DL_Debug (BBMD registration debug logging) --- ports/arduino_uno/bip-init.c | 8 ++++++++ ports/arduino_uno/bip.h | 2 ++ ports/bsd/bip-init.c | 8 ++++++++ ports/linux/bip-init.c | 8 ++++++++ ports/win32/bip-init.c | 8 ++++++++ src/bacnet/basic/bbmd/h_bbmd.c | 8 ++++++++ src/bacnet/basic/bbmd/h_bbmd.h | 3 +++ src/bacnet/datalink/bip.h | 3 +++ src/bacnet/datalink/dlenv.c | 20 +++++++++++++++++++- src/bacnet/datalink/dlenv.h | 8 ++++++++ 10 files changed, 75 insertions(+), 1 deletion(-) diff --git a/ports/arduino_uno/bip-init.c b/ports/arduino_uno/bip-init.c index 3c1165b0..32605000 100644 --- a/ports/arduino_uno/bip-init.c +++ b/ports/arduino_uno/bip-init.c @@ -53,6 +53,14 @@ void bip_debug_enable(void) BIP_Debug = true; } +/** + * @brief Disalbe debug printing of BACnet/IPv4 + */ +void bip_debug_disable(void) +{ + BIP_Debug = false; +} + /* gets an IP address by name, where name can be a string that is an IP address in dotted form, or a name that is a domain name diff --git a/ports/arduino_uno/bip.h b/ports/arduino_uno/bip.h index aae99636..1200bd3a 100644 --- a/ports/arduino_uno/bip.h +++ b/ports/arduino_uno/bip.h @@ -102,6 +102,8 @@ extern "C" { void bip_debug_enable(void); + void bip_debug_disable(void); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ports/bsd/bip-init.c b/ports/bsd/bip-init.c index c57962ea..85782770 100644 --- a/ports/bsd/bip-init.c +++ b/ports/bsd/bip-init.c @@ -97,6 +97,14 @@ void bip_debug_enable(void) BIP_Debug = true; } +/** + * @brief Disalbe debug printing of BACnet/IPv4 + */ +void bip_debug_disable(void) +{ + BIP_Debug = false; +} + /** * @brief Set the BACnet IPv4 UDP port number * @param port - IPv4 UDP port number - in host byte order diff --git a/ports/linux/bip-init.c b/ports/linux/bip-init.c index 5c03b54a..3603569d 100644 --- a/ports/linux/bip-init.c +++ b/ports/linux/bip-init.c @@ -113,6 +113,14 @@ void bip_debug_enable(void) BIP_Debug = true; } +/** + * @brief Disalbe debug printing of BACnet/IPv4 + */ +void bip_debug_disable(void) +{ + BIP_Debug = false; +} + /** * @brief Set the BACnet IPv4 UDP port number * @param port - IPv4 UDP port number - in host byte order diff --git a/ports/win32/bip-init.c b/ports/win32/bip-init.c index 37567950..c60dd005 100644 --- a/ports/win32/bip-init.c +++ b/ports/win32/bip-init.c @@ -106,6 +106,14 @@ void bip_debug_enable(void) BIP_Debug = true; } +/** + * @brief Disalbe debug printing of BACnet/IPv4 + */ +void bip_debug_disable(void) +{ + BIP_Debug = false; +} + /** * @brief Get the text string for Windows Error Codes */ diff --git a/src/bacnet/basic/bbmd/h_bbmd.c b/src/bacnet/basic/bbmd/h_bbmd.c index 0a7a05c9..acebc158 100644 --- a/src/bacnet/basic/bbmd/h_bbmd.c +++ b/src/bacnet/basic/bbmd/h_bbmd.c @@ -102,6 +102,14 @@ void bvlc_debug_enable(void) BVLC_Debug = true; } +/** + * @brief Disable debug printing of BACnet/IPv4 BBMD + */ +void bvlc_debug_disable(void) +{ + BVLC_Debug = true; +} + /** * @brief Print the IPv4 address with debug info for this module * @param str - debug info string diff --git a/src/bacnet/basic/bbmd/h_bbmd.h b/src/bacnet/basic/bbmd/h_bbmd.h index e7b5d44b..b1662569 100644 --- a/src/bacnet/basic/bbmd/h_bbmd.h +++ b/src/bacnet/basic/bbmd/h_bbmd.h @@ -85,6 +85,9 @@ void bvlc_init(void); BACNET_STACK_EXPORT void bvlc_debug_enable(void); +BACNET_STACK_EXPORT +void bvlc_debug_disable(void); + /* send a Read BDT request */ BACNET_STACK_EXPORT int bvlc_bbmd_read_bdt(BACNET_IP_ADDRESS *bbmd_addr); diff --git a/src/bacnet/datalink/bip.h b/src/bacnet/datalink/bip.h index 4fe4b26e..136ba0ea 100644 --- a/src/bacnet/datalink/bip.h +++ b/src/bacnet/datalink/bip.h @@ -113,6 +113,9 @@ extern "C" { BACNET_STACK_EXPORT void bip_debug_enable(void); + BACNET_STACK_EXPORT + void bip_debug_disable(void); + BACNET_STACK_EXPORT int bip_get_socket(void); diff --git a/src/bacnet/datalink/dlenv.c b/src/bacnet/datalink/dlenv.c index bb7ffce7..a1c5d1df 100644 --- a/src/bacnet/datalink/dlenv.c +++ b/src/bacnet/datalink/dlenv.c @@ -57,6 +57,24 @@ static BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY BBMD_Table_Entry; /* enable debugging */ static bool BIP_DL_Debug = false; +/* Debug toggle */ + +/** + * @brief Enabled debug printing of BACnet/IPv4 DL + */ +void bip_dl_debug_enable(void) +{ + BIP_DL_Debug = true; +} + +/** + * @brief Disable debug printing of BACnet/IPv4 DL + */ +void bip_dl_debug_disable(void) +{ + BIP_DL_Debug = false; +} + /* Simple setters for BBMD registration variables. */ /** @@ -473,7 +491,7 @@ void dlenv_init(void) if (pEnv) { bip_debug_enable(); bvlc_debug_enable(); - BIP_DL_Debug = true; + bip_dl_debug_enable(); } pEnv = getenv("BACNET_IP_PORT"); if (pEnv) { diff --git a/src/bacnet/datalink/dlenv.h b/src/bacnet/datalink/dlenv.h index 4b78275c..b7536e3a 100644 --- a/src/bacnet/datalink/dlenv.h +++ b/src/bacnet/datalink/dlenv.h @@ -39,6 +39,14 @@ extern "C" { void dlenv_init( void); + BACNET_STACK_EXPORT + void bip_dl_debug_enable( + void); + + BACNET_STACK_EXPORT + void bip_dl_debug_disable( + void); + BACNET_STACK_EXPORT int dlenv_register_as_foreign_device( void);