From 3e6c8d220a8dc0e10c427bb22d5aedb779448737 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 2 Feb 2022 17:44:47 +0100 Subject: [PATCH] platform: use NM_HASH_OBFUSCATE_PTR() in "nmp-route-manager.c" NM_HASH_OBFUSCATE_PTR() is some snake-oil to not log raw pointer values. It obviously makes debugging harder. But we don't need to generate differently obfuscated pointer values. At least, let most users use the same obfuscation, so that the values are comparable. --- src/libnm-platform/nmp-route-manager.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libnm-platform/nmp-route-manager.c b/src/libnm-platform/nmp-route-manager.c index 7d5366878f..f13ee59aba 100644 --- a/src/libnm-platform/nmp-route-manager.c +++ b/src/libnm-platform/nmp-route-manager.c @@ -37,8 +37,6 @@ NMP_IS_ROUTE_MANAGER(gpointer self) && NM_IS_PLATFORM(((NMPRouteManager *) self)->platform); } -#define _USER_TAG_LOG(user_tag) nm_hash_obfuscate_ptr(1240261787u, (user_tag)) - /*****************************************************************************/ typedef struct { @@ -383,7 +381,7 @@ nmp_route_manager_track_rule(NMPRouteManager *self, if (changed) { _LOGD("routing-rule: track [" NM_HASH_OBFUSCATE_PTR_FMT ",%s%u] \"%s\")", - _USER_TAG_LOG(track_data->user_tag), + NM_HASH_OBFUSCATE_PTR(track_data->user_tag), (track_data->track_priority_val == 0 ? "" : (track_data->track_priority_present ? "+" : "-")), @@ -406,7 +404,7 @@ _track_data_untrack(NMPRouteManager *self, nm_assert(g_hash_table_lookup(self->by_data, track_data) == track_data); _LOGD("routing-rule: untrack [" NM_HASH_OBFUSCATE_PTR_FMT "] \"%s\"", - _USER_TAG_LOG(track_data->user_tag), + NM_HASH_OBFUSCATE_PTR(track_data->user_tag), nmp_object_to_string(track_data->obj, NMP_OBJECT_TO_STRING_PUBLIC, NULL, 0)); #if NM_MORE_ASSERTS