diff options
author | Dan Winship <danw@gnome.org> | 2014-04-23 10:29:34 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-04-23 10:29:34 -0400 |
commit | 8f4e39cdc4c01e3fc08bec301dedcaad5cd69584 (patch) | |
tree | 5c447265b7933793f6551979164dd83d6a811a4d | |
parent | 645f0204f95f26616d6c71d90b6f4c1e6c3b4707 (diff) | |
parent | 0140cdb73d8f0724632677658a8dac24ebd590e4 (diff) | |
download | NetworkManager-8f4e39cdc4c01e3fc08bec301dedcaad5cd69584.tar.gz |
all: clean up "make check" results (bgo #727764)
59 files changed, 1050 insertions, 675 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index af99bb990f..f4f8fd943a 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/libnm-glib \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""nmcli"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 970c5ee8eb..6db0607c62 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ + -DG_LOG_DOMAIN=\""libnm-glib"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index f586f91825..ccc9ed22bd 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/include \ -I${top_builddir}/include \ + -DG_LOG_DOMAIN=\""libnm-util"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index 85948caba4..b6fc2c8203 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -122,22 +122,56 @@ test_setting_vpn_items (void) nm_setting_vpn_remove_secret (s_vpn, "foobar4"); /* Try to add some blank values and make sure they are rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*key != NULL*"); nm_setting_vpn_add_data_item (s_vpn, NULL, NULL); + g_test_assert_expected_messages (); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*"); nm_setting_vpn_add_data_item (s_vpn, "", ""); + g_test_assert_expected_messages (); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*item != NULL*"); nm_setting_vpn_add_data_item (s_vpn, "foobar1", NULL); + g_test_assert_expected_messages (); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (item) > 0*"); nm_setting_vpn_add_data_item (s_vpn, "foobar1", ""); + g_test_assert_expected_messages (); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*key != NULL*"); nm_setting_vpn_add_data_item (s_vpn, NULL, "blahblah1"); + g_test_assert_expected_messages (); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*"); nm_setting_vpn_add_data_item (s_vpn, "", "blahblah1"); + g_test_assert_expected_messages (); nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_empty_func, "vpn-data-empty"); /* Try to add some blank secrets and make sure they are rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*key != NULL*"); nm_setting_vpn_add_secret (s_vpn, NULL, NULL); + g_test_assert_expected_messages (); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*"); nm_setting_vpn_add_secret (s_vpn, "", ""); + g_test_assert_expected_messages (); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*secret != NULL*"); nm_setting_vpn_add_secret (s_vpn, "foobar1", NULL); + g_test_assert_expected_messages (); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (secret) > 0*"); nm_setting_vpn_add_secret (s_vpn, "foobar1", ""); + g_test_assert_expected_messages (); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*key != NULL*"); nm_setting_vpn_add_secret (s_vpn, NULL, "blahblah1"); + g_test_assert_expected_messages (); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*"); nm_setting_vpn_add_secret (s_vpn, "", "blahblah1"); + g_test_assert_expected_messages (); nm_setting_vpn_foreach_secret (s_vpn, vpn_check_empty_func, "vpn-secrets-empty"); @@ -1032,37 +1066,55 @@ test_setting_connection_permissions_helpers (void) s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ()); /* Ensure a bad [type] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strcmp (ptype, \"user\") == 0*"); success = nm_setting_connection_add_permission (s_con, "foobar", "blah", NULL); + g_test_assert_expected_messages (); ASSERT (success == FALSE, "setting-connection-permissions-helpers", "unexpected success adding bad permission type #1"); /* Ensure a bad [type] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*ptype*"); success = nm_setting_connection_add_permission (s_con, NULL, "blah", NULL); + g_test_assert_expected_messages (); ASSERT (success == FALSE, "setting-connection-permissions-helpers", "unexpected success adding bad permission type #2"); /* Ensure a bad [item] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*uname*"); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", NULL, NULL); + g_test_assert_expected_messages (); ASSERT (success == FALSE, "setting-connection-permissions-helpers", "unexpected success adding bad permission item #1"); /* Ensure a bad [item] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*uname[0] != '\\0'*"); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", "", NULL); + g_test_assert_expected_messages (); ASSERT (success == FALSE, "setting-connection-permissions-helpers", "unexpected success adding bad permission item #2"); /* Ensure an [item] with ':' is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strchr (uname, ':')*"); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", "ad:asdf", NULL); + g_test_assert_expected_messages (); ASSERT (success == FALSE, "setting-connection-permissions-helpers", "unexpected success adding bad permission item #3"); /* Ensure a non-UTF-8 [item] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*g_utf8_validate (uname, -1, NULL)*"); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", buf, NULL); + g_test_assert_expected_messages (); ASSERT (success == FALSE, "setting-connection-permissions-helpers", "unexpected success adding bad permission item #4"); /* Ensure a non-NULL [detail] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*detail == NULL*"); success = nm_setting_connection_add_permission (s_con, "user", "dafasdf", "asdf"); + g_test_assert_expected_messages (); ASSERT (success == FALSE, "setting-connection-permissions-helpers", "unexpected success adding bad detail"); @@ -1138,42 +1190,58 @@ test_setting_connection_permissions_property (void) s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ()); /* Ensure a bad [type] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strncmp (str, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0*"); add_permission_property (s_con, "foobar", "blah", -1, NULL); + g_test_assert_expected_messages (); ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, "setting-connection-permissions-property", "unexpected success adding bad permission type #1"); /* Ensure a bad [type] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strncmp (str, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0*"); add_permission_property (s_con, NULL, "blah", -1, NULL); + g_test_assert_expected_messages (); ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, "setting-connection-permissions-property", "unexpected success adding bad permission type #2"); /* Ensure a bad [item] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*last_colon > str*"); add_permission_property (s_con, "user", NULL, -1, NULL); + g_test_assert_expected_messages (); ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, "setting-connection-permissions-property", "unexpected success adding bad permission item #1"); /* Ensure a bad [item] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*last_colon > str*"); add_permission_property (s_con, "user", "", -1, NULL); + g_test_assert_expected_messages (); ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, "setting-connection-permissions-property", "unexpected success adding bad permission item #2"); /* Ensure an [item] with ':' in the middle is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*str[i] != ':'*"); add_permission_property (s_con, "user", "ad:asdf", -1, NULL); + g_test_assert_expected_messages (); ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, "setting-connection-permissions-property", "unexpected success adding bad permission item #3"); /* Ensure an [item] with ':' at the end is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*str[i] != ':'*"); add_permission_property (s_con, "user", "adasdfaf:", -1, NULL); + g_test_assert_expected_messages (); ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, "setting-connection-permissions-property", "unexpected success adding bad permission item #4"); /* Ensure a non-UTF-8 [item] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*g_utf8_validate (str, -1, NULL)*"); add_permission_property (s_con, "user", buf, (int) sizeof (buf), NULL); + g_test_assert_expected_messages (); ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, "setting-connection-permissions-property", "unexpected success adding bad permission item #5"); /* Ensure a non-NULL [detail] is rejected */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*(last_colon + 1) == '\\0'*"); add_permission_property (s_con, "user", "dafasdf", -1, "asdf"); + g_test_assert_expected_messages (); ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, "setting-connection-permissions-property", "unexpected success adding bad detail"); @@ -2002,12 +2070,18 @@ test_setting_connection_changed_signal (void) ASSERT_CHANGED (nm_setting_connection_add_permission (s_con, "user", "billsmith", NULL)); ASSERT_CHANGED (nm_setting_connection_remove_permission (s_con, 0)); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*iter != NULL*"); ASSERT_UNCHANGED (nm_setting_connection_remove_permission (s_con, 1)); + g_test_assert_expected_messages (); uuid = nm_utils_uuid_generate (); ASSERT_CHANGED (nm_setting_connection_add_secondary (s_con, uuid)); ASSERT_CHANGED (nm_setting_connection_remove_secondary (s_con, 0)); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_connection_remove_secondary (s_con, 1)); + g_test_assert_expected_messages (); g_object_unref (connection); } @@ -2055,14 +2129,20 @@ test_setting_ip4_changed_signal (void) ASSERT_CHANGED (nm_setting_ip4_config_add_dns (s_ip4, 0x1122)); ASSERT_CHANGED (nm_setting_ip4_config_remove_dns (s_ip4, 0)); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*i <= priv->dns->len*"); ASSERT_UNCHANGED (nm_setting_ip4_config_remove_dns (s_ip4, 1)); + g_test_assert_expected_messages (); nm_setting_ip4_config_add_dns (s_ip4, 0x3344); ASSERT_CHANGED (nm_setting_ip4_config_clear_dns (s_ip4)); ASSERT_CHANGED (nm_setting_ip4_config_add_dns_search (s_ip4, "foobar.com")); ASSERT_CHANGED (nm_setting_ip4_config_remove_dns_search (s_ip4, 0)); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_ip4_config_remove_dns_search (s_ip4, 1)); + g_test_assert_expected_messages (); ASSERT_CHANGED (nm_setting_ip4_config_add_dns_search (s_ip4, "foobar.com")); ASSERT_CHANGED (nm_setting_ip4_config_clear_dns_searches (s_ip4)); @@ -2072,7 +2152,10 @@ test_setting_ip4_changed_signal (void) nm_ip4_address_set_prefix (addr, 24); ASSERT_CHANGED (nm_setting_ip4_config_add_address (s_ip4, addr)); ASSERT_CHANGED (nm_setting_ip4_config_remove_address (s_ip4, 0)); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*addr != NULL && label != NULL*"); ASSERT_UNCHANGED (nm_setting_ip4_config_remove_address (s_ip4, 1)); + g_test_assert_expected_messages (); nm_setting_ip4_config_add_address (s_ip4, addr); ASSERT_CHANGED (nm_setting_ip4_config_clear_addresses (s_ip4)); @@ -2083,7 +2166,10 @@ test_setting_ip4_changed_signal (void) ASSERT_CHANGED (nm_setting_ip4_config_add_route (s_ip4, route)); ASSERT_CHANGED (nm_setting_ip4_config_remove_route (s_ip4, 0)); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_ip4_config_remove_route (s_ip4, 1)); + g_test_assert_expected_messages (); nm_setting_ip4_config_add_route (s_ip4, route); ASSERT_CHANGED (nm_setting_ip4_config_clear_routes (s_ip4)); @@ -2114,14 +2200,20 @@ test_setting_ip6_changed_signal (void) ASSERT_CHANGED (nm_setting_ip6_config_add_dns (s_ip6, &t)); ASSERT_CHANGED (nm_setting_ip6_config_remove_dns (s_ip6, 0)); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_ip6_config_remove_dns (s_ip6, 1)); + g_test_assert_expected_messages (); nm_setting_ip6_config_add_dns (s_ip6, &t); ASSERT_CHANGED (nm_setting_ip6_config_clear_dns (s_ip6)); ASSERT_CHANGED (nm_setting_ip6_config_add_dns_search (s_ip6, "foobar.com")); ASSERT_CHANGED (nm_setting_ip6_config_remove_dns_search (s_ip6, 0)); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_ip6_config_remove_dns_search (s_ip6, 1)); + g_test_assert_expected_messages (); nm_setting_ip6_config_add_dns_search (s_ip6, "foobar.com"); ASSERT_CHANGED (nm_setting_ip6_config_clear_dns_searches (s_ip6)); @@ -2132,7 +2224,10 @@ test_setting_ip6_changed_signal (void) ASSERT_CHANGED (nm_setting_ip6_config_add_address (s_ip6, addr)); ASSERT_CHANGED (nm_setting_ip6_config_remove_address (s_ip6, 0)); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_ip6_config_remove_address (s_ip6, 1)); + g_test_assert_expected_messages (); nm_setting_ip6_config_add_address (s_ip6, addr); ASSERT_CHANGED (nm_setting_ip6_config_clear_addresses (s_ip6)); @@ -2143,7 +2238,10 @@ test_setting_ip6_changed_signal (void) ASSERT_CHANGED (nm_setting_ip6_config_add_route (s_ip6, route)); ASSERT_CHANGED (nm_setting_ip6_config_remove_route (s_ip6, 0)); + + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_ip6_config_remove_route (s_ip6, 1)); + g_test_assert_expected_messages (); nm_setting_ip6_config_add_route (s_ip6, route); ASSERT_CHANGED (nm_setting_ip6_config_clear_routes (s_ip6)); @@ -2171,13 +2269,17 @@ test_setting_vlan_changed_signal (void) ASSERT_CHANGED (nm_setting_vlan_add_priority (s_vlan, NM_VLAN_INGRESS_MAP, 1, 3)); ASSERT_CHANGED (nm_setting_vlan_remove_priority (s_vlan, NM_VLAN_INGRESS_MAP, 0)); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*idx < g_slist_length (list)*"); ASSERT_UNCHANGED (nm_setting_vlan_remove_priority (s_vlan, NM_VLAN_INGRESS_MAP, 1)); + g_test_assert_expected_messages (); ASSERT_CHANGED (nm_setting_vlan_add_priority_str (s_vlan, NM_VLAN_INGRESS_MAP, "1:3")); ASSERT_CHANGED (nm_setting_vlan_clear_priorities (s_vlan, NM_VLAN_INGRESS_MAP)); ASSERT_CHANGED (nm_setting_vlan_add_priority (s_vlan, NM_VLAN_EGRESS_MAP, 1, 3)); ASSERT_CHANGED (nm_setting_vlan_remove_priority (s_vlan, NM_VLAN_EGRESS_MAP, 0)); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*idx < g_slist_length (list)*"); ASSERT_UNCHANGED (nm_setting_vlan_remove_priority (s_vlan, NM_VLAN_EGRESS_MAP, 1)); + g_test_assert_expected_messages (); ASSERT_CHANGED (nm_setting_vlan_add_priority_str (s_vlan, NM_VLAN_EGRESS_MAP, "1:3")); ASSERT_CHANGED (nm_setting_vlan_clear_priorities (s_vlan, NM_VLAN_EGRESS_MAP)); @@ -2274,7 +2376,9 @@ test_setting_wireless_security_changed_signal (void) /* Protos */ ASSERT_CHANGED (nm_setting_wireless_security_add_proto (s_wsec, "wpa")); ASSERT_CHANGED (nm_setting_wireless_security_remove_proto (s_wsec, 0)); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_wireless_security_remove_proto (s_wsec, 1)); + g_test_assert_expected_messages (); nm_setting_wireless_security_add_proto (s_wsec, "wep"); ASSERT_CHANGED (nm_setting_wireless_security_clear_protos (s_wsec)); @@ -2282,7 +2386,9 @@ test_setting_wireless_security_changed_signal (void) /* Pairwise ciphers */ ASSERT_CHANGED (nm_setting_wireless_security_add_pairwise (s_wsec, "tkip")); ASSERT_CHANGED (nm_setting_wireless_security_remove_pairwise (s_wsec, 0)); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_wireless_security_remove_pairwise (s_wsec, 1)); + g_test_assert_expected_messages (); nm_setting_wireless_security_add_pairwise (s_wsec, "tkip"); ASSERT_CHANGED (nm_setting_wireless_security_clear_pairwise (s_wsec)); @@ -2290,7 +2396,9 @@ test_setting_wireless_security_changed_signal (void) /* Group ciphers */ ASSERT_CHANGED (nm_setting_wireless_security_add_group (s_wsec, "ccmp")); ASSERT_CHANGED (nm_setting_wireless_security_remove_group (s_wsec, 0)); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_wireless_security_remove_group (s_wsec, 1)); + g_test_assert_expected_messages (); nm_setting_wireless_security_add_group (s_wsec, "tkip"); ASSERT_CHANGED (nm_setting_wireless_security_clear_groups (s_wsec)); @@ -2323,7 +2431,9 @@ test_setting_802_1x_changed_signal (void) /* EAP methods */ ASSERT_CHANGED (nm_setting_802_1x_add_eap_method (s_8021x, "tls")); ASSERT_CHANGED (nm_setting_802_1x_remove_eap_method (s_8021x, 0)); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_802_1x_remove_eap_method (s_8021x, 1)); + g_test_assert_expected_messages (); nm_setting_802_1x_add_eap_method (s_8021x, "ttls"); ASSERT_CHANGED (nm_setting_802_1x_clear_eap_methods (s_8021x)); @@ -2331,7 +2441,9 @@ test_setting_802_1x_changed_signal (void) /* alternate subject matches */ ASSERT_CHANGED (nm_setting_802_1x_add_altsubject_match (s_8021x, "EMAIL:server@example.com")); ASSERT_CHANGED (nm_setting_802_1x_remove_altsubject_match (s_8021x, 0)); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_802_1x_remove_altsubject_match (s_8021x, 1)); + g_test_assert_expected_messages (); nm_setting_802_1x_add_altsubject_match (s_8021x, "EMAIL:server@example.com"); ASSERT_CHANGED (nm_setting_802_1x_clear_altsubject_matches (s_8021x)); @@ -2339,7 +2451,9 @@ test_setting_802_1x_changed_signal (void) /* phase2 alternate subject matches */ ASSERT_CHANGED (nm_setting_802_1x_add_phase2_altsubject_match (s_8021x, "EMAIL:server@example.com")); ASSERT_CHANGED (nm_setting_802_1x_remove_phase2_altsubject_match (s_8021x, 0)); + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*"); ASSERT_UNCHANGED (nm_setting_802_1x_remove_phase2_altsubject_match (s_8021x, 1)); + g_test_assert_expected_messages (); nm_setting_802_1x_add_phase2_altsubject_match (s_8021x, "EMAIL:server@example.com"); ASSERT_CHANGED (nm_setting_802_1x_clear_phase2_altsubject_matches (s_8021x)); diff --git a/libnm-util/tests/test-setting-dcb.c b/libnm-util/tests/test-setting-dcb.c index cefdeed8f9..b0dad437d3 100644 --- a/libnm-util/tests/test-setting-dcb.c +++ b/libnm-util/tests/test-setting-dcb.c @@ -22,6 +22,7 @@ #include <glib.h> #include <string.h> #include <nm-utils.h> +#include <nm-glib-compat.h> #include "nm-setting-dcb.h" #define DCB_FLAGS_ALL (NM_SETTING_DCB_FLAG_ENABLE | \ @@ -91,12 +92,26 @@ test_dcb_flags_invalid (void) s_dcb = (NMSettingDcb *) nm_setting_dcb_new (); g_assert (s_dcb); + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, "*invalid or out of range*"); TEST_FLAG (NM_SETTING_DCB_APP_FCOE_FLAGS, nm_setting_dcb_get_app_fcoe_flags, 0x332523); + g_test_assert_expected_messages (); + + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, "*invalid or out of range*"); TEST_FLAG (NM_SETTING_DCB_APP_ISCSI_FLAGS, nm_setting_dcb_get_app_iscsi_flags, 0xFF); + g_test_assert_expected_messages (); + + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, "*invalid or out of range*"); TEST_FLAG (NM_SETTING_DCB_APP_FIP_FLAGS, nm_setting_dcb_get_app_fip_flags, 0x1111); + g_test_assert_expected_messages (); + + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, "*invalid or out of range*"); TEST_FLAG (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, nm_setting_dcb_get_priority_flow_control_flags, G_MAXUINT32); + g_test_assert_expected_messages (); + + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, "*invalid or out of range*"); TEST_FLAG (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, nm_setting_dcb_get_priority_group_flags, (NM_SETTING_DCB_FLAG_ENABLE | NM_SETTING_DCB_FLAG_ADVERTISE | NM_SETTING_DCB_FLAG_WILLING) + 1); + g_test_assert_expected_messages (); } #define TEST_APP_PRIORITY(lcprop, ucprop, v) \ @@ -295,7 +310,9 @@ int main (int argc, char **argv) g_assert_no_error (error); g_assert (success); +#if !GLIB_CHECK_VERSION(2,34,0) g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); +#endif g_test_add_func (TPATH "flags-valid", test_dcb_flags_valid); g_test_add_func (TPATH "flags-invalid", test_dcb_flags_invalid); diff --git a/src/Makefile.am b/src/Makefile.am index ca2a372585..f75f84df6c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,6 +34,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/callouts \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE # add each subdirectory that contains a libNM source file. $(sort) is being used diff --git a/src/config/tests/Makefile.am b/src/config/tests/Makefile.am index 2a767ac9ae..4fb38c731d 100644 --- a/src/config/tests/Makefile.am +++ b/src/config/tests/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src/config \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ -DSRCDIR=\""$(srcdir)"\" diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am index 4c493d943c..a4ec50abf8 100644 --- a/src/devices/adsl/Makefile.am +++ b/src/devices/adsl/Makefile.am @@ -14,6 +14,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util \ + -DG_LOG_DOMAIN=\""NetworkManager-adsl"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(POLKIT_CFLAGS) \ diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am index a82efffbd1..22777beeec 100644 --- a/src/devices/bluetooth/Makefile.am +++ b/src/devices/bluetooth/Makefile.am @@ -14,6 +14,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util \ + -DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(POLKIT_CFLAGS) \ diff --git a/src/devices/wimax/Makefile.am b/src/devices/wimax/Makefile.am index 2331598879..3ed5955c08 100644 --- a/src/devices/wimax/Makefile.am +++ b/src/devices/wimax/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util \ + -DG_LOG_DOMAIN=\""NetworkManager-wimax"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(POLKIT_CFLAGS) \ diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am index 5f6358af84..3740fa4fc9 100644 --- a/src/devices/wwan/Makefile.am +++ b/src/devices/wwan/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util \ + -DG_LOG_DOMAIN=\""NetworkManager-wwan"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(POLKIT_CFLAGS) \ diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index 517d38a4dd..63eac9d56f 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -4,6 +4,7 @@ nm_dhcp_helper_SOURCES = nm-dhcp-helper.c nm_dhcp_helper_CPPFLAGS = \ $(DBUS_CFLAGS) \ + -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNMRUNDIR=\"$(nmrundir)\" diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am index d84a860e38..67cbca81f9 100644 --- a/src/dhcp-manager/tests/Makefile.am +++ b/src/dhcp-manager/tests/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/dhcp-manager \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/platform \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ -DTESTDIR="\"$(abs_srcdir)\"" diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am index 5b7e22fbc8..779e1eb2e1 100644 --- a/src/dnsmasq-manager/tests/Makefile.am +++ b/src/dnsmasq-manager/tests/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/dnsmasq-manager \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/platform \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ -DTESTDIR="\"$(abs_srcdir)\"" diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c index a7cd19101e..71322bac81 100644 --- a/src/logging/nm-logging.c +++ b/src/logging/nm-logging.c @@ -57,6 +57,7 @@ nm_log_handler (const gchar *log_domain, static guint32 log_level = LOGL_INFO; static char *log_domains; static guint64 logging[LOGL_MAX]; +static gboolean logging_set_up; static gboolean syslog_opened; typedef struct { @@ -163,6 +164,8 @@ nm_logging_setup (const char *level, char **tmp, **iter; int i; + logging_set_up = TRUE; + for (i = 0; i < LOGL_MAX; i++) new_logging[i] = 0; @@ -368,9 +371,13 @@ _nm_log (const char *loc, char *fullmsg = NULL; GTimeVal tv; int syslog_level = LOG_INFO; + int g_log_level = G_LOG_LEVEL_INFO; g_return_if_fail (level < LOGL_MAX); + if (G_UNLIKELY (!logging_set_up)) + nm_logging_setup ("INFO", "DEFAULT", NULL, NULL); + if (!(logging[level] & domain)) return; @@ -382,18 +389,23 @@ _nm_log (const char *loc, case LOGL_DEBUG: g_get_current_time (&tv); syslog_level = LOG_INFO; + g_log_level = G_LOG_LEVEL_DEBUG; fullmsg = g_strdup_printf ("<debug> [%ld.%06ld] [%s] %s(): %s", tv.tv_sec, tv.tv_usec, loc, func, msg); break; case LOGL_INFO: syslog_level = LOG_INFO; + g_log_level = G_LOG_LEVEL_MESSAGE; fullmsg = g_strconcat ("<info> ", msg, NULL); break; case LOGL_WARN: syslog_level = LOG_WARNING; + g_log_level = G_LOG_LEVEL_WARNING; fullmsg = g_strconcat ("<warn> ", msg, NULL); break; case LOGL_ERR: syslog_level = LOG_ERR; + /* g_log_level is still WARNING, because ERROR is fatal */ + g_log_level = G_LOG_LEVEL_WARNING; g_get_current_time (&tv); fullmsg = g_strdup_printf ("<error> [%ld.%06ld] [%s] %s(): %s", tv.tv_sec, tv.tv_usec, loc, func, msg); break; @@ -403,14 +415,8 @@ _nm_log (const char *loc, if (syslog_opened) syslog (syslog_level, "%s", fullmsg); - else { - FILE *log_target; - if (level == LOGL_WARN || level == LOGL_ERR) - log_target = stderr; - else - log_target = stdout; - fprintf (log_target, "%s\n", fullmsg); - } + else + g_log (G_LOG_DOMAIN, g_log_level, "%s", fullmsg); g_free (msg); g_free (fullmsg); diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index 2702faaba0..f9269b6157 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -466,16 +466,16 @@ private_connection_disconnected (NMDBusManager *self, DBusGConnection *connectio g_signal_emit (G_OBJECT (self), signals[NAME_OWNER_CHANGED], 0, owner, owner, NULL); } -#endif /* HAVE_DBUS_GLIB_100 */ static void -nm_dbus_manager_init (NMDBusManager *self) +private_server_setup (NMDBusManager *self) { NMDBusManagerPrivate *priv = NM_DBUS_MANAGER_GET_PRIVATE (self); - priv->exported = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free); + /* Skip this step if this is just a test program */ + if (g_test_initialized ()) + return; -#if HAVE_DBUS_GLIB_100 /* Set up our main private DBus socket */ if (mkdir (NMRUNDIR, 0700) == -1) { if (errno != EEXIST) @@ -494,6 +494,18 @@ nm_dbus_manager_init (NMDBusManager *self) (GCallback) private_connection_disconnected, NULL); } +} +#endif /* HAVE_DBUS_GLIB_100 */ + +static void +nm_dbus_manager_init (NMDBusManager *self) +{ + NMDBusManagerPrivate *priv = NM_DBUS_MANAGER_GET_PRIVATE (self); + + priv->exported = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free); + +#if HAVE_DBUS_GLIB_100 + private_server_setup (self); #endif } diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am index b94e12e606..9bdb4452bc 100644 --- a/src/platform/tests/Makefile.am +++ b/src/platform/tests/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ -I${srcdir}/.. \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index 1cf50958b5..46fc913880 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -3,6 +3,7 @@ if WITH_PPP AM_CPPFLAGS = \ -I${top_builddir}/include \ -I${top_srcdir}/include \ + -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am index d7dd828ce2..85036f71b8 100644 --- a/src/rdisc/tests/Makefile.am +++ b/src/rdisc/tests/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/posix-signals \ -I${top_srcdir}/libnm-util \ -I${srcdir}/.. \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/src/settings/nm-system-config-interface.h b/src/settings/nm-system-config-interface.h index 76ee168faa..c04fae2de7 100644 --- a/src/settings/nm-system-config-interface.h +++ b/src/settings/nm-system-config-interface.h @@ -29,13 +29,6 @@ G_BEGIN_DECLS -#define PLUGIN_PRINT(pname, fmt, args...) \ - { g_message (" " pname ": " fmt, ##args); } - -#define PLUGIN_WARN(pname, fmt, args...) \ - { g_warning (" " pname ": " fmt, ##args); } - - /* Plugin's factory function that returns a GObject that implements * NMSystemConfigInterface. */ diff --git a/src/settings/plugins/example/Makefile.am b/src/settings/plugins/example/Makefile.am index 937b477244..8233a71fdb 100644 --- a/src/settings/plugins/example/Makefile.am +++ b/src/settings/plugins/example/Makefile.am @@ -1,11 +1,13 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/config \ + -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ + -DG_LOG_DOMAIN=\""NetworkManager-example"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ @@ -31,6 +33,7 @@ libnm_settings_plugin_example_la_SOURCES = \ writer.c libnm_settings_plugin_example_la_LIBADD = \ + $(top_builddir)/src/libNetworkManager.la \ $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) diff --git a/src/settings/plugins/example/plugin.c b/src/settings/plugins/example/plugin.c index 18353a74e7..15c7bfe281 100644 --- a/src/settings/plugins/example/plugin.c +++ b/src/settings/plugins/example/plugin.c @@ -35,6 +35,7 @@ #include <nm-setting-connection.h> #include <nm-utils.h> #include <nm-config.h> +#include <nm-logging.h> #include "plugin.h" #include "nm-system-config-interface.h" @@ -156,7 +157,7 @@ read_connections (NMSystemConfigInterface *config) dir = g_dir_open (EXAMPLE_DIR, 0, &error); if (!dir) { - PLUGIN_WARN (EXAMPLE_PLUGIN_NAME, "Cannot read directory '%s': (%d) %s", + nm_log_warn (LOGD_SETTINGS, "Cannot read directory '%s': (%d) %s", EXAMPLE_DIR, error ? error->code : -1, error && error->message ? error->message : "(unknown)"); @@ -171,15 +172,15 @@ read_connections (NMSystemConfigInterface *config) /* XXX: Check file extension and ignore "~", ".tmp", ".bak", etc */ full_path = g_build_filename (EXAMPLE_DIR, item, NULL); - PLUGIN_PRINT (EXAMPLE_PLUGIN_NAME, "parsing %s ... ", item); + nm_log_info (LOGD_SETTINGS, "parsing %s ... ", item); connection = _internal_new_connection (self, full_path, NULL, &error); if (connection) { - PLUGIN_PRINT (EXAMPLE_PLUGIN_NAME, " read connection '%s'", - nm_connection_get_id (NM_CONNECTION (connection))); + nm_log_info (LOGD_SETTINGS, " read connection '%s'", + nm_connection_get_id (NM_CONNECTION (connection))); } else { - PLUGIN_PRINT (EXAMPLE_PLUGIN_NAME, " error: %s", - (error && error->message) ? error->message : "(unknown)"); + nm_log_info (LOGD_SETTINGS, " error: %s", + (error && error->message) ? error->message : "(unknown)"); } g_clear_error (&error); g_free (full_path); @@ -197,11 +198,11 @@ update_connection_settings_commit_cb (NMSettingsConnection *orig, GError *error, * an error here. */ if (error) { - g_warning ("%s: '%s' / '%s' invalid: %d", - __func__, - error ? g_type_name (nm_connection_lookup_setting_type_by_quark (error->domain)) : "(none)", - (error && error->message) ? error->message : "(none)", - error ? error->code : -1); + nm_log_warn (LOGD_SETTINGS, "%s: '%s' / '%s' invalid: %d", + __func__, + error ? g_type_name (nm_connection_lookup_setting_type_by_quark (error->domain)) : "(none)", + (error && error->message) ? error->message : "(none)", + error ? error->code : -1); g_clear_error (&error); nm_settings_connection_signal_remove (orig); @@ -288,7 +289,7 @@ dir_changed (GFileMonitor *monitor, switch (event_type) { case G_FILE_MONITOR_EVENT_DELETED: if (connection) { - PLUGIN_PRINT (EXAMPLE_PLUGIN_NAME, "removed %s.", full_path); + nm_log_info (LOGD_SETTINGS, "removed %s.", full_path); remove_connection (SC_PLUGIN_EXAMPLE (config), connection, full_path); } break; @@ -308,7 +309,7 @@ dir_changed (GFileMonitor *monitor, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS | NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)) { /* Connection changed; update our internal connection object */ - PLUGIN_PRINT (EXAMPLE_PLUGIN_NAME, "updating %s", full_path); + nm_log_info (LOGD_SETTINGS, "updating %s", full_path); update_connection_settings (connection, tmp); } g_object_unref (tmp); @@ -318,13 +319,13 @@ dir_changed (GFileMonitor *monitor, * becomes valid again later we'll get another change * notification, we'll re-read it, and we'll treat it as new. */ - PLUGIN_PRINT (EXAMPLE_PLUGIN_NAME, " error: %s", - (error && error->message) ? error->message : "(unknown)"); + nm_log_info (LOGD_SETTINGS, " error: %s", + (error && error->message) ? error->message : "(unknown)"); remove_connection (SC_PLUGIN_EXAMPLE (config), connection, full_path); } g_clear_error (&error); } else { - PLUGIN_PRINT (EXAMPLE_PLUGIN_NAME, "updating %s", full_path); + nm_log_info (LOGD_SETTINGS, "updating %s", full_path); /* We don't know about the connection yet, so the change represents * a completely new connection. @@ -369,8 +370,7 @@ dir_changed (GFileMonitor *monitor, g_signal_emit_by_name (config, NM_SYSTEM_CONFIG_INTERFACE_CONNECTION_ADDED, connection); } } else { - PLUGIN_PRINT (EXAMPLE_PLUGIN_NAME, " error: %s", - (error && error->message) ? error->message : "(unknown)"); + nm_log_info (LOGD_SETTINGS, " error: %s", (error && error->message) ? error->message : "(unknown)"); g_clear_error (&error); } } @@ -547,7 +547,7 @@ get_unmanaged_specs (NMSystemConfigInterface *config) key_file = g_key_file_new (); if (!g_key_file_load_from_file (key_file, priv->conf_file, G_KEY_FILE_NONE, &error)) { - g_warning ("Error parsing file '%s': %s", priv->conf_file, error->message); + nm_log_warn (LOGD_SETTINGS, "Error parsing file '%s': %s", priv->conf_file, error->message); g_error_free (error); goto out; } @@ -565,7 +565,7 @@ get_unmanaged_specs (NMSystemConfigInterface *config) } else if (!strncmp (ids[i], "interface-name:", 15) && nm_utils_iface_valid_name (ids[i] + 15)) { specs = g_slist_append (specs, ids[i]); } else { - g_warning ("Error in file '%s': invalid unmanaged-devices entry: '%s'", priv->conf_file, ids[i]); + nm_log_warn (LOGD_SETTINGS, "Error in file '%s': invalid unmanaged-devices entry: '%s'", priv->conf_file, ids[i]); g_free (ids[i]); } } @@ -598,7 +598,7 @@ plugin_get_hostname (SCPluginExample *plugin) if (g_key_file_load_from_file (key_file, priv->conf_file, G_KEY_FILE_NONE, &error)) hostname = g_key_file_get_value (key_file, "keyfile", "hostname", NULL); else { - g_warning ("Error parsing file '%s': %s", priv->conf_file, error->message); + nm_log_warn (LOGD_SETTINGS, "Error parsing file '%s': %s", priv->conf_file, error->message); g_error_free (error); } @@ -617,7 +617,7 @@ plugin_set_hostname (SCPluginExample *plugin, const char *hostname) gsize len; if (!priv->conf_file) { - g_warning ("Error saving hostname: no config file"); + nm_log_warn (LOGD_SETTINGS, "Error saving hostname: no config file"); return FALSE; } @@ -626,7 +626,7 @@ plugin_set_hostname (SCPluginExample *plugin, const char *hostname) */ key_file = g_key_file_new (); if (!g_key_file_load_from_file (key_file, priv->conf_file, G_KEY_FILE_NONE, &error)) { - g_warning ("Error parsing file '%s': %s", priv->conf_file, error->message); + nm_log_warn (LOGD_SETTINGS, "Error parsing file '%s': %s", priv->conf_file, error->message); g_error_free (error); goto out; } @@ -646,7 +646,7 @@ plugin_set_hostname (SCPluginExample *plugin, const char *hostname) } if (error) { - g_warning ("Error saving hostname: %s", error->message); + nm_log_warn (LOGD_SETTINGS, "Error saving hostname: %s", error->message); g_error_free (error); } diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am index 7feb262e79..c5e458af50 100644 --- a/src/settings/plugins/ifcfg-rh/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/Makefile.am @@ -26,6 +26,7 @@ libifcfg_rh_io_la_SOURCES = \ AM_CPPFLAGS = \ -I$(top_srcdir)/src/ \ + -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/posix-signals \ @@ -40,6 +41,7 @@ AM_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(POLKIT_CFLAGS) \ $(NSS_CFLAGS) \ + -DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DSBINDIR=\"$(sbindir)\" diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c index 0bf16758b5..8a3f328c8e 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.c +++ b/src/settings/plugins/ifcfg-rh/plugin.c @@ -51,6 +51,7 @@ #include "nm-system-config-interface.h" #include "nm-settings-error.h" #include "nm-config.h" +#include "nm-logging.h" #include "nm-ifcfg-connection.h" #include "nm-inotify-helper.h" @@ -132,16 +133,13 @@ _internal_new_connection (SCPluginIfcfg *self, GError *local = NULL; gboolean ignore_error = FALSE; - if (!source) { - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "parsing %s ... ", path); - } + if (!source) + nm_log_info (LOGD_SETTINGS, "parsing %s ... ", path); connection = nm_ifcfg_connection_new (source, path, &local, &ignore_error); if (!connection) { - if (!ignore_error) { - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, " error: %s", - (local && local->message) ? local->message : "(unknown)"); - } + if (!ignore_error) + nm_log_warn (LOGD_SETTINGS, " %s", (local && local->message) ? local->message : "(unknown)"); if (local) g_propagate_error (error, local); else @@ -155,7 +153,7 @@ _internal_new_connection (SCPluginIfcfg *self, g_hash_table_insert (priv->connections, g_strdup (nm_connection_get_uuid (NM_CONNECTION (connection))), connection); - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, " read connection '%s'", cid); + nm_log_info (LOGD_SETTINGS, " read connection '%s'", cid); g_signal_connect (connection, NM_SETTINGS_CONNECTION_REMOVED, G_CALLBACK (connection_removed_cb), self); @@ -170,11 +168,10 @@ _internal_new_connection (SCPluginIfcfg *self, device_id++; else device_id = spec; - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "Ignoring connection '%s' / device '%s' " - "due to NM_CONTROLLED=no.", cid, device_id); + nm_log_warn (LOGD_SETTINGS, " Ignoring connection '%s' / device '%s' due to NM_CONTROLLED=no.", + cid, device_id); } else if (nm_ifcfg_connection_get_unrecognized_spec (connection)) { - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "Ignoring connection '%s' " - "of unrecognized type.", cid); + nm_log_warn (LOGD_SETTINGS, " Ignoring connection '%s' of unrecognized type.", cid); } /* watch changes of ifcfg hardlinks */ @@ -267,7 +264,7 @@ connection_new_or_changed (SCPluginIfcfg *self, existing = find_by_uuid_from_path (self, path); if (existing) { const char *old_path = nm_ifcfg_connection_get_path (existing); - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "renaming %s -> %s", old_path, path); + nm_log_info (LOGD_SETTINGS, "renaming %s -> %s", old_path, path); if (out_old_path) *out_old_path = g_strdup (old_path); nm_ifcfg_connection_set_path (existing, path); @@ -291,13 +288,11 @@ connection_new_or_changed (SCPluginIfcfg *self, new = (NMIfcfgConnection *) nm_ifcfg_connection_new (NULL, path, &error, &ignore_error); if (!new) { /* errors reading connection; remove it */ - if (!ignore_error) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: %s", - (error && error->message) ? error->message : "(unknown)"); - } + if (!ignore_error) + nm_log_warn (LOGD_SETTINGS, " %s", (error && error->message) ? error->message : "(unknown)"); g_clear_error (&error); - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "removed %s.", path); + nm_log_info (LOGD_SETTINGS, "removed %s.", path); remove_connection (self, existing); return; } @@ -322,7 +317,7 @@ connection_new_or_changed (SCPluginIfcfg *self, return; } - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "updating %s", path); + nm_log_info (LOGD_SETTINGS, "updating %s", path); g_object_set (existing, NM_IFCFG_CONNECTION_UNMANAGED_SPEC, new_unmanaged, NM_IFCFG_CONNECTION_UNRECOGNIZED_SPEC, new_unrecognized, @@ -350,12 +345,10 @@ connection_new_or_changed (SCPluginIfcfg *self, const char *cid = nm_connection_get_id (NM_CONNECTION (new)); if (old_unmanaged /* && !new_unmanaged */) { - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "Managing connection '%s' and its " - "device because NM_CONTROLLED was true.", cid); + nm_log_info (LOGD_SETTINGS, "Managing connection '%s' and its device because NM_CONTROLLED was true.", cid); g_signal_emit_by_name (self, NM_SYSTEM_CONFIG_INTERFACE_CONNECTION_ADDED, existing); } else if (old_unrecognized /* && !new_unrecognized */) { - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "Managing connection '%s' " - "because it is now a recognized type.", cid); + nm_log_info (LOGD_SETTINGS, "Managing connection '%s' because it is now a recognized type.", cid); g_signal_emit_by_name (self, NM_SYSTEM_CONFIG_INTERFACE_CONNECTION_ADDED, existing); } @@ -404,7 +397,7 @@ ifcfg_dir_changed (GFileMonitor *monitor, connection = find_by_path (plugin, ifcfg_path); switch (event_type) { case G_FILE_MONITOR_EVENT_DELETED: - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "removed %s.", ifcfg_path); + nm_log_info (LOGD_SETTINGS, "removed %s.", ifcfg_path); if (connection) remove_connection (plugin, connection); break; @@ -454,7 +447,7 @@ read_connections (SCPluginIfcfg *plugin) dir = g_dir_open (IFCFG_DIR, 0, &err); if (!dir) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Can not read directory '%s': %s", IFCFG_DIR, err->message); + nm_log_warn (LOGD_SETTINGS, "Could not read directory '%s': %s", IFCFG_DIR, err->message); g_error_free (err); return; } @@ -496,7 +489,7 @@ read_connections (SCPluginIfcfg *plugin) g_hash_table_iter_init (&iter, oldconns); while (g_hash_table_iter_next (&iter, &key, &value)) { - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "removed %s.", (char *)key); + nm_log_info (LOGD_SETTINGS, "removed %s.", (char *)key); g_hash_table_iter_remove (&iter); remove_connection (plugin, value); } @@ -648,7 +641,7 @@ plugin_get_hostname (SCPluginIfcfg *plugin) network = svOpenFile (SC_NETWORK_FILE, NULL); if (!network) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Could not get hostname: failed to read " SC_NETWORK_FILE); + nm_log_warn (LOGD_SETTINGS, "Could not get hostname: failed to read " SC_NETWORK_FILE); return NULL; } @@ -698,7 +691,7 @@ plugin_set_hostname (SCPluginIfcfg *plugin, const char *hostname) #endif if (!ret) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Could not save hostname: failed to create/open " HOSTNAME_FILE); + nm_log_warn (LOGD_SETTINGS, "Could not save hostname: failed to create/open " HOSTNAME_FILE); g_free (hostname_eol); return FALSE; } @@ -867,8 +860,7 @@ sc_plugin_ifcfg_init (SCPluginIfcfg *plugin) priv->bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); if (!priv->bus) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Couldn't connect to D-Bus: %s", - error->message); + nm_log_warn (LOGD_SETTINGS, "Couldn't connect to D-Bus: %s", error->message); g_clear_error (&error); } else { DBusConnection *tmp; @@ -889,11 +881,10 @@ sc_plugin_ifcfg_init (SCPluginIfcfg *plugin) G_TYPE_INVALID, G_TYPE_UINT, &result, G_TYPE_INVALID)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Couldn't acquire D-Bus service: %s", - error->message); + nm_log_warn (LOGD_SETTINGS, "Couldn't acquire D-Bus service: %s", error->message); g_clear_error (&error); } else if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Couldn't acquire ifcfgrh1 D-Bus service (already taken)"); + nm_log_warn (LOGD_SETTINGS, "Couldn't acquire ifcfgrh1 D-Bus service (already taken)"); } else success = TRUE; } @@ -1055,7 +1046,7 @@ nm_system_config_factory (void) dbus_g_connection_register_g_object (priv->bus, DBUS_OBJECT_PATH, G_OBJECT (singleton)); - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "Acquired D-Bus service %s", DBUS_SERVICE_NAME); + nm_log_info (LOGD_SETTINGS, "Acquired D-Bus service %s", DBUS_SERVICE_NAME); } else g_object_ref (singleton); diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index c6aa393f25..57e07ef4dc 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -56,6 +56,7 @@ #include "nm-platform.h" #include "nm-posix-signals.h" #include "NetworkManagerUtils.h" +#include "nm-logging.h" #include "common.h" #include "shvar.h" @@ -63,11 +64,7 @@ #include "reader.h" -#define PLUGIN_PRINT(pname, fmt, args...) \ - { g_message (" " pname ": " fmt, ##args); } - -#define PLUGIN_WARN(pname, fmt, args...) \ - { g_warning (" " pname ": " fmt, ##args); } +#define PARSE_WARNING(msg...) nm_log_warn (LOGD_SETTINGS, " " msg) static gboolean get_int (const char *str, int *value) @@ -168,7 +165,7 @@ make_connection_setting (const char *file, NM_SETTING_CONNECTION_INTERFACE_NAME, value, NULL); } else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid DEVICE name '%s'", value); + PARSE_WARNING ("invalid DEVICE name '%s'", value); g_free (value); } @@ -185,7 +182,7 @@ make_connection_setting (const char *file, for (iter = items; iter && *iter; iter++) { if (strlen (*iter)) { if (!nm_setting_connection_add_permission (s_con, "user", *iter, NULL)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid USERS item '%s'", *iter); + PARSE_WARNING ("invalid USERS item '%s'", *iter); } } g_free (value); @@ -209,8 +206,7 @@ make_connection_setting (const char *file, for (iter = items; iter && *iter; iter++) { if (strlen (*iter)) { if (!nm_setting_connection_add_secondary (s_con, *iter)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, - " warning: secondary connection UUID '%s' already added", *iter); + PARSE_WARNING ("secondary connection UUID '%s' already added", *iter); } } g_free (value); @@ -222,9 +218,8 @@ make_connection_setting (const char *file, const char *bridge; if ((bridge = nm_setting_connection_get_master (s_con))) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, - " warning: Already configured as slave of %s. " - "Ignoring BRIDGE=\"%s\"", bridge, value); + PARSE_WARNING ("Already configured as slave of %s. Ignoring BRIDGE=\"%s\"", + bridge, value); g_free (value); } @@ -245,7 +240,7 @@ make_connection_setting (const char *file, timeout = (guint32) tmp; g_object_set (s_con, NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, timeout, NULL); } else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid GATEWAY_PING_TIMEOUT time"); + PARSE_WARNING ("invalid GATEWAY_PING_TIMEOUT time"); g_free (value); } @@ -308,8 +303,7 @@ match_iscsiadm_tag (const char *line, const char *tag, gboolean *skip) p = strchr (line, '='); if (!p) { - g_warning ("%s: malformed iscsiadm record: no = in '%s'.", - __func__, line); + PARSE_WARNING ("malformed iscsiadm record: no = in '%s'.", line); *skip = TRUE; return NULL; } @@ -387,14 +381,14 @@ fill_ip4_setting_from_ibft (shvarFile *ifcfg, if (!g_ascii_strcasecmp (*iter, "# BEGIN RECORD")) { if (in_record) { - g_warning ("%s: malformed iscsiadm record: already parsing record.", __func__); + PARSE_WARNING ("malformed iscsiadm record: already parsing record."); skip = TRUE; } } else if (!g_ascii_strcasecmp (*iter, "# END RECORD")) { if (!skip && hwaddr_matched) { /* Record is good; fill IP4 config with its info */ if (!method) { - g_warning ("%s: malformed iscsiadm record: missing BOOTPROTO.", __func__); + PARSE_WARNING ("malformed iscsiadm record: missing BOOTPROTO."); goto done; } @@ -404,8 +398,8 @@ fill_ip4_setting_from_ibft (shvarFile *ifcfg, NMIP4Address *addr; if (!ipaddr || !prefix) { - g_warning ("%s: malformed iscsiadm record: BOOTPROTO=static " - "but missing IP address or prefix.", __func__); + PARSE_WARNING ("malformed iscsiadm record: BOOTPROTO=static " + "but missing IP address or prefix."); goto done; } @@ -445,7 +439,7 @@ fill_ip4_setting_from_ibft (shvarFile *ifcfg, ibft_mac = ether_aton (p); if (!ibft_mac) { - g_warning ("%s: malformed iscsiadm record: invalid hwaddress.", __func__); + PARSE_WARNING ("malformed iscsiadm record: invalid hwaddress."); skip = TRUE; continue; } @@ -467,8 +461,7 @@ fill_ip4_setting_from_ibft (shvarFile *ifcfg, else if (!g_ascii_strcasecmp (p, "static")) method = NM_SETTING_IP4_CONFIG_METHOD_MANUAL; else { - g_warning ("%s: malformed iscsiadm record: unknown BOOTPROTO '%s'.", - __func__, p); + PARSE_WARNING ("malformed iscsiadm record: unknown BOOTPROTO '%s'.", p); skip = TRUE; continue; } @@ -476,8 +469,7 @@ fill_ip4_setting_from_ibft (shvarFile *ifcfg, if (!skip && (p = match_iscsiadm_tag (*iter, ISCSI_IPADDR_TAG, &skip))) { if (inet_pton (AF_INET, p, &ipaddr) < 1) { - g_warning ("%s: malformed iscsiadm record: invalid IP address '%s'.", - __func__, p); + PARSE_WARNING ("malformed iscsiadm record: invalid IP address '%s'.", p); skip = TRUE; continue; } @@ -487,8 +479,7 @@ fill_ip4_setting_from_ibft (shvarFile *ifcfg, guint32 mask; if (inet_pton (AF_INET, p, &mask) < 1) { - g_warning ("%s: malformed iscsiadm record: invalid subnet mask '%s'.", - __func__, p); + PARSE_WARNING ("malformed iscsiadm record: invalid subnet mask '%s'.", p); skip = TRUE; continue; } @@ -498,8 +489,7 @@ fill_ip4_setting_from_ibft (shvarFile *ifcfg, if (!skip && (p = match_iscsiadm_tag (*iter, ISCSI_GATEWAY_TAG, &skip))) { if (inet_pton (AF_INET, p, &gateway) < 1) { - g_warning ("%s: malformed iscsiadm record: invalid IP gateway '%s'.", - __func__, p); + PARSE_WARNING ("malformed iscsiadm record: invalid IP gateway '%s'.", p); skip = TRUE; continue; } @@ -507,8 +497,7 @@ fill_ip4_setting_from_ibft (shvarFile *ifcfg, if (!skip && (p = match_iscsiadm_tag (*iter, ISCSI_DNS1_TAG, &skip))) { if (inet_pton (AF_INET, p, &dns1) < 1) { - g_warning ("%s: malformed iscsiadm record: invalid DNS1 address '%s'.", - __func__, p); + PARSE_WARNING ("malformed iscsiadm record: invalid DNS1 address '%s'.", p); skip = TRUE; continue; } @@ -516,8 +505,7 @@ fill_ip4_setting_from_ibft (shvarFile *ifcfg, if (!skip && (p = match_iscsiadm_tag (*iter, ISCSI_DNS2_TAG, &skip))) { if (inet_pton (AF_INET, p, &dns2) < 1) { - g_warning ("%s: malformed iscsiadm record: invalid DNS2 address '%s'.", - __func__, p); + PARSE_WARNING ("malformed iscsiadm record: invalid DNS2 address '%s'.", p); skip = TRUE; continue; } @@ -725,8 +713,7 @@ read_full_ip4_address (shvarFile *ifcfg, nm_ip4_address_set_prefix (addr, prefix); value = svGetValue (ifcfg, ip_tag, FALSE); - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: missing %s, assuming %s/%u", - prefix_tag, value, prefix); + PARSE_WARNING ("missing %s, assuming %s/%u", prefix_tag, value, prefix); g_free (value); } @@ -977,7 +964,7 @@ read_route_file_legacy (const char *filename, NMSettingIP4Config *s_ip4, GError g_match_info_free (match_info); if (!nm_setting_ip4_config_add_route (s_ip4, route)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate IP4 route"); + PARSE_WARNING ("duplicate IP4 route"); } @@ -1168,8 +1155,7 @@ read_route6_file (const char *filename, NMSettingIP6Config *s_ip6, GError **erro /* Ignore default route - NM handles it internally */ g_free (dest); g_match_info_free (match_info); - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: ignoring manual default route: '%s' (%s)", - *iter, filename); + PARSE_WARNING ("ignoring manual default route: '%s' (%s)", *iter, filename); continue; } if (inet_pton (AF_INET6, dest, &ip6_addr) != 1) { @@ -1238,7 +1224,7 @@ read_route6_file (const char *filename, NMSettingIP6Config *s_ip6, GError **erro g_match_info_free (match_info); if (!nm_setting_ip6_config_add_route (s_ip6, route)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate IP6 route"); + PARSE_WARNING ("duplicate IP6 route"); } success = TRUE; @@ -1396,7 +1382,7 @@ make_ip4_setting (shvarFile *ifcfg, } if (!nm_setting_ip4_config_add_address (s_ip4, addr)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate IP4 address"); + PARSE_WARNING ("duplicate IP4 address"); nm_ip4_address_unref (addr); } @@ -1427,7 +1413,7 @@ make_ip4_setting (shvarFile *ifcfg, } if (dns && !nm_setting_ip4_config_add_dns (s_ip4, dns)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate DNS server %s", tag); + PARSE_WARNING ("duplicate DNS server %s", tag); g_free (tag); } @@ -1442,7 +1428,7 @@ make_ip4_setting (shvarFile *ifcfg, for (item = searches; *item; item++) { if (strlen (*item)) { if (!nm_setting_ip4_config_add_dns_search (s_ip4, *item)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate DNS domain '%s'", *item); + PARSE_WARNING ("duplicate DNS domain '%s'", *item); } } g_strfreev (searches); @@ -1475,7 +1461,7 @@ make_ip4_setting (shvarFile *ifcfg, break; if (!nm_setting_ip4_config_add_route (s_ip4, route)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate IP4 route"); + PARSE_WARNING ("duplicate IP4 route"); nm_ip4_route_unref (route); } svCloseFile (route_ifcfg); @@ -1497,7 +1483,7 @@ make_ip4_setting (shvarFile *ifcfg, for (item = searches; *item; item++) { if (strlen (*item)) { if (!nm_setting_ip4_config_add_dns_search (s_ip4, *item)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate DNS search '%s'", *item); + PARSE_WARNING ("duplicate DNS search '%s'", *item); } } g_strfreev (searches); @@ -1557,15 +1543,14 @@ read_aliases (NMSettingIP4Config *s_ip4, const char *filename, const char *netwo break; } if (*p) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " alias: ignoring alias file '%s' with invalid name", full_path); + PARSE_WARNING ("ignoring alias file '%s' with invalid name", full_path); g_free (full_path); continue; } parsed = svOpenFile (full_path, &err); if (!parsed) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " alias: couldn't parse file '%s': %s", - full_path, err->message); + PARSE_WARNING ("couldn't parse alias file '%s': %s", full_path, err->message); g_free (full_path); g_clear_error (&err); continue; @@ -1573,14 +1558,15 @@ read_aliases (NMSettingIP4Config *s_ip4, const char *filename, const char *netwo device = svGetValue (parsed, "DEVICE", FALSE); if (!device) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " alias: file '%s' has no DEVICE", full_path); + PARSE_WARNING ("alias file '%s' has no DEVICE", full_path); svCloseFile (parsed); g_free (full_path); continue; } /* We know that item starts with IFCFG_TAG from utils_is_ifcfg_alias_file() */ if (strcmp (device, item + strlen (IFCFG_TAG)) != 0) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " alias: file '%s' has invalid DEVICE (%s) for filename", full_path, device); + PARSE_WARNING ("alias file '%s' has invalid DEVICE (%s) for filename", + full_path, device); g_free (device); svCloseFile (parsed); g_free (full_path); @@ -1592,10 +1578,11 @@ read_aliases (NMSettingIP4Config *s_ip4, const char *filename, const char *netwo svCloseFile (parsed); if (ok) { if (!NM_UTIL_PRIVATE_CALL (nm_setting_ip4_config_add_address_with_label (s_ip4, addr, device))) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " alias: duplicate IP4 address in alias file %s", item); + PARSE_WARNING ("duplicate IP4 address in alias file %s", item); } else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " alias: error reading IP4 address from '%s': %s", full_path, err ? err->message : "no address") - g_clear_error (&err); + PARSE_WARNING ("error reading IP4 address from alias file '%s': %s", + full_path, err ? err->message : "no address"); + g_clear_error (&err); } nm_ip4_address_unref (addr); @@ -1605,7 +1592,7 @@ read_aliases (NMSettingIP4Config *s_ip4, const char *filename, const char *netwo g_dir_close (dir); } else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " alias: can not read directory '%s': %s", dirname, err->message); + PARSE_WARNING ("can not read directory '%s': %s", dirname, err->message); g_error_free (err); } @@ -1778,7 +1765,7 @@ make_ip6_setting (shvarFile *ifcfg, } if (!nm_setting_ip6_config_add_address (s_ip6, addr)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate IP6 address"); + PARSE_WARNING ("duplicate IP6 address"); nm_ip6_address_unref (addr); } g_strfreev (list); @@ -1801,13 +1788,13 @@ make_ip6_setting (shvarFile *ifcfg, ip6_dns = in6addr_any; if (parse_ip6_address (value, &ip6_dns, NULL)) { if (!IN6_IS_ADDR_UNSPECIFIED (&ip6_dns) && !nm_setting_ip6_config_add_dns (s_ip6, &ip6_dns)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate DNS server %s", tag); + PARSE_WARNING ("duplicate DNS server %s", tag); } else { /* Maybe an IPv4 address? If so ignore it */ if (inet_pton (AF_INET, value, &ip4_addr) != 1) { g_free (tag); g_free (value); - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate IP6 address"); + PARSE_WARNING ("duplicate IP6 address"); goto error; } } @@ -1949,7 +1936,7 @@ read_dcb_app (shvarFile *ifcfg, g_free (val); if (!(flags & NM_SETTING_DCB_FLAG_ENABLE)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: ignoring DCB %s priority; app not enabled", app); + PARSE_WARNING ("ignoring DCB %s priority; app not enabled", app); } g_free (tmp); @@ -1983,14 +1970,14 @@ read_dcb_bool_array (shvarFile *ifcfg, return TRUE; if (!(flags & NM_SETTING_DCB_FLAG_ENABLE)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: ignoring %s; %s is not enabled", prop, desc); + PARSE_WARNING ("ignoring %s; %s is not enabled", prop, desc); success = TRUE; goto out; } val = g_strstrip (val); if (strlen (val) != 8) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: %s value '%s' must be 8 characters long", prop, val); + PARSE_WARNING ("%s value '%s' must be 8 characters long", prop, val); g_set_error_literal (error, IFCFG_PLUGIN_ERROR, 0, "boolean array must be 8 characters"); goto out; } @@ -1998,7 +1985,7 @@ read_dcb_bool_array (shvarFile *ifcfg, /* All characters must be either 0 or 1 */ for (i = 0; i < 8; i++) { if (val[i] != '0' && val[i] != '1') { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: invalid %s value '%s': not all 0s and 1s", prop, val); + PARSE_WARNING ("invalid %s value '%s': not all 0s and 1s", prop, val); g_set_error_literal (error, IFCFG_PLUGIN_ERROR, 0, "invalid boolean digit"); goto out; } @@ -2032,14 +2019,14 @@ read_dcb_uint_array (shvarFile *ifcfg, return TRUE; if (!(flags & NM_SETTING_DCB_FLAG_ENABLE)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: ignoring %s; %s is not enabled", prop, desc); + PARSE_WARNING ("ignoring %s; %s is not enabled", prop, desc); success = TRUE; goto out; } val = g_strstrip (val); if (strlen (val) != 8) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: %s value '%s' must be 8 characters long", prop, val); + PARSE_WARNING ("%s value '%s' must be 8 characters long", prop, val); g_set_error_literal (error, IFCFG_PLUGIN_ERROR, 0, "uint array must be 8 characters"); goto out; } @@ -2051,8 +2038,8 @@ read_dcb_uint_array (shvarFile *ifcfg, else if (f_allowed && (val[i] == 'f' || val[i] == 'F')) set_func (s_dcb, i, 15); else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: invalid %s value '%s': not 0 - 7%s", - prop, val, f_allowed ? " or 'f'" : ""); + PARSE_WARNING ("invalid %s value '%s': not 0 - 7%s", + prop, val, f_allowed ? " or 'f'" : ""); g_set_error_literal (error, IFCFG_PLUGIN_ERROR, 0, "invalid uint digit"); goto out; } @@ -2085,7 +2072,7 @@ read_dcb_percent_array (shvarFile *ifcfg, return TRUE; if (!(flags & NM_SETTING_DCB_FLAG_ENABLE)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: ignoring %s; %s is not enabled", prop, desc); + PARSE_WARNING ("ignoring %s; %s is not enabled", prop, desc); success = TRUE; goto out; } @@ -2093,14 +2080,14 @@ read_dcb_percent_array (shvarFile *ifcfg, val = g_strstrip (val); split = g_strsplit_set (val, ",", 0); if (!split || (g_strv_length (split) != 8)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: invalid %s percentage list value '%s'", prop, val); + PARSE_WARNING ("invalid %s percentage list value '%s'", prop, val); g_set_error_literal (error, IFCFG_PLUGIN_ERROR, 0, "percent array must be 8 elements"); goto out; } for (iter = split, i = 0; iter && *iter; iter++, i++) { if (!get_int (*iter, &tmp) || tmp < 0 || tmp > 100) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: invalid %s percentage value '%s'", prop, *iter); + PARSE_WARNING ("invalid %s percentage value '%s'", prop, *iter); g_set_error_literal (error, IFCFG_PLUGIN_ERROR, 0, "invalid percent element"); goto out; } @@ -2109,7 +2096,7 @@ read_dcb_percent_array (shvarFile *ifcfg, } if (sum_pct && (sum != 100)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: %s percentages do not equal 100%%", prop); + PARSE_WARNING ("%s percentages do not equal 100%%", prop); g_set_error_literal (error, IFCFG_PLUGIN_ERROR, 0, "invalid percentage sum"); goto out; } @@ -2158,7 +2145,7 @@ make_dcb_setting (shvarFile *ifcfg, strcmp (val, NM_SETTING_DCB_FCOE_MODE_VN2VN) == 0) g_object_set (G_OBJECT (s_dcb), NM_SETTING_DCB_APP_FCOE_MODE, val, NULL); else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: invalid FCoE mode '%s'", val); + PARSE_WARNING ("invalid FCoE mode '%s'", val); g_set_error_literal (error, IFCFG_PLUGIN_ERROR, 0, "invalid FCoE mode"); g_free (val); g_object_unref (s_dcb); @@ -2541,12 +2528,12 @@ fill_wpa_ciphers (shvarFile *ifcfg, */ if (adhoc) { if (group && (i > 0)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: ignoring group cipher '%s' (only one group cipher allowed in Ad-Hoc mode)", - *iter); + PARSE_WARNING ("ignoring group cipher '%s' (only one group cipher allowed " + "in Ad-Hoc mode)", *iter); continue; } else if (!group) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: ignoring pairwise cipher '%s' (pairwise not used in Ad-Hoc mode)", - *iter); + PARSE_WARNING ("ignoring pairwise cipher '%s' (pairwise not used " + "in Ad-Hoc mode)", *iter); continue; } } @@ -2566,9 +2553,9 @@ fill_wpa_ciphers (shvarFile *ifcfg, else if (group && !strcmp (*iter, "WEP40")) nm_setting_wireless_security_add_group (wsec, "wep40"); else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: ignoring invalid %s cipher '%s'", - group ? "CIPHER_GROUP" : "CIPHER_PAIRWISE", - *iter); + PARSE_WARNING ("ignoring invalid %s cipher '%s'", + group ? "CIPHER_GROUP" : "CIPHER_PAIRWISE", + *iter); } } @@ -2783,10 +2770,8 @@ eap_tls_reader (const char *eap_method, g_free (real_path); real_path = NULL; } else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: missing %s for EAP" - " method '%s'; this is insecure!", - ca_cert_key, - eap_method); + PARSE_WARNING ("missing %s for EAP method '%s'; this is insecure!", + ca_cert_key, eap_method); } /* Read and set private key password flags */ @@ -2916,10 +2901,8 @@ eap_peap_reader (const char *eap_method, error)) goto done; } else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: missing " - "IEEE_8021X_CA_CERT for EAP method '%s'; this is" - " insecure!", - eap_method); + PARSE_WARNING ("missing IEEE_8021X_CA_CERT for EAP method '%s'; this is insecure!", + eap_method); } peapver = svGetValue (ifcfg, "IEEE_8021X_PEAP_VERSION", FALSE); @@ -3022,10 +3005,8 @@ eap_ttls_reader (const char *eap_method, error)) goto done; } else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: missing " - "IEEE_8021X_CA_CERT for EAP method '%s'; this is" - " insecure!", - eap_method); + PARSE_WARNING ("missing IEEE_8021X_CA_CERT for EAP method '%s'; this is insecure!", + eap_method); } anon_ident = svGetValue (ifcfg, "IEEE_8021X_ANON_IDENTITY", FALSE); @@ -3120,9 +3101,9 @@ eap_fast_reader (const char *eap_method, else if (strcmp (*iter, "allow-auth") == 0) allow_auth = TRUE; else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid IEEE_8021X_FAST_PROVISIONING '%s' " - "(space-separated list of these values [allow-auth, allow-unauth] expected)", - *iter); + PARSE_WARNING ("invalid IEEE_8021X_FAST_PROVISIONING '%s' " + "(space-separated list of these values [allow-auth, allow-unauth] expected)", + *iter); } } g_strfreev (list); @@ -3292,9 +3273,8 @@ fill_8021x (shvarFile *ifcfg, * used with TTLS or PEAP or whatever. */ if (wifi && eap->wifi_phase2_only) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: ignored invalid " - "IEEE_8021X_EAP_METHOD '%s'; not allowed for wifi.", - lower); + PARSE_WARNING ("ignored invalid IEEE_8021X_EAP_METHOD '%s'; not allowed for wifi.", + lower); goto next; } @@ -3310,11 +3290,8 @@ fill_8021x (shvarFile *ifcfg, eap++; } - if (!found) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: ignored unknown" - "IEEE_8021X_EAP_METHOD '%s'.", - lower); - } + if (!found) + PARSE_WARNING ("ignored unknown IEEE_8021X_EAP_METHOD '%s'.", lower); g_free (lower); } @@ -3583,7 +3560,7 @@ make_wireless_setting (shvarFile *ifcfg, g_byte_array_free (array, TRUE); } } else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: %s", (*error)->message); + PARSE_WARNING ("%s", (*error)->message); g_clear_error (error); } @@ -3597,7 +3574,7 @@ make_wireless_setting (shvarFile *ifcfg, if (**iter == '\0') continue; if (!ether_aton_r (*iter, &addr)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid MAC in HWADDR_BLACKLIST '%s'", *iter); + PARSE_WARNING ("invalid MAC in HWADDR_BLACKLIST '%s'", *iter); continue; } macaddr_blacklist = g_slist_prepend (macaddr_blacklist, *iter); @@ -3856,7 +3833,7 @@ make_wired_setting (shvarFile *ifcfg, g_object_set (s_wired, NM_SETTING_WIRED_MTU, mtu, NULL); } else { /* Shouldn't be fatal... */ - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid MTU '%s'", value); + PARSE_WARNING ("invalid MTU '%s'", value); } g_free (value); } @@ -3880,7 +3857,7 @@ make_wired_setting (shvarFile *ifcfg, /* basic sanity checks */ while (*p) { if (!g_ascii_isxdigit (*p) && (*p != ',') && (*p != '.')) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid SUBCHANNELS '%s'", value); + PARSE_WARNING ("invalid SUBCHANNELS '%s'", value); success = FALSE; break; } @@ -3893,8 +3870,8 @@ make_wired_setting (shvarFile *ifcfg, chans = g_strsplit_set (value, ",", 0); num_chans = g_strv_length (chans); if (num_chans < 2 || num_chans > 3) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid SUBCHANNELS '%s' (%d channels, 2 or 3 expected)", - value, g_strv_length (chans)); + PARSE_WARNING ("invalid SUBCHANNELS '%s' (%d channels, 2 or 3 expected)", + value, g_strv_length (chans)); } else { GPtrArray *array = g_ptr_array_sized_new (num_chans); @@ -3927,7 +3904,7 @@ make_wired_setting (shvarFile *ifcfg, if (!strcmp (nettype, "qeth") || !strcmp (nettype, "lcs") || !strcmp (nettype, "ctc")) g_object_set (s_wired, NM_SETTING_WIRED_S390_NETTYPE, nettype, NULL); else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: unknown s390 NETTYPE '%s'", nettype); + PARSE_WARNING ("unknown s390 NETTYPE '%s'", nettype); } g_free (nettype); @@ -3945,7 +3922,7 @@ make_wired_setting (shvarFile *ifcfg, valid = nm_setting_wired_add_s390_option (s_wired, *iter, equals + 1); } if (!valid) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid s390 OPTION '%s'", *iter); + PARSE_WARNING ("invalid s390 OPTION '%s'", *iter); iter++; } g_strfreev (options); @@ -3959,7 +3936,7 @@ make_wired_setting (shvarFile *ifcfg, g_byte_array_free (mac, TRUE); } } else { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: %s", (*error)->message); + PARSE_WARNING ("%s", (*error)->message); g_clear_error (error); } @@ -3973,7 +3950,7 @@ make_wired_setting (shvarFile *ifcfg, if (**iter == '\0') continue; if (!ether_aton_r (*iter, &addr)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid MAC in HWADDR_BLACKLIST '%s'", *iter); + PARSE_WARNING ("invalid MAC in HWADDR_BLACKLIST '%s'", *iter); continue; } macaddr_blacklist = g_slist_prepend (macaddr_blacklist, *iter); @@ -4066,19 +4043,19 @@ parse_infiniband_p_key (shvarFile *ifcfg, device = svGetValue (ifcfg, "DEVICE", FALSE); if (!device) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " InfiniBand connection specified PKEY but not DEVICE"); + PARSE_WARNING ("InfiniBand connection specified PKEY but not DEVICE"); goto done; } physdev = svGetValue (ifcfg, "PHYSDEV", FALSE); if (!physdev) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " InfiniBand connection specified PKEY but not PHYSDEV"); + PARSE_WARNING ("InfiniBand connection specified PKEY but not PHYSDEV"); goto done; } pkey_id = svGetValue (ifcfg, "PKEY_ID", FALSE); if (!pkey_id) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " InfiniBand connection specified PKEY but not PKEY_ID"); + PARSE_WARNING ("InfiniBand connection specified PKEY but not PKEY_ID"); goto done; } @@ -4089,15 +4066,15 @@ parse_infiniband_p_key (shvarFile *ifcfg, else end = pkey_id; if (end == pkey_id || *end || id > 0xFFFF) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " invalid InfiniBand PKEY_ID '%s'", pkey_id); + PARSE_WARNING ("invalid InfiniBand PKEY_ID '%s'", pkey_id); goto done; } id = (id | 0x8000); ifname = g_strdup_printf ("%s.%04x", physdev, id); if (strcmp (device, ifname) != 0) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " InfiniBand DEVICE (%s) does not match PHYSDEV+PKEY_ID (%s)", - device, ifname); + PARSE_WARNING ("InfiniBand DEVICE (%s) does not match PHYSDEV+PKEY_ID (%s)", + device, ifname); goto done; } @@ -4138,7 +4115,7 @@ make_infiniband_setting (shvarFile *ifcfg, g_object_set (s_infiniband, NM_SETTING_INFINIBAND_MTU, mtu, NULL); } else { /* Shouldn't be fatal... */ - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid MTU '%s'", value); + PARSE_WARNING ("invalid MTU '%s'", value); } g_free (value); } @@ -4237,7 +4214,7 @@ handle_bond_option (NMSettingBond *s_bond, } if (!nm_setting_bond_add_option (s_bond, key, sanitized ? sanitized : value)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid bonding option '%s'", key); + PARSE_WARNING ("invalid bonding option '%s'", key); g_free (sanitized); } @@ -4467,32 +4444,32 @@ handle_bridge_option (NMSetting *setting, if (!strcmp (key, "priority")) { if (stp == FALSE) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: 'priority' invalid when STP is disabled"); + PARSE_WARNING ("'priority' invalid when STP is disabled"); } else if (get_uint (value, &u)) g_object_set (setting, NM_SETTING_BRIDGE_PRIORITY, u, NULL); else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid priority value '%s'", value); + PARSE_WARNING ("invalid priority value '%s'", value); } else if (!strcmp (key, "hello_time")) { if (stp == FALSE) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: 'hello_time' invalid when STP is disabled"); + PARSE_WARNING ("'hello_time' invalid when STP is disabled"); } else if (get_uint (value, &u)) g_object_set (setting, NM_SETTING_BRIDGE_HELLO_TIME, u, NULL); else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid hello_time value '%s'", value); + PARSE_WARNING ("invalid hello_time value '%s'", value); } else if (!strcmp (key, "max_age")) { if (stp == FALSE) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: 'max_age' invalid when STP is disabled"); + PARSE_WARNING ("'max_age' invalid when STP is disabled"); } else if (get_uint (value, &u)) g_object_set (setting, NM_SETTING_BRIDGE_MAX_AGE, u, NULL); else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid max_age value '%s'", value); + PARSE_WARNING ("invalid max_age value '%s'", value); } else if (!strcmp (key, "ageing_time")) { if (get_uint (value, &u)) g_object_set (setting, NM_SETTING_BRIDGE_AGEING_TIME, u, NULL); else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid ageing_time value '%s'", value); + PARSE_WARNING ("invalid ageing_time value '%s'", value); } else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: unhandled bridge option '%s'", key); + PARSE_WARNING ("unhandled bridge option '%s'", key); } static void @@ -4554,7 +4531,7 @@ make_bridge_setting (shvarFile *ifcfg, g_object_set (s_bridge, NM_SETTING_BRIDGE_STP, FALSE, NULL); stp_set = TRUE; } else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid STP value '%s'", value); + PARSE_WARNING ("invalid STP value '%s'", value); g_free (value); } @@ -4569,9 +4546,9 @@ make_bridge_setting (shvarFile *ifcfg, if (get_uint (value, &u)) g_object_set (s_bridge, NM_SETTING_BRIDGE_FORWARD_DELAY, u, NULL); else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid forward delay value '%s'", value); + PARSE_WARNING ("invalid forward delay value '%s'", value); } else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: DELAY invalid when STP is disabled"); + PARSE_WARNING ("DELAY invalid when STP is disabled"); g_free (value); } @@ -4638,21 +4615,21 @@ handle_bridge_port_option (NMSetting *setting, if (get_uint (value, &u)) g_object_set (setting, NM_SETTING_BRIDGE_PORT_PRIORITY, u, NULL); else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid priority value '%s'", value); + PARSE_WARNING ("invalid priority value '%s'", value); } else if (!strcmp (key, "path_cost")) { if (get_uint (value, &u)) g_object_set (setting, NM_SETTING_BRIDGE_PORT_PATH_COST, u, NULL); else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid path_cost value '%s'", value); + PARSE_WARNING ("invalid path_cost value '%s'", value); } else if (!strcmp (key, "hairpin_mode")) { if (!strcasecmp (value, "on") || !strcasecmp (value, "yes") || !strcmp (value, "1")) g_object_set (setting, NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, TRUE, NULL); else if (!strcasecmp (value, "off") || !strcasecmp (value, "no")) g_object_set (setting, NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, FALSE, NULL); else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid hairpin_mode value '%s'", value); + PARSE_WARNING ("invalid hairpin_mode value '%s'", value); } else - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: unhandled bridge port option '%s'", key); + PARSE_WARNING ("unhandled bridge port option '%s'", key); } static NMSetting * @@ -4690,7 +4667,7 @@ make_team_port_setting (shvarFile *ifcfg) g_object_set (s_port, NM_SETTING_TEAM_PORT_CONFIG, value, NULL); g_free (value); } else if (error) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: %s", error->message); + PARSE_WARNING ("%s", error->message); g_error_free (error); } @@ -4758,10 +4735,8 @@ parse_prio_map_list (NMSettingVlan *s_vlan, if (!*iter || !strchr (*iter, ':')) continue; - if (!nm_setting_vlan_add_priority_str (s_vlan, map, *iter)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: invalid %s priority map item '%s'", - key, *iter); - } + if (!nm_setting_vlan_add_priority_str (s_vlan, map, *iter)) + PARSE_WARNING ("invalid %s priority map item '%s'", key, *iter); } g_strfreev (list); } @@ -5042,7 +5017,7 @@ check_dns_search_domains (shvarFile *ifcfg, NMSetting *s_ip4, NMSetting *s_ip6) for (item = searches; *item; item++) { if (strlen (*item)) { if (!nm_setting_ip6_config_add_dns_search (NM_SETTING_IP6_CONFIG (s_ip6), *item)) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: duplicate DNS domain '%s'", *item); + PARSE_WARNING ("duplicate DNS domain '%s'", *item); } } g_strfreev (searches); @@ -5103,7 +5078,7 @@ connection_from_file (const char *filename, connection = create_unhandled_connection (filename, parsed, "unmanaged", out_unhandled); if (!connection) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: NM_CONTROLLED was false but device was not uniquely identified; device will be managed"); + PARSE_WARNING ("NM_CONTROLLED was false but device was not uniquely identified; device will be managed"); goto done; } @@ -5193,7 +5168,7 @@ connection_from_file (const char *filename, connection = create_unhandled_connection (filename, parsed, "unrecognized", out_unhandled); if (!connection) - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: connection type was unrecognized but device was not uniquely identified; device may be managed"); + PARSE_WARNING ("connection type was unrecognized but device was not uniquely identified; device may be managed"); goto done; } g_free (type); diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am index c360bba44c..89fd92000a 100644 --- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am @@ -14,10 +14,12 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/src/ \ + -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/posix-signals \ -I$(srcdir)/../ \ + -DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \ diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index b2a9bc3dfd..50ef84d567 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -50,6 +50,7 @@ #include "nm-test-helpers.h" #include "NetworkManagerUtils.h" +#include "nm-glib-compat.h" #include "common.h" #include "reader.h" @@ -512,8 +513,11 @@ test_read_wired_static_no_prefix (gconstpointer user_data) file = g_strdup_printf (TEST_IFCFG_DIR "/network-scripts/ifcfg-test-wired-static-no-prefix-%u", expected_prefix); expected_id = g_strdup_printf ("System test-wired-static-no-prefix-%u", expected_prefix); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*missing PREFIX, assuming*"); connection = connection_from_file (file, NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, NULL, &error, NULL); + g_test_assert_expected_messages (); g_assert_no_error (error); g_assert (connection); g_assert (nm_connection_verify (connection, &error)); @@ -1857,6 +1861,8 @@ test_read_wired_ipv6_manual (void) NMIP6Route *ip6_route; struct in6_addr addr; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*ignoring manual default route*"); connection = connection_from_file (TEST_IFCFG_WIRED_IPV6_MANUAL, NULL, TYPE_ETHERNET, @@ -1867,6 +1873,8 @@ test_read_wired_ipv6_manual (void) &route6file, &error, &ignore_error); + g_test_assert_expected_messages (); + ASSERT (connection != NULL, "wired-ipv6-manual-read", "failed to read %s: %s", TEST_IFCFG_WIRED_IPV6_MANUAL, error->message); @@ -2763,9 +2771,12 @@ test_read_write_802_1X_subj_matches (void) GError *error = NULL; gboolean success = FALSE; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*missing IEEE_8021X_CA_CERT*peap*"); connection = connection_from_file (TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wired-802-1X-subj-matches", NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, NULL, &error, NULL); + g_test_assert_expected_messages (); g_assert_no_error (error); g_assert (connection != NULL); @@ -2795,8 +2806,11 @@ test_read_write_802_1X_subj_matches (void) nm_utils_normalize_connection (connection, TRUE); /* re-read the connection for comparison */ + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*missing IEEE_8021X_CA_CERT*peap*"); reread = connection_from_file (written, NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, NULL, &error, NULL); + g_test_assert_expected_messages (); unlink (written); g_free (written); @@ -3002,6 +3016,10 @@ test_read_wired_aliases_bad (void) NMIP4Address *ip4_addr; struct in_addr addr; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*aliasem1:1*has no DEVICE*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*aliasem1:2*has invalid DEVICE*"); connection = connection_from_file (TEST_IFCFG_ALIASES_BAD, NULL, TYPE_ETHERNET, @@ -3012,6 +3030,7 @@ test_read_wired_aliases_bad (void) &route6file, &error, &ignore_error); + g_test_assert_expected_messages (); ASSERT (connection != NULL, "aliases-bad-read", "failed to read %s: %s", TEST_IFCFG_ALIASES_BAD, error->message); @@ -11250,7 +11269,7 @@ test_read_ibft_static (void) } static void -test_read_ibft_malformed (const char *name, const char *iscsiadm_path) +test_read_ibft_malformed (const char *name, const char *iscsiadm_path, gboolean expect_warning) { NMConnection *connection; char *unmanaged = NULL; @@ -11262,6 +11281,10 @@ test_read_ibft_malformed (const char *name, const char *iscsiadm_path) g_assert (g_file_test (iscsiadm_path, G_FILE_TEST_EXISTS)); + if (expect_warning) { + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*malformed iscsiadm record*"); + } connection = connection_from_file (TEST_IFCFG_IBFT_STATIC, NULL, TYPE_ETHERNET, @@ -11272,6 +11295,8 @@ test_read_ibft_malformed (const char *name, const char *iscsiadm_path) &route6file, &error, &ignore_error); + if (expect_warning) + g_test_assert_expected_messages (); ASSERT (connection == NULL, name, "unexpectedly able to read %s", TEST_IFCFG_IBFT_STATIC); @@ -12982,6 +13007,8 @@ test_read_bond_slave (void) gboolean ignore_error = FALSE; GError *error = NULL; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*ignoring IP4 config on slave*"); connection = connection_from_file (TEST_IFCFG_BOND_SLAVE, NULL, TYPE_ETHERNET, @@ -12992,6 +13019,8 @@ test_read_bond_slave (void) &route6file, &error, &ignore_error); + g_test_assert_expected_messages (); + ASSERT (connection != NULL, "bond-slave-read", "unexpected failure reading %s", TEST_IFCFG_BOND_SLAVE); @@ -13346,6 +13375,8 @@ test_read_bond_slave_ib (void) gboolean ignore_error = FALSE; GError *error = NULL; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*ignoring IP4 config on slave*"); connection = connection_from_file (TEST_IFCFG_BOND_SLAVE_IB, NULL, NULL, @@ -13356,6 +13387,8 @@ test_read_bond_slave_ib (void) &route6file, &error, &ignore_error); + g_test_assert_expected_messages(); + ASSERT (connection != NULL, "bond-slave-read-ib", "unexpected failure reading %s", TEST_IFCFG_BOND_SLAVE_IB); @@ -13694,8 +13727,12 @@ test_read_dcb_bad_booleans (void) NMConnection *connection; GError *error = NULL; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*invalid DCB_PG_STRICT value*not all 0s and 1s*"); connection = connection_from_file (TEST_IFCFG_DIR "/network-scripts/ifcfg-test-dcb-bad-booleans", NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, NULL, &error, NULL); + g_test_assert_expected_messages (); + g_assert_error (error, IFCFG_PLUGIN_ERROR, 0); g_assert (strstr (error->message, "invalid boolean digit")); g_assert (connection == NULL); @@ -13707,8 +13744,12 @@ test_read_dcb_short_booleans (void) NMConnection *connection; GError *error = NULL; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*DCB_PG_STRICT value*8 characters*"); connection = connection_from_file (TEST_IFCFG_DIR "/network-scripts/ifcfg-test-dcb-short-booleans", NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, NULL, &error, NULL); + g_test_assert_expected_messages (); + g_assert_error (error, IFCFG_PLUGIN_ERROR, 0); g_assert (strstr (error->message, "boolean array must be 8 characters")); g_assert (connection == NULL); @@ -13720,8 +13761,12 @@ test_read_dcb_bad_uints (void) NMConnection *connection; GError *error = NULL; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*invalid DCB_PG_UP2TC value*not 0 - 7*"); connection = connection_from_file (TEST_IFCFG_DIR "/network-scripts/ifcfg-test-dcb-bad-uints", NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, NULL, &error, NULL); + g_test_assert_expected_messages (); + g_assert_error (error, IFCFG_PLUGIN_ERROR, 0); g_assert (strstr (error->message, "invalid uint digit")); g_assert (connection == NULL); @@ -13733,8 +13778,12 @@ test_read_dcb_short_uints (void) NMConnection *connection; GError *error = NULL; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*DCB_PG_UP2TC value*8 characters*"); connection = connection_from_file (TEST_IFCFG_DIR "/network-scripts/ifcfg-test-dcb-short-uints", NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, NULL, &error, NULL); + g_test_assert_expected_messages (); + g_assert_error (error, IFCFG_PLUGIN_ERROR, 0); g_assert (strstr (error->message, "uint array must be 8 characters")); g_assert (connection == NULL); @@ -13746,8 +13795,12 @@ test_read_dcb_bad_percent (void) NMConnection *connection; GError *error = NULL; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*invalid DCB_PG_PCT percentage value*"); connection = connection_from_file (TEST_IFCFG_DIR "/network-scripts/ifcfg-test-dcb-bad-percent", NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, NULL, &error, NULL); + g_test_assert_expected_messages (); + g_assert_error (error, IFCFG_PLUGIN_ERROR, 0); g_assert (strstr (error->message, "invalid percent element")); g_assert (connection == NULL); @@ -13759,8 +13812,12 @@ test_read_dcb_short_percent (void) NMConnection *connection; GError *error = NULL; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*invalid DCB_PG_PCT percentage list value*"); connection = connection_from_file (TEST_IFCFG_DIR "/network-scripts/ifcfg-test-dcb-short-percent", NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, NULL, &error, NULL); + g_test_assert_expected_messages (); + g_assert_error (error, IFCFG_PLUGIN_ERROR, 0); g_assert (strstr (error->message, "percent array must be 8 elements")); g_assert (connection == NULL); @@ -13772,8 +13829,12 @@ test_read_dcb_pgpct_not_100 (void) NMConnection *connection; GError *error = NULL; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*DCB_PG_PCT percentages do not equal 100*"); connection = connection_from_file (TEST_IFCFG_DIR "/network-scripts/ifcfg-test-dcb-pgpct-not-100", NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, NULL, &error, NULL); + g_test_assert_expected_messages (); + g_assert_error (error, IFCFG_PLUGIN_ERROR, 0); g_assert (strstr (error->message, "invalid percentage sum")); g_assert (connection == NULL); @@ -14296,14 +14357,20 @@ int main (int argc, char **argv) gboolean success; g_test_init (&argc, &argv, NULL); +#if GLIB_CHECK_VERSION(2,34,0) + /* consider even unexpected g_message()s to be fatal */ + g_log_set_always_fatal (G_LOG_LEVEL_MASK); +#else + /* g_test_expect_message() is dummied out, so allow warnings */ + g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); +#endif + g_type_init (); success = nm_utils_init (&error); g_assert_no_error (error); g_assert (success); - g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); - g_test_add_func (TPATH "svUnescape", test_svUnescape); g_test_add_func (TPATH "unmanaged", test_read_unmanaged); @@ -14343,7 +14410,7 @@ int main (int argc, char **argv) test_read_wired_8021x_tls_secret_flags (TEST_IFCFG_WIRED_8021X_TLS_AGENT, NM_SETTING_SECRET_FLAG_AGENT_OWNED); test_read_wired_8021x_tls_secret_flags (TEST_IFCFG_WIRED_8021X_TLS_ALWAYS, NM_SETTING_SECRET_FLAG_AGENT_OWNED | NM_SETTING_SECRET_FLAG_NOT_SAVED); - g_test_add_func (TPATH "802-1x/subj-mathes", test_read_write_802_1X_subj_matches); + g_test_add_func (TPATH "802-1x/subj-matches", test_read_write_802_1X_subj_matches); test_read_wired_aliases_good (); test_read_wired_aliases_bad (); test_read_wifi_open (); @@ -14463,12 +14530,12 @@ int main (int argc, char **argv) /* iSCSI / ibft */ test_read_ibft_dhcp (); test_read_ibft_static (); - test_read_ibft_malformed ("ibft-bad-record-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-record"); - test_read_ibft_malformed ("ibft-bad-entry-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-entry"); - test_read_ibft_malformed ("ibft-bad-ipaddr-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-ipaddr"); - test_read_ibft_malformed ("ibft-bad-gateway-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-gateway"); - test_read_ibft_malformed ("ibft-bad-dns1-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-dns1"); - test_read_ibft_malformed ("ibft-bad-dns2-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-dns2"); + test_read_ibft_malformed ("ibft-bad-record-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-record", FALSE); + test_read_ibft_malformed ("ibft-bad-entry-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-entry", TRUE); + test_read_ibft_malformed ("ibft-bad-ipaddr-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-ipaddr", TRUE); + test_read_ibft_malformed ("ibft-bad-gateway-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-gateway", TRUE); + test_read_ibft_malformed ("ibft-bad-dns1-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-dns1", TRUE); + test_read_ibft_malformed ("ibft-bad-dns2-read", TEST_IFCFG_DIR "/iscsiadm-test-bad-dns2", TRUE); g_test_add_func (TPATH "dcb/read-basic", test_read_dcb_basic); g_test_add_func (TPATH "dcb/write-basic", test_write_dcb_basic); g_test_add_func (TPATH "dcb/default-app-priorities", test_read_dcb_default_app_priorities); diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index c9758beeb5..a19b3f1d08 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -42,6 +42,7 @@ #include <nm-util-private.h> #include <nm-utils.h> +#include "nm-logging.h" #include "common.h" #include "shvar.h" #include "reader.h" @@ -49,9 +50,6 @@ #include "utils.h" #include "crypto.h" -#define PLUGIN_WARN(pname, fmt, args...) \ - { g_warning (" " pname ": " fmt, ##args); } - static void save_secret_flags (shvarFile *ifcfg, const char *key, @@ -107,8 +105,7 @@ set_secret (shvarFile *ifcfg, keyfile = utils_get_keys_ifcfg (ifcfg->fileName, TRUE); if (!keyfile) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: could not create key file for '%s'", - ifcfg->fileName); + nm_log_warn (LOGD_SETTINGS, " could not create ifcfg file for '%s'", ifcfg->fileName); goto error; } @@ -120,7 +117,8 @@ set_secret (shvarFile *ifcfg, svSetValue (keyfile, key, value, verbatim); if (!svWriteFile (keyfile, 0600, &error)) { - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " warning: %s", error->message); + nm_log_warn (LOGD_SETTINGS, " could not update ifcfg file '%s': %s", + keyfile->fileName, error->message); g_clear_error (&error); svCloseFile (keyfile); goto error; diff --git a/src/settings/plugins/ifcfg-suse/Makefile.am b/src/settings/plugins/ifcfg-suse/Makefile.am index a6c20f98ae..d4f1cf74d2 100644 --- a/src/settings/plugins/ifcfg-suse/Makefile.am +++ b/src/settings/plugins/ifcfg-suse/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ + -DG_LOG_DOMAIN=\""NetworkManager-ifcfg-suse"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DSYSCONFDIR=\"$(sysconfdir)\" diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am index 75048752bb..a22ea557a5 100644 --- a/src/settings/plugins/ifnet/Makefile.am +++ b/src/settings/plugins/ifnet/Makefile.am @@ -5,6 +5,7 @@ SUBDIRS = . tests AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/config \ + -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/include \ @@ -12,6 +13,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ + -DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c index 9112febdcc..98f5a4d746 100644 --- a/src/settings/plugins/ifnet/connection_parser.c +++ b/src/settings/plugins/ifnet/connection_parser.c @@ -37,6 +37,7 @@ #include <nm-setting-wireless.h> #include <nm-setting-8021x.h> #include <nm-system-config-interface.h> +#include <nm-logging.h> #include <nm-utils.h> #include "net_utils.h" @@ -200,11 +201,9 @@ eap_tls_reader (const char *eap_method, goto done; } } else { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - " warning: missing %s for EAP" - " method '%s'; this is insecure!", - phase2 ? "IEEE_8021X_INNER_CA_CERT" : - "IEEE_8021X_CA_CERT", eap_method); + nm_log_warn (LOGD_SETTINGS, " missing %s for EAP method '%s'; this is insecure!", + phase2 ? "IEEE_8021X_INNER_CA_CERT" : + "IEEE_8021X_CA_CERT", eap_method); } /* Private key password */ @@ -310,9 +309,8 @@ eap_peap_reader (const char *eap_method, NULL, error)) goto done; } else { - PLUGIN_WARN (IFNET_PLUGIN_NAME, " warning: missing " - "IEEE_8021X_CA_CERT for EAP method '%s'; this is" - " insecure!", eap_method); + nm_log_warn (LOGD_SETTINGS, " missing IEEE_8021X_CA_CERT for EAP method '%s'; this is insecure!", + eap_method); } peapver = wpa_get_value (ssid, "phase1"); @@ -413,9 +411,8 @@ eap_ttls_reader (const char *eap_method, NULL, error)) goto done; } else { - PLUGIN_WARN (IFNET_PLUGIN_NAME, " warning: missing " - "IEEE_8021X_CA_CERT for EAP method '%s'; this is" - " insecure!", eap_method); + nm_log_warn (LOGD_SETTINGS, " missing IEEE_8021X_CA_CERT for EAP method '%s'; this is insecure!", + eap_method); } /* anonymous indentity for tls */ @@ -455,7 +452,7 @@ eap_ttls_reader (const char *eap_method, } else if ((pos = strstr (*iter, "mschapv2")) != NULL || (pos = strstr (*iter, "md5")) != NULL) { if (!eap_simple_reader (pos, ssid, s_8021x, TRUE, basepath, error)) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, "SIMPLE ERROR"); + nm_log_warn (LOGD_SETTINGS, "SIMPLE ERROR"); goto done; } g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTHEAP, @@ -495,8 +492,7 @@ guess_connection_type (const char *conn_name) if (!ret_type) ret_type = NM_SETTING_WIRED_SETTING_NAME; - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "guessed connection type (%s) = %s", conn_name, ret_type); + nm_log_info (LOGD_SETTINGS, "guessed connection type (%s) = %s", conn_name, ret_type); return ret_type; } @@ -539,9 +535,7 @@ make_wired_connection_setting (NMConnection *connection, errno = 0; mtu = strtol (value, NULL, 10); if (errno || mtu < 0 || mtu > 65535) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - " warning: invalid MTU '%s' for %s", - value, conn_name); + nm_log_warn (LOGD_SETTINGS, " invalid MTU '%s' for %s", value, conn_name); } else g_object_set (s_wired, NM_SETTING_WIRED_MTU, (guint32) mtu, NULL); @@ -615,8 +609,7 @@ make_ip4_setting (NMConnection *connection, g_object_unref (ip4_setting); return; } - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using %s method for %s", - method, conn_name); + nm_log_info (LOGD_SETTINGS, "Using %s method for %s", method, conn_name); }else { iblock = convert_ip4_config_block (conn_name); if (!iblock) { @@ -642,8 +635,7 @@ make_ip4_setting (NMConnection *connection, NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, TRUE, NULL); if (!nm_setting_ip4_config_add_address (ip4_setting, ip4_addr)) - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "ignoring duplicate IP4 address"); + nm_log_warn (LOGD_SETTINGS, "ignoring duplicate IP4 address"); nm_ip4_address_unref (ip4_addr); current_iblock = iblock; iblock = iblock->next; @@ -665,16 +657,14 @@ make_ip4_setting (NMConnection *connection, g_object_set (ip4_setting, NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, dhcp_hostname, NULL); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "DHCP hostname: %s", - dhcp_hostname); + nm_log_info (LOGD_SETTINGS, "DHCP hostname: %s", dhcp_hostname); g_free (dhcp_hostname); } if (client_id) { g_object_set (ip4_setting, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, client_id, NULL); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "DHCP client id: %s", - client_id); + nm_log_info (LOGD_SETTINGS, "DHCP client id: %s", client_id); g_free (client_id); } } @@ -697,10 +687,7 @@ make_ip4_setting (NMConnection *connection, for (item = searches; *item; item++) { if (strlen (*item)) { if (!nm_setting_ip4_config_add_dns_search (ip4_setting, *item)) - PLUGIN_WARN - (IFNET_PLUGIN_NAME, - " warning: duplicate DNS domain '%s'", - *item); + nm_log_warn (LOGD_SETTINGS, " duplicate DNS domain '%s'", *item); } } g_strfreev (searches); @@ -737,10 +724,8 @@ make_ip4_setting (NMConnection *connection, } if (!nm_setting_ip4_config_add_route (ip4_setting, route)) - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "warning: duplicate IP4 route"); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "new IP4 route:%d\n", iblock->ip); + nm_log_warn (LOGD_SETTINGS, "duplicate IP4 route"); + nm_log_info (LOGD_SETTINGS, "new IP4 route:%d\n", iblock->ip); nm_ip4_route_unref (route); @@ -792,8 +777,7 @@ make_ip6_setting (NMConnection *connection, else // doesn't have "dhcp6" && has at least one ipv6 address method = NM_SETTING_IP6_CONFIG_METHOD_MANUAL; - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "IPv6 for %s enabled, using %s", - conn_name, method); + nm_log_info (LOGD_SETTINGS, "IPv6 for %s enabled, using %s", conn_name, method); g_object_set (s_ip6, NM_SETTING_IP6_CONFIG_METHOD, method, @@ -819,13 +803,10 @@ make_ip6_setting (NMConnection *connection, nm_ip6_address_set_address (ip6_addr, iblock->ip); nm_ip6_address_set_prefix (ip6_addr, iblock->prefix); if (nm_setting_ip6_config_add_address (s_ip6, ip6_addr)) { - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "ipv6 addresses count: %d", - nm_setting_ip6_config_get_num_addresses - (s_ip6)); + nm_log_info (LOGD_SETTINGS, "ipv6 addresses count: %d", + nm_setting_ip6_config_get_num_addresses (s_ip6)); } else { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "ignoring duplicate IP4 address"); + nm_log_warn (LOGD_SETTINGS, "ignoring duplicate IP4 address"); } nm_ip6_address_unref (ip6_addr); current_iblock = iblock; @@ -875,10 +856,10 @@ make_ip6_setting (NMConnection *connection, nm_ip6_route_set_metric (route, (guint32) 1); } - if (!nm_setting_ip6_config_add_route (s_ip6, route)) - PLUGIN_WARN (IFNET_PLUGIN_NAME, - " warning: duplicate IP6 route"); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, " info: new IP6 route"); + if (nm_setting_ip6_config_add_route (s_ip6, route)) + nm_log_info (LOGD_SETTINGS, " new IP6 route"); + else + nm_log_warn (LOGD_SETTINGS, " duplicate IP6 route"); nm_ip6_route_unref (route); current_iblock = iblock; @@ -892,8 +873,7 @@ done: error: g_object_unref (s_ip6); - PLUGIN_WARN (IFNET_PLUGIN_NAME, " warning: Ignore IPv6 for %s", - conn_name); + nm_log_warn (LOGD_SETTINGS, " Ignore IPv6 for %s", conn_name); return; } @@ -914,8 +894,7 @@ make_wireless_connection_setting (const char *conn_name, "ppp") != 0, NULL); type = ifnet_get_data (conn_name, "type"); if (strcmp (type, "ppp") == 0) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "PPP over WIFI is not supported yet"); + nm_log_warn (LOGD_SETTINGS, "PPP over WIFI is not supported yet"); return NULL; } @@ -995,7 +974,7 @@ make_wireless_connection_setting (const char *conn_name, g_object_set (wireless_setting, NM_SETTING_WIRELESS_MODE, mode, NULL); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using mode: %s", mode); + nm_log_info (LOGD_SETTINGS, "Using mode: %s", mode); } /* BSSID setting */ @@ -1024,17 +1003,14 @@ make_wireless_connection_setting (const char *conn_name, errno = 0; mtu = strtol (value, NULL, 10); if (errno || mtu < 0 || mtu > 50000) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - " warning: invalid MTU '%s' for %s", - value, conn_name); + nm_log_warn (LOGD_SETTINGS, " invalid MTU '%s' for %s", value, conn_name); } else g_object_set (wireless_setting, NM_SETTING_WIRELESS_MTU, (guint32) mtu, NULL); } - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "wireless_setting added for %s", - conn_name); + nm_log_info (LOGD_SETTINGS, "wireless_setting added for %s", conn_name); return NM_SETTING (wireless_setting); error: if (wireless_setting) @@ -1183,8 +1159,7 @@ make_wep_setting (const char *ssid, GError **error) g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, default_key_idx, NULL); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "Default key index: %d", default_key_idx); + nm_log_info (LOGD_SETTINGS, "Default key index: %d", default_key_idx); } else { g_set_error (error, ifnet_plugin_error_quark (), 0, "Invalid default WEP key '%s'", value); @@ -1222,14 +1197,12 @@ make_wep_setting (const char *ssid, GError **error) g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", NULL); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "WEP: Use open system authentication"); + nm_log_info (LOGD_SETTINGS, "WEP: Use open system authentication"); } else if (strcmp (auth_alg, "SHARED") == 0) { g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "shared", NULL); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "WEP: Use shared system authentication"); + nm_log_info (LOGD_SETTINGS, "WEP: Use shared system authentication"); } else { g_set_error (error, ifnet_plugin_error_quark (), 0, "Invalid WEP authentication algorithm '%s'", @@ -1341,14 +1314,12 @@ fill_wpa_ciphers (const char *ssid, */ if (adhoc) { if (group && (i > 0)) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - " warning: ignoring group cipher '%s' (only one group cipher allowed in Ad-Hoc mode)", - *iter); + nm_log_warn (LOGD_SETTINGS, " ignoring group cipher '%s' (only one group cipher allowed in Ad-Hoc mode)", + *iter); continue; } else if (!group) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - " warning: ignoring pairwise cipher '%s' (pairwise not used in Ad-Hoc mode)", - *iter); + nm_log_warn (LOGD_SETTINGS, " ignoring pairwise cipher '%s' (pairwise not used in Ad-Hoc mode)", + *iter); continue; } } @@ -1372,10 +1343,9 @@ fill_wpa_ciphers (const char *ssid, else if (group && !strcmp (*iter, "WEP40")) nm_setting_wireless_security_add_group (wsec, "wep40"); else { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - " warning: ignoring invalid %s cipher '%s'", - group ? "CIPHER_GROUP" : "CIPHER_PAIRWISE", - *iter); + nm_log_warn (LOGD_SETTINGS, " ignoring invalid %s cipher '%s'", + group ? "CIPHER_GROUP" : "CIPHER_PAIRWISE", + *iter); } } @@ -1422,10 +1392,8 @@ fill_8021x (const char *ssid, * used with TTLS or PEAP or whatever. */ if (wifi && eap->wifi_phase2_only) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - " warning: ignored invalid " - "IEEE_8021X_EAP_METHOD '%s'; not allowed for wifi.", - lower); + nm_log_warn (LOGD_SETTINGS, " ignored invalid IEEE_8021X_EAP_METHOD '%s'; not allowed for wifi.", + lower); goto next; } @@ -1442,9 +1410,7 @@ fill_8021x (const char *ssid, } if (!found) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - " warning: ignored unknown" - "IEEE_8021X_EAP_METHOD '%s'.", lower); + nm_log_warn (LOGD_SETTINGS, " ignored unknown IEEE_8021X_EAP_METHOD '%s'.", lower); } g_free (lower); } @@ -1568,8 +1534,7 @@ make_wireless_security_setting (const char *conn_name, "ppp") != 0, NULL); if (!wpa_get_value (conn_name, "ssid")) return NULL; - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "updating wireless security settings (%s).", conn_name); + nm_log_info (LOGD_SETTINGS, "updating wireless security settings (%s).", conn_name); ssid = conn_name; value = wpa_get_value (ssid, "mode"); @@ -1682,7 +1647,7 @@ ifnet_update_connection_from_config_block (const char *conn_name, NM_SETTING_CONNECTION_READ_ONLY, FALSE, NM_SETTING_CONNECTION_AUTOCONNECT, auto_conn, NULL); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "%s: name:%s, id:%s, uuid: %s", __func__, conn_name, id, uuid); + nm_log_info (LOGD_SETTINGS, "name:%s, id:%s, uuid: %s", conn_name, id, uuid); g_free (id); g_free (uuid); @@ -1691,8 +1656,7 @@ ifnet_update_connection_from_config_block (const char *conn_name, /* wired setting */ make_wired_connection_setting (connection, conn_name, error); if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Found error: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto error; } /* pppoe setting */ @@ -1700,8 +1664,7 @@ ifnet_update_connection_from_config_block (const char *conn_name, make_pppoe_connection_setting (connection, conn_name, error); if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Found error: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto error; } } else if (!strcmp (NM_SETTING_WIRELESS_SETTING_NAME, type)) { @@ -1714,8 +1677,7 @@ ifnet_update_connection_from_config_block (const char *conn_name, nm_connection_add_setting (connection, wireless_setting); if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Found error: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto error; } @@ -1728,8 +1690,7 @@ ifnet_update_connection_from_config_block (const char *conn_name, } if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Found error: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto error; } @@ -1739,21 +1700,22 @@ ifnet_update_connection_from_config_block (const char *conn_name, /* IPv4 setting */ make_ip4_setting (connection, conn_name, error); if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Found error: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto error; } /* IPv6 setting */ make_ip6_setting (connection, conn_name, error); if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Found error: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto error; } success = nm_connection_verify (connection, error); if (error && *error) - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Found error: %s", (*error)->message); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Connection verified %s:%d", conn_name, success); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); + else + nm_log_info (LOGD_SETTINGS, "Connection verified %s:%d", conn_name, success); if (!success) goto error; return connection; @@ -1890,10 +1852,8 @@ write_object (NMSetting8021x *s_8021x, } /* does not support writing encryption data now */ - if (blob) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - " warning: Currently we do not support certs writing."); - } + if (blob) + nm_log_warn (LOGD_SETTINGS, " Currently we do not support cert writing."); return TRUE; } @@ -2022,8 +1982,7 @@ write_8021x_setting (NMConnection *connection, return TRUE; } - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Adding 8021x setting for %s", - conn_name); + nm_log_info (LOGD_SETTINGS, "Adding 8021x setting for %s", conn_name); /* If wired, write KEY_MGMT */ if (wired) @@ -2140,7 +2099,7 @@ write_wireless_security_setting (NMConnection * connection, wpa_set_data (conn_name, "key_mgmt", "WPA-EAP"); wpa = TRUE; } else - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Unknown key_mgmt: %s", key_mgmt); + nm_log_warn (LOGD_SETTINGS, "Unknown key_mgmt: %s", key_mgmt); if (auth_alg) { if (!strcmp (auth_alg, "shared")) @@ -2357,9 +2316,8 @@ write_wireless_setting (NMConnection *connection, wpa_set_data (ssid_str, "mode", "1"); adhoc = TRUE; } else { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Invalid mode '%s' in '%s' setting", - mode, NM_SETTING_WIRELESS_SETTING_NAME); + nm_log_warn (LOGD_SETTINGS, "Invalid mode '%s' in '%s' setting", + mode, NM_SETTING_WIRELESS_SETTING_NAME); return FALSE; } @@ -3062,7 +3020,7 @@ ifnet_add_new_connection (NMConnection *connection, type = nm_setting_connection_get_connection_type (s_con); g_assert (type); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Adding %s connection", type); + nm_log_info (LOGD_SETTINGS, "Adding %s connection", type); /* get name and type * Wireless type: wireless @@ -3097,8 +3055,8 @@ ifnet_add_new_connection (NMConnection *connection, error); } - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Added new connection: %s, result: %s", - new_name, success ? "success" : "fail"); + nm_log_info (LOGD_SETTINGS, "Added new connection: %s, result: %s", + new_name, success ? "success" : "fail"); out: if (!success || !out_new_name) diff --git a/src/settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/net_parser.c index 9e39925274..95add14fc2 100644 --- a/src/settings/plugins/ifnet/net_parser.c +++ b/src/settings/plugins/ifnet/net_parser.c @@ -20,12 +20,13 @@ */ #include <string.h> -#include <nm-system-config-interface.h> #include <stdio.h> - #include <sys/ioctl.h> #include <unistd.h> +#include <nm-system-config-interface.h> +#include <nm-logging.h> + #include "plugin.h" #include "nm-platform.h" @@ -70,7 +71,7 @@ ifnet_add_network (const char *name, const char *type) if (ifnet_has_network (name)) return TRUE; if (add_new_connection_config (type, name)) { - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Adding network for %s", name); + nm_log_info (LOGD_SETTINGS, "Adding network for %s", name); net_parser_data_changed = TRUE; return TRUE; } @@ -141,8 +142,7 @@ init_block_by_line (gchar * buf) key_value = g_strsplit (buf, "=", 2); if (g_strv_length (key_value) != 2) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Can't handle this line: %s\n", - buf); + nm_log_warn (LOGD_SETTINGS, "Can't handle this line: %s\n", buf); g_strfreev (key_value); return; } @@ -152,7 +152,7 @@ init_block_by_line (gchar * buf) data = g_strdup (key_value[1]); tmp = strip_string (data, '"'); strip_string (tmp, '\''); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "global:%s-%s\n", key_value[0], tmp); + nm_log_info (LOGD_SETTINGS, "global:%s-%s\n", key_value[0], tmp); g_hash_table_insert (global_settings_table, g_strdup (key_value[0]), g_strdup (tmp)); g_strfreev (key_value); g_free (data); @@ -264,8 +264,7 @@ is_function (gchar * line) for (i = 0; func_names[i]; i++) { if (g_str_has_prefix (line, func_names[i])) { - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "Ignoring function: %s", func_names[i]); + nm_log_info (LOGD_SETTINGS, "Ignoring function: %s", func_names[i]); return TRUE; } } @@ -309,8 +308,7 @@ ifnet_init (gchar * config_file) if (g_file_test (config_file, G_FILE_TEST_IS_REGULAR)) channel = g_io_channel_new_file (config_file, "r", NULL); if (channel == NULL) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Error: Can't open %s\n", config_file); + nm_log_warn (LOGD_SETTINGS, "Can't open %s", config_file); return FALSE; } @@ -439,7 +437,7 @@ ifnet_set_data (const char *conn_name, const char *key, const char *value) gchar * stripped = NULL; if (!conn) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, "%s does not exsit!", conn_name); + nm_log_warn (LOGD_SETTINGS, "%s does not exist!", conn_name); return; } if (value){ @@ -567,13 +565,12 @@ ifnet_flush_to_file (const char *config_file, gchar **out_backup) channel = g_io_channel_new_file (config_file, "w", NULL); if (!channel) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Can't open file %s for writing", config_file); + nm_log_warn (LOGD_SETTINGS, "Can't open file %s for writing", config_file); g_free (backup); return FALSE; } g_hash_table_iter_init (&iter, global_settings_table); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Writing to %s", config_file); + nm_log_info (LOGD_SETTINGS, "Writing to %s", config_file); g_io_channel_write_chars (channel, "#Generated by NetworkManager\n" "###### Global Configuration ######\n", @@ -589,8 +586,7 @@ ifnet_flush_to_file (const char *config_file, gchar **out_backup) g_free (out_line); } if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Found error: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto done; } @@ -636,8 +632,7 @@ ifnet_flush_to_file (const char *config_file, gchar **out_backup) } } if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Found error: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto done; } @@ -658,16 +653,14 @@ ifnet_flush_to_file (const char *config_file, gchar **out_backup) g_free (out_line); } if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Found error: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto done; } } g_io_channel_flush (channel, error); if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Found error: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto done; } result = TRUE; @@ -690,7 +683,7 @@ ifnet_delete_network (const char *conn_name) GHashTable *network = NULL; g_return_val_if_fail (conn_table != NULL && conn_name != NULL, FALSE); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Deleting network for %s", conn_name); + nm_log_info (LOGD_SETTINGS, "Deleting network for %s", conn_name); network = g_hash_table_lookup (conn_table, conn_name); if (!network) return FALSE; diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c index a397e25bbf..86ab8537da 100644 --- a/src/settings/plugins/ifnet/net_utils.c +++ b/src/settings/plugins/ifnet/net_utils.c @@ -25,6 +25,7 @@ #include <errno.h> #include <nm-utils.h> #include <nm-system-config-interface.h> +#include <nm-logging.h> #include <nm-config.h> #include <gio/gio.h> #include "net_utils.h" @@ -392,17 +393,14 @@ create_ip4_block (gchar * ip) } else { g_slice_free (ip_block, iblock); if (!is_ip6_address (ip) && !strstr (ip, "dhcp")) - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Can't handle ipv4 address: %s, missing netmask or prefix", - ip); + nm_log_warn (LOGD_SETTINGS, "Can't handle ipv4 address: %s, missing netmask or prefix", ip); return NULL; } g_strfreev (ip_mask); return iblock; error: if (!is_ip6_address (ip)) - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Can't handle IPv4 address: %s", - ip); + nm_log_warn (LOGD_SETTINGS, "Can't handle IPv4 address: %s", ip); g_strfreev (ip_mask); g_slice_free (ip_block, iblock); return NULL; @@ -436,8 +434,7 @@ create_ip6_block (gchar * ip) return iblock; error: if (!is_ip4_address (ip)) - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Can't handle IPv6 address: %s", - ip); + nm_log_warn (LOGD_SETTINGS, "Can't handle IPv6 address: %s", ip); g_slice_free (ip6_block, iblock); g_slice_free (struct in6_addr, tmp_ip6_addr); @@ -455,8 +452,7 @@ get_ip4_gateway (gchar * gateway) return 0; tmp = find_gateway_str (gateway); if (!tmp) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Couldn't obtain gateway in \"%s\"", gateway); + nm_log_warn (LOGD_SETTINGS, "Couldn't obtain gateway in \"%s\"", gateway); return 0; } tmp = g_strdup (tmp); @@ -473,8 +469,7 @@ get_ip4_gateway (gchar * gateway) return tmp_ip4_addr; error: if (!is_ip6_address (tmp)) - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Can't handle IPv4 gateway: %s", - tmp); + nm_log_warn (LOGD_SETTINGS, "Can't handle IPv4 gateway: %s", tmp); g_free (tmp); return 0; } @@ -489,8 +484,7 @@ get_ip6_next_hop (gchar * next_hop) return 0; tmp = find_gateway_str (next_hop); if (!tmp) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Couldn't obtain next_hop in \"%s\"", next_hop); + nm_log_warn (LOGD_SETTINGS, "Couldn't obtain next_hop in \"%s\"", next_hop); return 0; } tmp = g_strdup (tmp); @@ -503,8 +497,7 @@ get_ip6_next_hop (gchar * next_hop) return tmp_ip6_addr; error: if (!is_ip4_address (tmp)) - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Can't handle IPv6 next_hop: %s", tmp); + nm_log_warn (LOGD_SETTINGS, "Can't handle IPv6 next_hop: %s", tmp); g_free (tmp); g_slice_free (struct in6_addr, tmp_ip6_addr); @@ -709,16 +702,12 @@ set_ip4_dns_servers (NMSettingIP4Config *s_ip4, const char *conn_name) continue; if (!inet_pton (AF_INET, server_list[i], &tmp_ip4_addr)) { if (!is_ip6_address (server_list[i])) - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "ignored dns: %s\n", - server_list[i]); + nm_log_warn (LOGD_SETTINGS, "ignored dns: %s\n", server_list[i]); continue; } new_dns = tmp_ip4_addr; if (new_dns && !nm_setting_ip4_config_add_dns (s_ip4, new_dns)) - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "warning: duplicate DNS server %s", - server_list[i]); + nm_log_warn (LOGD_SETTINGS, "warning: duplicate DNS server %s", server_list[i]); } g_strfreev (server_list); } @@ -750,16 +739,12 @@ set_ip6_dns_servers (NMSettingIP6Config *s_ip6, const char *conn_name) continue; if (!inet_pton (AF_INET6, server_list[i], &tmp_ip6_addr)) { if (is_ip6_address (server_list[i])) - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "ignored dns: %s\n", - server_list[i]); + nm_log_warn (LOGD_SETTINGS, "ignored dns: %s\n", server_list[i]); continue; } if (!IN6_IS_ADDR_UNSPECIFIED (&tmp_ip6_addr) && !nm_setting_ip6_config_add_dns (s_ip6, &tmp_ip6_addr)) - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "warning: duplicate DNS server %s", - server_list[i]); + nm_log_warn (LOGD_SETTINGS, "warning: duplicate DNS server %s", server_list[i]); } g_strfreev (server_list); } @@ -820,16 +805,14 @@ get_dhcp_hostname_and_client_id (char **hostname, char **client_id) if (tmp[0] != '\0') *hostname = g_strdup (tmp); else - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "dhcpcd hostname not defined, ignoring"); + nm_log_info (LOGD_SETTINGS, "dhcpcd hostname not defined, ignoring"); } else if (g_str_has_prefix (line, "clientid")) { tmp = line + strlen ("clientid"); g_strstrip (tmp); if (tmp[0] != '\0') *client_id = g_strdup (tmp); else - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "dhcpcd clientid not defined, ignoring"); + nm_log_info (LOGD_SETTINGS, "dhcpcd clientid not defined, ignoring"); } // dhclient.conf else if ((tmp = strstr (line, "send host-name")) != NULL) { @@ -840,8 +823,7 @@ get_dhcp_hostname_and_client_id (char **hostname, char **client_id) if (tmp[0] != '\0') *hostname = g_strdup (tmp); else - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "dhclient hostname not defined, ignoring"); + nm_log_info (LOGD_SETTINGS, "dhclient hostname not defined, ignoring"); } else if ((tmp = strstr (line, "send dhcp-client-identifier")) != NULL) { tmp += strlen ("send dhcp-client-identifier"); @@ -850,8 +832,7 @@ get_dhcp_hostname_and_client_id (char **hostname, char **client_id) if (tmp[0] != '\0') *client_id = g_strdup (tmp); else - PLUGIN_PRINT (IFNET_PLUGIN_NAME, - "dhclient clientid not defined, ignoring"); + nm_log_info (LOGD_SETTINGS, "dhclient clientid not defined, ignoring"); } } g_strfreev (all_lines); @@ -870,7 +851,7 @@ gchar *backup_file (const gchar* target) g_file_copy (source, backup, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, error); if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Backup failed: %s", (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Backup failed: %s", (*error)->message); g_free (backup_path); backup_path = NULL; } diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c index 57aab6b55f..478d6e32e3 100644 --- a/src/settings/plugins/ifnet/nm-ifnet-connection.c +++ b/src/settings/plugins/ifnet/nm-ifnet-connection.c @@ -26,6 +26,7 @@ #include <nm-setting-wireless-security.h> #include <nm-settings-connection.h> #include <nm-system-config-interface.h> +#include <nm-logging.h> #include <nm-settings-error.h> #include "nm-ifnet-connection.h" #include "connection_parser.h" @@ -137,11 +138,11 @@ commit_changes (NMSettingsConnection *connection, priv->conn_name = new_name; NM_SETTINGS_CONNECTION_CLASS (nm_ifnet_connection_parent_class)->commit_changes (connection, callback, user_data); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Successfully updated %s", priv->conn_name); + nm_log_info (LOGD_SETTINGS, "Successfully updated %s", priv->conn_name); } else { - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Failed to update %s", - priv->conn_name ? priv->conn_name : - nm_connection_get_id (NM_CONNECTION (connection))); + nm_log_warn (LOGD_SETTINGS, "Failed to update %s", + priv->conn_name ? priv->conn_name : + nm_connection_get_id (NM_CONNECTION (connection))); reload_parsers (); callback (connection, error, user_data); g_error_free (error); @@ -163,7 +164,7 @@ do_delete (NMSettingsConnection *connection, /* Only connections which exist in /etc/conf.d/net will have a conn_name */ if (priv->conn_name) { if (!ifnet_delete_connection_in_parsers (priv->conn_name, CONF_NET_FILE, WPA_SUPPLICANT_CONF, NULL)) { - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Failed to delete %s", priv->conn_name); + nm_log_warn (LOGD_SETTINGS, "Failed to delete %s", priv->conn_name); reload_parsers (); callback (connection, error, user_data); g_error_free (error); @@ -176,9 +177,9 @@ do_delete (NMSettingsConnection *connection, g_signal_emit (connection, signals[IFNET_SETUP_MONITORS], 0); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Successfully deleted %s", - priv->conn_name ? priv->conn_name : - nm_connection_get_id (NM_CONNECTION (connection))); + nm_log_info (LOGD_SETTINGS, "Successfully deleted %s", + priv->conn_name ? priv->conn_name : + nm_connection_get_id (NM_CONNECTION (connection))); } static void diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c index 93ee9305b0..bc7b35c22c 100644 --- a/src/settings/plugins/ifnet/plugin.c +++ b/src/settings/plugins/ifnet/plugin.c @@ -31,6 +31,7 @@ #include "NetworkManager.h" #include "nm-system-config-interface.h" +#include "nm-logging.h" #include "nm-ifnet-connection.h" #include "nm-config.h" @@ -95,8 +96,7 @@ update_system_hostname (gpointer config) g_object_notify (G_OBJECT (config), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Hostname updated to: %s", - priv->hostname); + nm_log_info (LOGD_SETTINGS, "Hostname updated to: %s", priv->hostname); } static void @@ -106,16 +106,14 @@ write_system_hostname (NMSystemConfigInterface * config, SCPluginIfnetPrivate *priv = SC_PLUGIN_IFNET_GET_PRIVATE (config); g_return_if_fail (newhostname); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Write system hostname: %s", - newhostname); + nm_log_info (LOGD_SETTINGS, "Write system hostname: %s", newhostname); if (write_hostname (IFNET_SYSTEM_HOSTNAME_FILE, newhostname)) { g_free (priv->hostname); priv->hostname = g_strdup (newhostname); g_object_notify (G_OBJECT (config), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME); } else - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Write system hostname: %s failed", newhostname); + nm_log_warn (LOGD_SETTINGS, "Write system hostname: %s failed", newhostname); } static gboolean @@ -175,10 +173,10 @@ monitor_file_changes (const char *filename, info); g_signal_connect (monitor, "changed", G_CALLBACK (file_changed), info); - } else - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Monitoring %s failed, error: %s", filename, - error == NULL ? "nothing" : (*error)->message); + } else { + nm_log_warn (LOGD_SETTINGS, "Monitoring %s failed, error: %s", filename, + error == NULL ? "nothing" : (*error)->message); + } return monitor; } @@ -262,7 +260,7 @@ reload_connections (NMSystemConfigInterface *config) if (!reload_parsers ()) return; - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Loading connections"); + nm_log_info (LOGD_SETTINGS, "Loading connections"); str_auto_refresh = nm_config_get_value (nm_config_get (), IFNET_KEY_FILE_GROUP, "auto_refresh", @@ -301,7 +299,7 @@ reload_connections (NMSystemConfigInterface *config) NM_CONNECTION (new), NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS | NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)) { - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Auto refreshing %s", conn_name); + nm_log_info (LOGD_SETTINGS, "Auto refreshing %s", conn_name); nm_settings_connection_signal_remove (NM_SETTINGS_CONNECTION (old)); track_new_connection (self, new); @@ -317,8 +315,8 @@ reload_connections (NMSystemConfigInterface *config) /* Shouldn't ever get here as 'new' was verified by the reader already */ g_assert_no_error (error); } - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Connection %s updated", - nm_connection_get_id (NM_CONNECTION (new))); + nm_log_info (LOGD_SETTINGS, "Connection %s updated", + nm_connection_get_id (NM_CONNECTION (new))); } g_signal_emit_by_name (self, NM_SYSTEM_CONFIG_INTERFACE_UNMANAGED_SPECS_CHANGED); } else if (new) { @@ -396,7 +394,7 @@ check_unmanaged (gpointer key, gpointer data, gpointer user_data) if (is_managed (conn_name)) return; - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Checking unmanaged: %s", conn_name); + nm_log_info (LOGD_SETTINGS, "Checking unmanaged: %s", conn_name); mac = ifnet_get_data (conn_name, "mac"); if (mac) unmanaged_spec = g_strdup_printf ("mac:%s", mac); @@ -411,7 +409,7 @@ check_unmanaged (gpointer key, gpointer data, gpointer user_data) } } - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Add unmanaged: %s", unmanaged_spec); + nm_log_info (LOGD_SETTINGS, "Add unmanaged: %s", unmanaged_spec); *list = g_slist_prepend (*list, unmanaged_spec); } @@ -421,7 +419,7 @@ get_unmanaged_specs (NMSystemConfigInterface * config) SCPluginIfnetPrivate *priv = SC_PLUGIN_IFNET_GET_PRIVATE (config); GSList *list = NULL; - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "getting unmanaged specs..."); + nm_log_info (LOGD_SETTINGS, "getting unmanaged specs..."); g_hash_table_foreach (priv->connections, check_unmanaged, &list); return list; } @@ -432,18 +430,18 @@ init (NMSystemConfigInterface *config) SCPluginIfnet *self = SC_PLUGIN_IFNET (config); SCPluginIfnetPrivate *priv = SC_PLUGIN_IFNET_GET_PRIVATE (self); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Initializing!"); + nm_log_info (LOGD_SETTINGS, "Initializing!"); priv->connections = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref); priv->unmanaged_well_known = !is_managed_plugin (); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "management mode: %s", - priv->unmanaged_well_known ? "unmanaged" : "managed"); + nm_log_info (LOGD_SETTINGS, "management mode: %s", + priv->unmanaged_well_known ? "unmanaged" : "managed"); setup_monitors (NULL, config); reload_connections (config); update_system_hostname (self); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Initialzation complete!"); + nm_log_info (LOGD_SETTINGS, "Initialzation complete!"); } static GSList * @@ -454,7 +452,7 @@ get_connections (NMSystemConfigInterface *config) GHashTableIter iter; NMIfnetConnection *connection; - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "(%p) ... get_connections.", config); + nm_log_info (LOGD_SETTINGS, "(%p) ... get_connections.", config); g_hash_table_iter_init (&iter, priv->connections); while (g_hash_table_iter_next (&iter, NULL, (gpointer) &connection)) { @@ -463,8 +461,8 @@ get_connections (NMSystemConfigInterface *config) if (!conn_name || (!priv->unmanaged_well_known && is_managed (conn_name))) connections = g_slist_prepend (connections, connection); } - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "(%p) connections count: %d", - config, g_slist_length (connections)); + nm_log_info (LOGD_SETTINGS, "(%p) connections count: %d", + config, g_slist_length (connections)); return connections; } diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am index 01e57bc246..f66a6a3dd7 100644 --- a/src/settings/plugins/ifnet/tests/Makefile.am +++ b/src/settings/plugins/ifnet/tests/Makefile.am @@ -11,8 +11,10 @@ AM_CPPFLAGS= \ -I$(top_builddir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/config \ + -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/platform \ + -DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(CHECK_CFLAGS) \ $(GLIB_CFLAGS) \ diff --git a/src/settings/plugins/ifnet/tests/test_all.c b/src/settings/plugins/ifnet/tests/test_all.c index 4801acdda0..dcf163e8fc 100644 --- a/src/settings/plugins/ifnet/tests/test_all.c +++ b/src/settings/plugins/ifnet/tests/test_all.c @@ -28,8 +28,11 @@ #include <unistd.h> #include <nm-utils.h> -#include "net_parser.h" #include "nm-test-helpers.h" +#include "nm-linux-platform.h" +#include "nm-logging.h" + +#include "net_parser.h" #include "net_utils.h" #include "wpa_parser.h" #include "connection_parser.h" @@ -195,12 +198,19 @@ test_convert_ipv4_config_block () check_ip_block (iblock, "192.168.4.121", "255.255.255.0", "202.117.16.1"); destroy_ip_block (iblock); + + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*Can't handle IPv4 address*202.117.16.1211*"); iblock = convert_ip4_config_block ("eth2"); + g_test_assert_expected_messages (); ASSERT (iblock != NULL && iblock->next == NULL, "convert error IPv4 address", "should only get one address"); check_ip_block (iblock, "192.168.4.121", "255.255.255.0", "0.0.0.0"); destroy_ip_block (iblock); + + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*missing netmask or prefix*"); iblock = convert_ip4_config_block ("eth3"); ASSERT (iblock == NULL, "convert config_block", "convert error configuration"); @@ -281,7 +291,12 @@ test_new_connection () GError *error = NULL; NMConnection *connection; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*Can't handle IPv4 address*202.117.16.1211*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*Can't handle IPv6 address*202.117.16.1211*"); connection = ifnet_update_connection_from_config_block ("eth2", NULL, &error); + g_test_assert_expected_messages (); ASSERT (connection != NULL, "new connection", "new connection failed: %s", error ? error->message : "None"); @@ -378,7 +393,12 @@ test_add_connection (const char *basepath) kill_backup (&backup); g_object_unref (connection); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*Can't handle ipv4 address: brd, missing netmask or prefix*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*Can't handle ipv4 address: 202.117.16.255, missing netmask or prefix*"); connection = ifnet_update_connection_from_config_block ("myxjtu2", basepath, NULL); + g_test_assert_expected_messages (); ASSERT (ifnet_add_new_connection (connection, NET_GEN_NAME, SUP_GEN_NAME, NULL, &backup, NULL), "add connection", "add connection failed: %s", "myxjtu2"); kill_backup (&backup); @@ -423,7 +443,10 @@ test_missing_config () GError *error = NULL; NMConnection *connection; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*Unknown config for eth8*"); connection = ifnet_update_connection_from_config_block ("eth8", NULL, &error); + g_test_assert_expected_messages (); ASSERT (connection == NULL && error != NULL, "get connection", "get connection should fail with 'Unknown config for eth8'"); } @@ -434,6 +457,8 @@ main (int argc, char **argv) char *f; g_type_init (); + nm_linux_platform_setup (); + nm_logging_setup ("WARN", "DEFAULT", NULL, NULL); nm_fake_platform_setup (); diff --git a/src/settings/plugins/ifnet/wpa_parser.c b/src/settings/plugins/ifnet/wpa_parser.c index e517bf1252..748eb351d0 100644 --- a/src/settings/plugins/ifnet/wpa_parser.c +++ b/src/settings/plugins/ifnet/wpa_parser.c @@ -22,6 +22,7 @@ #include <string.h> #include <stdlib.h> #include <nm-system-config-interface.h> +#include <nm-logging.h> #include "wpa_parser.h" #include "net_parser.h" #include "net_utils.h" @@ -236,8 +237,7 @@ add_global_data (gchar * line) g_strstrip (line); key_value = g_strsplit (line, "=", 2); if (g_strv_length (key_value) != 2) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Can't handle this line: %s\n", - line); + nm_log_warn (LOGD_SETTINGS, "Can't handle this line: %s\n", line); g_strfreev (key_value); return; } @@ -262,9 +262,8 @@ wpa_parser_init (const char *wpa_supplicant_conf) channel = g_io_channel_new_file (wpa_supplicant_conf, "r", NULL); if (channel == NULL) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Can't open %s for wireless security", - wpa_supplicant_conf); + nm_log_warn (LOGD_SETTINGS, "Can't open %s for wireless security", + wpa_supplicant_conf); return; } @@ -380,12 +379,11 @@ wpa_flush_to_file (const char *config_file) channel = g_io_channel_new_file (config_file, "w", NULL); if (!channel) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Can't open file %s for writing", config_file); + nm_log_warn (LOGD_SETTINGS, "Can't open file %s for writing", config_file); return FALSE; } g_hash_table_iter_init (&iter, wsec_global_table); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Writing to %s", config_file); + nm_log_info (LOGD_SETTINGS, "Writing to %s", config_file); g_io_channel_write_chars (channel, "#Generated by NetworkManager\n" "###### Global Configuration ######\n", @@ -402,8 +400,7 @@ wpa_flush_to_file (const char *config_file) g_free (out_line); } if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Found error: %s", - (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto done; } g_io_channel_write_chars (channel, @@ -433,15 +430,13 @@ wpa_flush_to_file (const char *config_file) } if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Found error: %s", - (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto done; } g_io_channel_flush (channel, error); if (error && *error) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, "Found error: %s", - (*error)->message); + nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message); goto done; } wpa_parser_data_changed = FALSE; @@ -504,8 +499,7 @@ wpa_add_security (const char *ssid) g_hash_table_new (g_str_hash, g_str_equal); gchar *ssid_i; - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Adding security for %s", - ssid); + nm_log_info (LOGD_SETTINGS, "Adding security for %s", ssid); if (g_str_has_prefix (ssid, "0x")) { /* hex ssid */ ssid_i = g_strdup (ssid + 2); @@ -528,7 +522,7 @@ wpa_delete_security (const char *ssid) gpointer old_key, old_value; g_return_val_if_fail (wsec_table != NULL && ssid != NULL, FALSE); - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Deleting security for %s", ssid); + nm_log_info (LOGD_SETTINGS, "Deleting security for %s", ssid); if (!g_hash_table_lookup_extended (wsec_table, ssid, &old_key, &old_value)) return FALSE; diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am index baaebf63ff..fd98f8fe5c 100644 --- a/src/settings/plugins/ifupdown/Makefile.am +++ b/src/settings/plugins/ifupdown/Makefile.am @@ -12,6 +12,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ + -DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/src/settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/interface_parser.c index 2c1c070757..ee233c93a3 100644 --- a/src/settings/plugins/ifupdown/interface_parser.c +++ b/src/settings/plugins/ifupdown/interface_parser.c @@ -28,6 +28,7 @@ #include <wordexp.h> #include <libgen.h> #include "nm-utils.h" +#include "nm-logging.h" if_block* first; if_block* last; @@ -112,17 +113,17 @@ _recursive_ifparser (const char *eni_file, int quiet) // Check if interfaces file exists and open it if (!g_file_test (eni_file, G_FILE_TEST_EXISTS)) { if (!quiet) - g_warning ("Warning: interfaces file %s doesn't exist\n", eni_file); + nm_log_warn (LOGD_SETTINGS, "interfaces file %s doesn't exist\n", eni_file); return; } inp = fopen (eni_file, "r"); if (inp == NULL) { if (!quiet) - g_warning ("Error: Can't open %s\n", eni_file); + nm_log_warn (LOGD_SETTINGS, "Can't open %s\n", eni_file); return; } if (!quiet) - g_message (" interface-parser: parsing file %s\n", eni_file); + nm_log_info (LOGD_SETTINGS, " interface-parser: parsing file %s\n", eni_file); while (!feof(inp)) @@ -142,7 +143,7 @@ _recursive_ifparser (const char *eni_file, int quiet) if (!feof(inp) && len > 0 && line[len-1] != '\n') { if (!skip_long_line) { if (!quiet) - g_message ("Error: Skipping over-long-line '%s...'\n", line); + nm_log_warn (LOGD_SETTINGS, "Skipping over-long-line '%s...'\n", line); } skip_long_line = 1; continue; @@ -182,8 +183,8 @@ _recursive_ifparser (const char *eni_file, int quiet) if (toknum < 2) { if (!quiet) { - g_message ("Error: Can't parse interface line '%s'\n", - join_values_with_spaces(value, token)); + nm_log_warn (LOGD_SETTINGS, "Can't parse interface line '%s'\n", + join_values_with_spaces(value, token)); } skip_to_block = 1; continue; @@ -197,8 +198,8 @@ _recursive_ifparser (const char *eni_file, int quiet) if (strcmp(token[0], "iface") == 0) { if (toknum < 4) { if (!quiet) { - g_message ("Error: Can't parse iface line '%s'\n", - join_values_with_spaces(value, token)); + nm_log_warn (LOGD_SETTINGS, "Can't parse iface line '%s'\n", + join_values_with_spaces(value, token)); } continue; } @@ -235,7 +236,7 @@ _recursive_ifparser (const char *eni_file, int quiet) if (toknum == 1) { if (!quiet) - g_warning ("Error: Invalid source line without parameters\n"); + nm_log_warn (LOGD_SETTINGS, "Invalid source line without parameters\n"); continue; } @@ -247,8 +248,8 @@ _recursive_ifparser (const char *eni_file, int quiet) else { if (skip_to_block) { if (!quiet) { - g_message ("Error: ignoring out-of-block data '%s'\n", - join_values_with_spaces(value, token)); + nm_log_warn (LOGD_SETTINGS, "ignoring out-of-block data '%s'\n", + join_values_with_spaces(value, token)); } } else add_data(token[0], join_values_with_spaces(value, token + 1)); @@ -257,7 +258,7 @@ _recursive_ifparser (const char *eni_file, int quiet) fclose(inp); if (!quiet) - g_message (" interface-parser: finished parsing file %s\n", eni_file); + nm_log_info (LOGD_SETTINGS, " interface-parser: finished parsing file %s\n", eni_file); } static void @@ -273,12 +274,12 @@ _ifparser_source (const char *path, const char *en_dir, int quiet) abs_path = g_build_filename (en_dir, path, NULL); if (!quiet) - g_message (" interface-parser: source line includes interfaces file(s) %s\n", abs_path); + nm_log_info (LOGD_SETTINGS, " interface-parser: source line includes interfaces file(s) %s\n", abs_path); /* ifupdown uses WRDE_NOCMD for wordexp. */ if (wordexp (abs_path, &we, WRDE_NOCMD)) { if (!quiet) - g_warning ("Error: word expansion for %s failed\n", abs_path); + nm_log_warn (LOGD_SETTINGS, "word expansion for %s failed\n", abs_path); } else { for (i = 0; i < we.we_wordc; i++) _recursive_ifparser (we.we_wordv[i], quiet); diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c index 0cc73b34f6..4e13a2b839 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c @@ -29,6 +29,7 @@ #include <nm-settings-connection.h> #include <nm-system-config-interface.h> #include <nm-settings-error.h> +#include <nm-logging.h> #include "nm-ifupdown-connection.h" #include "parser.h" @@ -60,7 +61,7 @@ nm_ifupdown_connection_new (if_block *block) static gboolean supports_secrets (NMSettingsConnection *connection, const char *setting_name) { - PLUGIN_PRINT ("SCPlugin-Ifupdown", "supports_secrets() for setting_name: '%s'", setting_name); + nm_log_info (LOGD_SETTINGS, "supports_secrets() for setting_name: '%s'", setting_name); return (strcmp (setting_name, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME) == 0); } @@ -84,20 +85,20 @@ constructor (GType type, priv = NM_IFUPDOWN_CONNECTION_GET_PRIVATE (object); if (!priv) { - g_warning ("%s.%d - no private instance.", __FILE__, __LINE__); + nm_log_warn (LOGD_SETTINGS, "%s.%d - no private instance.", __FILE__, __LINE__); goto err; } if (!priv->ifblock) { - g_warning ("(ifupdown) ifblock not provided to constructor."); + nm_log_warn (LOGD_SETTINGS, "(ifupdown) ifblock not provided to constructor."); goto err; } if (!ifupdown_update_connection_from_if_block (NM_CONNECTION (object), priv->ifblock, &error)) { - g_warning ("%s.%d - invalid connection read from /etc/network/interfaces: (%d) %s", - __FILE__, - __LINE__, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + nm_log_warn (LOGD_SETTINGS, "%s.%d - invalid connection read from /etc/network/interfaces: (%d) %s", + __FILE__, + __LINE__, + error ? error->code : -1, + error && error->message ? error->message : "(unknown)"); goto err; } diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c index 9348523f87..2b273bc3a2 100644 --- a/src/settings/plugins/ifupdown/parser.c +++ b/src/settings/plugins/ifupdown/parser.c @@ -36,6 +36,7 @@ #include <nm-setting-8021x.h> #include <nm-system-config-interface.h> #include <nm-utils.h> +#include <nm-logging.h> #include <ctype.h> #include "parser.h" @@ -67,9 +68,7 @@ _ifupdownplugin_guess_connection_type (if_block *block) if(!ret_type) ret_type = NM_SETTING_WIRED_SETTING_NAME; - PLUGIN_PRINT("SCPluginIfupdown", - "guessed connection type (%s) = %s", - block->name, ret_type); + nm_log_info (LOGD_SETTINGS, "guessed connection type (%s) = %s", block->name, ret_type); return ret_type; } @@ -111,15 +110,14 @@ update_wireless_setting_from_if_block(NMConnection *connection, return; } - PLUGIN_PRINT ("SCPlugin-Ifupdown", "update wireless settings (%s).", block->name); + nm_log_info (LOGD_SETTINGS, "update wireless settings (%s).", block->name); wireless_setting = NM_SETTING_WIRELESS(nm_setting_wireless_new()); while(curr) { if(strlen(curr->key) > wireless_l && !strncmp("wireless-", curr->key, wireless_l)) { const gchar* newkey = map_by_mapping(mapping, curr->key+wireless_l); - PLUGIN_PRINT ("SCPlugin-Ifupdown", "wireless setting key: %s='%s'", - newkey, curr->data); + nm_log_info (LOGD_SETTINGS, "wireless setting key: %s='%s'", newkey, curr->data); if(newkey && !strcmp("ssid", newkey)) { GByteArray *ssid; gint len = strlen(curr->data); @@ -128,7 +126,7 @@ update_wireless_setting_from_if_block(NMConnection *connection, g_byte_array_append (ssid, (const guint8 *) curr->data, len); g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL); g_byte_array_free (ssid, TRUE); - PLUGIN_PRINT("SCPlugin-Ifupdown", "setting wireless ssid = %d", len); + nm_log_info (LOGD_SETTINGS, "setting wireless ssid = %d", len); } else { g_object_set(wireless_setting, newkey, curr->data, @@ -146,13 +144,13 @@ update_wireless_setting_from_if_block(NMConnection *connection, g_byte_array_append (ssid, (const guint8 *) curr->data, len); g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL); g_byte_array_free (ssid, TRUE); - PLUGIN_PRINT("SCPlugin-Ifupdown", "setting wpa ssid = %d", len); + nm_log_info (LOGD_SETTINGS, "setting wpa ssid = %d", len); } else if(newkey) { g_object_set(wireless_setting, newkey, curr->data, NULL); - PLUGIN_PRINT ("SCPlugin-Ifupdown", "setting wpa newkey(%s)=data(%s)", newkey, curr->data); + nm_log_info (LOGD_SETTINGS, "setting wpa newkey(%s)=data(%s)", newkey, curr->data); } } curr = curr->next; @@ -313,7 +311,7 @@ update_wireless_security_setting_from_if_block(NMConnection *connection, s_wireless = nm_connection_get_setting_wireless(connection); g_return_if_fail(s_wireless); - PLUGIN_PRINT ("SCPlugin-Ifupdown","update wireless security settings (%s).", block->name); + nm_log_info (LOGD_SETTINGS, "update wireless security settings (%s).", block->name); wireless_security_setting = NM_SETTING_WIRELESS_SECURITY(nm_setting_wireless_security_new()); @@ -328,12 +326,13 @@ update_wireless_security_setting_from_if_block(NMConnection *connection, IfupdownStrToTypeFunc type_map_func = map_by_mapping (type_mapping, curr->key+wireless_l); GFreeFunc free_func = map_by_mapping (free_type_mapping, curr->key+wireless_l); if(!newkey || !dupe_func) { - g_warning("no (wireless) mapping found for key: %s", curr->key); + nm_log_warn (LOGD_SETTINGS, "no (wireless) mapping found for key: %s", + curr->key); goto next; } property_value = (*dupe_func) (curr->data, connection); - PLUGIN_PRINT ("SCPlugin-Ifupdown", "setting wireless security key: %s=%s", - newkey, property_value); + nm_log_info (LOGD_SETTINGS, "setting wireless security key: %s=%s", + newkey, property_value); if (type_map_func) { errno = 0; @@ -365,23 +364,23 @@ update_wireless_security_setting_from_if_block(NMConnection *connection, goto next; } property_value = (*dupe_func) (curr->data, connection); - PLUGIN_PRINT ("SCPlugin-Ifupdown", "setting wpa security key: %s=%s", - newkey, + nm_log_info (LOGD_SETTINGS, "setting wpa security key: %s=%s", + newkey, #ifdef DEBUG_SECRETS - property_value + property_value #else // DEBUG_SECRETS - !strcmp("key", newkey) || - !strcmp("leap-password", newkey) || - !strcmp("pin", newkey) || - !strcmp("psk", newkey) || - !strcmp("wep-key0", newkey) || - !strcmp("wep-key1", newkey) || - !strcmp("wep-key2", newkey) || - !strcmp("wep-key3", newkey) || - NULL ? - "<omitted>" : property_value + !strcmp("key", newkey) || + !strcmp("leap-password", newkey) || + !strcmp("pin", newkey) || + !strcmp("psk", newkey) || + !strcmp("wep-key0", newkey) || + !strcmp("wep-key1", newkey) || + !strcmp("wep-key2", newkey) || + !strcmp("wep-key3", newkey) || + NULL ? + "<omitted>" : property_value #endif // DEBUG_SECRETS - ); + ); if (type_map_func) { errno = 0; @@ -444,15 +443,12 @@ ifupdown_ip4_add_dns (NMSettingIP4Config *s_ip4, const char *dns) if (g_ascii_isspace (*iter[0])) continue; if (!inet_pton (AF_INET, *iter, &addr)) { - PLUGIN_WARN ("SCPlugin-Ifupdown", - " warning: ignoring invalid nameserver '%s'", *iter); + nm_log_warn (LOGD_SETTINGS, " ignoring invalid nameserver '%s'", *iter); continue; } - if (!nm_setting_ip4_config_add_dns (s_ip4, addr)) { - PLUGIN_WARN ("SCPlugin-Ifupdown", - " warning: duplicate DNS domain '%s'", *iter); - } + if (!nm_setting_ip4_config_add_dns (s_ip4, addr)) + nm_log_warn (LOGD_SETTINGS, " duplicate DNS domain '%s'", *iter); } g_strfreev (list); } @@ -526,10 +522,10 @@ update_ip4_setting_from_if_block(NMConnection *connection, nm_ip4_address_set_gateway (addr, tmp_gw); if (nm_setting_ip4_config_add_address (s_ip4, addr)) { - PLUGIN_PRINT("SCPlugin-Ifupdown", "addresses count: %d", + nm_log_info (LOGD_SETTINGS, "addresses count: %d", nm_setting_ip4_config_get_num_addresses (s_ip4)); } else { - PLUGIN_PRINT("SCPlugin-Ifupdown", "ignoring duplicate IP4 address"); + nm_log_info (LOGD_SETTINGS, "ignoring duplicate IP4 address"); } nameserver_v = ifparser_getkey (block, "dns-nameserver"); @@ -539,7 +535,7 @@ update_ip4_setting_from_if_block(NMConnection *connection, ifupdown_ip4_add_dns (s_ip4, nameservers_v); if (!nm_setting_ip4_config_get_num_dns (s_ip4)) - PLUGIN_PRINT("SCPlugin-Ifupdown", "No dns-nameserver configured in /etc/network/interfaces"); + nm_log_info (LOGD_SETTINGS, "No dns-nameserver configured in /etc/network/interfaces"); /* DNS searches */ search_v = ifparser_getkey (block, "dns-search"); @@ -549,10 +545,8 @@ update_ip4_setting_from_if_block(NMConnection *connection, g_strstrip (*iter); if (g_ascii_isspace (*iter[0])) continue; - if (!nm_setting_ip4_config_add_dns_search (s_ip4, *iter)) { - PLUGIN_WARN ("SCPlugin-Ifupdown", - " warning: duplicate DNS domain '%s'", *iter); - } + if (!nm_setting_ip4_config_add_dns_search (s_ip4, *iter)) + nm_log_warn (LOGD_SETTINGS, " duplicate DNS domain '%s'", *iter); } g_strfreev (list); } @@ -583,15 +577,12 @@ ifupdown_ip6_add_dns (NMSettingIP6Config *s_ip6, const char *dns) if (g_ascii_isspace (*iter[0])) continue; if (!inet_pton (AF_INET6, *iter, &addr)) { - PLUGIN_WARN ("SCPlugin-Ifupdown", - " warning: ignoring invalid nameserver '%s'", *iter); + nm_log_warn (LOGD_SETTINGS, " ignoring invalid nameserver '%s'", *iter); continue; } - if (!nm_setting_ip6_config_add_dns (s_ip6, &addr)) { - PLUGIN_WARN ("SCPlugin-Ifupdown", - " warning: duplicate DNS domain '%s'", *iter); - } + if (!nm_setting_ip6_config_add_dns (s_ip6, &addr)) + nm_log_warn (LOGD_SETTINGS, " duplicate DNS domain '%s'", *iter); } g_strfreev (list); } @@ -651,10 +642,10 @@ update_ip6_setting_from_if_block(NMConnection *connection, nm_ip6_address_set_gateway (addr, &tmp_gw); if (nm_setting_ip6_config_add_address (s_ip6, addr)) { - PLUGIN_PRINT("SCPlugin-Ifupdown", "addresses count: %d", - nm_setting_ip6_config_get_num_addresses (s_ip6)); + nm_log_info (LOGD_SETTINGS, "addresses count: %d", + nm_setting_ip6_config_get_num_addresses (s_ip6)); } else { - PLUGIN_PRINT("SCPlugin-Ifupdown", "ignoring duplicate IP6 address"); + nm_log_info (LOGD_SETTINGS, "ignoring duplicate IP6 address"); } nameserver_v = ifparser_getkey(block, "dns-nameserver"); @@ -664,7 +655,7 @@ update_ip6_setting_from_if_block(NMConnection *connection, ifupdown_ip6_add_dns (s_ip6, nameservers_v); if (!nm_setting_ip6_config_get_num_dns (s_ip6)) - PLUGIN_PRINT("SCPlugin-Ifupdown", "No dns-nameserver configured in /etc/network/interfaces"); + nm_log_info (LOGD_SETTINGS, "No dns-nameserver configured in /etc/network/interfaces"); /* DNS searches */ search_v = ifparser_getkey (block, "dns-search"); @@ -674,10 +665,8 @@ update_ip6_setting_from_if_block(NMConnection *connection, g_strstrip (*iter); if (isblank (*iter[0])) continue; - if (!nm_setting_ip6_config_add_dns_search (s_ip6, *iter)) { - PLUGIN_WARN ("SCPlugin-Ifupdown", - " warning: duplicate DNS domain '%s'", *iter); - } + if (!nm_setting_ip6_config_add_dns_search (s_ip6, *iter)) + nm_log_warn (LOGD_SETTINGS, " duplicate DNS domain '%s'", *iter); } g_strfreev (list); } @@ -729,8 +718,8 @@ ifupdown_update_connection_from_if_block (NMConnection *connection, NULL); g_free (uuid); - PLUGIN_PRINT("SCPlugin-Ifupdown", "update_connection_setting_from_if_block: name:%s, type:%s, id:%s, uuid: %s", - block->name, type, idstr, nm_setting_connection_get_uuid (s_con)); + nm_log_info (LOGD_SETTINGS, "update_connection_setting_from_if_block: name:%s, type:%s, id:%s, uuid: %s", + block->name, type, idstr, nm_setting_connection_get_uuid (s_con)); if (!strcmp (NM_SETTING_WIRED_SETTING_NAME, type)) update_wired_setting_from_if_block (connection, block); diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c index 5b3ba6e06e..dcae211c45 100644 --- a/src/settings/plugins/ifupdown/plugin.c +++ b/src/settings/plugins/ifupdown/plugin.c @@ -193,19 +193,19 @@ bind_device_to_connection (SCPluginIfupdown *self, iface = g_udev_device_get_name (device); if (!iface) { - PLUGIN_WARN ("SCPluginIfupdown", "failed to get ifname for device."); + nm_log_warn (LOGD_SETTINGS, "failed to get ifname for device."); return; } address = g_udev_device_get_sysfs_attr (device, "address"); if (!address || !strlen (address)) { - PLUGIN_WARN ("SCPluginIfupdown", "failed to get MAC address for %s", iface); + nm_log_warn (LOGD_SETTINGS, "failed to get MAC address for %s", iface); return; } mac_address = nm_utils_hwaddr_atoba (address, ARPHRD_ETHER); if (!mac_address) { - PLUGIN_WARN ("SCPluginIfupdown", "failed to parse MAC address '%s' for %s", + nm_log_warn (LOGD_SETTINGS, "failed to parse MAC address '%s' for %s", address, iface); return; } @@ -213,10 +213,10 @@ bind_device_to_connection (SCPluginIfupdown *self, s_wired = nm_connection_get_setting_wired (NM_CONNECTION (exported)); s_wifi = nm_connection_get_setting_wireless (NM_CONNECTION (exported)); if (s_wired) { - PLUGIN_PRINT ("SCPluginIfupdown", "locking wired connection setting"); + nm_log_info (LOGD_SETTINGS, "locking wired connection setting"); g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS, mac_address, NULL); } else if (s_wifi) { - PLUGIN_PRINT ("SCPluginIfupdown", "locking wireless connection setting"); + nm_log_info (LOGD_SETTINGS, "locking wireless connection setting"); g_object_set (s_wifi, NM_SETTING_WIRELESS_MAC_ADDRESS, mac_address, NULL); } g_byte_array_free (mac_address, TRUE); @@ -236,16 +236,15 @@ udev_device_added (SCPluginIfupdown *self, GUdevDevice *device) if (!iface || !path) return; - PLUGIN_PRINT("SCPlugin-Ifupdown", - "devices added (path: %s, iface: %s)", path, iface); + nm_log_info (LOGD_SETTINGS, "devices added (path: %s, iface: %s)", path, iface); /* if we have a configured connection for this particular iface * we want to either unmanage the device or lock it */ exported = g_hash_table_lookup (priv->connections, iface); if (!exported && !g_hash_table_lookup (priv->eni_ifaces, iface)) { - PLUGIN_PRINT("SCPlugin-Ifupdown", - "device added (path: %s, iface: %s): no ifupdown configuration found.", path, iface); + nm_log_info (LOGD_SETTINGS, "device added (path: %s, iface: %s): no ifupdown configuration found.", + path, iface); return; } @@ -269,8 +268,7 @@ udev_device_removed (SCPluginIfupdown *self, GUdevDevice *device) if (!iface || !path) return; - PLUGIN_PRINT("SCPlugin-Ifupdown", - "devices removed (path: %s, iface: %s)", path, iface); + nm_log_info (LOGD_SETTINGS, "devices removed (path: %s, iface: %s)", path, iface); if (!g_hash_table_remove (priv->kernel_ifaces, iface)) return; @@ -290,7 +288,7 @@ udev_device_changed (SCPluginIfupdown *self, GUdevDevice *device) if (!iface || !path) return; - PLUGIN_PRINT("SCPlugin-Ifupdown", "device changed (path: %s, iface: %s)", path, iface); + nm_log_info (LOGD_SETTINGS, "device changed (path: %s, iface: %s)", path, iface); if (!g_hash_table_lookup (priv->kernel_ifaces, iface)) return; @@ -350,11 +348,11 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config) if(!priv->eni_ifaces) priv->eni_ifaces = g_hash_table_new (g_str_hash, g_str_equal); - PLUGIN_PRINT("SCPlugin-Ifupdown", "init!"); + nm_log_info (LOGD_SETTINGS, "init!"); priv->client = g_udev_client_new (subsys); if (!priv->client) { - PLUGIN_WARN ("SCPlugin-Ifupdown", " error initializing libgudev"); + nm_log_warn (LOGD_SETTINGS, " error initializing libgudev"); } else g_signal_connect (priv->client, "uevent", G_CALLBACK (handle_uevent), self); @@ -389,7 +387,7 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config) int state = 0; char **port_ifaces; - PLUGIN_PRINT("SCPlugin-Ifupdown", "found bridge ports %s for %s", ports, block->name); + nm_log_info (LOGD_SETTINGS, "found bridge ports %s for %s", ports, block->name); port_ifaces = g_strsplit_set (ports, " \t", -1); for (i = 0; i < g_strv_length (port_ifaces); i++) { @@ -408,7 +406,7 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config) continue; } if (state == 0 && strlen (token) > 0) { - PLUGIN_PRINT("SCPlugin-Ifupdown", "adding bridge port %s to eni_ifaces", token); + nm_log_info (LOGD_SETTINGS, "adding bridge port %s to eni_ifaces", token); g_hash_table_insert (priv->eni_ifaces, g_strdup (token), "known"); } } @@ -425,7 +423,7 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config) /* Remove any connection for this block that was previously found */ exported = g_hash_table_lookup (priv->connections, block->name); if (exported) { - PLUGIN_PRINT("SCPlugin-Ifupdown", "deleting %s from connections", block->name); + nm_log_info (LOGD_SETTINGS, "deleting %s from connections", block->name); nm_settings_connection_delete (NM_SETTINGS_CONNECTION (exported), NULL, NULL); g_hash_table_remove (priv->connections, block->name); } @@ -433,14 +431,14 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config) /* add the new connection */ exported = nm_ifupdown_connection_new (block); if (exported) { - PLUGIN_PRINT("SCPlugin-Ifupdown", "adding %s to connections", block->name); + nm_log_info (LOGD_SETTINGS, "adding %s to connections", block->name); g_hash_table_insert (priv->connections, block->name, exported); } - PLUGIN_PRINT("SCPlugin-Ifupdown", "adding iface %s to eni_ifaces", block->name); + nm_log_info (LOGD_SETTINGS, "adding iface %s to eni_ifaces", block->name); g_hash_table_insert (priv->eni_ifaces, block->name, "known"); } else if (!strcmp ("mapping", block->type)) { g_hash_table_insert (priv->eni_ifaces, block->name, "known"); - PLUGIN_PRINT("SCPlugin-Ifupdown", "adding mapping %s to eni_ifaces", block->name); + nm_log_info (LOGD_SETTINGS, "adding mapping %s to eni_ifaces", block->name); } next: block = block->next; @@ -454,7 +452,7 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config) if (g_hash_table_lookup (auto_ifaces, block_name)) { setting = nm_connection_get_setting_connection (NM_CONNECTION (connection)); g_object_set (setting, NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, NULL); - PLUGIN_PRINT("SCPlugin-Ifupdown", "autoconnect"); + nm_log_info (LOGD_SETTINGS, "autoconnect"); } } g_hash_table_destroy (auto_ifaces); @@ -475,7 +473,7 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config) priv->unmanage_well_known = !manage_well_known; g_free (value); } - PLUGIN_PRINT ("SCPluginIfupdown", "management mode: %s", priv->unmanage_well_known ? "unmanaged" : "managed"); + nm_log_info (LOGD_SETTINGS, "management mode: %s", priv->unmanage_well_known ? "unmanaged" : "managed"); /* Add well-known interfaces */ keys = g_udev_client_query_by_subsystem (priv->client, "net"); @@ -498,7 +496,7 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config) g_list_free (con_list); } - PLUGIN_PRINT("SCPlugin-Ifupdown", "end _init."); + nm_log_info (LOGD_SETTINGS, "end _init."); } @@ -513,10 +511,10 @@ SCPluginIfupdown_get_connections (NMSystemConfigInterface *config) GHashTableIter iter; gpointer value; - PLUGIN_PRINT("SCPlugin-Ifupdown", "(%d) ... get_connections.", GPOINTER_TO_UINT(config)); + nm_log_info (LOGD_SETTINGS, "(%d) ... get_connections.", GPOINTER_TO_UINT(config)); if(priv->unmanage_well_known) { - PLUGIN_PRINT("SCPlugin-Ifupdown", "(%d) ... get_connections (managed=false): return empty list.", GPOINTER_TO_UINT(config)); + nm_log_info (LOGD_SETTINGS, "(%d) ... get_connections (managed=false): return empty list.", GPOINTER_TO_UINT(config)); return NULL; } @@ -524,7 +522,7 @@ SCPluginIfupdown_get_connections (NMSystemConfigInterface *config) while (g_hash_table_iter_next (&iter, NULL, &value)) connections = g_slist_prepend (connections, value); - PLUGIN_PRINT("SCPlugin-Ifupdown", "(%d) connections count: %d", GPOINTER_TO_UINT(config), g_slist_length(connections)); + nm_log_info (LOGD_SETTINGS, "(%d) connections count: %d", GPOINTER_TO_UINT(config), g_slist_length(connections)); return connections; } @@ -545,7 +543,7 @@ SCPluginIfupdown_get_unmanaged_specs (NMSystemConfigInterface *config) if (!ALWAYS_UNMANAGE && !priv->unmanage_well_known) return NULL; - PLUGIN_PRINT("Ifupdown", "get unmanaged devices count: %d", + nm_log_info (LOGD_SETTINGS, "get unmanaged devices count: %d", g_hash_table_size (priv->kernel_ifaces)); g_hash_table_iter_init (&iter, priv->kernel_ifaces); @@ -580,7 +578,7 @@ update_system_hostname(NMInotifyHelper *inotify_helper, gsize hostname_file_len = 0; GError *error = NULL; - PLUGIN_PRINT ("SCPlugin-Ifupdown", "update_system_hostname"); + nm_log_info (LOGD_SETTINGS, "update_system_hostname"); if (evt && evt->wd != priv->inotify_system_hostname_wd) return; @@ -590,8 +588,8 @@ update_system_hostname(NMInotifyHelper *inotify_helper, &hostname_file_len, &error)) { nm_log_warn (LOGD_SETTINGS, "update_system_hostname() - couldn't read " - IFUPDOWN_SYSTEM_HOSTNAME_FILE " (%d/%s)", - error->code, error->message); + IFUPDOWN_SYSTEM_HOSTNAME_FILE " (%d/%s)", + error->code, error->message); return; } @@ -613,7 +611,7 @@ write_system_hostname(NMSystemConfigInterface *config, { GError *error = NULL; SCPluginIfupdownPrivate *priv = SC_PLUGIN_IFUPDOWN_GET_PRIVATE (config); - PLUGIN_PRINT ("SCPlugin-Ifupdown", "write_system_hostname: %s", newhostname); + nm_log_info (LOGD_SETTINGS, "write_system_hostname: %s", newhostname); g_return_if_fail (newhostname); @@ -622,8 +620,8 @@ write_system_hostname(NMSystemConfigInterface *config, -1, &error)) { nm_log_warn (LOGD_SETTINGS, "update_system_hostname() - couldn't write hostname (%s) to " - IFUPDOWN_SYSTEM_HOSTNAME_FILE " (%d/%s)", - newhostname, error->code, error->message); + IFUPDOWN_SYSTEM_HOSTNAME_FILE " (%d/%s)", + newhostname, error->code, error->message); } else { priv->hostname = g_strdup (newhostname); } diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am index 9c2edc33be..13eed25e08 100644 --- a/src/settings/plugins/ifupdown/tests/Makefile.am +++ b/src/settings/plugins/ifupdown/tests/Makefile.am @@ -7,8 +7,10 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/settings \ -I$(srcdir)/../ \ + -DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ @@ -23,6 +25,7 @@ test_ifupdown_SOURCES = \ ../parser.c test_ifupdown_LDADD = \ + $(top_builddir)/src/libNetworkManager.la \ $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c index 1040099a31..8512761b26 100644 --- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c +++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c @@ -24,6 +24,8 @@ #include <nm-utils.h> #include "nm-test-helpers.h" +#include "nm-logging.h" + #include "interface_parser.h" #include "parser.h" @@ -941,6 +943,7 @@ main (int argc, char **argv) if (!nm_utils_init (&error)) FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message); + nm_logging_setup ("WARN", "DEFAULT", NULL, NULL); g_test_init (&argc, &argv, NULL); diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am index c2e8fdaeab..cac97e7fba 100644 --- a/src/settings/plugins/keyfile/Makefile.am +++ b/src/settings/plugins/keyfile/Makefile.am @@ -5,11 +5,13 @@ SUBDIRS = . tests AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/config \ + -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ + -DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index 3439f55d5e..bad1fd75c7 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -36,6 +36,7 @@ #include <nm-setting-connection.h> #include <nm-utils.h> #include <nm-config.h> +#include <nm-logging.h> #include "plugin.h" #include "nm-system-config-interface.h" @@ -105,7 +106,7 @@ remove_connection (SCPluginKeyfile *self, NMKeyfileConnection *connection) { g_return_if_fail (connection != NULL); - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "removed %s.", nm_keyfile_connection_get_path (connection)); + nm_log_info (LOGD_SETTINGS, "removed %s.", nm_keyfile_connection_get_path (connection)); /* Removing from the hash table should drop the last reference */ g_object_ref (connection); @@ -126,8 +127,7 @@ update_connection (SCPluginKeyfile *self, tmp = nm_keyfile_connection_new (NULL, name, &error); if (!tmp) { /* Error; remove the connection */ - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, " error: %s", - (error && error->message) ? error->message : "(unknown)"); + nm_log_warn (LOGD_SETTINGS, " %s", (error && error->message) ? error->message : "(unknown)"); g_clear_error (&error); remove_connection (self, connection); return; @@ -137,7 +137,7 @@ update_connection (SCPluginKeyfile *self, NM_CONNECTION (tmp), NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS | NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)) { - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "updating %s", name); + nm_log_info (LOGD_SETTINGS, "updating %s", name); if (!nm_settings_connection_replace_settings (NM_SETTINGS_CONNECTION (connection), NM_CONNECTION (tmp), FALSE, /* don't set Unsaved */ @@ -180,8 +180,8 @@ new_connection (SCPluginKeyfile *self, tmp = nm_keyfile_connection_new (NULL, name, &error); if (!tmp) { - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, " error in connection %s: %s", name, - (error && error->message) ? error->message : "(unknown)"); + nm_log_warn (LOGD_SETTINGS, " error in connection %s: %s", name, + (error && error->message) ? error->message : "(unknown)"); g_clear_error (&error); return; } @@ -189,8 +189,7 @@ new_connection (SCPluginKeyfile *self, /* Connection renames will show as different paths but same UUID */ connection = g_hash_table_lookup (priv->connections, nm_connection_get_uuid (NM_CONNECTION (tmp))); if (connection) { - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "rename %s -> %s", - nm_keyfile_connection_get_path (connection), name); + nm_log_info (LOGD_SETTINGS, "rename %s -> %s", nm_keyfile_connection_get_path (connection), name); if (!nm_settings_connection_replace_settings (NM_SETTINGS_CONNECTION (connection), NM_CONNECTION (tmp), FALSE, /* don't set Unsaved */ @@ -203,7 +202,7 @@ new_connection (SCPluginKeyfile *self, *out_old_path = g_strdup (nm_keyfile_connection_get_path (connection)); nm_keyfile_connection_set_path (connection, name); } else { - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "new connection %s", name); + nm_log_info (LOGD_SETTINGS, "new connection %s", name); g_hash_table_insert (priv->connections, (gpointer) nm_connection_get_uuid (NM_CONNECTION (tmp)), tmp); @@ -335,7 +334,7 @@ read_connections (NMSystemConfigInterface *config) dir = g_dir_open (KEYFILE_DIR, 0, &error); if (!dir) { - PLUGIN_WARN (KEYFILE_PLUGIN_NAME, "Cannot read directory '%s': (%d) %s", + nm_log_warn (LOGD_SETTINGS, "Cannot read directory '%s': (%d) %s", KEYFILE_DIR, error ? error->code : -1, error && error->message ? error->message : "(unknown)"); @@ -514,7 +513,7 @@ get_unmanaged_specs (NMSystemConfigInterface *config) } else if (!strncmp (udis[i], "interface-name:", 15) && nm_utils_iface_valid_name (udis[i] + 15)) { specs = g_slist_append (specs, udis[i]); } else { - g_warning ("Error in file '%s': invalid unmanaged-devices entry: '%s'", priv->conf_file, udis[i]); + nm_log_warn (LOGD_SETTINGS, "Error in file '%s': invalid unmanaged-devices entry: '%s'", priv->conf_file, udis[i]); g_free (udis[i]); } } @@ -524,7 +523,7 @@ get_unmanaged_specs (NMSystemConfigInterface *config) out: if (error) { - g_warning ("%s", error->message); + nm_log_warn (LOGD_SETTINGS, "%s", error->message); g_error_free (error); } if (key_file) @@ -552,7 +551,7 @@ plugin_get_hostname (SCPluginKeyfile *plugin) out: if (error) { - g_warning ("%s", error->message); + nm_log_warn (LOGD_SETTINGS, "%s", error->message); g_error_free (error); } if (key_file) @@ -599,7 +598,7 @@ plugin_set_hostname (SCPluginKeyfile *plugin, const char *hostname) out: if (error) { - g_warning ("%s", error->message); + nm_log_warn (LOGD_SETTINGS, "%s", error->message); g_error_free (error); } g_free (data); diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c index 03e1c344ee..bfdd1e1446 100644 --- a/src/settings/plugins/keyfile/reader.c +++ b/src/settings/plugins/keyfile/reader.c @@ -43,6 +43,7 @@ #include "nm-dbus-glib-types.h" #include "nm-glib-compat.h" #include "nm-system-config-interface.h" +#include "nm-logging.h" #include "reader.h" #include "common.h" #include "utils.h" @@ -101,7 +102,7 @@ get_one_int (const char *str, guint32 max_val, const char *key_name, guint32 *ou if (!str || !str[0]) { if (key_name) - g_warning ("%s: ignoring missing number %s", __func__, key_name); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring missing number %s", __func__, key_name); return FALSE; } @@ -109,7 +110,7 @@ get_one_int (const char *str, guint32 max_val, const char *key_name, guint32 *ou tmp = strtol (str, &endptr, 10); if (errno || (tmp < 0) || (tmp > max_val) || *endptr != 0) { if (key_name) - g_warning ("%s: ignoring invalid number %s '%s'", __func__, key_name, str); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid number %s '%s'", __func__, key_name, str); return FALSE; } @@ -132,7 +133,7 @@ build_ip4_address_or_route (const char *key_name, const char *address_str, guint /* Address */ err = inet_pton (AF_INET, address_str, &addr); if (err <= 0) { - g_warning ("%s: ignoring invalid IPv4 address '%s'", __func__, address_str); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid IPv4 address '%s'", __func__, address_str); return NULL; } address = addr; @@ -141,7 +142,7 @@ build_ip4_address_or_route (const char *key_name, const char *address_str, guint if (gateway_str && gateway_str[0]) { err = inet_pton (AF_INET, gateway_str, &addr); if (err <= 0) { - g_warning ("%s: ignoring invalid IPv4 gateway '%s'", __func__, gateway_str); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid IPv4 gateway '%s'", __func__, gateway_str); return NULL; } gateway = addr; @@ -183,7 +184,7 @@ build_ip6_address_or_route (const char *key_name, const char *address_str, guint /* add address */ err = inet_pton (AF_INET6, address_str, &addr); if (err <= 0) { - g_warning ("%s: ignoring invalid IPv6 address '%s'", __func__, address_str); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid IPv6 address '%s'", __func__, address_str); goto error_out; } address = g_byte_array_new (); @@ -214,7 +215,7 @@ build_ip6_address_or_route (const char *key_name, const char *address_str, guint if (route && !metric_str && get_one_int (gateway_str, G_MAXUINT32, NULL, &metric)) addr = in6addr_any; else { - g_warning ("%s: ignoring invalid IPv6 gateway '%s'", __func__, gateway_str); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid IPv6 gateway '%s'", __func__, gateway_str); goto error_out; } } @@ -354,8 +355,8 @@ read_one_ip_address_or_route (GKeyFile *file, /* get address field */ address_str = read_field (¤t, &error, IP_ADDRESS_CHARS, DELIMITERS); if (error) { - g_warning ("keyfile: Unexpected character '%c' in '%s.%s' address (position %td of '%s').", - *error, setting_name, key_name, error - current, current); + nm_log_warn (LOGD_SETTINGS, "keyfile: Unexpected character '%c' in '%s.%s' address (position %td of '%s').", + *error, setting_name, key_name, error - current, current); goto error; } /* get prefix length field (skippable) */ @@ -363,18 +364,18 @@ read_one_ip_address_or_route (GKeyFile *file, /* get gateway field */ gateway_str = read_field (¤t, &error, IP_ADDRESS_CHARS, DELIMITERS); if (error) { - g_warning ("keyfile: Unexpected character '%c' in '%s.%s' %s (position %td of '%s').", - *error, setting_name, key_name, - plen_str ? "gateway" : "gateway or prefix length", - error - current, current); + nm_log_warn (LOGD_SETTINGS, "keyfile: Unexpected character '%c' in '%s.%s' %s (position %td of '%s').", + *error, setting_name, key_name, + plen_str ? "gateway" : "gateway or prefix length", + error - current, current); goto error; } /* for routes, get metric */ if (route) { metric_str = read_field (¤t, &error, DIGITS, DELIMITERS); if (error) { - g_warning ("keyfile: Unexpected character '%c' in '%s.%s' prefix length (position %td of '%s').", - *error, setting_name, key_name, error - current, current); + nm_log_warn (LOGD_SETTINGS, "keyfile: Unexpected character '%c' in '%s.%s' prefix length (position %td of '%s').", + *error, setting_name, key_name, error - current, current); goto error; } } else @@ -383,13 +384,13 @@ read_one_ip_address_or_route (GKeyFile *file, /* there is still some data */ if (*current) { /* another field follows */ - g_warning ("keyfile: %s.%s: Garbage at the and of the line: %s", - setting_name, key_name, current); + nm_log_warn (LOGD_SETTINGS, "keyfile: %s.%s: Garbage at the and of the line: %s", + setting_name, key_name, current); goto error; } else { /* semicolon at the end of input */ - g_message ("keyfile: %s.%s: Deprecated semicolon at the end of value.", - setting_name, key_name); + nm_log_info (LOGD_SETTINGS, "keyfile: %s.%s: Deprecated semicolon at the end of value.", + setting_name, key_name); } } @@ -402,8 +403,8 @@ read_one_ip_address_or_route (GKeyFile *file, plen = ipv6 ? 128 : 24; else plen = ipv6 ? 64 : 24; - g_warning ("keyfile: Missing prefix length in '%s.%s', defaulting to %d", - setting_name, key_name, plen); + nm_log_warn (LOGD_SETTINGS, "keyfile: Missing prefix length in '%s.%s', defaulting to %d", + setting_name, key_name, plen); } /* build the appropriate data structure for NetworkManager settings */ @@ -481,7 +482,7 @@ ip4_dns_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const ch ret = inet_pton (AF_INET, *iter, &addr); if (ret <= 0) { - g_warning ("%s: ignoring invalid DNS server address '%s'", __func__, *iter); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid DNS server address '%s'", __func__, *iter); continue; } @@ -516,7 +517,7 @@ ip6_dns_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const ch ret = inet_pton (AF_INET6, *iter, &addr); if (ret <= 0) { - g_warning ("%s: ignoring invalid DNS server IPv6 address '%s'", __func__, *iter); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid DNS server IPv6 address '%s'", __func__, *iter); continue; } byte_array = g_byte_array_new (); @@ -570,9 +571,9 @@ mac_address_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, cons const guint8 v = (guint8) (val & 0xFF); if (val < 0 || val > 255) { - g_warning ("%s: %s / %s ignoring invalid byte element '%d' (not " - " between 0 and 255 inclusive)", __func__, setting_name, - key, val); + nm_log_warn (LOGD_SETTINGS, "%s: %s / %s ignoring invalid byte element '%d' (not " + " between 0 and 255 inclusive)", __func__, setting_name, + key, val); g_byte_array_free (array, TRUE); array = NULL; break; @@ -587,8 +588,8 @@ mac_address_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, cons g_object_set (setting, key, array, NULL); g_byte_array_free (array, TRUE); } else { - g_warning ("%s: ignoring invalid MAC address for %s / %s", - __func__, setting_name, key); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid MAC address for %s / %s", + __func__, setting_name, key); } } @@ -684,9 +685,9 @@ get_uchar_array (GKeyFile *keyfile, unsigned char v = (unsigned char) (val & 0xFF); if (val < 0 || val > 255) { - g_warning ("%s: %s / %s ignoring invalid byte element '%d' (not " - " between 0 and 255 inclusive)", __func__, setting_name, - key, val); + nm_log_warn (LOGD_SETTINGS, "%s: %s / %s ignoring invalid byte element '%d' (not " + " between 0 and 255 inclusive)", __func__, setting_name, + key, val); } else g_byte_array_append (array, (const unsigned char *) &v, sizeof (v)); } @@ -711,8 +712,8 @@ ssid_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const char g_object_set (setting, key, array, NULL); g_byte_array_free (array, TRUE); } else { - g_warning ("%s: ignoring invalid SSID for %s / %s", - __func__, setting_name, key); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid SSID for %s / %s", + __func__, setting_name, key); } } @@ -727,8 +728,8 @@ password_raw_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, con g_object_set (setting, key, array, NULL); g_byte_array_free (array, TRUE); } else { - g_warning ("%s: ignoring invalid raw password for %s / %s", - __func__, setting_name, key); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid raw password for %s / %s", + __func__, setting_name, key); } } @@ -829,7 +830,7 @@ handle_as_path (GByteArray *array, /* Warn if the certificate didn't exist */ if (exists == FALSE) - PLUGIN_WARN (KEYFILE_PLUGIN_NAME, " certificate or key %s does not exist", path); + nm_log_warn (LOGD_SETTINGS, "certificate or key %s does not exist", path); } g_free (path); @@ -856,8 +857,8 @@ cert_parser (NMSetting *setting, const char *key, GKeyFile *keyfile, const char if (success == FALSE) g_object_set (setting, key, array, NULL); } else { - g_warning ("%s: ignoring invalid key/cert value for %s / %s", - __func__, setting_name, key); + nm_log_warn (LOGD_SETTINGS, "%s: ignoring invalid key/cert value for %s / %s", + __func__, setting_name, key); } if (array) @@ -1032,7 +1033,7 @@ read_one_setting_value (NMSetting *setting, if (check_for_key && !nm_keyfile_plugin_kf_has_key (info->keyfile, setting_name, key, &err)) { /* Key doesn't exist or an error ocurred, thus nothing to do. */ if (err) { - g_warning ("Error loading setting '%s' value: %s", setting_name, err->message); + nm_log_warn (LOGD_SETTINGS, "Error loading setting '%s' value: %s", setting_name, err->message); g_error_free (err); } return; @@ -1059,7 +1060,7 @@ read_one_setting_value (NMSetting *setting, int_val = nm_keyfile_plugin_kf_get_integer (info->keyfile, setting_name, key, NULL); if (int_val < 0) - g_warning ("Casting negative value (%i) to uint", int_val); + nm_log_warn (LOGD_SETTINGS, "Casting negative value (%i) to uint", int_val); g_object_set (setting, key, int_val, NULL); } else if (type == G_TYPE_INT) { int int_val; @@ -1076,7 +1077,7 @@ read_one_setting_value (NMSetting *setting, int_val = nm_keyfile_plugin_kf_get_integer (info->keyfile, setting_name, key, NULL); if (int_val < G_MININT8 || int_val > G_MAXINT8) - g_warning ("Casting value (%i) to char", int_val); + nm_log_warn (LOGD_SETTINGS, "Casting value (%i) to char", int_val); g_object_set (setting, key, int_val, NULL); } else if (type == G_TYPE_UINT64) { @@ -1101,9 +1102,9 @@ read_one_setting_value (NMSetting *setting, unsigned char v = (unsigned char) (val & 0xFF); if (val < 0 || val > 255) { - g_warning ("%s: %s / %s ignoring invalid byte element '%d' (not " - " between 0 and 255 inclusive)", __func__, setting_name, - key, val); + nm_log_warn (LOGD_SETTINGS, "%s: %s / %s ignoring invalid byte element '%d' (not " + " between 0 and 255 inclusive)", __func__, setting_name, + key, val); } else g_byte_array_append (array, (const unsigned char *) &v, sizeof (v)); } @@ -1130,12 +1131,12 @@ read_one_setting_value (NMSetting *setting, read_hash_of_string (info->keyfile, setting, key); } else if (type == DBUS_TYPE_G_UINT_ARRAY) { if (!read_array_of_uint (info->keyfile, setting, key)) { - g_warning ("Unhandled setting property type (read): '%s/%s' : '%s'", - setting_name, key, G_VALUE_TYPE_NAME (value)); + nm_log_warn (LOGD_SETTINGS, "Unhandled setting property type (read): '%s/%s' : '%s'", + setting_name, key, G_VALUE_TYPE_NAME (value)); } } else { - g_warning ("Unhandled setting property type (read): '%s/%s' : '%s'", - setting_name, key, G_VALUE_TYPE_NAME (value)); + nm_log_warn (LOGD_SETTINGS, "Unhandled setting property type (read): '%s/%s' : '%s'", + setting_name, key, G_VALUE_TYPE_NAME (value)); } } @@ -1151,7 +1152,7 @@ read_setting (GKeyFile *file, const char *keyfile_path, const char *group) if (setting) nm_setting_enumerate_values (setting, read_one_setting_value, &info); else - g_warning ("Invalid setting name '%s'", group); + nm_log_warn (LOGD_SETTINGS, "Invalid setting name '%s'", group); return setting; } @@ -1293,8 +1294,8 @@ nm_keyfile_plugin_connection_from_file (const char *filename, GError **error) g_clear_error (&verify_error); g_object_unref (connection); connection = NULL; - g_warning ("Connection failed to verify: %s", - verify_error ? g_type_name (nm_connection_lookup_setting_type_by_quark (verify_error->domain)) : "(unknown)"); + nm_log_warn (LOGD_SETTINGS, "Connection failed to verify: %s", + verify_error ? g_type_name (nm_connection_lookup_setting_type_by_quark (verify_error->domain)) : "(unknown)"); } out: diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am index f4855fcbe2..3424e2768b 100644 --- a/src/settings/plugins/keyfile/tests/Makefile.am +++ b/src/settings/plugins/keyfile/tests/Makefile.am @@ -11,12 +11,14 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/settings \ -I$(srcdir)/../ \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(POLKIT_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ + -DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" \ @@ -32,6 +34,7 @@ test_keyfile_SOURCES = \ ../utils.c test_keyfile_LDADD = \ + $(top_builddir)/src/libNetworkManager.la \ $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index bd585dd862..8f9df94ba9 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -42,6 +42,7 @@ #include <nm-setting-infiniband.h> #include "nm-test-helpers.h" +#include "nm-glib-compat.h" #include "reader.h" #include "writer.h" @@ -141,7 +142,36 @@ test_read_valid_wired_connection (void) const char *expected6_dnssearch2 = "redhat.com"; const char *expected6_dnssearch3 = "gnu.org"; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv4.addresses1*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv4.addresses2*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*Missing prefix length*ipv4.address4*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*Missing prefix length*ipv4.address5*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv4.routes2*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv4.routes3*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv4.routes5*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv4.routes8*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*Missing prefix length*ipv6.address4*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv6.address5*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*Missing prefix length*ipv6.address5*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv6.address7*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv6.routes1*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv6.route6*semicolon at the end*"); connection = nm_keyfile_plugin_connection_from_file (TEST_WIRED_FILE, NULL); + g_test_assert_expected_messages (); ASSERT (connection != NULL, "connection-read", "failed to read %s", TEST_WIRED_FILE); @@ -861,7 +891,14 @@ test_read_wired_mac_case (void) const char *expected_id = "Test Wired Connection MAC Case"; const char *expected_uuid = "4e80a56d-c99f-4aad-a6dd-b449bc398c57"; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv4.addresses1*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv4.addresses2*semicolon at the end*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*ipv6.routes1*semicolon at the end*"); connection = nm_keyfile_plugin_connection_from_file (TEST_WIRED_MAC_CASE_FILE, NULL); + g_test_assert_expected_messages (); ASSERT (connection != NULL, "connection-read", "failed to read %s", TEST_WIRED_MAC_CASE_FILE); @@ -2182,7 +2219,10 @@ test_read_wired_8021x_tls_blob_connection (void) g_assert_cmpint (nm_setting_802_1x_get_ca_cert_scheme (s_8021x), ==, NM_SETTING_802_1X_CK_SCHEME_BLOB); /* Make sure it's not a path, since it's a blob */ + g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, + "*assertion*scheme == NM_SETTING_802_1X_CK_SCHEME_PATH*"); tmp = nm_setting_802_1x_get_ca_cert_path (s_8021x); + g_test_assert_expected_messages (); g_assert (tmp == NULL); /* Validate the path */ @@ -2212,7 +2252,10 @@ test_read_wired_8021x_tls_bad_path_connection (void) char *tmp2; gboolean success; + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*does not exist*"); connection = nm_keyfile_plugin_connection_from_file (TEST_WIRED_TLS_PATH_MISSING_FILE, &error); + g_test_assert_expected_messages (); if (connection == NULL) { g_assert (error); g_warning ("Failed to read %s: %s", TEST_WIRED_TLS_PATH_MISSING_FILE, error->message); @@ -3300,6 +3343,7 @@ int main (int argc, char **argv) char *base; g_type_init (); + g_log_set_always_fatal (G_LOG_LEVEL_MASK); if (!nm_utils_init (&error)) FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message); diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c index e03ad3d8e7..e95ec87493 100644 --- a/src/settings/plugins/keyfile/writer.c +++ b/src/settings/plugins/keyfile/writer.c @@ -44,6 +44,7 @@ #include "nm-dbus-glib-types.h" #include "nm-glib-compat.h" +#include "nm-logging.h" #include "writer.h" #include "common.h" #include "utils.h" @@ -329,9 +330,8 @@ ip6_addr_writer (GKeyFile *file, char *key_name, *ip6_addr; if (values->n_values != 3) { - g_warning ("%s: error writing IP6 address %d (address array length " - "%d is not 3)", - __func__, i, values->n_values); + nm_log_warn (LOGD_SETTINGS, "%s: error writing IP6 address %d (address array " + "length %d is not 3)", __func__, i, values->n_values); continue; } @@ -424,8 +424,8 @@ mac_address_writer (GKeyFile *file, type = nm_utils_hwaddr_type (array->len); if (type < 0) { - g_warning ("%s: invalid %s / %s MAC address length %d", - __func__, setting_name, key, array->len); + nm_log_warn (LOGD_SETTINGS, "%s: invalid %s / %s MAC address length %d", + __func__, setting_name, key, array->len); return; } @@ -752,7 +752,8 @@ cert_writer (GKeyFile *file, /* Write the path value to the keyfile */ nm_keyfile_plugin_kf_set_string (file, setting_name, key, new_path); } else { - g_warning ("Failed to write certificate/key %s: %s", new_path, error->message); + nm_log_warn (LOGD_SETTINGS, "Failed to write certificate/key %s: %s", + new_path, error->message); g_error_free (error); } g_free (new_path); @@ -969,12 +970,12 @@ write_setting_value (NMSetting *setting, write_hash_of_string (info->keyfile, setting, key, value); } else if (type == DBUS_TYPE_G_UINT_ARRAY) { if (!write_array_of_uint (info->keyfile, setting, key, value)) { - g_warning ("Unhandled setting property type (write) '%s/%s' : '%s'", - setting_name, key, g_type_name (type)); + nm_log_warn (LOGD_SETTINGS, "Unhandled setting property type (write) '%s/%s' : '%s'", + setting_name, key, g_type_name (type)); } } else { - g_warning ("Unhandled setting property type (write) '%s/%s' : '%s'", - setting_name, key, g_type_name (type)); + nm_log_warn (LOGD_SETTINGS, "Unhandled setting property type (write) '%s/%s' : '%s'", + setting_name, key, g_type_name (type)); } } diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am index 059914b371..0c509a9e8e 100644 --- a/src/settings/tests/Makefile.am +++ b/src/settings/tests/Makefile.am @@ -3,6 +3,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/src/settings \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index 742f22478d..b27d46fe5f 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/supplicant-manager \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c index 458e1a1348..181a11f90b 100644 --- a/src/supplicant-manager/tests/test-supplicant-config.c +++ b/src/supplicant-manager/tests/test-supplicant-config.c @@ -40,6 +40,7 @@ #include <nm-setting-8021x.h> #include "nm-test-helpers.h" +#include "nm-glib-compat.h" #include "nm-supplicant-config.h" #include "nm-supplicant-settings-verify.h" @@ -173,13 +174,25 @@ test_wifi_open (void) config = nm_supplicant_config_new (); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'ssid' value 'Test SSID'*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'scan_ssid' value '1'*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'bssid' value '11:22:33:44:55:66'*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'freq_list' value *"); success = nm_supplicant_config_add_setting_wireless (config, s_wifi, 0); ASSERT (success == TRUE, "wifi-open", "failed to add wireless setting to supplicant config."); + g_test_assert_expected_messages (); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'key_mgmt' value 'NONE'"); success = nm_supplicant_config_add_no_security (config); ASSERT (success == TRUE, "wifi-open", "failed to add wireless security to supplicant config."); + g_test_assert_expected_messages (); hash = nm_supplicant_config_get_hash (config); ASSERT (hash != NULL, @@ -272,16 +285,32 @@ test_wifi_wep_key (const char *detail, config = nm_supplicant_config_new (); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'ssid' value 'Test SSID'*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'scan_ssid' value '1'*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'bssid' value '11:22:33:44:55:66'*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'freq_list' value *"); success = nm_supplicant_config_add_setting_wireless (config, s_wifi, 0); ASSERT (success == TRUE, detail, "failed to add wireless setting to supplicant config."); - + g_test_assert_expected_messages (); + + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'key_mgmt' value 'NONE'"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'wep_key0' value *"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'wep_tx_keyidx' value '0'"); success = nm_supplicant_config_add_setting_wireless_security (config, s_wsec, NULL, "376aced7-b28c-46be-9a62-fcdf072571da"); ASSERT (success == TRUE, detail, "failed to add wireless security to supplicant config."); + g_test_assert_expected_messages (); hash = nm_supplicant_config_get_hash (config); ASSERT (hash != NULL, @@ -405,16 +434,36 @@ test_wifi_wpa_psk (const char *detail, config = nm_supplicant_config_new (); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'ssid' value 'Test SSID'*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'scan_ssid' value '1'*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'bssid' value '11:22:33:44:55:66'*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'freq_list' value *"); success = nm_supplicant_config_add_setting_wireless (config, s_wifi, 0); ASSERT (success == TRUE, detail, "failed to add wireless setting to supplicant config."); - + g_test_assert_expected_messages (); + + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'key_mgmt' value 'WPA-PSK'"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'psk' value *"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'proto' value 'WPA RSN'"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'pairwise' value 'TKIP CCMP'"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE, + "*added 'group' value 'TKIP CCMP'"); success = nm_supplicant_config_add_setting_wireless_security (config, s_wsec, NULL, "376aced7-b28c-46be-9a62-fcdf072571da"); ASSERT (success == TRUE, detail, "failed to add wireless security to supplicant config."); + g_test_assert_expected_messages (); hash = nm_supplicant_config_get_hash (config); ASSERT (hash != NULL, diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 4dda163c48..50609cf8b4 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -3,10 +3,12 @@ AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ + -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/dhcp-manager \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/src/tests/test-dhcp-options.c b/src/tests/test-dhcp-options.c index 6ef599e9c7..6b324514fc 100644 --- a/src/tests/test-dhcp-options.c +++ b/src/tests/test-dhcp-options.c @@ -29,6 +29,7 @@ #include <nm-utils.h> #include "nm-dhcp-manager.h" +#include "nm-logging.h" typedef struct { const char *name; @@ -97,8 +98,9 @@ static Option generic_options[] = { }; static void -test_generic_options (const char *client) +test_generic_options (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const NMPlatformIP4Address *address; @@ -214,8 +216,9 @@ static Option wins_options[] = { }; static void -test_wins_options (const char *client) +test_wins_options (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const NMPlatformIP4Address *address; @@ -295,8 +298,9 @@ ip4_test_gateway (const char *test, } static void -test_classless_static_routes_1 (const char *client) +test_classless_static_routes_1 (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "192.168.10.0"; @@ -328,8 +332,9 @@ test_classless_static_routes_1 (const char *client) } static void -test_classless_static_routes_2 (const char *client) +test_classless_static_routes_2 (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "192.168.10.0"; @@ -361,8 +366,9 @@ test_classless_static_routes_2 (const char *client) } static void -test_fedora_dhclient_classless_static_routes (const char *client) +test_fedora_dhclient_classless_static_routes (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "129.210.177.128"; @@ -398,8 +404,9 @@ test_fedora_dhclient_classless_static_routes (const char *client) } static void -test_dhclient_invalid_classless_routes_1 (const char *client) +test_dhclient_invalid_classless_routes_1 (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "192.168.10.0"; @@ -413,9 +420,12 @@ test_dhclient_invalid_classless_routes_1 (const char *client) options = fill_table (generic_options, NULL); options = fill_table (data, options); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*ignoring invalid classless static routes*"); ip4_config = nm_dhcp_manager_test_ip4_options_to_config (client, "eth0", options, "rebind"); ASSERT (ip4_config != NULL, "dhcp-dhclient-classless-invalid-1", "failed to parse DHCP4 options"); + g_test_assert_expected_messages (); /* IP4 routes */ ASSERT (nm_ip4_config_get_num_routes (ip4_config) == 1, @@ -428,8 +438,9 @@ test_dhclient_invalid_classless_routes_1 (const char *client) } static void -test_dhcpcd_invalid_classless_routes_1 (const char *client) +test_dhcpcd_invalid_classless_routes_1 (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "10.1.1.5"; @@ -445,9 +456,12 @@ test_dhcpcd_invalid_classless_routes_1 (const char *client) options = fill_table (generic_options, NULL); options = fill_table (data, options); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*ignoring invalid classless static routes*"); ip4_config = nm_dhcp_manager_test_ip4_options_to_config (client, "eth0", options, "rebind"); ASSERT (ip4_config != NULL, "dhcp-dhcpcd-classless-invalid-1", "failed to parse DHCP4 options"); + g_test_assert_expected_messages (); /* Test falling back to old-style static routes if the classless static * routes are invalid. @@ -463,8 +477,9 @@ test_dhcpcd_invalid_classless_routes_1 (const char *client) } static void -test_dhclient_invalid_classless_routes_2 (const char *client) +test_dhclient_invalid_classless_routes_2 (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "10.1.1.5"; @@ -479,9 +494,12 @@ test_dhclient_invalid_classless_routes_2 (const char *client) options = fill_table (generic_options, NULL); options = fill_table (data, options); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*ignoring invalid classless static routes*"); ip4_config = nm_dhcp_manager_test_ip4_options_to_config (client, "eth0", options, "rebind"); ASSERT (ip4_config != NULL, "dhcp-dhclient-classless-invalid-2", "failed to parse DHCP4 options"); + g_test_assert_expected_messages (); /* Test falling back to old-style static routes if the classless static * routes are invalid. @@ -497,8 +515,9 @@ test_dhclient_invalid_classless_routes_2 (const char *client) } static void -test_dhcpcd_invalid_classless_routes_2 (const char *client) +test_dhcpcd_invalid_classless_routes_2 (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "10.1.1.5"; @@ -513,9 +532,12 @@ test_dhcpcd_invalid_classless_routes_2 (const char *client) options = fill_table (generic_options, NULL); options = fill_table (data, options); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*ignoring invalid classless static routes*"); ip4_config = nm_dhcp_manager_test_ip4_options_to_config (client, "eth0", options, "rebind"); ASSERT (ip4_config != NULL, "dhcp-dhcpcd-classless-invalid-2", "failed to parse DHCP4 options"); + g_test_assert_expected_messages (); /* Test falling back to old-style static routes if the classless static * routes are invalid. @@ -533,8 +555,9 @@ test_dhcpcd_invalid_classless_routes_2 (const char *client) } static void -test_dhclient_invalid_classless_routes_3 (const char *client) +test_dhclient_invalid_classless_routes_3 (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "192.168.10.0"; @@ -547,9 +570,12 @@ test_dhclient_invalid_classless_routes_3 (const char *client) options = fill_table (generic_options, NULL); options = fill_table (data, options); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*ignoring invalid classless static routes*"); ip4_config = nm_dhcp_manager_test_ip4_options_to_config (client, "eth0", options, "rebind"); ASSERT (ip4_config != NULL, "dhcp-dhclient-classless-invalid-3", "failed to parse DHCP4 options"); + g_test_assert_expected_messages (); /* IP4 routes */ ASSERT (nm_ip4_config_get_num_routes (ip4_config) == 1, @@ -561,8 +587,9 @@ test_dhclient_invalid_classless_routes_3 (const char *client) } static void -test_dhcpcd_invalid_classless_routes_3 (const char *client) +test_dhcpcd_invalid_classless_routes_3 (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "192.168.10.0"; @@ -575,9 +602,12 @@ test_dhcpcd_invalid_classless_routes_3 (const char *client) options = fill_table (generic_options, NULL); options = fill_table (data, options); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*DHCP provided invalid classless static route*"); ip4_config = nm_dhcp_manager_test_ip4_options_to_config (client, "eth0", options, "rebind"); ASSERT (ip4_config != NULL, "dhcp-dhcpcd-classless-invalid-3", "failed to parse DHCP4 options"); + g_test_assert_expected_messages (); /* IP4 routes */ ASSERT (nm_ip4_config_get_num_routes (ip4_config) == 1, @@ -589,8 +619,9 @@ test_dhcpcd_invalid_classless_routes_3 (const char *client) } static void -test_dhclient_gw_in_classless_routes (const char *client) +test_dhclient_gw_in_classless_routes (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "192.168.10.0"; @@ -621,8 +652,9 @@ test_dhclient_gw_in_classless_routes (const char *client) } static void -test_dhcpcd_gw_in_classless_routes (const char *client) +test_dhcpcd_gw_in_classless_routes (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_route1_dest = "192.168.10.0"; @@ -658,8 +690,9 @@ static Option escaped_searches_options[] = { }; static void -test_escaped_domain_searches (const char *client) +test_escaped_domain_searches (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const char *expected_search0 = "host1"; @@ -692,17 +725,21 @@ static Option invalid_escaped_searches_options[] = { }; static void -test_invalid_escaped_domain_searches (const char *client) +test_invalid_escaped_domain_searches (gconstpointer test_data) { + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; options = fill_table (generic_options, NULL); options = fill_table (invalid_escaped_searches_options, options); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, + "*invalid domain search*"); ip4_config = nm_dhcp_manager_test_ip4_options_to_config (client, "eth0", options, "rebind"); ASSERT (ip4_config != NULL, "dhcp-invalid-escaped-domain-searches", "failed to parse DHCP4 options"); + g_test_assert_expected_messages (); /* domain searches */ ASSERT (nm_ip4_config_get_num_searches (ip4_config) == 0, @@ -741,8 +778,33 @@ test_ip4_missing_prefix (const char *client, const char *ip, guint32 expected_pr } static void -test_ip4_prefix_classless (const char *client) +test_ip4_missing_prefix_24 (gconstpointer test_data) { + const char *client = test_data; + + test_ip4_missing_prefix (client, "192.168.1.10", 24); +} + +static void +test_ip4_missing_prefix_16 (gconstpointer test_data) +{ + const char *client = test_data; + + test_ip4_missing_prefix (client, "172.16.54.50", 16); +} + +static void +test_ip4_missing_prefix_8 (gconstpointer test_data) +{ + const char *client = test_data; + + test_ip4_missing_prefix (client, "10.1.2.3", 8); +} + +static void +test_ip4_prefix_classless (gconstpointer test_data) +{ + const char *client = test_data; GHashTable *options; NMIP4Config *ip4_config; const NMPlatformIP4Address *address; @@ -777,16 +839,21 @@ test_ip4_prefix_classless (const char *client) int main (int argc, char **argv) { GError *error = NULL; - char *base; + char *path; const char *clients[2][2] = { {DHCLIENT_PATH, "dhclient"}, {DHCPCD_PATH, "dhcpcd"} }; guint32 i; + g_test_init (&argc, &argv, NULL); +#if !GLIB_CHECK_VERSION(2,34,0) + g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); +#endif + g_type_init (); if (!nm_utils_init (&error)) FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message); + nm_logging_setup ("WARN", "DEFAULT", NULL, NULL); - /* The tests */ for (i = 0; i < 2; i++) { const char *client_path = clients[i][0]; const char *client = clients[i][1]; @@ -794,30 +861,83 @@ int main (int argc, char **argv) if (!client_path || !strlen (client_path)) continue; - test_generic_options (client); - test_wins_options (client); - test_classless_static_routes_1 (client); - test_classless_static_routes_2 (client); - test_fedora_dhclient_classless_static_routes (client); - test_dhclient_invalid_classless_routes_1 (client); - test_dhcpcd_invalid_classless_routes_1 (client); - test_dhclient_invalid_classless_routes_2 (client); - test_dhcpcd_invalid_classless_routes_2 (client); - test_dhclient_invalid_classless_routes_3 (client); - test_dhcpcd_invalid_classless_routes_3 (client); - test_dhclient_gw_in_classless_routes (client); - test_dhcpcd_gw_in_classless_routes (client); - test_escaped_domain_searches (client); - test_invalid_escaped_domain_searches (client); - test_ip4_missing_prefix (client, "192.168.1.10", 24); - test_ip4_missing_prefix (client, "172.16.54.50", 16); - test_ip4_missing_prefix (client, "10.1.2.3", 8); - test_ip4_prefix_classless (client); + path = g_strdup_printf ("/dhcp/%s/generic-options", client); + g_test_add_data_func (path, client, test_generic_options); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/wins-options", client); + g_test_add_data_func (path, client, test_wins_options); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/classless-static-routes-1", client); + g_test_add_data_func (path, client, test_classless_static_routes_1); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/classless-static-routes-2", client); + g_test_add_data_func (path, client, test_classless_static_routes_2); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/fedora-dhclient-classless-static-routes", client); + g_test_add_data_func (path, client, test_fedora_dhclient_classless_static_routes); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/dhclient-invalid-classless-routes-1", client); + g_test_add_data_func (path, client, test_dhclient_invalid_classless_routes_1); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/dhcpcd-invalid-classless-routes-1", client); + g_test_add_data_func (path, client, test_dhcpcd_invalid_classless_routes_1); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/dhclient-invalid-classless-routes-2", client); + g_test_add_data_func (path, client, test_dhclient_invalid_classless_routes_2); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/dhcpcd-invalid-classless-routes-2", client); + g_test_add_data_func (path, client, test_dhcpcd_invalid_classless_routes_2); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/dhclient-invalid-classless-routes-3", client); + g_test_add_data_func (path, client, test_dhclient_invalid_classless_routes_3); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/dhcpcd-invalid-classless-routes-3", client); + g_test_add_data_func (path, client, test_dhcpcd_invalid_classless_routes_3); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/dhclient-gw-in-classless-routes", client); + g_test_add_data_func (path, client, test_dhclient_gw_in_classless_routes); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/dhcpcd-gw-in-classless-routes", client); + g_test_add_data_func (path, client, test_dhcpcd_gw_in_classless_routes); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/escaped-domain-searches", client); + g_test_add_data_func (path, client, test_escaped_domain_searches); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/invalid-escaped-domain-searches", client); + g_test_add_data_func (path, client, test_invalid_escaped_domain_searches); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/ip4-missing-prefix-24", client); + g_test_add_data_func (path, client, test_ip4_missing_prefix_24); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/ip4-missing-prefix-16", client); + g_test_add_data_func (path, client, test_ip4_missing_prefix_16); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/ip4-missing-prefix-8", client); + g_test_add_data_func (path, client, test_ip4_missing_prefix_8); + g_free (path); + + path = g_strdup_printf ("/dhcp/%s/ip4-prefix-classless", client); + g_test_add_data_func (path, client, test_ip4_prefix_classless); + g_free (path); } - base = g_path_get_basename (argv[0]); - fprintf (stdout, "%s: SUCCESS\n", base); - g_free (base); - return 0; + return g_test_run (); } diff --git a/test/Makefile.am b/test/Makefile.am index 4a79b79324..830019ba4c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -17,6 +17,10 @@ bin_PROGRAMS = nm-online noinst_PROGRAMS = libnm-glib-test nm_online_SOURCES = nm-online.c +nm_online_CPPFLAGS = \ + -DG_LOG_DOMAIN=\""nm-online"\" \ + $(AM_CPPFLAGS) + nm_online_LDADD = \ $(top_builddir)/libnm-glib/libnm-glib.la \ $(top_builddir)/libnm-util/libnm-util.la \ diff --git a/tui/Makefile.am b/tui/Makefile.am index 5b66a16bef..755b689412 100644 --- a/tui/Makefile.am +++ b/tui/Makefile.am @@ -14,6 +14,7 @@ AM_CPPFLAGS= \ $(NEWT_CFLAGS) \ $(DBUS_CFLAGS) \ $(GUDEV_CFLAGS) \ + -DG_LOG_DOMAIN=\""nmtui"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DLOCALEDIR=\""$(localedir)"\" \ $(NULL) diff --git a/tui/newt/Makefile.am b/tui/newt/Makefile.am index a69e796d81..0db5525d04 100644 --- a/tui/newt/Makefile.am +++ b/tui/newt/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS= \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ + -DG_LOG_DOMAIN=\""nmtui"\" \ $(GLIB_CFLAGS) \ $(NEWT_CFLAGS) \ $(NULL) |