diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-12-01 15:01:17 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-12-11 09:23:47 +0100 |
| commit | 2c217f67f091d1a4a6fdadd3ca2b369d50b7a36a (patch) | |
| tree | 07f67428d94f966db60a673216da38a21640af82 | |
| parent | e60f6ee6d6e970a2aef3e8ffc562ca7a248c6172 (diff) | |
| download | NetworkManager-2c217f67f091d1a4a6fdadd3ca2b369d50b7a36a.tar.gz | |
connectivity: add a unique counter for logging connectivity checks
While at it, replace "AF_INET" with "IPv". The connectivity check
logging line is already much too long. Save a few characters. Also,
I think the meaning of "AF_INET" is less clear (to a novice user) than
"IPv4".
| -rw-r--r-- | src/nm-connectivity.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index ca40fb5a75..ea4ea7189e 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -69,6 +69,9 @@ struct _NMConnectivityCheckHandle { char *ifspec; + const char *completed_log_message; + char *completed_log_message_free; + #if WITH_CONCHECK struct { char *response; @@ -85,8 +88,7 @@ struct _NMConnectivityCheckHandle { } concheck; #endif - const char *completed_log_message; - char *completed_log_message_free; + guint64 request_counter; int addr_family; @@ -146,10 +148,11 @@ NM_DEFINE_SINGLETON_GETTER (NMConnectivity, nm_connectivity_get, NM_TYPE_CONNECT _nm_log (__level, _NMLOG2_DOMAIN, 0, \ (cb_data->ifspec ? &cb_data->ifspec[3] : NULL), \ NULL, \ - "connectivity: (%s,AF_INET%s) " \ + "connectivity: (%s,IPv%c,%"G_GUINT64_FORMAT") " \ _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ (cb_data->ifspec ? &cb_data->ifspec[3] : ""), \ - (cb_data->addr_family == AF_INET6 ? "6" : "") \ + nm_utils_addr_family_to_char (cb_data->addr_family), \ + cb_data->request_counter \ _NM_UTILS_MACRO_REST (__VA_ARGS__)); \ } \ } G_STMT_END @@ -704,6 +707,7 @@ nm_connectivity_check_start (NMConnectivity *self, { NMConnectivityPrivate *priv; NMConnectivityCheckHandle *cb_data; + static guint64 request_counter = 0; g_return_val_if_fail (NM_IS_CONNECTIVITY (self), NULL); g_return_val_if_fail (callback, NULL); @@ -712,6 +716,7 @@ nm_connectivity_check_start (NMConnectivity *self, cb_data = g_slice_new0 (NMConnectivityCheckHandle); cb_data->self = self; + cb_data->request_counter = ++request_counter; c_list_link_tail (&priv->handles_lst_head, &cb_data->handles_lst); cb_data->callback = callback; cb_data->user_data = user_data; |