From 86689030e8f89a30d7cd59e91411ddc442abf4d5 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Fri, 30 Nov 2018 12:54:56 +0200 Subject: [PATCH] net: Clarify logging in networking code Remove network specific default and max log level setting and start to use the zephyr logging values for those. Remove LOG_MODULE_REGISTER() from net_core.h and place the calls into .c files. This is done in order to avoid weird compiler errors in some cases and to make the code look similar as other subsystems. Fixes #11343 Fixes #11659 Signed-off-by: Jukka Rissanen --- include/net/net_core.h | 18 ------------ samples/net/coap_client/src/coap-client.c | 4 +-- samples/net/coap_server/src/coap-server.c | 4 +-- samples/net/dhcpv4_client/src/main.c | 4 +-- samples/net/dns_resolve/src/main.c | 4 +-- samples/net/echo_client/src/echo-client.c | 4 +-- samples/net/echo_client/src/tcp.c | 4 +-- samples/net/echo_client/src/udp.c | 4 +-- samples/net/echo_client/src/vlan.c | 4 +-- samples/net/echo_server/src/echo-server.c | 4 +-- samples/net/echo_server/src/tcp.c | 4 +-- samples/net/echo_server/src/udp.c | 4 +-- samples/net/echo_server/src/vlan.c | 4 +-- samples/net/eth_native_posix/src/main.c | 4 +-- samples/net/gptp/src/main.c | 4 +-- samples/net/http_client/src/main.c | 4 +-- samples/net/http_server/src/main.c | 4 ++- samples/net/ipv4_autoconf/src/main.c | 4 +-- samples/net/irc_bot/src/irc-bot.c | 4 +-- samples/net/leds_demo/src/leds-demo.c | 4 +-- samples/net/lldp/src/main.c | 4 +-- samples/net/mdns_responder/src/main.c | 4 +-- samples/net/mqtt_publisher/src/main.c | 3 ++ samples/net/nats/src/main.c | 4 +-- samples/net/nats/src/nats.c | 3 ++ samples/net/promiscuous_mode/src/main.c | 4 +-- samples/net/rpl_border_router/src/coap.c | 4 +-- samples/net/rpl_border_router/src/http.c | 4 +-- samples/net/rpl_border_router/src/main.c | 4 +-- samples/net/rpl_border_router/src/rpl.c | 10 ++++--- samples/net/rpl_border_router/src/shell.c | 4 +-- samples/net/rpl_node/src/main.c | 4 +-- samples/net/sntp_client/src/main.c | 3 ++ .../big_http_download/src/big_http_download.c | 5 ++-- .../net/sockets/coap_client/src/coap-client.c | 4 +-- .../net/sockets/coap_server/src/coap-server.c | 4 +-- .../dumb_http_server/src/socket_dumb_http.c | 5 ++-- samples/net/sockets/echo/src/socket_echo.c | 3 ++ .../net/sockets/echo_async/src/socket_echo.c | 3 ++ .../net/sockets/echo_client/src/echo-client.c | 4 +-- samples/net/sockets/echo_client/src/tcp.c | 4 +-- samples/net/sockets/echo_client/src/udp.c | 4 +-- samples/net/sockets/echo_client/src/vlan.c | 4 +-- .../net/sockets/echo_server/src/echo-server.c | 4 +-- samples/net/sockets/echo_server/src/tcp.c | 4 +-- samples/net/sockets/echo_server/src/udp.c | 4 +-- samples/net/sockets/echo_server/src/vlan.c | 4 +-- samples/net/sockets/http_get/src/http_get.c | 4 +-- samples/net/stats/src/main.c | 4 +-- samples/net/syslog_net/src/main.c | 4 +-- samples/net/telnet/src/telnet.c | 4 +-- samples/net/throughput_server/src/server.c | 4 +-- samples/net/throughput_server/src/udp.c | 4 +-- samples/net/traffic_class/src/main.c | 4 +-- samples/net/vlan/src/main.c | 4 +-- samples/net/wpan_serial/src/main.c | 4 +-- samples/net/ws_console/src/main.c | 4 +-- samples/net/ws_console/src/ws_console.c | 6 ++-- samples/net/ws_echo_server/src/main.c | 4 +-- samples/net/ws_echo_server/src/ws.c | 4 +-- samples/net/zperf/src/shell_utils.c | 3 -- samples/net/zperf/src/zperf_session.c | 4 +-- samples/net/zperf/src/zperf_shell.c | 4 +-- samples/net/zperf/src/zperf_tcp_receiver.c | 4 +-- samples/net/zperf/src/zperf_tcp_uploader.c | 4 +-- samples/net/zperf/src/zperf_udp_receiver.c | 4 +-- samples/net/zperf/src/zperf_udp_uploader.c | 4 +-- subsys/logging/log_backend_net.c | 3 ++ subsys/net/Kconfig.template.log_config.net | 2 +- subsys/net/hostname.c | 4 +-- subsys/net/ip/6lo.c | 4 +-- subsys/net/ip/Kconfig.debug | 14 ---------- subsys/net/ip/connection.c | 8 +++--- subsys/net/ip/dhcpv4.c | 4 +-- subsys/net/ip/icmpv4.c | 4 +-- subsys/net/ip/icmpv6.c | 4 +-- subsys/net/ip/ipv4.c | 4 +-- subsys/net/ip/ipv4_autoconf.c | 4 +-- subsys/net/ip/ipv6.c | 6 ++-- subsys/net/ip/ipv6_fragment.c | 4 +-- subsys/net/ip/ipv6_mld.c | 4 +-- subsys/net/ip/ipv6_nbr.c | 8 +++--- subsys/net/ip/nbr.c | 6 ++-- subsys/net/ip/net_context.c | 4 +-- subsys/net/ip/net_core.c | 4 +-- subsys/net/ip/net_if.c | 8 +++--- subsys/net/ip/net_mgmt.c | 4 +-- subsys/net/ip/net_pkt.c | 10 ++++--- subsys/net/ip/net_shell.c | 3 +- subsys/net/ip/net_stats.c | 5 ++-- subsys/net/ip/net_tc.c | 4 +-- subsys/net/ip/promiscuous.c | 4 +-- subsys/net/ip/route.c | 8 +++--- subsys/net/ip/rpl-mrhof.c | 4 +-- subsys/net/ip/rpl-of0.c | 4 +-- subsys/net/ip/rpl.c | 12 ++++---- subsys/net/ip/tcp.c | 14 +++++----- subsys/net/ip/trickle.c | 4 +-- subsys/net/ip/udp.c | 4 +-- subsys/net/ip/utils.c | 4 +-- subsys/net/l2/bluetooth/bluetooth.c | 12 ++++---- subsys/net/l2/bluetooth/bluetooth_shell.c | 4 +-- subsys/net/l2/dummy/dummy.c | 4 +-- subsys/net/l2/ethernet/arp.c | 4 +-- subsys/net/l2/ethernet/ethernet.c | 8 +++--- subsys/net/l2/ethernet/ethernet_mgmt.c | 4 +-- subsys/net/l2/ethernet/ethernet_stats.c | 3 +- subsys/net/l2/ethernet/gptp/gptp.c | 4 +-- subsys/net/l2/ethernet/gptp/gptp_md.c | 4 +-- subsys/net/l2/ethernet/gptp/gptp_messages.c | 6 ++-- subsys/net/l2/ethernet/gptp/gptp_mi.c | 4 +-- subsys/net/l2/ethernet/gptp/gptp_user_api.c | 4 +-- subsys/net/l2/ethernet/lldp/lldp.c | 4 +-- subsys/net/l2/ieee802154/ieee802154.c | 4 +-- .../net/l2/ieee802154/ieee802154_fragment.c | 5 ++-- subsys/net/l2/ieee802154/ieee802154_frame.c | 22 +++++++-------- subsys/net/l2/ieee802154/ieee802154_mgmt.c | 4 +-- .../l2/ieee802154/ieee802154_radio_aloha.c | 4 +-- .../l2/ieee802154/ieee802154_radio_csma_ca.c | 4 +-- .../net/l2/ieee802154/ieee802154_security.c | 5 ++-- subsys/net/l2/ieee802154/ieee802154_shell.c | 4 +-- subsys/net/l2/openthread/openthread.c | 4 +-- subsys/net/l2/openthread/openthread_utils.c | 4 +-- subsys/net/l2/wifi/wifi_mgmt.c | 4 +-- subsys/net/l2/wifi/wifi_shell.c | 3 ++ subsys/net/lib/app/client.c | 4 +-- subsys/net/lib/app/net_app.c | 14 +++++----- subsys/net/lib/app/net_app_private.h | 2 +- subsys/net/lib/app/server.c | 8 +++--- subsys/net/lib/coap/coap.c | 4 +-- subsys/net/lib/coap/coap_link_format.c | 4 +-- subsys/net/lib/coap/coap_link_format_sock.c | 6 ++-- subsys/net/lib/coap/coap_sock.c | 9 ++---- subsys/net/lib/config/bt_settings.c | 4 +-- subsys/net/lib/config/ieee802154_settings.c | 4 +-- subsys/net/lib/config/init.c | 16 +++++------ subsys/net/lib/dns/llmnr_responder.c | 4 +-- subsys/net/lib/dns/mdns_responder.c | 4 +-- subsys/net/lib/dns/resolve.c | 4 +-- subsys/net/lib/http/http.c | 4 +-- subsys/net/lib/http/http_client.c | 14 ++++------ subsys/net/lib/http/http_server.c | 28 ++++++++----------- subsys/net/lib/mqtt/mqtt.c | 4 +-- subsys/net/lib/mqtt_sock/mqtt.c | 4 +-- subsys/net/lib/mqtt_sock/mqtt_decoder.c | 4 +-- subsys/net/lib/mqtt_sock/mqtt_encoder.c | 4 +-- subsys/net/lib/mqtt_sock/mqtt_rx.c | 4 +-- .../lib/mqtt_sock/mqtt_transport_socket_tcp.c | 4 +-- .../lib/mqtt_sock/mqtt_transport_socket_tls.c | 4 +-- subsys/net/lib/sntp/sntp.c | 4 +-- subsys/net/lib/sockets/getaddrinfo.c | 6 ++-- subsys/net/lib/sockets/socket_offload.c | 4 +-- subsys/net/lib/sockets/sockets.c | 6 ++-- subsys/net/lib/sockets/sockets_tls.c | 12 ++++---- subsys/net/lib/websocket/websocket.c | 4 +-- tests/net/6lo/prj.conf | 1 - tests/net/6lo/src/main.c | 4 +-- tests/net/all/src/main.c | 4 +-- tests/net/app/src/main.c | 4 +-- tests/net/arp/src/main.c | 4 +-- tests/net/checksum_offload/src/main.c | 4 ++- tests/net/context/src/main.c | 4 +-- tests/net/dhcpv4/src/main.c | 4 +-- tests/net/ethernet_mgmt/src/main.c | 4 +-- tests/net/icmpv6/src/main.c | 4 +-- .../crypto/src/ieee802154_crypto_test.c | 4 +-- tests/net/ieee802154/fragment/src/main.c | 4 +-- .../l2/src/ieee802154_fake_driver.c | 4 +-- tests/net/ieee802154/l2/src/ieee802154_test.c | 4 +-- tests/net/iface/src/main.c | 4 ++- tests/net/ip-addr/src/main.c | 4 +-- tests/net/ipv6/prj.conf | 1 - tests/net/ipv6/src/main.c | 4 +-- tests/net/ipv6_fragment/src/main.c | 4 +-- tests/net/lib/coap/src/main.c | 4 +-- tests/net/lib/coap_sock/src/main.c | 4 +-- tests/net/lib/dns_resolve/src/main.c | 4 +-- .../mqtt_publisher/src/test_mqtt_publish.c | 4 +-- .../lib/mqtt_pubsub/src/test_mqtt_pubsub.c | 4 +-- .../mqtt_subscriber/src/test_mqtt_subscribe.c | 4 +-- tests/net/mgmt/src/mgmt.c | 4 +-- tests/net/mld/src/main.c | 4 +-- tests/net/neighbor/src/main.c | 4 +-- tests/net/net_pkt/prj.conf | 2 +- tests/net/net_pkt/src/main.c | 4 +-- tests/net/promiscuous/src/main.c | 4 ++- tests/net/ptp/clock/src/main.c | 4 ++- tests/net/route/src/main.c | 4 +-- tests/net/rpl/src/main.c | 4 ++- tests/net/socket/getaddrinfo/src/main.c | 4 +-- tests/net/socket/tcp/src/main.c | 4 +-- tests/net/socket/udp/src/main.c | 4 +-- tests/net/tcp/src/main.c | 4 +-- tests/net/traffic_class/src/main.c | 4 ++- tests/net/trickle/src/main.c | 4 +-- tests/net/tx_timestamp/src/main.c | 4 ++- tests/net/udp/src/main.c | 4 ++- tests/net/utils/src/main.c | 4 +-- tests/net/vlan/src/main.c | 4 ++- tests/net/websocket/src/main.c | 6 ++-- tests/net/websocket/src/server.c | 6 ++-- 201 files changed, 490 insertions(+), 488 deletions(-) diff --git a/include/net/net_core.h b/include/net/net_core.h index 24e9ab7d966..96301d632d1 100644 --- a/include/net/net_core.h +++ b/include/net/net_core.h @@ -34,26 +34,8 @@ extern "C" { */ /* Network subsystem logging helpers */ - -#if !defined(LOG_LEVEL) -#if !defined(NET_LOG_LEVEL) -#define NET_LOG_LEVEL CONFIG_NET_DEFAULT_LOG_LEVEL -#endif /* !NET_LOG_LEVEL */ - -#if NET_LOG_LEVEL > CONFIG_NET_MAX_LOG_LEVEL -#undef NET_LOG_LEVEL -#define NET_LOG_LEVEL CONFIG_NET_MAX_LOG_LEVEL -#endif /* NET_LOG_LEVEL > CONFIG_NET_MAX_LOG_LEVEL */ - -#define LOG_LEVEL NET_LOG_LEVEL -#endif /* !LOG_LEVEL */ - -#if defined(NET_LOG_LEVEL) #include -LOG_MODULE_REGISTER(LOG_MODULE_NAME); -#endif /* NET_LOG_LEVEL */ - #if defined(CONFIG_LOG_FUNCTION_NAME) #define NET_DBG(fmt, ...) LOG_DBG("(%p): " fmt, k_current_get(), \ ##__VA_ARGS__) diff --git a/samples/net/coap_client/src/coap-client.c b/samples/net/coap_client/src/coap-client.c index 027d01b101c..080a1976b10 100644 --- a/samples/net/coap_client/src/coap-client.c +++ b/samples/net/coap_client/src/coap-client.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_coap_client -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_coap_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/coap_server/src/coap-server.c b/samples/net/coap_server/src/coap-server.c index de883ded933..f367e6d3fab 100644 --- a/samples/net/coap_server/src/coap-server.c +++ b/samples/net/coap_server/src/coap-server.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_coap_server -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_coap_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/dhcpv4_client/src/main.c b/samples/net/dhcpv4_client/src/main.c index 96e86b4bfb5..521c4f7d026 100644 --- a/samples/net/dhcpv4_client/src/main.c +++ b/samples/net/dhcpv4_client/src/main.c @@ -7,8 +7,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_dhcpv4_client -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_dhcpv4_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/dns_resolve/src/main.c b/samples/net/dns_resolve/src/main.c index f9fb2cc4aba..b36844592c2 100644 --- a/samples/net/dns_resolve/src/main.c +++ b/samples/net/dns_resolve/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_dns_resolve_client -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_dns_resolve_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/echo_client/src/echo-client.c b/samples/net/echo_client/src/echo-client.c index ed71db5867c..72d6284bdb1 100644 --- a/samples/net/echo_client/src/echo-client.c +++ b/samples/net/echo_client/src/echo-client.c @@ -16,8 +16,8 @@ * This might not be what you want to do in your app so caveat emptor. */ -#define LOG_MODULE_NAME net_echo_client -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_echo_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/echo_client/src/tcp.c b/samples/net/echo_client/src/tcp.c index 8bd9640311e..7823e4731a8 100644 --- a/samples/net/echo_client/src/tcp.c +++ b/samples/net/echo_client/src/tcp.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_client_tcp -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/echo_client/src/udp.c b/samples/net/echo_client/src/udp.c index 96e3c4bcd13..11987b8d0af 100644 --- a/samples/net/echo_client/src/udp.c +++ b/samples/net/echo_client/src/udp.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_client_udp -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/echo_client/src/vlan.c b/samples/net/echo_client/src/vlan.c index 67624aa9d81..5cf7c23b582 100644 --- a/samples/net/echo_client/src/vlan.c +++ b/samples/net/echo_client/src/vlan.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_client_vlan -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG); #include diff --git a/samples/net/echo_server/src/echo-server.c b/samples/net/echo_server/src/echo-server.c index 2e4a9c91239..490e98c91e9 100644 --- a/samples/net/echo_server/src/echo-server.c +++ b/samples/net/echo_server/src/echo-server.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_server -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_echo_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/echo_server/src/tcp.c b/samples/net/echo_server/src/tcp.c index fae56e201fc..98b8d5dd2ea 100644 --- a/samples/net/echo_server/src/tcp.c +++ b/samples/net/echo_server/src/tcp.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_server_tcp -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/echo_server/src/udp.c b/samples/net/echo_server/src/udp.c index c9a0a8aa12a..dd0f37a229a 100644 --- a/samples/net/echo_server/src/udp.c +++ b/samples/net/echo_server/src/udp.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_server_udp -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/echo_server/src/vlan.c b/samples/net/echo_server/src/vlan.c index bfdfc136dad..b269fedbda0 100644 --- a/samples/net/echo_server/src/vlan.c +++ b/samples/net/echo_server/src/vlan.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_server_vlan -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG); #include diff --git a/samples/net/eth_native_posix/src/main.c b/samples/net/eth_native_posix/src/main.c index b2ea1db1b54..de1f16dce9f 100644 --- a/samples/net/eth_native_posix/src/main.c +++ b/samples/net/eth_native_posix/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_native_posix -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_native_posix_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/gptp/src/main.c b/samples/net/gptp/src/main.c index 1f648007152..ce5448be377 100644 --- a/samples/net/gptp/src/main.c +++ b/samples/net/gptp/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_gptp_app -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_gptp_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/http_client/src/main.c b/samples/net/http_client/src/main.c index 2bf3ae819d4..7ee2c6a4d57 100644 --- a/samples/net/http_client/src/main.c +++ b/samples/net/http_client/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_http_client_sample -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_http_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/http_server/src/main.c b/samples/net/http_server/src/main.c index fa54e077764..577afb7e42a 100644 --- a/samples/net/http_server/src/main.c +++ b/samples/net/http_server/src/main.c @@ -9,7 +9,9 @@ #else #define LOG_MODULE_NAME net_http_server_sample #endif -#define NET_LOG_LEVEL LOG_LEVEL_DBG + +#include +LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/ipv4_autoconf/src/main.c b/samples/net/ipv4_autoconf/src/main.c index 592418e2541..bdec24f625e 100644 --- a/samples/net/ipv4_autoconf/src/main.c +++ b/samples/net/ipv4_autoconf/src/main.c @@ -7,8 +7,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ipv4_autoconf_sample -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_ipv4_autoconf_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/irc_bot/src/irc-bot.c b/samples/net/irc_bot/src/irc-bot.c index f4b071e1849..2674f3046da 100644 --- a/samples/net/irc_bot/src/irc-bot.c +++ b/samples/net/irc_bot/src/irc-bot.c @@ -5,8 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_irc_bot -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_irc_bot_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/leds_demo/src/leds-demo.c b/samples/net/leds_demo/src/leds-demo.c index 8b436a0ad0b..75688d22117 100644 --- a/samples/net/leds_demo/src/leds-demo.c +++ b/samples/net/leds_demo/src/leds-demo.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_leds_demo -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_leds_demo_sample, LOG_LEVEL_DBG); #include diff --git a/samples/net/lldp/src/main.c b/samples/net/lldp/src/main.c index 4e782aa1351..f8ac681e2ce 100644 --- a/samples/net/lldp/src/main.c +++ b/samples/net/lldp/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_lldp_app -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_lldp_sample, LOG_LEVEL_DBG); #include diff --git a/samples/net/mdns_responder/src/main.c b/samples/net/mdns_responder/src/main.c index 676f8499cd1..59981b09486 100644 --- a/samples/net/mdns_responder/src/main.c +++ b/samples/net/mdns_responder/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_mdns_responder_app -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_mdns_responder_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c index 3869f0c8ca7..347e1f085d2 100644 --- a/samples/net/mqtt_publisher/src/main.c +++ b/samples/net/mqtt_publisher/src/main.c @@ -4,6 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include +LOG_MODULE_REGISTER(net_mqtt_publisher_sample, LOG_LEVEL_DBG); + #include #include #include diff --git a/samples/net/nats/src/main.c b/samples/net/nats/src/main.c index a63aa13b833..ed1b08e3be6 100644 --- a/samples/net/nats/src/main.c +++ b/samples/net/nats/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_nats_app_main -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_nats_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/nats/src/nats.c b/samples/net/nats/src/nats.c index a458946b2b7..26bc9c503cf 100644 --- a/samples/net/nats/src/nats.c +++ b/samples/net/nats/src/nats.c @@ -4,6 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include +LOG_MODULE_DECLARE(net_nats_sample, LOG_LEVEL_DBG); + #include #include #include diff --git a/samples/net/promiscuous_mode/src/main.c b/samples/net/promiscuous_mode/src/main.c index d608be16548..fb38a80cf9e 100644 --- a/samples/net/promiscuous_mode/src/main.c +++ b/samples/net/promiscuous_mode/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_promisc_sample -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_promisc_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/rpl_border_router/src/coap.c b/samples/net/rpl_border_router/src/coap.c index 13523025cb7..b0ead695385 100644 --- a/samples/net/rpl_border_router/src/coap.c +++ b/samples/net/rpl_border_router/src/coap.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_rpl_br_coap -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_rpl_br_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/rpl_border_router/src/http.c b/samples/net/rpl_border_router/src/http.c index 55fb36a78a1..e65b14d58a5 100644 --- a/samples/net/rpl_border_router/src/http.c +++ b/samples/net/rpl_border_router/src/http.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_rpl_br_http -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_rpl_br_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/rpl_border_router/src/main.c b/samples/net/rpl_border_router/src/main.c index 9604a8d512d..1959002d006 100644 --- a/samples/net/rpl_border_router/src/main.c +++ b/samples/net/rpl_border_router/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_rpl_br_main -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_rpl_br_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/rpl_border_router/src/rpl.c b/samples/net/rpl_border_router/src/rpl.c index 98cde25fd0e..57816a9e3ab 100644 --- a/samples/net/rpl_border_router/src/rpl.c +++ b/samples/net/rpl_border_router/src/rpl.c @@ -4,8 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_rpl_br_rpl -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#define LOG_LEVEL LOG_LEVEL_DBG + +#include +LOG_MODULE_DECLARE(net_rpl_br_sample, LOG_LEVEL); #include #include @@ -42,7 +44,7 @@ static bool br_join_dag(struct net_rpl_dio *dio) rpl.dag_has_version = true; } } else { - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (LOG_LEVEL >= LOG_LEVEL_DBG) { char me[NET_IPV6_ADDR_LEN]; char other[NET_IPV6_ADDR_LEN]; @@ -119,7 +121,7 @@ bool setup_rpl(struct net_if *iface, const char *addr_prefix) return false; } - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (LOG_LEVEL >= LOG_LEVEL_DBG) { char out[NET_IPV6_ADDR_LEN]; if (net_addr_ntop(AF_INET6, &rpl.prefix, out, diff --git a/samples/net/rpl_border_router/src/shell.c b/samples/net/rpl_border_router/src/shell.c index 4b2c179eff1..85c7dfb5ae8 100644 --- a/samples/net/rpl_border_router/src/shell.c +++ b/samples/net/rpl_border_router/src/shell.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_rpl_br_shell -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_rpl_br_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/rpl_node/src/main.c b/samples/net/rpl_node/src/main.c index 3b6d79e7b79..189aa650897 100644 --- a/samples/net/rpl_node/src/main.c +++ b/samples/net/rpl_node/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_rpl_node -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_rpl_node_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sntp_client/src/main.c b/samples/net/sntp_client/src/main.c index 4911c6e76bc..c154fd774c7 100644 --- a/samples/net/sntp_client/src/main.c +++ b/samples/net/sntp_client/src/main.c @@ -4,6 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include +LOG_MODULE_REGISTER(net_sntp_client_sample, LOG_LEVEL_DBG); + #include #include #include diff --git a/samples/net/sockets/big_http_download/src/big_http_download.c b/samples/net/sockets/big_http_download/src/big_http_download.c index 97ddd384289..d115abe1782 100644 --- a/samples/net/sockets/big_http_download/src/big_http_download.c +++ b/samples/net/sockets/big_http_download/src/big_http_download.c @@ -20,8 +20,9 @@ #include #else -#define LOG_MODULE_NAME net_big_http_download -#define NET_LOG_LEVEL LOG_LEVEL_DBG + +#include +LOG_MODULE_REGISTER(net_big_http_download_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sockets/coap_client/src/coap-client.c b/samples/net/sockets/coap_client/src/coap-client.c index f2e2af26b7b..fb3db9bf2e3 100644 --- a/samples/net/sockets/coap_client/src/coap-client.c +++ b/samples/net/sockets/coap_client/src/coap-client.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_coap_client -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_coap_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sockets/coap_server/src/coap-server.c b/samples/net/sockets/coap_server/src/coap-server.c index 740297532ca..f38ceff936d 100644 --- a/samples/net/sockets/coap_server/src/coap-server.c +++ b/samples/net/sockets/coap_server/src/coap-server.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_coap_server -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_coap_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sockets/dumb_http_server/src/socket_dumb_http.c b/samples/net/sockets/dumb_http_server/src/socket_dumb_http.c index 211b51146fd..4d0f1c63609 100644 --- a/samples/net/sockets/dumb_http_server/src/socket_dumb_http.c +++ b/samples/net/sockets/dumb_http_server/src/socket_dumb_http.c @@ -16,8 +16,9 @@ #include #else -#define LOG_MODULE_NAME net_dump_http_download -#define NET_LOG_LEVEL LOG_LEVEL_DBG + +#include +LOG_MODULE_REGISTER(net_dump_http_download_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sockets/echo/src/socket_echo.c b/samples/net/sockets/echo/src/socket_echo.c index 6dffbe528d8..75f9c0d3f99 100644 --- a/samples/net/sockets/echo/src/socket_echo.c +++ b/samples/net/sockets/echo/src/socket_echo.c @@ -16,6 +16,9 @@ #else +#include +LOG_MODULE_REGISTER(net_socket_echo_sample, LOG_LEVEL_DBG); + #include #include #include diff --git a/samples/net/sockets/echo_async/src/socket_echo.c b/samples/net/sockets/echo_async/src/socket_echo.c index a5a077606d0..7d53cbbd314 100644 --- a/samples/net/sockets/echo_async/src/socket_echo.c +++ b/samples/net/sockets/echo_async/src/socket_echo.c @@ -18,6 +18,9 @@ #else +#include +LOG_MODULE_REGISTER(net_echo_async_sample, LOG_LEVEL_DBG); + #include #include #include diff --git a/samples/net/sockets/echo_client/src/echo-client.c b/samples/net/sockets/echo_client/src/echo-client.c index de524e14b44..c21f4497ba0 100644 --- a/samples/net/sockets/echo_client/src/echo-client.c +++ b/samples/net/sockets/echo_client/src/echo-client.c @@ -17,8 +17,8 @@ * This might not be what you want to do in your app so caveat emptor. */ -#define LOG_MODULE_NAME net_echo_client -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_echo_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c index 443420a7f03..1fee8e8bead 100644 --- a/samples/net/sockets/echo_client/src/tcp.c +++ b/samples/net/sockets/echo_client/src/tcp.c @@ -7,8 +7,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_client_tcp -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c index f181dab90da..ae9908a5a7d 100644 --- a/samples/net/sockets/echo_client/src/udp.c +++ b/samples/net/sockets/echo_client/src/udp.c @@ -7,8 +7,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_client_udp -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sockets/echo_client/src/vlan.c b/samples/net/sockets/echo_client/src/vlan.c index 27495b3a49b..8a14feff813 100644 --- a/samples/net/sockets/echo_client/src/vlan.c +++ b/samples/net/sockets/echo_client/src/vlan.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_client_vlan -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG); #include diff --git a/samples/net/sockets/echo_server/src/echo-server.c b/samples/net/sockets/echo_server/src/echo-server.c index 626538ece80..acdcf8a474f 100644 --- a/samples/net/sockets/echo_server/src/echo-server.c +++ b/samples/net/sockets/echo_server/src/echo-server.c @@ -7,8 +7,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_server -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_echo_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sockets/echo_server/src/tcp.c b/samples/net/sockets/echo_server/src/tcp.c index 7f2429fc498..344fee317aa 100644 --- a/samples/net/sockets/echo_server/src/tcp.c +++ b/samples/net/sockets/echo_server/src/tcp.c @@ -7,8 +7,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_server_tcp -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sockets/echo_server/src/udp.c b/samples/net/sockets/echo_server/src/udp.c index f3efa035004..479f89d42cb 100644 --- a/samples/net/sockets/echo_server/src/udp.c +++ b/samples/net/sockets/echo_server/src/udp.c @@ -7,8 +7,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_server_udp -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/sockets/echo_server/src/vlan.c b/samples/net/sockets/echo_server/src/vlan.c index bfdfc136dad..b269fedbda0 100644 --- a/samples/net/sockets/echo_server/src/vlan.c +++ b/samples/net/sockets/echo_server/src/vlan.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_echo_server_vlan -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG); #include diff --git a/samples/net/sockets/http_get/src/http_get.c b/samples/net/sockets/http_get/src/http_get.c index 633531c644d..07a337c9e44 100644 --- a/samples/net/sockets/http_get/src/http_get.c +++ b/samples/net/sockets/http_get/src/http_get.c @@ -16,8 +16,8 @@ #include #else -#define LOG_MODULE_NAME net_http_get -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_http_get_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/stats/src/main.c b/samples/net/stats/src/main.c index 17583d8e24e..83cc14d8529 100644 --- a/samples/net/stats/src/main.c +++ b/samples/net/stats/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_stats_sample -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_stats_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/syslog_net/src/main.c b/samples/net/syslog_net/src/main.c index b788dcd3bbb..1e5d477f5fd 100644 --- a/samples/net/syslog_net/src/main.c +++ b/samples/net/syslog_net/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_syslog -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_syslog, LOG_LEVEL_DBG); #include diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c index 8a9822e5bf2..9fd71699a99 100644 --- a/samples/net/telnet/src/telnet.c +++ b/samples/net/telnet/src/telnet.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_telnet_setup -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_telnet_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/throughput_server/src/server.c b/samples/net/throughput_server/src/server.c index 4bd8d0e8156..0960beacef4 100644 --- a/samples/net/throughput_server/src/server.c +++ b/samples/net/throughput_server/src/server.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_tp_server -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_tp_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/throughput_server/src/udp.c b/samples/net/throughput_server/src/udp.c index c992935c9d6..f86ae0a4f99 100644 --- a/samples/net/throughput_server/src/udp.c +++ b/samples/net/throughput_server/src/udp.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_tp_server_udp -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_tp_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/traffic_class/src/main.c b/samples/net/traffic_class/src/main.c index 5a2b93a6759..8233bbbfede 100644 --- a/samples/net/traffic_class/src/main.c +++ b/samples/net/traffic_class/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_tc_app -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_tc_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/vlan/src/main.c b/samples/net/vlan/src/main.c index 9479df771b9..1bb16b77847 100644 --- a/samples/net/vlan/src/main.c +++ b/samples/net/vlan/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_vlan_app -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_vlan_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c index b817d691c72..81da5ab9ba7 100644 --- a/samples/net/wpan_serial/src/main.c +++ b/samples/net/wpan_serial/src/main.c @@ -12,8 +12,8 @@ * with popular Contiki-based native border routers. */ -#define LOG_MODULE_NAME net_wpan_serial -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_wpan_serial_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/ws_console/src/main.c b/samples/net/ws_console/src/main.c index a922aa17893..d9383dfd674 100644 --- a/samples/net/ws_console/src/main.c +++ b/samples/net/ws_console/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ws_console_main -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_ws_console_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/ws_console/src/ws_console.c b/samples/net/ws_console/src/ws_console.c index 1d0bf31830b..bea8a0e1a6d 100644 --- a/samples/net/ws_console/src/ws_console.c +++ b/samples/net/ws_console/src/ws_console.c @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ws_console_sample -#define NET_LOG_LEVEL LOG_LEVEL_DBG - /* Printing debugs from this module looks funny in console so do not * do it unless you are debugging this module. */ #define EXTRA_DEBUG 0 +#include +LOG_MODULE_DECLARE(net_ws_console_sample, LOG_LEVEL_DBG); + #include #include #include diff --git a/samples/net/ws_echo_server/src/main.c b/samples/net/ws_echo_server/src/main.c index 967f7e3d803..e3ab358701c 100644 --- a/samples/net/ws_echo_server/src/main.c +++ b/samples/net/ws_echo_server/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ws_echo_server_main -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_ws_echo_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/ws_echo_server/src/ws.c b/samples/net/ws_echo_server/src/ws.c index 80d5a16e573..83e70520183 100644 --- a/samples/net/ws_echo_server/src/ws.c +++ b/samples/net/ws_echo_server/src/ws.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ws_echo_server_sample -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_ws_echo_server_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/zperf/src/shell_utils.c b/samples/net/zperf/src/shell_utils.c index 1121155cb5c..8f8ed86436e 100644 --- a/samples/net/zperf/src/shell_utils.c +++ b/samples/net/zperf/src/shell_utils.c @@ -4,9 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_zperf_shell_utils -#define NET_LOG_LEVEL LOG_LEVEL_DBG - #include #include #include diff --git a/samples/net/zperf/src/zperf_session.c b/samples/net/zperf/src/zperf_session.c index 0171de7d09a..09809314e82 100644 --- a/samples/net/zperf/src/zperf_session.c +++ b/samples/net/zperf/src/zperf_session.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_zperf_session -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_zperf_sample, LOG_LEVEL_DBG); #include diff --git a/samples/net/zperf/src/zperf_shell.c b/samples/net/zperf/src/zperf_shell.c index 2e2bdeef503..1b643909bb8 100644 --- a/samples/net/zperf/src/zperf_shell.c +++ b/samples/net/zperf/src/zperf_shell.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_zperf_shell -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_zperf_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/zperf/src/zperf_tcp_receiver.c b/samples/net/zperf/src/zperf_tcp_receiver.c index dd00aaab975..2aa9547bd40 100644 --- a/samples/net/zperf/src/zperf_tcp_receiver.c +++ b/samples/net/zperf/src/zperf_tcp_receiver.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_zperf_tcp_recv -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_zperf_sample, LOG_LEVEL_DBG); #include diff --git a/samples/net/zperf/src/zperf_tcp_uploader.c b/samples/net/zperf/src/zperf_tcp_uploader.c index 6157c74d855..2055cb594ab 100644 --- a/samples/net/zperf/src/zperf_tcp_uploader.c +++ b/samples/net/zperf/src/zperf_tcp_uploader.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_zperf_tcp_send -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_zperf_sample, LOG_LEVEL_DBG); #include diff --git a/samples/net/zperf/src/zperf_udp_receiver.c b/samples/net/zperf/src/zperf_udp_receiver.c index 1be89a3cad1..0f3f53e5795 100644 --- a/samples/net/zperf/src/zperf_udp_receiver.c +++ b/samples/net/zperf/src/zperf_udp_receiver.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_zperf_udp_recv -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_zperf_sample, LOG_LEVEL_DBG); #include #include diff --git a/samples/net/zperf/src/zperf_udp_uploader.c b/samples/net/zperf/src/zperf_udp_uploader.c index bb17b774a7d..7fb0aeb7d7a 100644 --- a/samples/net/zperf/src/zperf_udp_uploader.c +++ b/samples/net/zperf/src/zperf_udp_uploader.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_zperf_udp_send -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_zperf_sample, LOG_LEVEL_DBG); #include diff --git a/subsys/logging/log_backend_net.c b/subsys/logging/log_backend_net.c index eb9846df8ee..825c9338306 100644 --- a/subsys/logging/log_backend_net.c +++ b/subsys/logging/log_backend_net.c @@ -4,6 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include +LOG_MODULE_REGISTER(log_backend_net, CONFIG_LOG_DEFAULT_LEVEL); + #include #include #include diff --git a/subsys/net/Kconfig.template.log_config.net b/subsys/net/Kconfig.template.log_config.net index ca50ec9f2ea..d9a07e92de8 100644 --- a/subsys/net/Kconfig.template.log_config.net +++ b/subsys/net/Kconfig.template.log_config.net @@ -54,4 +54,4 @@ config $(module)_LOG_LEVEL default 2 if $(module)_LOG_LEVEL_WRN default 3 if $(module)_LOG_LEVEL_INF default 4 if $(module)_LOG_LEVEL_DBG - default NET_DEFAULT_LOG_LEVEL if $(module)_LOG_LEVEL_DEFAULT + default LOG_DEFAULT_LEVEL if $(module)_LOG_LEVEL_DEFAULT diff --git a/subsys/net/hostname.c b/subsys/net/hostname.c index f05c4b3cdac..cb3014407ac 100644 --- a/subsys/net/hostname.c +++ b/subsys/net/hostname.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_hostname -#define NET_LOG_LEVEL CONFIG_NET_HOSTNAME_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_hostname, CONFIG_NET_HOSTNAME_LOG_LEVEL); #include diff --git a/subsys/net/ip/6lo.c b/subsys/net/ip/6lo.c index 7a7faaceed2..124b45b152a 100644 --- a/subsys/net/ip/6lo.c +++ b/subsys/net/ip/6lo.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_6lo -#define NET_LOG_LEVEL CONFIG_NET_6LO_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_6lo, CONFIG_NET_6LO_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/Kconfig.debug b/subsys/net/ip/Kconfig.debug index ab4e272cd3d..f76c65b180d 100644 --- a/subsys/net/ip/Kconfig.debug +++ b/subsys/net/ip/Kconfig.debug @@ -14,20 +14,6 @@ menuconfig NET_LOG Specific debugging options to other sub-menus will be unlocked as well (IPv6, IPv4, ...). -module = NET_DEFAULT -module-dep = NET_LOG -module-def = LOG_LEVEL_ERR -module-str = Default network stack logging level -module-help = Default log level if the user has not specified one. -source "subsys/net/Kconfig.template.log_config.default.net" - -module = NET_MAX -module-dep = NET_LOG -module-def = LOG_LEVEL_DBG -module-str = Max network stack logging level -module-help = Max log level. This overrides individual networking log levels. -source "subsys/net/Kconfig.template.log_config.default.net" - module = NET_CORE module-dep = NET_LOG module-str = Log level for core IP stack diff --git a/subsys/net/ip/connection.c b/subsys/net/ip/connection.c index c691ba97a8c..11b63bee830 100644 --- a/subsys/net/ip/connection.c +++ b/subsys/net/ip/connection.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_conn -#define NET_LOG_LEVEL CONFIG_NET_CONN_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_conn, CONFIG_NET_CONN_LOG_LEVEL); #include #include @@ -675,7 +675,7 @@ int net_conn_register(enum net_ip_protocol proto, /* Cache needs to be cleared if new entries are added. */ cache_clear(); - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_CONN_LOG_LEVEL >= LOG_LEVEL_DBG) { char dst[NET_IPV6_ADDR_LEN]; char src[NET_IPV6_ADDR_LEN]; @@ -854,7 +854,7 @@ enum net_verdict net_conn_input(enum net_ip_protocol proto, struct net_pkt *pkt) return NET_DROP; } - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_CONN_LOG_LEVEL >= LOG_LEVEL_DBG) { int data_len = -1; if (IS_ENABLED(CONFIG_NET_IPV4) && diff --git a/subsys/net/ip/dhcpv4.c b/subsys/net/ip/dhcpv4.c index c38053d686b..e08519c5c7c 100644 --- a/subsys/net/ip/dhcpv4.c +++ b/subsys/net/ip/dhcpv4.c @@ -9,8 +9,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_dhcpv4 -#define NET_LOG_LEVEL CONFIG_NET_DHCPV4_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_dhcpv4, CONFIG_NET_DHCPV4_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/icmpv4.c b/subsys/net/ip/icmpv4.c index 56806d3abd5..36b57108aea 100644 --- a/subsys/net/ip/icmpv4.c +++ b/subsys/net/ip/icmpv4.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_icmpv4 -#define NET_LOG_LEVEL CONFIG_NET_ICMPV4_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_icmpv4, CONFIG_NET_ICMPV4_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/icmpv6.c b/subsys/net/ip/icmpv6.c index 5a01d39d29f..466ae78d106 100644 --- a/subsys/net/ip/icmpv6.c +++ b/subsys/net/ip/icmpv6.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_icmpv6 -#define NET_LOG_LEVEL CONFIG_NET_ICMPV6_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_icmpv6, CONFIG_NET_ICMPV6_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/ipv4.c b/subsys/net/ip/ipv4.c index 71312a20521..ff9f991afc5 100644 --- a/subsys/net/ip/ipv4.c +++ b/subsys/net/ip/ipv4.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ipv4 -#define NET_LOG_LEVEL CONFIG_NET_IPV4_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ipv4, CONFIG_NET_IPV4_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/ipv4_autoconf.c b/subsys/net/ip/ipv4_autoconf.c index 3a4a7abe7b7..a1fd2d2a2a9 100644 --- a/subsys/net/ip/ipv4_autoconf.c +++ b/subsys/net/ip/ipv4_autoconf.c @@ -9,8 +9,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ipv4_autoconf -#define NET_LOG_LEVEL CONFIG_NET_IPV4_AUTO_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ipv4_autoconf, CONFIG_NET_IPV4_AUTO_LOG_LEVEL); #include "net_private.h" #include diff --git a/subsys/net/ip/ipv6.c b/subsys/net/ip/ipv6.c index f6aea28a38b..5be67024cba 100644 --- a/subsys/net/ip/ipv6.c +++ b/subsys/net/ip/ipv6.c @@ -8,14 +8,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ipv6 -#define NET_LOG_LEVEL CONFIG_NET_IPV6_LOG_LEVEL - /* By default this prints too much data, set the value to 1 to see * neighbor cache contents. */ #define NET_DEBUG_NBR 0 +#include +LOG_MODULE_REGISTER(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL); + #include #include #include diff --git a/subsys/net/ip/ipv6_fragment.c b/subsys/net/ip/ipv6_fragment.c index 08ad7d20a74..61285332a60 100644 --- a/subsys/net/ip/ipv6_fragment.c +++ b/subsys/net/ip/ipv6_fragment.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ipv6_frag -#define NET_LOG_LEVEL CONFIG_NET_IPV6_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/ipv6_mld.c b/subsys/net/ip/ipv6_mld.c index d08023abb23..60d1ac848b1 100644 --- a/subsys/net/ip/ipv6_mld.c +++ b/subsys/net/ip/ipv6_mld.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ipv6_mld -#define NET_LOG_LEVEL CONFIG_NET_IPV6_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/ipv6_nbr.c b/subsys/net/ip/ipv6_nbr.c index bb5f5ddff61..f19525bdefb 100644 --- a/subsys/net/ip/ipv6_nbr.c +++ b/subsys/net/ip/ipv6_nbr.c @@ -8,14 +8,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ipv6_nbr -#define NET_LOG_LEVEL CONFIG_NET_IPV6_LOG_LEVEL - /* By default this prints too much data, set the value to 1 to see * neighbor cache contents. */ #define NET_DEBUG_NBR 0 +#include +LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL); + #include #include #include @@ -1204,7 +1204,7 @@ static void ns_routing_info(struct net_pkt *pkt, struct in6_addr *nexthop, struct in6_addr *tgt) { - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_IPV6_LOG_LEVEL >= LOG_LEVEL_DBG) { char out[NET_IPV6_ADDR_LEN]; snprintk(out, sizeof(out), "%s", diff --git a/subsys/net/ip/nbr.c b/subsys/net/ip/nbr.c index 93f0a89b021..6dd7b7cd13c 100644 --- a/subsys/net/ip/nbr.c +++ b/subsys/net/ip/nbr.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_nbr -#define NET_LOG_LEVEL CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_nbr, CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL); #include @@ -206,7 +206,7 @@ void net_nbr_clear_table(struct net_nbr_table *table) void net_nbr_print(struct net_nbr_table *table) { - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL >= LOG_LEVEL_DBG) { int i; for (i = 0; i < table->nbr_count; i++) { diff --git a/subsys/net/ip/net_context.c b/subsys/net/ip/net_context.c index 0b3cbc732e8..7b29b72621a 100644 --- a/subsys/net/ip/net_context.c +++ b/subsys/net/ip/net_context.c @@ -10,8 +10,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ctx -#define NET_LOG_LEVEL CONFIG_NET_CONTEXT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ctx, CONFIG_NET_CONTEXT_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/net_core.c b/subsys/net/ip/net_core.c index 059e979daa5..c79b9a37caa 100644 --- a/subsys/net/ip/net_core.c +++ b/subsys/net/ip/net_core.c @@ -11,8 +11,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_core -#define NET_LOG_LEVEL CONFIG_NET_CORE_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_core, CONFIG_NET_CORE_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c index fe01c57ab00..1c3c26b22a7 100644 --- a/subsys/net/ip/net_if.c +++ b/subsys/net/ip/net_if.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_if -#define NET_LOG_LEVEL CONFIG_NET_IF_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_if, CONFIG_NET_IF_LOG_LEVEL); #include #include @@ -97,7 +97,7 @@ static struct k_thread tx_thread_ts; static sys_slist_t timestamp_callbacks; #endif /* CONFIG_NET_PKT_TIMESTAMP */ -#if NET_LOG_LEVEL >= LOG_LEVEL_DBG +#if CONFIG_NET_IF_LOG_LEVEL >= LOG_LEVEL_DBG #if defined(CONFIG_NET_STATISTICS) #define debug_check_packet(pkt) \ do { \ @@ -119,7 +119,7 @@ static sys_slist_t timestamp_callbacks; #endif /* CONFIG_NET_STATISTICS */ #else #define debug_check_packet(...) -#endif /* NET_LOG_LEVEL >= LOG_LEVEL_DBG */ +#endif /* CONFIG_NET_IF_LOG_LEVEL >= LOG_LEVEL_DBG */ static inline void net_context_send_cb(struct net_context *context, void *token, int status) diff --git a/subsys/net/ip/net_mgmt.c b/subsys/net/ip/net_mgmt.c index b3a17b5591a..743ba5733a0 100644 --- a/subsys/net/ip/net_mgmt.c +++ b/subsys/net/ip/net_mgmt.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_mgmt -#define NET_LOG_LEVEL CONFIG_NET_MGMT_EVENT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_mgmt, CONFIG_NET_MGMT_EVENT_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c index 95ee17b8af3..ecac715cbe5 100644 --- a/subsys/net/ip/net_pkt.c +++ b/subsys/net/ip/net_pkt.c @@ -10,17 +10,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_pkt -#define NET_LOG_LEVEL CONFIG_NET_PKT_LOG_LEVEL - /* This enables allocation debugging but does not print so much output * as that can slow things down a lot. */ -#if defined(CONFIG_NET_DEBUG_NET_PKT_ALL) #undef NET_LOG_LEVEL +#if defined(CONFIG_NET_DEBUG_NET_PKT_ALL) #define NET_LOG_LEVEL 5 +#else +#define NET_LOG_LEVEL CONFIG_NET_PKT_LOG_LEVEL #endif +#include +LOG_MODULE_REGISTER(net_pkt, NET_LOG_LEVEL); + #include #include #include diff --git a/subsys/net/ip/net_shell.c b/subsys/net/ip/net_shell.c index 2510212ebd5..a49826c1ed4 100644 --- a/subsys/net/ip/net_shell.c +++ b/subsys/net/ip/net_shell.c @@ -10,7 +10,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_shell +#include +LOG_MODULE_REGISTER(net_shell, LOG_LEVEL_DBG); #include #include diff --git a/subsys/net/ip/net_stats.c b/subsys/net/ip/net_stats.c index 1ecfa8e1799..b24d816facc 100644 --- a/subsys/net/ip/net_stats.c +++ b/subsys/net/ip/net_stats.c @@ -4,14 +4,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_stats - #if defined(CONFIG_NET_STATISTICS_PERIODIC_OUTPUT) #define NET_LOG_LEVEL LOG_LEVEL_INF #else #define NET_LOG_LEVEL CONFIG_NET_STATISTICS_LOG_LEVEL #endif +#include +LOG_MODULE_REGISTER(net_stats, NET_LOG_LEVEL); + #include #include #include diff --git a/subsys/net/ip/net_tc.c b/subsys/net/ip/net_tc.c index 563869baa8b..88f235005b9 100644 --- a/subsys/net/ip/net_tc.c +++ b/subsys/net/ip/net_tc.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_tc -#define NET_LOG_LEVEL CONFIG_NET_TC_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_tc, CONFIG_NET_TC_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/promiscuous.c b/subsys/net/ip/promiscuous.c index 1d8ba6315a5..a867137a6f6 100644 --- a/subsys/net/ip/promiscuous.c +++ b/subsys/net/ip/promiscuous.c @@ -12,8 +12,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_promisc -#define NET_LOG_LEVEL CONFIG_NET_PROMISC_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_promisc, CONFIG_NET_PROMISC_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/route.c b/subsys/net/ip/route.c index bb41598af8c..863b1cd2c78 100644 --- a/subsys/net/ip/route.c +++ b/subsys/net/ip/route.c @@ -9,8 +9,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_route -#define NET_LOG_LEVEL CONFIG_NET_ROUTE_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_route, CONFIG_NET_ROUTE_LOG_LEVEL); #include #include @@ -234,7 +234,7 @@ static int nbr_nexthop_put(struct net_nbr *nbr) #define net_route_info(str, route, dst) \ - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { \ + if (CONFIG_NET_ROUTE_LOG_LEVEL >= LOG_LEVEL_DBG) { \ struct in6_addr *naddr = net_route_get_nexthop(route); \ \ NET_ASSERT_INFO(naddr, "Unknown nexthop address"); \ @@ -356,7 +356,7 @@ struct net_route_entry *net_route_add(struct net_if *iface, struct net_route_entry, node); - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_ROUTE_LOG_LEVEL >= LOG_LEVEL_DBG) { struct in6_addr *tmp; struct net_linkaddr_storage *llstorage; diff --git a/subsys/net/ip/rpl-mrhof.c b/subsys/net/ip/rpl-mrhof.c index 33eb52cf41c..24a1956e827 100644 --- a/subsys/net/ip/rpl-mrhof.c +++ b/subsys/net/ip/rpl-mrhof.c @@ -38,8 +38,8 @@ * SUCH DAMAGE. */ -#define LOG_MODULE_NAME net_rpl_mrhof -#define NET_LOG_LEVEL CONFIG_NET_RPL_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_rpl, CONFIG_NET_RPL_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/rpl-of0.c b/subsys/net/ip/rpl-of0.c index 18db0cff7df..461b39f70d2 100644 --- a/subsys/net/ip/rpl-of0.c +++ b/subsys/net/ip/rpl-of0.c @@ -38,8 +38,8 @@ * SUCH DAMAGE. */ -#define LOG_MODULE_NAME net_rpl_of0 -#define NET_LOG_LEVEL CONFIG_NET_RPL_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_rpl, CONFIG_NET_RPL_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/rpl.c b/subsys/net/ip/rpl.c index db3349605de..fdb1a4fafa2 100644 --- a/subsys/net/ip/rpl.c +++ b/subsys/net/ip/rpl.c @@ -38,8 +38,8 @@ * SUCH DAMAGE. */ -#define LOG_MODULE_NAME net_rpl -#define NET_LOG_LEVEL CONFIG_NET_RPL_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_rpl, CONFIG_NET_RPL_LOG_LEVEL); #include #include @@ -352,7 +352,7 @@ int net_rpl_foreach_parent(net_rpl_parent_cb_t cb, void *user_data) return ret; } -#if NET_LOG_LEVEL >= LOG_LEVEL_DBG +#if CONFIG_NET_RPL_LOG_LEVEL >= LOG_LEVEL_DBG static void net_rpl_print_parents(void) { struct net_rpl_parent *parent; @@ -1548,7 +1548,7 @@ static void net_rpl_remove_parent(struct net_if *iface, } } - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_RPL_LOG_LEVEL >= LOG_LEVEL_DBG) { struct in6_addr *addr; struct net_linkaddr_storage *lladdr; @@ -2053,7 +2053,7 @@ static bool net_rpl_process_parent_event(struct net_if *iface, return false; } - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_RPL_LOG_LEVEL >= LOG_LEVEL_DBG) { u16_t old_rank = instance->current_dag->rank; if (NET_RPL_DAG_RANK(old_rank, instance) != @@ -3534,7 +3534,7 @@ static enum net_verdict handle_dao(struct net_pkt *pkt) if (dag->preferred_parent) { r = forwarding_dao(instance, dag, pkt, sequence, flags, -#if NET_LOG_LEVEL >= LOG_LEVEL_DBG +#if CONFIG_NET_RPL_LOG_LEVEL >= LOG_LEVEL_DBG "Forwarding no-path DAO to " "parent" #else diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c index f2a8544caa9..7107041a70f 100644 --- a/subsys/net/ip/tcp.c +++ b/subsys/net/ip/tcp.c @@ -13,8 +13,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_tcp -#define NET_LOG_LEVEL CONFIG_NET_TCP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_tcp, CONFIG_NET_TCP_LOG_LEVEL); #include #include @@ -115,7 +115,7 @@ static void net_tcp_trace(struct net_pkt *pkt, struct net_tcp *tcp) u32_t rel_ack, ack; u8_t flags; - if (NET_LOG_LEVEL < LOG_LEVEL_DBG) { + if (CONFIG_NET_TCP_LOG_LEVEL < LOG_LEVEL_DBG) { return; } @@ -776,7 +776,7 @@ int net_tcp_prepare_reset(struct net_tcp *tcp, const char *net_tcp_state_str(enum net_tcp_state state) { -#if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) || defined(CONFIG_NET_SHELL) +#if (CONFIG_NET_TCP_LOG_LEVEL >= LOG_LEVEL_DBG) || defined(CONFIG_NET_SHELL) switch (state) { case NET_TCP_CLOSED: return "CLOSED"; @@ -1114,7 +1114,7 @@ void net_tcp_init(void) { } -#if NET_LOG_LEVEL >= LOG_LEVEL_DBG +#if CONFIG_NET_TCP_LOG_LEVEL >= LOG_LEVEL_DBG static void validate_state_transition(enum net_tcp_state current, enum net_tcp_state new) { @@ -1279,7 +1279,7 @@ struct net_tcp_hdr *net_tcp_get_hdr(struct net_pkt *pkt, /* If the pkt is compressed, then this is the typical outcome * so no use printing error in this case. */ - if ((NET_LOG_LEVEL >= LOG_LEVEL_DBG) && + if ((CONFIG_NET_TCP_LOG_LEVEL >= LOG_LEVEL_DBG) && !is_6lo_technology(pkt)) { NET_ASSERT(frag); } @@ -1858,7 +1858,7 @@ int net_tcp_unref(struct net_context *context) static void print_send_info(struct net_pkt *pkt, const char *msg) { - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_TCP_LOG_LEVEL >= LOG_LEVEL_DBG) { struct net_tcp_hdr hdr, *tcp_hdr; tcp_hdr = net_tcp_get_hdr(pkt, &hdr); diff --git a/subsys/net/ip/trickle.c b/subsys/net/ip/trickle.c index 2a27408c039..cf3260fcad9 100644 --- a/subsys/net/ip/trickle.c +++ b/subsys/net/ip/trickle.c @@ -10,8 +10,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_trickle -#define NET_LOG_LEVEL CONFIG_NET_TRICKLE_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_trickle, CONFIG_NET_TRICKLE_LOG_LEVEL); #include #include diff --git a/subsys/net/ip/udp.c b/subsys/net/ip/udp.c index 28b1289031c..275a7c1c623 100644 --- a/subsys/net/ip/udp.c +++ b/subsys/net/ip/udp.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_udp -#define NET_LOG_LEVEL CONFIG_NET_UDP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_udp, CONFIG_NET_UDP_LOG_LEVEL); #include "net_private.h" #include "udp_internal.h" diff --git a/subsys/net/ip/utils.c b/subsys/net/ip/utils.c index 78a282c2bdb..27e9a2073be 100644 --- a/subsys/net/ip/utils.c +++ b/subsys/net/ip/utils.c @@ -9,8 +9,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_utils -#define NET_LOG_LEVEL CONFIG_NET_UTILS_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_utils, CONFIG_NET_UTILS_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/bluetooth/bluetooth.c b/subsys/net/l2/bluetooth/bluetooth.c index 6196fe6f761..1382c11a344 100644 --- a/subsys/net/l2/bluetooth/bluetooth.c +++ b/subsys/net/l2/bluetooth/bluetooth.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_bt -#define NET_LOG_LEVEL CONFIG_NET_L2_BT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_bt, CONFIG_NET_L2_BT_LOG_LEVEL); #include #include @@ -145,7 +145,7 @@ static void ipsp_connected(struct bt_l2cap_chan *chan) return; } - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_L2_BT_LOG_LEVEL >= LOG_LEVEL_DBG) { char src[BT_ADDR_LE_STR_LEN]; char dst[BT_ADDR_LE_STR_LEN]; @@ -376,7 +376,7 @@ static bool eir_found(u8_t type, const u8_t *data, u8_t data_len, continue; } - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_L2_BT_LOG_LEVEL >= LOG_LEVEL_DBG) { bt_addr_le_t *addr = user_data; char dev[BT_ADDR_LE_STR_LEN]; @@ -502,7 +502,7 @@ static int bt_disconnect(u32_t mgmt_request, struct net_if *iface, static void connected(struct bt_conn *conn, u8_t err) { if (err) { - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_L2_BT_LOG_LEVEL >= LOG_LEVEL_DBG) { char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, @@ -529,7 +529,7 @@ static void disconnected(struct bt_conn *conn, u8_t reason) return; } - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { + if (CONFIG_NET_L2_BT_LOG_LEVEL >= LOG_LEVEL_DBG) { char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); diff --git a/subsys/net/l2/bluetooth/bluetooth_shell.c b/subsys/net/l2/bluetooth/bluetooth_shell.c index ac5ddd408ff..9f0ed54375c 100644 --- a/subsys/net/l2/bluetooth/bluetooth_shell.c +++ b/subsys/net/l2/bluetooth/bluetooth_shell.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_bt_shell -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_bt_shell, CONFIG_NET_L2_BT_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/dummy/dummy.c b/subsys/net/l2/dummy/dummy.c index 71092cea478..30f00b529ad 100644 --- a/subsys/net/l2/dummy/dummy.c +++ b/subsys/net/l2/dummy/dummy.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_l2_dummy -#define NET_LOG_LEVEL LOG_LEVEL_NONE +#include +LOG_MODULE_REGISTER(net_l2_dummy, LOG_LEVEL_NONE); #include #include diff --git a/subsys/net/l2/ethernet/arp.c b/subsys/net/l2/ethernet/arp.c index 5070ff3ab63..11f33a06c88 100644 --- a/subsys/net/l2/ethernet/arp.c +++ b/subsys/net/l2/ethernet/arp.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_arp -#define NET_LOG_LEVEL CONFIG_NET_ARP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_arp, CONFIG_NET_ARP_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c index f2f5fcf10ce..26a257db8fb 100644 --- a/subsys/net/l2/ethernet/ethernet.c +++ b/subsys/net/l2/ethernet/ethernet.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ethernet -#define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ethernet, CONFIG_NET_L2_ETHERNET_LOG_LEVEL); #include #include @@ -49,7 +49,7 @@ void net_eth_ipv6_mcast_to_mac_addr(const struct in6_addr *ipv6_addr, } #define print_ll_addrs(pkt, type, len, src, dst) \ - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { \ + if (CONFIG_NET_L2_ETHERNET_LOG_LEVEL >= LOG_LEVEL_DBG) { \ char out[sizeof("xx:xx:xx:xx:xx:xx")]; \ \ snprintk(out, sizeof(out), "%s", \ @@ -65,7 +65,7 @@ void net_eth_ipv6_mcast_to_mac_addr(const struct in6_addr *ipv6_addr, #ifdef CONFIG_NET_VLAN #define print_vlan_ll_addrs(pkt, type, tci, len, src, dst) \ - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { \ + if (CONFIG_NET_L2_ETHERNET_LOG_LEVEL >= LOG_LEVEL_DBG) { \ char out[sizeof("xx:xx:xx:xx:xx:xx")]; \ \ snprintk(out, sizeof(out), "%s", \ diff --git a/subsys/net/l2/ethernet/ethernet_mgmt.c b/subsys/net/l2/ethernet/ethernet_mgmt.c index 84c51c9c77e..77f0fe8afea 100644 --- a/subsys/net/l2/ethernet/ethernet_mgmt.c +++ b/subsys/net/l2/ethernet/ethernet_mgmt.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ethernet_mgmt -#define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ethernet_mgmt, CONFIG_NET_L2_ETHERNET_LOG_LEVEL); #include diff --git a/subsys/net/l2/ethernet/ethernet_stats.c b/subsys/net/l2/ethernet/ethernet_stats.c index 08b27d6ce20..5c2bbcb9b04 100644 --- a/subsys/net/l2/ethernet/ethernet_stats.c +++ b/subsys/net/l2/ethernet/ethernet_stats.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ethernet_stats +#include +LOG_MODULE_REGISTER(net_ethernet_stats, CONFIG_NET_L2_ETHERNET_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/ethernet/gptp/gptp.c b/subsys/net/l2/ethernet/gptp/gptp.c index e457b07bf72..54ef0b6a01b 100644 --- a/subsys/net/l2/ethernet/gptp/gptp.c +++ b/subsys/net/l2/ethernet/gptp/gptp.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_gptp -#define NET_LOG_LEVEL CONFIG_NET_GPTP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/ethernet/gptp/gptp_md.c b/subsys/net/l2/ethernet/gptp/gptp_md.c index b9b7adb07d0..d0bb613d0c0 100644 --- a/subsys/net/l2/ethernet/gptp/gptp_md.c +++ b/subsys/net/l2/ethernet/gptp/gptp_md.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_gptp_md -#define NET_LOG_LEVEL CONFIG_NET_GPTP_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL); #include "gptp_messages.h" #include "gptp_md.h" diff --git a/subsys/net/l2/ethernet/gptp/gptp_messages.c b/subsys/net/l2/ethernet/gptp/gptp_messages.c index 8fad1b60d9d..f7d5da42b56 100644 --- a/subsys/net/l2/ethernet/gptp/gptp_messages.c +++ b/subsys/net/l2/ethernet/gptp/gptp_messages.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_gptp_msg -#define NET_LOG_LEVEL CONFIG_NET_GPTP_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL); #include @@ -25,7 +25,7 @@ static const struct net_eth_addr gptp_multicast_eth_addr = { { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e } }; #define NET_GPTP_INFO(msg, pkt) \ - if (NET_LOG_LEVEL >= LOG_LEVEL_DBG) { \ + if (CONFIG_NET_GPTP_LOG_LEVEL >= LOG_LEVEL_DBG) { \ struct gptp_hdr *hdr = GPTP_HDR(pkt); \ \ if (hdr->message_type == GPTP_ANNOUNCE_MESSAGE) { \ diff --git a/subsys/net/l2/ethernet/gptp/gptp_mi.c b/subsys/net/l2/ethernet/gptp/gptp_mi.c index f56135e2d0a..020b132b527 100644 --- a/subsys/net/l2/ethernet/gptp/gptp_mi.c +++ b/subsys/net/l2/ethernet/gptp/gptp_mi.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_gptp_mi -#define NET_LOG_LEVEL CONFIG_NET_GPTP_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL); #include diff --git a/subsys/net/l2/ethernet/gptp/gptp_user_api.c b/subsys/net/l2/ethernet/gptp/gptp_user_api.c index cc9c9b525ca..c79e8639bbc 100644 --- a/subsys/net/l2/ethernet/gptp/gptp_user_api.c +++ b/subsys/net/l2/ethernet/gptp/gptp_user_api.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_gptp_api -#define NET_LOG_LEVEL CONFIG_NET_GPTP_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/ethernet/lldp/lldp.c b/subsys/net/l2/ethernet/lldp/lldp.c index 63ad997a991..66507d9e43d 100644 --- a/subsys/net/l2/ethernet/lldp/lldp.c +++ b/subsys/net/l2/ethernet/lldp/lldp.c @@ -8,8 +8,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_lldp -#define NET_LOG_LEVEL CONFIG_NET_LLDP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_lldp, CONFIG_NET_LLDP_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/ieee802154/ieee802154.c b/subsys/net/l2/ieee802154/ieee802154.c index c3e2ba99ef3..717711910b3 100644 --- a/subsys/net/l2/ieee802154/ieee802154.c +++ b/subsys/net/l2/ieee802154/ieee802154.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ieee802154 -#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ieee802154, CONFIG_NET_L2_IEEE802154_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/ieee802154/ieee802154_fragment.c b/subsys/net/l2/ieee802154/ieee802154_fragment.c index 344a3450264..68b3fc50bb5 100644 --- a/subsys/net/l2/ieee802154/ieee802154_fragment.c +++ b/subsys/net/l2/ieee802154/ieee802154_fragment.c @@ -8,8 +8,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ieee802154_fragment -#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ieee802154_fragment, + CONFIG_NET_L2_IEEE802154_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/ieee802154/ieee802154_frame.c b/subsys/net/l2/ieee802154/ieee802154_frame.c index 897210145b7..7c99d5bcc24 100644 --- a/subsys/net/l2/ieee802154/ieee802154_frame.c +++ b/subsys/net/l2/ieee802154/ieee802154_frame.c @@ -4,8 +4,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ieee802154_frame -#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ieee802154_frame, CONFIG_NET_L2_IEEE802154_LOG_LEVEL); + +#include +#include + +#include +#include + +#include "ieee802154_frame.h" +#include "ieee802154_security.h" #define dbg_print_fs(fs) \ NET_DBG("fs(1): %u/%u/%u/%u/%u/%u", \ @@ -17,15 +26,6 @@ fs->fc.dst_addr_mode, fs->fc.frame_version, \ fs->fc.src_addr_mode, fs->sequence) -#include -#include - -#include -#include - -#include "ieee802154_frame.h" -#include "ieee802154_security.h" - #define BUF_TIMEOUT K_MSEC(50) #ifdef CONFIG_NET_L2_IEEE802154_SECURITY diff --git a/subsys/net/l2/ieee802154/ieee802154_mgmt.c b/subsys/net/l2/ieee802154/ieee802154_mgmt.c index 5bda96ebf44..be43a209190 100644 --- a/subsys/net/l2/ieee802154/ieee802154_mgmt.c +++ b/subsys/net/l2/ieee802154/ieee802154_mgmt.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ieee802154_mgmt -#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ieee802154_mgmt, CONFIG_NET_L2_IEEE802154_LOG_LEVEL); #include diff --git a/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c b/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c index 9721d434e51..837b9083bd5 100644 --- a/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c +++ b/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ieee802154_aloha -#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ieee802154_aloha, CONFIG_NET_L2_IEEE802154_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c b/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c index 0d03bc06c1b..b963937b5f1 100644 --- a/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c +++ b/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ieee802154_csma -#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ieee802154_csma, CONFIG_NET_L2_IEEE802154_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/ieee802154/ieee802154_security.c b/subsys/net/l2/ieee802154/ieee802154_security.c index 58c5c29a95f..f27a98a9446 100644 --- a/subsys/net/l2/ieee802154/ieee802154_security.c +++ b/subsys/net/l2/ieee802154/ieee802154_security.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ieee802154_security -#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ieee802154_security, + CONFIG_NET_L2_IEEE802154_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/ieee802154/ieee802154_shell.c b/subsys/net/l2/ieee802154/ieee802154_shell.c index a9abaf17966..cedd82edf20 100644 --- a/subsys/net/l2/ieee802154/ieee802154_shell.c +++ b/subsys/net/l2/ieee802154/ieee802154_shell.c @@ -8,8 +8,8 @@ * @brief IEEE 802.15.4 shell module */ -#define LOG_MODULE_NAME net_ieee802154_shell -#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_ieee802154_shell, CONFIG_NET_L2_IEEE802154_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c index 3ee722d8ba3..ed11a1ac97e 100644 --- a/subsys/net/l2/openthread/openthread.c +++ b/subsys/net/l2/openthread/openthread.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define NET_LOG_LEVEL CONFIG_OPENTHREAD_L2_LOG_LEVEL -#define LOG_MODULE_NAME net_l2_openthread +#include +LOG_MODULE_REGISTER(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/openthread/openthread_utils.c b/subsys/net/l2/openthread/openthread_utils.c index 9de137c1746..5f2bbd2a7cf 100644 --- a/subsys/net/l2/openthread/openthread_utils.c +++ b/subsys/net/l2/openthread/openthread_utils.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define NET_LOG_LEVEL CONFIG_OPENTHREAD_L2_LOG_LEVEL -#define LOG_MODULE_NAME net_l2_openthread_utils +#include +LOG_MODULE_DECLARE(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL); #include #include diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c index fb3bc564de0..dfe44d603e3 100644 --- a/subsys/net/l2/wifi/wifi_mgmt.c +++ b/subsys/net/l2/wifi/wifi_mgmt.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_wifi_mgmt -#define NET_LOG_LEVEL CONFIG_NET_L2_WIFI_MGMT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_wifi_mgmt, CONFIG_NET_L2_WIFI_MGMT_LOG_LEVEL); #include diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c index 05f55177aa8..009b4990210 100644 --- a/subsys/net/l2/wifi/wifi_shell.c +++ b/subsys/net/l2/wifi/wifi_shell.c @@ -8,6 +8,9 @@ * @brief WiFi shell module */ +#include +LOG_MODULE_REGISTER(net_wifi_shell, LOG_LEVEL_INF); + #include #include #include diff --git a/subsys/net/lib/app/client.c b/subsys/net/lib/app/client.c index d0dea31fbd6..14828aa54b9 100644 --- a/subsys/net/lib/app/client.c +++ b/subsys/net/lib/app/client.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_app_client -#define NET_LOG_LEVEL CONFIG_NET_APP_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_app, CONFIG_NET_APP_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/app/net_app.c b/subsys/net/lib/app/net_app.c index 687ae812233..3629a0afa79 100644 --- a/subsys/net/lib/app/net_app.c +++ b/subsys/net/lib/app/net_app.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_app -#define NET_LOG_LEVEL CONFIG_NET_APP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_app, CONFIG_NET_APP_LOG_LEVEL); #if defined(CONFIG_STDOUT_CONSOLE) #include @@ -725,7 +725,7 @@ struct net_context *select_server_ctx(struct net_app_ctx *ctx, #define select_server_ctx(...) NULL #endif /* CONFIG_NET_APP_SERVER */ -#if NET_LOG_LEVEL >= LOG_LEVEL_ERR +#if CONFIG_NET_APP_LOG_LEVEL >= LOG_LEVEL_ERR struct net_context *_net_app_select_net_ctx_debug(struct net_app_ctx *ctx, const struct sockaddr *dst, const char *caller, @@ -743,7 +743,7 @@ struct net_context *_net_app_select_net_ctx(struct net_app_ctx *ctx, net_ctx = select_server_ctx(ctx, dst); } -#if NET_LOG_LEVEL >= LOG_LEVEL_ERR +#if CONFIG_NET_APP_LOG_LEVEL >= LOG_LEVEL_ERR NET_DBG("Selecting %p net_ctx (%s():%d)", net_ctx, caller, line); #endif @@ -1160,7 +1160,7 @@ int net_app_close2(struct net_app_ctx *ctx, struct net_context *net_ctx) } #if defined(CONFIG_NET_APP_TLS) || defined(CONFIG_NET_APP_DTLS) -#if defined(MBEDTLS_DEBUG_C) && (NET_LOG_LEVEL >= LOG_LEVEL_DBG) +#if defined(MBEDTLS_DEBUG_C) && (CONFIG_NET_APP_LOG_LEVEL >= LOG_LEVEL_DBG) static void my_debug(void *ctx, int level, const char *file, int line, const char *str) { @@ -1186,7 +1186,7 @@ static void my_debug(void *ctx, int level, NET_DBG("%s:%04d: |%d| %s", basename, line, level, log_strdup(str)); } -#endif /* MBEDTLS_DEBUG_C && NET_LOG_LEVEL >= LOG_LEVEL_DBG */ +#endif /* MBEDTLS_DEBUG_C && CONFIG_NET_APP_LOG_LEVEL >= LOG_LEVEL_DBG */ static void ssl_sent(struct net_context *context, int status, void *token, void *user_data) @@ -2221,7 +2221,7 @@ int _net_app_tls_init(struct net_app_ctx *ctx, int client_or_server) mbedtls_entropy_init(&ctx->tls.mbedtls.entropy); mbedtls_ctr_drbg_init(&ctx->tls.mbedtls.ctr_drbg); -#if defined(MBEDTLS_DEBUG_C) && NET_LOG_LEVEL >= LOG_LEVEL_DBG +#if defined(MBEDTLS_DEBUG_C) && CONFIG_NET_APP_LOG_LEVEL >= LOG_LEVEL_DBG mbedtls_debug_set_threshold(CONFIG_MBEDTLS_DEBUG_LEVEL); mbedtls_ssl_conf_dbg(&ctx->tls.mbedtls.conf, my_debug, NULL); #endif diff --git a/subsys/net/lib/app/net_app_private.h b/subsys/net/lib/app/net_app_private.h index e172e7fefa7..9fc600c098d 100644 --- a/subsys/net/lib/app/net_app_private.h +++ b/subsys/net/lib/app/net_app_private.h @@ -58,7 +58,7 @@ int _net_app_config_local_ctx(struct net_app_ctx *ctx, enum net_ip_protocol proto, struct sockaddr *addr); -#if NET_LOG_LEVEL > 0 +#if CONFIG_NET_APP_LOG_LEVEL >= LOG_LEVEL_ERR struct net_context *_net_app_select_net_ctx_debug(struct net_app_ctx *ctx, const struct sockaddr *dst, const char *caller, diff --git a/subsys/net/lib/app/server.c b/subsys/net/lib/app/server.c index 61aa7c14499..f93db37e0f1 100644 --- a/subsys/net/lib/app/server.c +++ b/subsys/net/lib/app/server.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_app_server -#define NET_LOG_LEVEL CONFIG_NET_APP_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_app, CONFIG_NET_APP_LOG_LEVEL); #include #include @@ -26,7 +26,7 @@ static void new_client(struct net_context *net_ctx, const struct sockaddr *addr) { -#if NET_LOG_LEVEL >= LOG_LEVEL_WRN +#if CONFIG_NET_APP_LOG_LEVEL >= LOG_LEVEL_WRN #if defined(CONFIG_NET_IPV6) #define PORT_STR sizeof("[]:xxxxx") char buf[NET_IPV6_ADDR_LEN + PORT_STR]; @@ -288,7 +288,7 @@ fail: static inline void new_server(struct net_app_ctx *ctx, const char *server_banner) { -#if NET_LOG_LEVEL >= LOG_LEVEL_WRN +#if CONFIG_NET_APP_LOG_LEVEL >= LOG_LEVEL_WRN #if defined(CONFIG_NET_IPV6) #define PORT_STR sizeof("[]:xxxxx") char buf[NET_IPV6_ADDR_LEN + PORT_STR]; diff --git a/subsys/net/lib/coap/coap.c b/subsys/net/lib/coap/coap.c index c2f398d6f5f..dea31aa266d 100644 --- a/subsys/net/lib/coap/coap.c +++ b/subsys/net/lib/coap/coap.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_coap -#define NET_LOG_LEVEL CONFIG_COAP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_coap, CONFIG_COAP_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/coap/coap_link_format.c b/subsys/net/lib/coap/coap_link_format.c index 3b81581e803..e842e03019f 100644 --- a/subsys/net/lib/coap/coap_link_format.c +++ b/subsys/net/lib/coap/coap_link_format.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_coap_utils -#define NET_LOG_LEVEL CONFIG_COAP_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/coap/coap_link_format_sock.c b/subsys/net/lib/coap/coap_link_format_sock.c index 67dfd55d30c..64fe5be5c6f 100644 --- a/subsys/net/lib/coap/coap_link_format_sock.c +++ b/subsys/net/lib/coap/coap_link_format_sock.c @@ -4,10 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined(CONFIG_NET_DEBUG_COAP_SOCK) -#define SYS_LOG_DOMAIN "coap" -#define NET_LOG_ENABLED 1 -#endif +#include +LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/coap/coap_sock.c b/subsys/net/lib/coap/coap_sock.c index 59b464d01a2..3f3beaa8e22 100644 --- a/subsys/net/lib/coap/coap_sock.c +++ b/subsys/net/lib/coap/coap_sock.c @@ -4,13 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_coap_sock -#define NET_LOG_LEVEL CONFIG_COAP_SOCK_LOG_LEVEL - -#if defined(CONFIG_NET_DEBUG_COAP_SOCK) -#define SYS_LOG_DOMAIN "coap" -#define NET_LOG_ENABLED 1 -#endif +#include +LOG_MODULE_REGISTER(net_coap, CONFIG_COAP_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/config/bt_settings.c b/subsys/net/lib/config/bt_settings.c index f80c26cf549..6b8c65d0c6b 100644 --- a/subsys/net/lib/config/bt_settings.c +++ b/subsys/net/lib/config/bt_settings.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_config_bt -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_DECLARE(net_config, CONFIG_NET_CONFIG_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/config/ieee802154_settings.c b/subsys/net/lib/config/ieee802154_settings.c index 92e456cb1e6..0674b1bdd4d 100644 --- a/subsys/net/lib/config/ieee802154_settings.c +++ b/subsys/net/lib/config/ieee802154_settings.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_config_ieee802154 -#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_config, CONFIG_NET_CONFIG_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/config/init.c b/subsys/net/lib/config/init.c index e15d0e5d038..fe3b987074e 100644 --- a/subsys/net/lib/config/init.c +++ b/subsys/net/lib/config/init.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_config -#define NET_LOG_LEVEL CONFIG_NET_CONFIG_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_config, CONFIG_NET_CONFIG_LOG_LEVEL); #include #include @@ -40,7 +40,7 @@ static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb, u32_t mgmt_event, struct net_if *iface) { -#if NET_LOG_LEVEL > 2 +#if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF char hr_addr[NET_IPV4_ADDR_LEN]; #endif int i; @@ -57,7 +57,7 @@ static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb, continue; } -#if NET_LOG_LEVEL > 2 +#if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF NET_INFO("IPv4 address: %s", log_strdup(net_addr_ntop(AF_INET, &if_addr->address.in_addr, @@ -104,7 +104,7 @@ static void setup_dhcpv4(struct net_if *iface) static void setup_ipv4(struct net_if *iface) { -#if NET_LOG_LEVEL > 2 +#if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF char hr_addr[NET_IPV4_ADDR_LEN]; #endif struct in_addr addr; @@ -135,7 +135,7 @@ static void setup_ipv4(struct net_if *iface) net_if_ipv4_addr_add(iface, &addr, NET_ADDR_MANUAL, 0); #endif -#if NET_LOG_LEVEL > 2 +#if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF NET_INFO("IPv4 address: %s", log_strdup(net_addr_ntop(AF_INET, &addr, hr_addr, sizeof(hr_addr)))); @@ -201,7 +201,7 @@ static void ipv6_event_handler(struct net_mgmt_event_callback *cb, } if (mgmt_event == NET_EVENT_IPV6_DAD_SUCCEED) { -#if NET_LOG_LEVEL > 2 +#if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF char hr_addr[NET_IPV6_ADDR_LEN]; #endif struct net_if_addr *ifaddr; @@ -214,7 +214,7 @@ static void ipv6_event_handler(struct net_mgmt_event_callback *cb, return; } -#if NET_LOG_LEVEL > 2 +#if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF NET_INFO("IPv6 address: %s", log_strdup(net_addr_ntop(AF_INET6, &laddr, hr_addr, NET_IPV6_ADDR_LEN))); diff --git a/subsys/net/lib/dns/llmnr_responder.c b/subsys/net/lib/dns/llmnr_responder.c index b90551652e6..203e6d4dcf1 100644 --- a/subsys/net/lib/dns/llmnr_responder.c +++ b/subsys/net/lib/dns/llmnr_responder.c @@ -10,8 +10,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_llmnr_responder -#define NET_LOG_LEVEL CONFIG_LLMNR_RESPONDER_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_llmnr_responder, CONFIG_LLMNR_RESPONDER_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/dns/mdns_responder.c b/subsys/net/lib/dns/mdns_responder.c index 819dd1800b0..28e9829a000 100644 --- a/subsys/net/lib/dns/mdns_responder.c +++ b/subsys/net/lib/dns/mdns_responder.c @@ -10,8 +10,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_mdns_responder -#define NET_LOG_LEVEL CONFIG_MDNS_RESPONDER_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_mdns_responder, CONFIG_MDNS_RESPONDER_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/dns/resolve.c b/subsys/net/lib/dns/resolve.c index a73c24663b7..e123461400c 100644 --- a/subsys/net/lib/dns/resolve.c +++ b/subsys/net/lib/dns/resolve.c @@ -10,8 +10,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_dns_resolve -#define NET_LOG_LEVEL CONFIG_DNS_RESOLVER_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_dns_resolve, CONFIG_DNS_RESOLVER_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/http/http.c b/subsys/net/lib/http/http.c index 68afd32942a..1425a1b1ad9 100644 --- a/subsys/net/lib/http/http.c +++ b/subsys/net/lib/http/http.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_http -#define NET_LOG_LEVEL CONFIG_HTTP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_http, CONFIG_HTTP_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/http/http_client.c b/subsys/net/lib/http/http_client.c index 61850e4055a..f4ba860d536 100644 --- a/subsys/net/lib/http/http_client.c +++ b/subsys/net/lib/http/http_client.c @@ -4,12 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined(CONFIG_HTTPS) -#define LOG_MODULE_NAME net_https_client -#else -#define LOG_MODULE_NAME net_http_client -#endif -#define NET_LOG_LEVEL CONFIG_HTTP_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_http, CONFIG_HTTP_LOG_LEVEL); #include #include @@ -181,7 +177,7 @@ static void sprint_addr(char *buf, int len, static inline void print_info(struct http_ctx *ctx, enum http_method method) { - if (NET_LOG_LEVEL >= LOG_LEVEL_INF) { + if (CONFIG_HTTP_LOG_LEVEL >= LOG_LEVEL_INF) { char local[NET_IPV6_ADDR_LEN]; char remote[NET_IPV6_ADDR_LEN]; @@ -271,7 +267,7 @@ out: static void print_header_field(size_t len, const char *str) { - if (NET_LOG_LEVEL >= LOG_LEVEL_INF) { + if (CONFIG_HTTP_LOG_LEVEL >= LOG_LEVEL_INF) { #define MAX_OUTPUT_LEN 128 char output[MAX_OUTPUT_LEN]; @@ -434,7 +430,7 @@ static int on_headers_complete(struct http_parser *parser) static int on_message_begin(struct http_parser *parser) { - if (NET_LOG_LEVEL >= LOG_LEVEL_INF) { + if (CONFIG_HTTP_LOG_LEVEL >= LOG_LEVEL_INF) { struct http_ctx *ctx = CONTAINER_OF(parser, struct http_ctx, http.parser); diff --git a/subsys/net/lib/http/http_server.c b/subsys/net/lib/http/http_server.c index 480b8efe457..2e6f7223684 100644 --- a/subsys/net/lib/http/http_server.c +++ b/subsys/net/lib/http/http_server.c @@ -4,12 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined(CONFIG_HTTPS) -#define LOG_MODULE_NAME net_https_server -#else -#define LOG_MODULE_NAME net_http_server -#endif -#define NET_LOG_LEVEL CONFIG_HTTP_LOG_LEVEL +#include +LOG_MODULE_DECLARE(net_http, CONFIG_HTTP_LOG_LEVEL); #include #include @@ -78,7 +74,7 @@ void http_server_conn_monitor(http_server_cb_t cb, void *user_data) const char * const http_state_str(enum http_state state) { -#if NET_LOG_LEVEL >= LOG_LEVEL_DBG +#if CONFIG_HTTP_LOG_LEVEL >= LOG_LEVEL_DBG switch (state) { case HTTP_STATE_CLOSED: return "CLOSED"; @@ -98,7 +94,7 @@ const char * const http_state_str(enum http_state state) return ""; } -#if NET_LOG_LEVEL >= LOG_LEVEL_DBG +#if CONFIG_HTTP_LOG_LEVEL >= LOG_LEVEL_DBG static void validate_state_transition(struct http_ctx *ctx, enum http_state current, enum http_state new) @@ -124,7 +120,7 @@ static void validate_state_transition(struct http_ctx *ctx, http_state_str(new), new); } } -#endif /* NET_LOG_LEVEL */ +#endif /* CONFIG_HTTP_LOG_LEVEL */ void _http_change_state(struct http_ctx *ctx, enum http_state new_state, @@ -142,7 +138,7 @@ void _http_change_state(struct http_ctx *ctx, http_state_str(new_state), new_state, func, line); -#if NET_LOG_LEVEL >= LOG_LEVEL_DBG +#if CONFIG_HTTP_LOG_LEVEL >= LOG_LEVEL_DBG validate_state_transition(ctx, ctx->state, new_state); #endif @@ -214,7 +210,7 @@ quit: return ret; } -#if NET_LOG_LEVEL >= LOG_LEVEL_INF +#if CONFIG_HTTP_LOG_LEVEL >= LOG_LEVEL_INF static char *sprint_ipaddr(char *buf, int buflen, const struct sockaddr *addr) { if (addr->sa_family == AF_INET6) { @@ -297,14 +293,14 @@ static struct net_context *get_server_ctx(struct net_app_ctx *ctx, return NULL; } -#endif /* NET_LOG_LEVEL */ +#endif /* CONFIG_HTTP_LOG_LEVEL */ static inline void new_client(struct http_ctx *ctx, enum http_connection_type type, struct net_app_ctx *app_ctx, const struct sockaddr *dst) { -#if NET_LOG_LEVEL >= LOG_LEVEL_INF +#if CONFIG_HTTP_LOG_LEVEL >= LOG_LEVEL_INF #if defined(CONFIG_NET_IPV6) #define PORT_LEN sizeof("[]:xxxxx") #define ADDR_LEN NET_IPV6_ADDR_LEN @@ -328,7 +324,7 @@ static inline void new_client(struct http_ctx *ctx, } else { NET_INFO("[%p] %s connection", ctx, type_str); } -#endif /* NET_LOG_LEVEL */ +#endif /* CONFIG_HTTP_LOG_LEVEL */ } static void url_connected(struct http_ctx *ctx, @@ -993,7 +989,7 @@ static inline void new_server(struct http_ctx *ctx, const char *server_banner, const struct sockaddr *addr) { -#if NET_LOG_LEVEL >= LOG_LEVEL_INF +#if CONFIG_HTTP_LOG_LEVEL >= LOG_LEVEL_INF #if defined(CONFIG_NET_IPV6) #define PORT_STR sizeof("[]:xxxxx") char buf[NET_IPV6_ADDR_LEN + PORT_STR]; @@ -1008,7 +1004,7 @@ static inline void new_server(struct http_ctx *ctx, } else { NET_INFO("%s (%p)", server_banner, ctx); } -#endif /* NET_LOG_LEVEL */ +#endif /* CONFIG_HTTP_LOG_LEVEL */ } static void init_net(struct http_ctx *ctx, diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c index a316d4d8bab..08922755ed2 100644 --- a/subsys/net/lib/mqtt/mqtt.c +++ b/subsys/net/lib/mqtt/mqtt.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_mqtt -#define NET_LOG_LEVEL LOG_LEVEL_ERR +#include +LOG_MODULE_REGISTER(net_mqtt, LOG_LEVEL_ERR); #include #include "mqtt_pkt.h" diff --git a/subsys/net/lib/mqtt_sock/mqtt.c b/subsys/net/lib/mqtt_sock/mqtt.c index 9193054af0b..4d678abcd99 100644 --- a/subsys/net/lib/mqtt_sock/mqtt.c +++ b/subsys/net/lib/mqtt_sock/mqtt.c @@ -9,8 +9,8 @@ * @brief MQTT Client API Implementation. */ -#define LOG_MODULE_NAME net_mqtt -#define NET_LOG_LEVEL CONFIG_MQTT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_mqtt, CONFIG_MQTT_LOG_LEVEL); #include diff --git a/subsys/net/lib/mqtt_sock/mqtt_decoder.c b/subsys/net/lib/mqtt_sock/mqtt_decoder.c index 7df7dbcb534..67a71ec2ac4 100644 --- a/subsys/net/lib/mqtt_sock/mqtt_decoder.c +++ b/subsys/net/lib/mqtt_sock/mqtt_decoder.c @@ -10,8 +10,8 @@ * broker. */ -#define LOG_MODULE_NAME net_mqtt_dec -#define NET_LOG_LEVEL CONFIG_MQTT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_mqtt_dec, CONFIG_MQTT_LOG_LEVEL); #include "mqtt_internal.h" #include "mqtt_os.h" diff --git a/subsys/net/lib/mqtt_sock/mqtt_encoder.c b/subsys/net/lib/mqtt_sock/mqtt_encoder.c index a9a3b3c84b4..899a90d96a3 100644 --- a/subsys/net/lib/mqtt_sock/mqtt_encoder.c +++ b/subsys/net/lib/mqtt_sock/mqtt_encoder.c @@ -9,8 +9,8 @@ * @brief Encoding functions needed to create packet to be sent to the broker. */ -#define LOG_MODULE_NAME net_mqtt_enc -#define NET_LOG_LEVEL CONFIG_MQTT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_mqtt_enc, CONFIG_MQTT_LOG_LEVEL); #include "mqtt_internal.h" #include "mqtt_os.h" diff --git a/subsys/net/lib/mqtt_sock/mqtt_rx.c b/subsys/net/lib/mqtt_sock/mqtt_rx.c index 9d610fa5b88..109ad187178 100644 --- a/subsys/net/lib/mqtt_sock/mqtt_rx.c +++ b/subsys/net/lib/mqtt_sock/mqtt_rx.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_mqtt_rx -#define NET_LOG_LEVEL CONFIG_MQTT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_mqtt_rx, CONFIG_MQTT_LOG_LEVEL); #include "mqtt_internal.h" #include "mqtt_transport.h" diff --git a/subsys/net/lib/mqtt_sock/mqtt_transport_socket_tcp.c b/subsys/net/lib/mqtt_sock/mqtt_transport_socket_tcp.c index cb0f39f4e43..035917edb12 100644 --- a/subsys/net/lib/mqtt_sock/mqtt_transport_socket_tcp.c +++ b/subsys/net/lib/mqtt_sock/mqtt_transport_socket_tcp.c @@ -9,8 +9,8 @@ * @brief Internal functions to handle transport over TCP socket. */ -#define LOG_MODULE_NAME net_mqtt_sock_tcp -#define NET_LOG_LEVEL CONFIG_MQTT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_mqtt_sock_tcp, CONFIG_MQTT_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/mqtt_sock/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt_sock/mqtt_transport_socket_tls.c index 625c2ef3e26..63592f2fbc9 100644 --- a/subsys/net/lib/mqtt_sock/mqtt_transport_socket_tls.c +++ b/subsys/net/lib/mqtt_sock/mqtt_transport_socket_tls.c @@ -9,8 +9,8 @@ * @brief Internal functions to handle transport over TLS socket. */ -#define LOG_MODULE_NAME net_mqtt_sock_tls -#define NET_LOG_LEVEL CONFIG_MQTT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_mqtt_sock_tls, CONFIG_MQTT_LOG_LEVEL); #include #include diff --git a/subsys/net/lib/sntp/sntp.c b/subsys/net/lib/sntp/sntp.c index 21afa894809..bc8901f50bd 100644 --- a/subsys/net/lib/sntp/sntp.c +++ b/subsys/net/lib/sntp/sntp.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_sntp -#define NET_LOG_LEVEL CONFIG_SNTP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_sntp, CONFIG_SNTP_LOG_LEVEL); #include #include "sntp_pkt.h" diff --git a/subsys/net/lib/sockets/getaddrinfo.c b/subsys/net/lib/sockets/getaddrinfo.c index 676f67a3fd3..d6a305ae685 100644 --- a/subsys/net/lib/sockets/getaddrinfo.c +++ b/subsys/net/lib/sockets/getaddrinfo.c @@ -4,13 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_sock_addr -#define NET_LOG_LEVEL CONFIG_NET_SOCKETS_LOG_LEVEL - /* libc headers */ #include /* Zephyr headers */ +#include +LOG_MODULE_REGISTER(net_sock_addr, CONFIG_NET_SOCKETS_LOG_LEVEL); + #include #include #include diff --git a/subsys/net/lib/sockets/socket_offload.c b/subsys/net/lib/sockets/socket_offload.c index 51fbbf5f8c9..bd78897c431 100644 --- a/subsys/net/lib/sockets/socket_offload.c +++ b/subsys/net/lib/sockets/socket_offload.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_socket_offload -#define NET_LOG_LEVEL CONFIG_NET_SOCKETS_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_socket_offload, CONFIG_NET_SOCKETS_LOG_LEVEL); #include diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c index c08a77464f5..efdd5deaf48 100644 --- a/subsys/net/lib/sockets/sockets.c +++ b/subsys/net/lib/sockets/sockets.c @@ -4,13 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_sock -#define NET_LOG_LEVEL CONFIG_NET_SOCKETS_LOG_LEVEL - /* libc headers */ #include /* Zephyr headers */ +#include +LOG_MODULE_REGISTER(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL); + #include #include #include diff --git a/subsys/net/lib/sockets/sockets_tls.c b/subsys/net/lib/sockets/sockets_tls.c index 0460d355320..fc5aaed5440 100644 --- a/subsys/net/lib/sockets/sockets_tls.c +++ b/subsys/net/lib/sockets/sockets_tls.c @@ -5,11 +5,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_sock_tls -#define NET_LOG_LEVEL CONFIG_NET_SOCKETS_LOG_LEVEL - #include +#include +LOG_MODULE_REGISTER(net_sock_tls, CONFIG_NET_SOCKETS_LOG_LEVEL); + #include #include #include @@ -149,7 +149,7 @@ static inline struct net_context *sock_to_net_ctx(int sock) return z_get_fd_obj(sock, NULL, ENOTSOCK); } -#if defined(MBEDTLS_DEBUG_C) && (NET_LOG_LEVEL >= LOG_LEVEL_DBG) +#if defined(MBEDTLS_DEBUG_C) && (CONFIG_NET_SOCKETS_LOG_LEVEL >= LOG_LEVEL_DBG) static void tls_debug(void *ctx, int level, const char *file, int line, const char *str) { @@ -284,7 +284,7 @@ static int tls_init(struct device *unused) return -EFAULT; } -#if defined(MBEDTLS_DEBUG_C) && (NET_LOG_LEVEL >= LOG_LEVEL_DBG) +#if defined(MBEDTLS_DEBUG_C) && (CONFIG_NET_SOCKETS_LOG_LEVEL >= LOG_LEVEL_DBG) mbedtls_debug_set_threshold(CONFIG_MBEDTLS_DEBUG_LEVEL); #endif @@ -327,7 +327,7 @@ static struct tls_context *tls_alloc(void) mbedtls_pk_init(&tls->priv_key); #endif -#if defined(MBEDTLS_DEBUG_C) && (NET_LOG_LEVEL >= LOG_LEVEL_DBG) +#if defined(MBEDTLS_DEBUG_C) && (CONFIG_NET_SOCKETS_LOG_LEVEL >= LOG_LEVEL_DBG) mbedtls_ssl_conf_dbg(&tls->config, tls_debug, NULL); #endif } else { diff --git a/subsys/net/lib/websocket/websocket.c b/subsys/net/lib/websocket/websocket.c index 52ad0e2d1b5..ea2578c9e26 100644 --- a/subsys/net/lib/websocket/websocket.c +++ b/subsys/net/lib/websocket/websocket.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_websocket -#define NET_LOG_LEVEL CONFIG_WEBSOCKET_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_websocket, CONFIG_WEBSOCKET_LOG_LEVEL); #include #include diff --git a/tests/net/6lo/prj.conf b/tests/net/6lo/prj.conf index b32309834aa..02033da467d 100644 --- a/tests/net/6lo/prj.conf +++ b/tests/net/6lo/prj.conf @@ -15,7 +15,6 @@ CONFIG_NET_PKT_TX_COUNT=1 CONFIG_NET_BUF_RX_COUNT=3 CONFIG_NET_BUF_TX_COUNT=3 CONFIG_NET_LOG=y -CONFIG_NET_DEFAULT_LOG_LEVEL_WRN=y CONFIG_NET_6LO_CONTEXT=y #Before modifying this value, add respective code in src/main.c diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c index 9740f38dd08..202c233e133 100644 --- a/tests/net/6lo/src/main.c +++ b/tests/net/6lo/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_6LO_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_6LO_LOG_LEVEL); #include #include diff --git a/tests/net/all/src/main.c b/tests/net/all/src/main.c index c06ed795e14..adb0358ac95 100644 --- a/tests/net/all/src/main.c +++ b/tests/net/all/src/main.c @@ -10,8 +10,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_test, LOG_LEVEL_DBG); #include diff --git a/tests/net/app/src/main.c b/tests/net/app/src/main.c index ff20e474584..454a1cddbb9 100644 --- a/tests/net/app/src/main.c +++ b/tests/net/app/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_APP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_APP_LOG_LEVEL); #include #include diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c index 9e813fc71c9..2f427bbd6f0 100644 --- a/tests/net/arp/src/main.c +++ b/tests/net/arp/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_ARP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_ARP_LOG_LEVEL); #include #include diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c index 44e8cdefefe..c5cd62ede7e 100644 --- a/tests/net/checksum_offload/src/main.c +++ b/tests/net/checksum_offload/src/main.c @@ -6,9 +6,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test #define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); + #include #include #include diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c index e3f3af0c1eb..e906970cb99 100644 --- a/tests/net/context/src/main.c +++ b/tests/net/context/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_CONTEXT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_CONTEXT_LOG_LEVEL); #include #include diff --git a/tests/net/dhcpv4/src/main.c b/tests/net/dhcpv4/src/main.c index 3b3738ab109..681799820cd 100644 --- a/tests/net/dhcpv4/src/main.c +++ b/tests/net/dhcpv4/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_DHCPV4_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_DHCPV4_LOG_LEVEL); #include #include diff --git a/tests/net/ethernet_mgmt/src/main.c b/tests/net/ethernet_mgmt/src/main.c index e5eec3480fd..30149f54683 100644 --- a/tests/net/ethernet_mgmt/src/main.c +++ b/tests/net/ethernet_mgmt/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_L2_ETHERNET_LOG_LEVEL); #include diff --git a/tests/net/icmpv6/src/main.c b/tests/net/icmpv6/src/main.c index b240cb6e2a0..48192d6b225 100644 --- a/tests/net/icmpv6/src/main.c +++ b/tests/net/icmpv6/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_ICMPV6_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_ICMPV6_LOG_LEVEL); #include #include diff --git a/tests/net/ieee802154/crypto/src/ieee802154_crypto_test.c b/tests/net/ieee802154/crypto/src/ieee802154_crypto_test.c index 81c22072899..7ebc0260f94 100644 --- a/tests/net/ieee802154/crypto/src/ieee802154_crypto_test.c +++ b/tests/net/ieee802154/crypto/src/ieee802154_crypto_test.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_test, LOG_LEVEL_DBG); #include #include diff --git a/tests/net/ieee802154/fragment/src/main.c b/tests/net/ieee802154/fragment/src/main.c index 1bf30abfb17..c24a31bd415 100644 --- a/tests/net/ieee802154/fragment/src/main.c +++ b/tests/net/ieee802154/fragment/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_L2_IEEE802154_LOG_LEVEL); #include #include diff --git a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c index 86d1e874579..c0597db874f 100644 --- a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c +++ b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ieee802154_fake_driver -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_ieee802154_fake_driver, LOG_LEVEL_DBG); #include diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c index 8a26d1fdde3..e77c513f4ef 100644 --- a/tests/net/ieee802154/l2/src/ieee802154_test.c +++ b/tests/net/ieee802154/l2/src/ieee802154_test.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_ieee802154_test -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_ieee802154_test, LOG_LEVEL_DBG); #include #include diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c index 927b5a2779e..7a42a553201 100644 --- a/tests/net/iface/src/main.c +++ b/tests/net/iface/src/main.c @@ -6,9 +6,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test #define NET_LOG_LEVEL CONFIG_NET_IF_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); + #include #include #include diff --git a/tests/net/ip-addr/src/main.c b/tests/net/ip-addr/src/main.c index c81e389171d..d2a9e793202 100644 --- a/tests/net/ip-addr/src/main.c +++ b/tests/net/ip-addr/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_IPV6_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL); #include #include diff --git a/tests/net/ipv6/prj.conf b/tests/net/ipv6/prj.conf index 38bbae8de17..48fe041d84f 100644 --- a/tests/net/ipv6/prj.conf +++ b/tests/net/ipv6/prj.conf @@ -23,5 +23,4 @@ CONFIG_NET_MAX_ROUTERS=2 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=9 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=7 CONFIG_NET_IF_IPV6_PREFIX_COUNT=3 -CONFIG_NET_DEFAULT_LOG_LEVEL_WRN=y CONFIG_NET_UDP_CHECKSUM=n diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c index 088b08f02e6..065852eb428 100644 --- a/tests/net/ipv6/src/main.c +++ b/tests/net/ipv6/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_IPV6_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL); #include #include diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c index e993a59a640..a8847a3b83f 100644 --- a/tests/net/ipv6_fragment/src/main.c +++ b/tests/net/ipv6_fragment/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_IPV6_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL); #include #include diff --git a/tests/net/lib/coap/src/main.c b/tests/net/lib/coap/src/main.c index 6190c8046ce..3fee9cd0428 100644 --- a/tests/net/lib/coap/src/main.c +++ b/tests/net/lib/coap/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_COAP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_COAP_LOG_LEVEL); #include #include diff --git a/tests/net/lib/coap_sock/src/main.c b/tests/net/lib/coap_sock/src/main.c index 6aea47f7ff6..ed25c7c6416 100644 --- a/tests/net/lib/coap_sock/src/main.c +++ b/tests/net/lib/coap_sock/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_coap_tests -#define NET_LOG_LEVEL LOG_LEVEL_DBG +#include +LOG_MODULE_REGISTER(net_test, LOG_LEVEL_DBG); #include #include diff --git a/tests/net/lib/dns_resolve/src/main.c b/tests/net/lib/dns_resolve/src/main.c index ff715f65079..f23852905f8 100644 --- a/tests/net/lib/dns_resolve/src/main.c +++ b/tests/net/lib/dns_resolve/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_DNS_RESOLVER_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL); #include #include diff --git a/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c b/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c index 680f1410bd9..bbaadeeaace 100644 --- a/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c +++ b/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL LOG_LEVEL_WRN +#include +LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN); #include #include diff --git a/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c b/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c index 49a4a65fcad..4ddebd3ea4f 100644 --- a/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c +++ b/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL LOG_LEVEL_WRN +#include +LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN); #include #include diff --git a/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c b/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c index 6270d1eb19b..bce7d47df8a 100644 --- a/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c +++ b/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL LOG_LEVEL_WRN +#include +LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN); #include #include diff --git a/tests/net/mgmt/src/mgmt.c b/tests/net/mgmt/src/mgmt.c index 9ff02ba1477..f05394b956e 100644 --- a/tests/net/mgmt/src/mgmt.c +++ b/tests/net/mgmt/src/mgmt.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_MGMT_EVENT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_MGMT_EVENT_LOG_LEVEL); #include #include diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c index d3c769701a3..1396d131e33 100644 --- a/tests/net/mld/src/main.c +++ b/tests/net/mld/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_IPV6_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL); #include #include diff --git a/tests/net/neighbor/src/main.c b/tests/net/neighbor/src/main.c index 39b7df6ebcb..7f1c1f1a52a 100644 --- a/tests/net/neighbor/src/main.c +++ b/tests/net/neighbor/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL); #include #include diff --git a/tests/net/net_pkt/prj.conf b/tests/net/net_pkt/prj.conf index 962d27a2220..e8f16ee917e 100644 --- a/tests/net/net_pkt/prj.conf +++ b/tests/net/net_pkt/prj.conf @@ -18,4 +18,4 @@ CONFIG_ZTEST=y # Do not print any errors, they just confuse the sanitychecker # even if there is no problem with the test. -CONFIG_NET_MAX_LOG_LEVEL_OFF=y +CONFIG_LOG_MAX_LEVEL=0 diff --git a/tests/net/net_pkt/src/main.c b/tests/net/net_pkt/src/main.c index ad040b85dd5..9ceec9cf7b2 100644 --- a/tests/net/net_pkt/src/main.c +++ b/tests/net/net_pkt/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_PKT_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_PKT_LOG_LEVEL); #include #include diff --git a/tests/net/promiscuous/src/main.c b/tests/net/promiscuous/src/main.c index 53219c224d5..7cb87d83f09 100644 --- a/tests/net/promiscuous/src/main.c +++ b/tests/net/promiscuous/src/main.c @@ -6,9 +6,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test #define NET_LOG_LEVEL CONFIG_NET_IF_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); + #include #include #include diff --git a/tests/net/ptp/clock/src/main.c b/tests/net/ptp/clock/src/main.c index fa31af7b972..d8adeeabbeb 100644 --- a/tests/net/ptp/clock/src/main.c +++ b/tests/net/ptp/clock/src/main.c @@ -6,9 +6,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test #define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); + #include #include #include diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c index 3e28514a4f1..5cbe4355e94 100644 --- a/tests/net/route/src/main.c +++ b/tests/net/route/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_ROUTE_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL); #include #include diff --git a/tests/net/rpl/src/main.c b/tests/net/rpl/src/main.c index 1f415e98cb7..a42b6a53555 100644 --- a/tests/net/rpl/src/main.c +++ b/tests/net/rpl/src/main.c @@ -6,9 +6,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test #define NET_LOG_LEVEL CONFIG_NET_RPL_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); + #include #include #include diff --git a/tests/net/socket/getaddrinfo/src/main.c b/tests/net/socket/getaddrinfo/src/main.c index 7cb7c47dffb..2599034d281 100644 --- a/tests/net/socket/getaddrinfo/src/main.c +++ b/tests/net/socket/getaddrinfo/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_SOCKETS_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); #include #include diff --git a/tests/net/socket/tcp/src/main.c b/tests/net/socket/tcp/src/main.c index 56512d5b142..2ed6e8d7db7 100644 --- a/tests/net/socket/tcp/src/main.c +++ b/tests/net/socket/tcp/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_SOCKETS_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); #include #include diff --git a/tests/net/socket/udp/src/main.c b/tests/net/socket/udp/src/main.c index 662733d6cc5..067bff8851b 100644 --- a/tests/net/socket/udp/src/main.c +++ b/tests/net/socket/udp/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_SOCKETS_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); #include #include diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c index 806fc209441..4403a466e93 100644 --- a/tests/net/tcp/src/main.c +++ b/tests/net/tcp/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_TCP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_TCP_LOG_LEVEL); #include diff --git a/tests/net/traffic_class/src/main.c b/tests/net/traffic_class/src/main.c index 252db598df3..957b4e6d313 100644 --- a/tests/net/traffic_class/src/main.c +++ b/tests/net/traffic_class/src/main.c @@ -6,9 +6,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test #define NET_LOG_LEVEL CONFIG_NET_TC_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); + #include #include #include diff --git a/tests/net/trickle/src/main.c b/tests/net/trickle/src/main.c index 432bc23c6bb..8f160624b81 100644 --- a/tests/net/trickle/src/main.c +++ b/tests/net/trickle/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_TRICKLE_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_TRICKLE_LOG_LEVEL); #include #include diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c index 3b0e436e311..811c2259a3f 100644 --- a/tests/net/tx_timestamp/src/main.c +++ b/tests/net/tx_timestamp/src/main.c @@ -6,9 +6,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test #define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); + #include #include #include diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c index 4cb6ee63767..6e41f6cc2e3 100644 --- a/tests/net/udp/src/main.c +++ b/tests/net/udp/src/main.c @@ -6,9 +6,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test #define NET_LOG_LEVEL CONFIG_NET_UDP_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); + #include #include diff --git a/tests/net/utils/src/main.c b/tests/net/utils/src/main.c index 7cd08393b68..48ef430752f 100644 --- a/tests/net/utils/src/main.c +++ b/tests/net/utils/src/main.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test -#define NET_LOG_LEVEL CONFIG_NET_UTILS_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, CONFIG_NET_UTILS_LOG_LEVEL); #include #include diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c index 503cf43c396..af8a17124f1 100644 --- a/tests/net/vlan/src/main.c +++ b/tests/net/vlan/src/main.c @@ -6,9 +6,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test #define NET_LOG_LEVEL CONFIG_NET_L2_ETHERNET_LOG_LEVEL +#include +LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); + #include #include #include diff --git a/tests/net/websocket/src/main.c b/tests/net/websocket/src/main.c index bc33d1a4328..0013cba132c 100644 --- a/tests/net/websocket/src/main.c +++ b/tests/net/websocket/src/main.c @@ -11,10 +11,12 @@ * we get proper data back. */ -#define LOG_MODULE_NAME net_test +#include + #define NET_LOG_LEVEL CONFIG_WEBSOCKET_LOG_LEVEL -#include +#include +LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); #include #include diff --git a/tests/net/websocket/src/server.c b/tests/net/websocket/src/server.c index ef00a80a0f3..a85eacc17c6 100644 --- a/tests/net/websocket/src/server.c +++ b/tests/net/websocket/src/server.c @@ -4,13 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_MODULE_NAME net_test_websocket -#define NET_LOG_LEVEL CONFIG_WEBSOCKET_LOG_LEVEL - #include #include #include +#include +LOG_MODULE_DECLARE(net_test, CONFIG_WEBSOCKET_LOG_LEVEL); + #include #include #include