From 8b6dc28ee7b3c55a09723ebb69dde06942b6f6b1 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 13 Sep 2022 12:18:50 +0000 Subject: log-helpers: add helper to log bearer properties --- src/Makefile.am | 2 ++ src/meson.build | 1 + src/mm-log-helpers.c | 35 +++++++++++++++++++++++++++++++++++ src/mm-log-helpers.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 src/mm-log-helpers.c create mode 100644 src/mm-log-helpers.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 2a2c30dd..f628383b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -311,6 +311,8 @@ ModemManager_SOURCES = \ mm-context.h \ mm-context.c \ mm-utils.h \ + mm-log-helpers.h \ + mm-log-helpers.c \ mm-private-boxed-types.h \ mm-private-boxed-types.c \ mm-auth-provider.h \ diff --git a/src/meson.build b/src/meson.build index fdcfdebd..e7a6d0c5 100644 --- a/src/meson.build +++ b/src/meson.build @@ -218,6 +218,7 @@ sources = files( 'mm-iface-modem-simple.c', 'mm-iface-modem-time.c', 'mm-iface-modem-voice.c', + 'mm-log-helpers.c', 'mm-plugin.c', 'mm-plugin-manager.c', 'mm-port-probe.c', diff --git a/src/mm-log-helpers.c b/src/mm-log-helpers.c new file mode 100644 index 00000000..141ef370 --- /dev/null +++ b/src/mm-log-helpers.c @@ -0,0 +1,35 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details: + * + * Copyright (C) 2022 Google, Inc. + */ + +#include "mm-log-helpers.h" + +void +mm_log_bearer_properties (gpointer log_object, + MMLogLevel level, + const gchar *prefix, + MMBearerProperties *properties) +{ + g_autoptr(GPtrArray) properties_print = NULL; + guint i; + + if (!mm_log_check_level_enabled (level)) + return; + + properties_print = mm_bearer_properties_print (properties, mm_log_get_show_personal_info ()); + mm_common_str_array_human_keys (properties_print); + for (i = 0; i < properties_print->len; i++) + mm_obj_log (log_object, level, "%s%s", prefix, + (const gchar *)g_ptr_array_index (properties_print, i)); +} diff --git a/src/mm-log-helpers.h b/src/mm-log-helpers.h new file mode 100644 index 00000000..e903cdc8 --- /dev/null +++ b/src/mm-log-helpers.h @@ -0,0 +1,30 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details: + * + * Copyright (C) 2022 Google, Inc. + */ + +#ifndef MM_LOG_HELPERS_H +#define MM_LOG_HELPERS_H + +#include +#define _LIBMM_INSIDE_MM +#include + +#include "mm-log.h" + +void mm_log_bearer_properties (gpointer log_object, + MMLogLevel level, + const gchar *prefix, + MMBearerProperties *properties); + +#endif /* MM_LOG_HELPERS_H */ -- cgit v1.2.3-70-g09d2