diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-02 21:17:22 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-24 12:42:09 +0100 |
| commit | 323bdc26eaad3dd01b96f871ddf7465353be98a2 (patch) | |
| tree | 090ac1fa3ac28747c176e1c05ec904b7e28eb228 | |
| parent | eccad6fa904e686a13d602f4ea621a263b4b37fa (diff) | |
| download | NetworkManager-323bdc26eaad3dd01b96f871ddf7465353be98a2.tar.gz | |
vpn/vpn-connection: log the connection context
| -rw-r--r-- | src/vpn/nm-vpn-connection.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index 1c74e7ce17..add26830a6 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -200,18 +200,15 @@ static void _set_vpn_state (NMVpnConnection *self, #define __NMLOG_prefix_buf_len 128 static const char * -__LOG_create_prefix (char *buf, NMVpnConnection *self) +__LOG_create_prefix (char *buf, NMVpnConnection *self, NMConnection *con) { NMVpnConnectionPrivate *priv; - NMConnection *con; const char *id; if (!self) return _NMLOG_PREFIX_NAME; priv = NM_VPN_CONNECTION_GET_PRIVATE (self); - - con = NM_CONNECTION (_get_settings_connection (self, TRUE)); id = con ? nm_connection_get_id (con) : NULL; g_snprintf (buf, __NMLOG_prefix_buf_len, @@ -236,13 +233,16 @@ __LOG_create_prefix (char *buf, NMVpnConnection *self) #define _NMLOG(level, ...) \ G_STMT_START { \ const NMLogLevel __level = (level); \ + NMConnection *__con = (self) ? (NMConnection *) _get_settings_connection (self, TRUE) : NULL; \ \ if (nm_logging_enabled (__level, _NMLOG_DOMAIN)) { \ char __prefix[__NMLOG_prefix_buf_len]; \ \ - _nm_log (__level, _NMLOG_DOMAIN, 0, NULL, NULL, \ + _nm_log (__level, _NMLOG_DOMAIN, 0, \ + (self) ? NM_VPN_CONNECTION_GET_PRIVATE (self)->ip_iface : NULL, \ + (__con) ? nm_connection_get_uuid (__con) : NULL, \ "%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ - __LOG_create_prefix (__prefix, self) \ + __LOG_create_prefix (__prefix, (self), __con) \ _NM_UTILS_MACRO_REST (__VA_ARGS__)); \ } \ } G_STMT_END |