summaryrefslogtreecommitdiff
path: root/src/nm-core-utils.h
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-03-29 11:47:52 +0200
committerThomas Haller <thaller@redhat.com>2018-04-13 09:09:46 +0200
commitb0bf9b2b9b5f02a5fb99e8a16076d140a8838773 (patch)
tree5e6add86271a2ffa6e61364df1e9f456ca971e1c /src/nm-core-utils.h
parent9efa7c7220aeb0e37ec9131b8815575d10164aa1 (diff)
downloadNetworkManager-b0bf9b2b9b5f02a5fb99e8a16076d140a8838773.tar.gz
core: explicitly pass D-Bus path to nm_utils_log_connection_diff()
No longer rely on nm_connection_get_path() being meaningful in server. It also was wrong. During update, nm_settings_connection_update() would call nm_utils_log_connection_diff (replace_connection, NM_CONNECTION (self), ... where replace_connection has no path set, and nothing was logged. Fix it, by explicitly passing the D-Bus path. Also, because nm-core-utils.c should be independent of nm-dbus-object.h.
Diffstat (limited to 'src/nm-core-utils.h')
-rw-r--r--src/nm-core-utils.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index 33773ab679..6b3682aa8f 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -231,7 +231,12 @@ const char *nm_utils_new_infiniband_name (char *name, const char *parent_name, i
int nm_utils_cmp_connection_by_autoconnect_priority (NMConnection *a, NMConnection *b);
-void nm_utils_log_connection_diff (NMConnection *connection, NMConnection *diff_base, guint32 level, guint64 domain, const char *name, const char *prefix);
+void nm_utils_log_connection_diff (NMConnection *connection,
+ NMConnection *diff_base,
+ guint32 level, guint64 domain,
+ const char *name,
+ const char *prefix,
+ const char *dbus_path);
gint64 nm_utils_get_monotonic_timestamp_ns (void);
gint64 nm_utils_get_monotonic_timestamp_us (void);