From dd09cd69f20a14736107c553c084bd9f88a6aa14 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 10 Feb 2014 16:18:01 +0100 Subject: WIP: check all calls to nm_act_request_get_(applied_)connection --- src/devices/nm-device-ethernet.c | 28 ++++++++++++++-------------- src/devices/nm-device-infiniband.c | 2 +- src/devices/nm-device-vlan.c | 2 +- src/devices/nm-device-wifi.c | 20 ++++++++++---------- src/devices/nm-device.c | 16 ++++++++-------- src/modem-manager/nm-modem-broadband.c | 2 +- src/modem-manager/nm-modem-old.c | 2 +- src/modem-manager/nm-modem.c | 2 +- src/nm-activation-request.c | 2 +- src/nm-activation-request.h | 2 +- src/nm-policy.c | 4 ++-- src/ppp-manager/nm-ppp-manager.c | 6 +++--- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 1fb2c5f91c..3e39ba31e3 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -71,7 +71,7 @@ G_DEFINE_TYPE (NMDeviceEthernet, nm_device_ethernet, NM_TYPE_DEVICE) #define NM_ETHERNET_ERROR (nm_ethernet_error_quark ()) -static NMSetting *device_get_setting (NMDevice *device, GType setting_type); +static NMSetting *device_get_applied_setting (NMDevice *device, GType setting_type); typedef struct Supplicant { NMSupplicantManager *mgr; @@ -493,7 +493,7 @@ check_connection_compatible (NMDevice *device, /* FIXME: Move it to nm-device.c and then get rid of all foo_device_get_setting() all around. It's here now to keep the patch short. */ static NMSetting * -device_get_setting (NMDevice *device, GType setting_type) +device_get_applied_setting (NMDevice *device, GType setting_type) { NMActRequest *req; NMSetting *setting = NULL; @@ -502,7 +502,7 @@ device_get_setting (NMDevice *device, GType setting_type) if (req) { NMConnection *connection; - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); if (connection) setting = nm_connection_get_setting (connection, setting_type); } @@ -799,7 +799,7 @@ handle_auth_or_fail (NMDeviceEthernet *self, guint32 tries; NMConnection *connection; - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); tries = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (connection), WIRED_SECRETS_TRIES)); @@ -851,7 +851,7 @@ supplicant_connection_timeout_cb (gpointer user_data) req = nm_device_get_act_request (device); g_assert (req); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); /* Ask for new secrets only if we've never activated this connection @@ -936,7 +936,7 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) req = nm_device_get_act_request (NM_DEVICE (self)); g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE); - s_wired = (NMSettingWired *) device_get_setting (dev, NM_TYPE_SETTING_WIRED); + s_wired = (NMSettingWired *) device_get_applied_setting (dev, NM_TYPE_SETTING_WIRED); if (s_wired) { /* Set device MAC address if the connection wants to change it */ cloned_mac = nm_setting_wired_get_cloned_mac_address (s_wired); @@ -952,7 +952,7 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) if (priv->last_pppoe_time) { gint32 delay = nm_utils_get_monotonic_timestamp_s () - priv->last_pppoe_time; - if (delay < PPPOE_RECONNECT_DELAY && device_get_setting (dev, NM_TYPE_SETTING_PPPOE)) { + if (delay < PPPOE_RECONNECT_DELAY && device_get_applied_setting (dev, NM_TYPE_SETTING_PPPOE)) { nm_log_info (LOGD_DEVICE, "(%s) delaying PPPoE reconnect for %d seconds to ensure peer is ready...", nm_device_get_iface (dev), delay); g_assert (!priv->pppoe_wait_id); @@ -1067,7 +1067,7 @@ pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reas req = nm_device_get_act_request (NM_DEVICE (self)); g_assert (req); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (req); s_pppoe = nm_connection_get_setting_pppoe (connection); @@ -1108,7 +1108,7 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *reason) g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); /* DCB and FCoE setup */ - s_dcb = (NMSettingDcb *) device_get_setting (device, NM_TYPE_SETTING_DCB); + s_dcb = (NMSettingDcb *) device_get_applied_setting (device, NM_TYPE_SETTING_DCB); if (s_dcb) { if (!nm_dcb_setup (nm_device_get_iface (device), s_dcb, &error)) { nm_log_warn (LOGD_DEVICE | LOGD_HW, @@ -1120,7 +1120,7 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *reason) } } - s_con = NM_SETTING_CONNECTION (device_get_setting (device, NM_TYPE_SETTING_CONNECTION)); + s_con = NM_SETTING_CONNECTION (device_get_applied_setting (device, NM_TYPE_SETTING_CONNECTION)); g_assert (s_con); /* 802.1x has to run before any IP configuration since the 802.1x auth @@ -1130,7 +1130,7 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *reason) if (!strcmp (connection_type, NM_SETTING_WIRED_SETTING_NAME)) { NMSetting8021x *security; - security = (NMSetting8021x *) device_get_setting (device, NM_TYPE_SETTING_802_1X); + security = (NMSetting8021x *) device_get_applied_setting (device, NM_TYPE_SETTING_802_1X); if (security) ret = nm_8021x_stage2_config (NM_DEVICE_ETHERNET (device), reason); } @@ -1148,7 +1148,7 @@ act_stage3_ip4_config_start (NMDevice *device, g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); - s_con = NM_SETTING_CONNECTION (device_get_setting (device, NM_TYPE_SETTING_CONNECTION)); + s_con = NM_SETTING_CONNECTION (device_get_applied_setting (device, NM_TYPE_SETTING_CONNECTION)); g_assert (s_con); connection_type = nm_setting_connection_get_connection_type (s_con); @@ -1209,7 +1209,7 @@ deactivate (NMDevice *device) supplicant_interface_release (self); /* Tear down DCB/FCoE if it was enabled */ - s_dcb = (NMSettingDcb *) device_get_setting (device, NM_TYPE_SETTING_DCB); + s_dcb = (NMSettingDcb *) device_get_applied_setting (device, NM_TYPE_SETTING_DCB); if (s_dcb) { if (!nm_dcb_cleanup (nm_device_get_iface (device), &error)) { nm_log_warn (LOGD_DEVICE | LOGD_HW, @@ -1220,7 +1220,7 @@ deactivate (NMDevice *device) } /* Set last PPPoE connection time */ - if (device_get_setting (device, NM_TYPE_SETTING_PPPOE)) + if (device_get_applied_setting (device, NM_TYPE_SETTING_PPPOE)) NM_DEVICE_ETHERNET_GET_PRIVATE (device)->last_pppoe_time = nm_utils_get_monotonic_timestamp_s (); /* Reset MAC address back to initial address */ diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index 4d2c96bb13..a5cb5ea022 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -161,7 +161,7 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) req = nm_device_get_act_request (dev); g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); s_infiniband = nm_connection_get_setting_infiniband (connection); g_assert (s_infiniband); diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index bdae7642c1..f6465cacc9 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -372,7 +372,7 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) req = nm_device_get_act_request (dev); g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_return_val_if_fail (connection != NULL, NM_ACT_STAGE_RETURN_FAILURE); s_wired = nm_connection_get_setting_wired (connection); diff --git a/src/devices/nm-device-wifi.c b/src/devices/nm-device-wifi.c index 3b81a59f40..aad97c27b0 100644 --- a/src/devices/nm-device-wifi.c +++ b/src/devices/nm-device-wifi.c @@ -636,7 +636,7 @@ update_seen_bssids_cache (NMDeviceWifi *self, NMAccessPoint *ap) if (nm_device_get_state (NM_DEVICE (self)) == NM_DEVICE_STATE_ACTIVATED) { req = nm_device_get_act_request (NM_DEVICE (self)); if (req) { - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); nm_settings_connection_add_seen_bssid (NM_SETTINGS_CONNECTION (connection), nm_ap_get_address (ap)); } @@ -845,7 +845,7 @@ deactivate (NMDevice *dev) req = nm_device_get_act_request (dev); if (req) { - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); /* Clear wireless secrets tries when deactivating */ g_object_set_data (G_OBJECT (connection), WIRELESS_SECRETS_TRIES, NULL); } @@ -1537,7 +1537,7 @@ scanning_allowed (NMDeviceWifi *self) const GByteArray *bssid; /* Don't scan when a shared connection is active; it makes drivers mad */ - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); ip4_method = nm_utils_get_ip_config_method (connection, NM_TYPE_SETTING_IP4_CONFIG); if (!strcmp (ip4_method, NM_SETTING_IP4_CONFIG_METHOD_SHARED)) @@ -2085,7 +2085,7 @@ wifi_secrets_cb (NMActRequest *req, g_return_if_fail (req == nm_device_get_act_request (dev)); g_return_if_fail (nm_device_get_state (dev) == NM_DEVICE_STATE_NEED_AUTH); - g_return_if_fail (nm_act_request_get_connection (req) == connection); + g_return_if_fail (nm_act_request_get_applied_connection (req) == connection); if (error) { nm_log_warn (LOGD_WIFI, "%s", error->message); @@ -2252,7 +2252,7 @@ handle_8021x_or_psk_auth_fail (NMDeviceWifi *self, req = nm_device_get_act_request (NM_DEVICE (self)); g_return_val_if_fail (req != NULL, FALSE); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); if ( need_new_8021x_secrets (self, old_state, &setting_name) @@ -2532,7 +2532,7 @@ handle_auth_or_fail (NMDeviceWifi *self, g_assert (req); } - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); tries = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (connection), WIRELESS_SECRETS_TRIES)); @@ -2587,7 +2587,7 @@ supplicant_connection_timeout_cb (gpointer user_data) req = nm_device_get_act_request (dev); g_assert (req); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); if ( priv->mode == NM_802_11_MODE_ADHOC @@ -2827,7 +2827,7 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) req = nm_device_get_act_request (NM_DEVICE (self)); g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_return_val_if_fail (connection != NULL, NM_ACT_STAGE_RETURN_FAILURE); s_wireless = nm_connection_get_setting_wireless (connection); @@ -2970,7 +2970,7 @@ act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason) goto out; } - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); s_wireless = nm_connection_get_setting_wireless (connection); @@ -3253,7 +3253,7 @@ activation_success_handler (NMDevice *dev) req = nm_device_get_act_request (dev); g_assert (req); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); /* Clear any critical protocol notification in the wifi stack */ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index b9ee388741..83c4752051 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1580,7 +1580,7 @@ nm_device_get_connection (NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - return priv->act_request ? nm_act_request_get_connection (priv->act_request) : NULL; + return priv->act_request ? nm_act_request_get_applied_connection (priv->act_request) : NULL; } NMConnection * @@ -2373,7 +2373,7 @@ nm_device_handle_autoip4_event (NMDevice *self, if (priv->act_request == NULL) return; - connection = nm_act_request_get_connection (priv->act_request); + connection = nm_act_request_get_applied_connection (priv->act_request); g_assert (connection); /* Ignore if the connection isn't an AutoIP connection */ @@ -4282,7 +4282,7 @@ nm_device_activate_ip4_config_commit (gpointer user_data) req = nm_device_get_act_request (self); g_assert (req); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); /* Device should be up before we can do anything with it */ @@ -4375,7 +4375,7 @@ nm_device_activate_ip6_config_commit (gpointer user_data) req = nm_device_get_act_request (self); g_assert (req); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); /* Device should be up before we can do anything with it */ @@ -4670,7 +4670,7 @@ nm_device_deactivate (NMDevice *self, NMDeviceStateReason reason) } if (priv->act_request) - connection = nm_act_request_get_connection (priv->act_request); + connection = nm_act_request_get_applied_connection (priv->act_request); if (connection) { s_con = nm_connection_get_setting_connection (connection); nm_firewall_manager_remove_from_zone (priv->fw_manager, @@ -4825,7 +4825,7 @@ nm_device_activate (NMDevice *self, NMActRequest *req) priv = NM_DEVICE_GET_PRIVATE (self); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); nm_log_info (LOGD_DEVICE, "Activation (%s) starting connection '%s'", @@ -6488,7 +6488,7 @@ nm_device_state_changed (NMDevice *device, case NM_DEVICE_STATE_ACTIVATED: nm_log_info (LOGD_DEVICE, "Activation (%s) successful, device activated.", nm_device_get_iface (device)); - nm_dispatcher_call (DISPATCHER_ACTION_UP, nm_act_request_get_connection (req), device, NULL, NULL); + nm_dispatcher_call (DISPATCHER_ACTION_UP, nm_act_request_get_applied_connection (req), device, NULL, NULL); break; case NM_DEVICE_STATE_FAILED: { NMConnection *connection = nm_device_get_connection (device); @@ -6543,7 +6543,7 @@ nm_device_state_changed (NMDevice *device, delete_on_deactivate_unschedule (priv); if (old_state == NM_DEVICE_STATE_ACTIVATED) - nm_dispatcher_call (DISPATCHER_ACTION_DOWN, nm_act_request_get_connection (req), device, NULL, NULL); + nm_dispatcher_call (DISPATCHER_ACTION_DOWN, nm_act_request_get_applied_connection (req), device, NULL, NULL); /* IP-related properties are only valid when the device has IP configuration. * If it no longer does, ensure their change notifications are emitted. diff --git a/src/modem-manager/nm-modem-broadband.c b/src/modem-manager/nm-modem-broadband.c index 032557de99..fa3b3e3cf1 100644 --- a/src/modem-manager/nm-modem-broadband.c +++ b/src/modem-manager/nm-modem-broadband.c @@ -304,7 +304,7 @@ act_stage1_prepare (NMModem *_self, NMModemBroadband *self = NM_MODEM_BROADBAND (_self); NMConnection *connection; - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); *out_setting_name = nm_connection_need_secrets (connection, out_hints); diff --git a/src/modem-manager/nm-modem-old.c b/src/modem-manager/nm-modem-old.c index 866a94a122..3c3e2c5c41 100644 --- a/src/modem-manager/nm-modem-old.c +++ b/src/modem-manager/nm-modem-old.c @@ -547,7 +547,7 @@ act_stage1_prepare (NMModem *modem, NMModemOldPrivate *priv = NM_MODEM_OLD_GET_PRIVATE (self); NMConnection *connection; - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); *out_setting_name = nm_connection_need_secrets (connection, out_hints); diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 998decaa4e..33dc91b740 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -236,7 +236,7 @@ ppp_stage3_ip4_config_start (NMModem *self, g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); if (NM_MODEM_GET_CLASS (self)->get_user_pass) { - NMConnection *connection = nm_act_request_get_connection (req); + NMConnection *connection = nm_act_request_get_applied_connection (req); g_assert (connection); if (!NM_MODEM_GET_CLASS (self)->get_user_pass (self, connection, &ppp_name, NULL)) diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 7a4875645b..79673e365f 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -69,7 +69,7 @@ enum { /*******************************************************************/ NMConnection * -nm_act_request_get_connection (NMActRequest *req) +nm_act_request_get_applied_connection (NMActRequest *req) { g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NULL); diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h index 08b3322c7c..c62c2de06b 100644 --- a/src/nm-activation-request.h +++ b/src/nm-activation-request.h @@ -51,7 +51,7 @@ NMActRequest *nm_act_request_new (NMConnection *connection, NMAuthSubject *subject, NMDevice *device); -NMConnection *nm_act_request_get_connection (NMActRequest *req); +NMConnection *nm_act_request_get_applied_connection (NMActRequest *req); NMConnection *nm_act_request_get_applied_connection (NMActRequest *req); gboolean nm_act_request_get_shared (NMActRequest *req); diff --git a/src/nm-policy.c b/src/nm-policy.c index e520bf2cfd..61c6269ca9 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -134,7 +134,7 @@ get_best_ip4_device (NMManager *manager, gboolean fully_activated) req = nm_device_get_act_request (dev); g_assert (req); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); method = nm_utils_get_ip_config_method (connection, NM_TYPE_SETTING_IP4_CONFIG); @@ -213,7 +213,7 @@ get_best_ip6_device (NMManager *manager, gboolean fully_activated) req = nm_device_get_act_request (dev); g_assert (req); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); method = nm_utils_get_ip_config_method (connection, NM_TYPE_SETTING_IP6_CONFIG); diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index cf085a8a73..fc82a6916f 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -466,7 +466,7 @@ impl_ppp_manager_need_secrets (NMPPPManager *manager, GError *error = NULL; NMSettingsGetSecretsFlags flags = NM_SETTINGS_GET_SECRETS_FLAG_ALLOW_INTERACTION; - connection = nm_act_request_get_connection (priv->act_req); + connection = nm_act_request_get_applied_connection (priv->act_req); nm_connection_clear_secrets (connection); priv->secrets_setting_name = nm_connection_need_secrets (connection, &hints); @@ -581,7 +581,7 @@ impl_ppp_manager_set_ip4_config (NMPPPManager *manager, priv->ip_iface = g_value_dup_string (val); /* Got successful IP4 config; obviously the secrets worked */ - connection = nm_act_request_get_connection (priv->act_req); + connection = nm_act_request_get_applied_connection (priv->act_req); g_assert (connection); g_object_set_data (G_OBJECT (connection), PPP_MANAGER_SECRET_TRIES, NULL); @@ -1036,7 +1036,7 @@ nm_ppp_manager_start (NMPPPManager *manager, if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) ignored = system ("/sbin/modprobe ppp_generic"); - connection = nm_act_request_get_connection (req); + connection = nm_act_request_get_applied_connection (req); g_assert (connection); s_ppp = nm_connection_get_setting_ppp (connection); -- cgit v1.2.1