fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-04 22:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: remove "real_" prefix from method implementation names

Browse source 
The idea was copied from gtk, but it's only used there in cases where
the method's wrapper function and default implementation would
otherwise have the same name, which never happens in NM because our
method implementations aren't prefixed with the type name, so it's
just noise here.
This commit is contained in:
Dan Winship 2012-09-27 12:12:15 -04:00
parent 14b19982f6
commit 565c43e91d
18 changed files with 466 additions and 466 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dhcp-manager/nm-dhcp-client.c
View file

@ -182,7 +182,7 @@ nm_dhcp_client_stop_pid (GPid pid, const char *iface, guint timeout_secs)
}
static void
real_stop (NMDHCPClient *self, gboolean release)
stop (NMDHCPClient *self, gboolean release)
{
NMDHCPClientPrivate *priv;
@ -1398,7 +1398,7 @@ nm_dhcp_client_class_init (NMDHCPClientClass *client_class)
object_class->get_property = get_property;
object_class->set_property = set_property;
client_class->stop = real_stop;
client_class->stop = stop;
g_object_class_install_property
(object_class, PROP_IFACE,

26
src/dhcp-manager/nm-dhcp-dhclient.c
View file

@ -545,10 +545,10 @@ dhclient_start (NMDHCPClient *client,
}
static GPid
real_ip4_start (NMDHCPClient *client,
NMSettingIP4Config *s_ip4,
guint8 *dhcp_anycast_addr,
const char *hostname)
ip4_start (NMDHCPClient *client,
NMSettingIP4Config *s_ip4,
guint8 *dhcp_anycast_addr,
const char *hostname)
{
NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
const char *iface;
@ -565,17 +565,17 @@ real_ip4_start (NMDHCPClient *client,
}
static GPid
real_ip6_start (NMDHCPClient *client,
NMSettingIP6Config *s_ip6,
guint8 *dhcp_anycast_addr,
const char *hostname,
gboolean info_only)
ip6_start (NMDHCPClient *client,
NMSettingIP6Config *s_ip6,
guint8 *dhcp_anycast_addr,
const char *hostname,
gboolean info_only)
{
return dhclient_start (client, info_only ? "-S" : "-N", FALSE);
}
static void
real_stop (NMDHCPClient *client, gboolean release)
stop (NMDHCPClient *client, gboolean release)
{
NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
@ -634,8 +634,8 @@ nm_dhcp_dhclient_class_init (NMDHCPDhclientClass *dhclient_class)
/* virtual methods */
object_class->dispose = dispose;
client_class->ip4_start = real_ip4_start;
client_class->ip6_start = real_ip6_start;
client_class->stop = real_stop;
client_class->ip4_start = ip4_start;
client_class->ip6_start = ip6_start;
client_class->stop = stop;
}

26
src/dhcp-manager/nm-dhcp-dhcpcd.c
View file

@ -93,10 +93,10 @@ dhcpcd_child_setup (gpointer user_data G_GNUC_UNUSED)
}
static GPid
real_ip4_start (NMDHCPClient *client,
NMSettingIP4Config *s_ip4,
guint8 *dhcp_anycast_addr,
const char *hostname)
ip4_start (NMDHCPClient *client,
NMSettingIP4Config *s_ip4,
guint8 *dhcp_anycast_addr,
const char *hostname)
{
NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client);
GPtrArray *argv = NULL;
@ -166,18 +166,18 @@ real_ip4_start (NMDHCPClient *client,
}
static GPid
real_ip6_start (NMDHCPClient *client,
NMSettingIP6Config *s_ip6,
guint8 *dhcp_anycast_addr,
const char *hostname,
gboolean info_only)
ip6_start (NMDHCPClient *client,
NMSettingIP6Config *s_ip6,
guint8 *dhcp_anycast_addr,
const char *hostname,
gboolean info_only)
{
nm_log_warn (LOGD_DHCP6, "the dhcpcd backend does not support IPv6.");
return -1;
}
static void
real_stop (NMDHCPClient *client, gboolean release)
stop (NMDHCPClient *client, gboolean release)
{
NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client);
@ -221,8 +221,8 @@ nm_dhcp_dhcpcd_class_init (NMDHCPDhcpcdClass *dhcpcd_class)
/* virtual methods */
object_class->dispose = dispose;
client_class->ip4_start = real_ip4_start;
client_class->ip6_start = real_ip6_start;
client_class->stop = real_stop;
client_class->ip4_start = ip4_start;
client_class->ip6_start = ip6_start;
client_class->stop = stop;
}

56
src/modem-manager/nm-modem-cdma.c
View file

@ -154,11 +154,11 @@ create_connect_properties (NMConnection *connection)
}
static NMActStageReturn
real_act_stage1_prepare (NMModem *modem,
NMActRequest *req,
GPtrArray **out_hints,
const char **out_setting_name,
NMDeviceStateReason *reason)
act_stage1_prepare (NMModem *modem,
NMActRequest *req,
GPtrArray **out_hints,
const char **out_setting_name,
NMDeviceStateReason *reason)
{
NMModemCdma *self = NM_MODEM_CDMA (modem);
NMModemCdmaPrivate *priv = NM_MODEM_CDMA_GET_PRIVATE (self);
@ -194,9 +194,9 @@ real_act_stage1_prepare (NMModem *modem,
}
static NMConnection *
real_get_best_auto_connection (NMModem *modem,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMModem *modem,
GSList *connections,
char **specific_object)
{
GSList *iter;
@ -219,9 +219,9 @@ real_get_best_auto_connection (NMModem *modem,
}
static gboolean
real_check_connection_compatible (NMModem *modem,
NMConnection *connection,
GError **error)
check_connection_compatible (NMModem *modem,
NMConnection *connection,
GError **error)
{
NMSettingConnection *s_con;
NMSettingCdma *s_cdma;
@ -248,10 +248,10 @@ real_check_connection_compatible (NMModem *modem,
}
static gboolean
real_complete_connection (NMModem *modem,
NMConnection *connection,
const GSList *existing_connections,
GError **error)
complete_connection (NMModem *modem,
NMConnection *connection,
const GSList *existing_connections,
GError **error)
{
NMSettingCdma *s_cdma;
NMSettingPPP *s_ppp;
@ -286,10 +286,10 @@ real_complete_connection (NMModem *modem,
}
static gboolean
real_get_user_pass (NMModem *modem,
NMConnection *connection,
const char **user,
const char **pass)
get_user_pass (NMModem *modem,
NMConnection *connection,
const char **user,
const char **pass)
{
NMSettingCdma *s_cdma;
@ -306,13 +306,13 @@ real_get_user_pass (NMModem *modem,
}
static const char *
real_get_setting_name (NMModem *modem)
get_setting_name (NMModem *modem)
{
return NM_SETTING_CDMA_SETTING_NAME;
}
static void
real_deactivate (NMModem *modem, NMDevice *device)
deactivate (NMModem *modem, NMDevice *device)
{
NMModemCdmaPrivate *priv = NM_MODEM_CDMA_GET_PRIVATE (modem);
@ -356,13 +356,13 @@ nm_modem_cdma_class_init (NMModemCdmaClass *klass)
/* Virtual methods */
object_class->dispose = dispose;
modem_class->get_user_pass = real_get_user_pass;
modem_class->get_setting_name = real_get_setting_name;
modem_class->get_best_auto_connection = real_get_best_auto_connection;
modem_class->check_connection_compatible = real_check_connection_compatible;
modem_class->complete_connection = real_complete_connection;
modem_class->act_stage1_prepare = real_act_stage1_prepare;
modem_class->deactivate = real_deactivate;
modem_class->get_user_pass = get_user_pass;
modem_class->get_setting_name = get_setting_name;
modem_class->get_best_auto_connection = get_best_auto_connection;
modem_class->check_connection_compatible = check_connection_compatible;
modem_class->complete_connection = complete_connection;
modem_class->act_stage1_prepare = act_stage1_prepare;
modem_class->deactivate = deactivate;
dbus_g_error_domain_register (NM_CDMA_ERROR, NULL, NM_TYPE_CDMA_ERROR);
}

56
src/modem-manager/nm-modem-gsm.c
View file

@ -435,11 +435,11 @@ create_connect_properties (NMConnection *connection)
}
static NMActStageReturn
real_act_stage1_prepare (NMModem *modem,
NMActRequest *req,
GPtrArray **out_hints,
const char **out_setting_name,
NMDeviceStateReason *reason)
act_stage1_prepare (NMModem *modem,
NMActRequest *req,
GPtrArray **out_hints,
const char **out_setting_name,
NMDeviceStateReason *reason)
{
NMModemGsm *self = NM_MODEM_GSM (modem);
NMModemGsmPrivate *priv = NM_MODEM_GSM_GET_PRIVATE (self);
@ -468,9 +468,9 @@ real_act_stage1_prepare (NMModem *modem,
}
static NMConnection *
real_get_best_auto_connection (NMModem *modem,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMModem *modem,
GSList *connections,
char **specific_object)
{
GSList *iter;
@ -493,9 +493,9 @@ real_get_best_auto_connection (NMModem *modem,
}
static gboolean
real_check_connection_compatible (NMModem *modem,
NMConnection *connection,
GError **error)
check_connection_compatible (NMModem *modem,
NMConnection *connection,
GError **error)
{
NMSettingConnection *s_con;
NMSettingGsm *s_gsm;
@ -522,10 +522,10 @@ real_check_connection_compatible (NMModem *modem,
}
static gboolean
real_complete_connection (NMModem *modem,
NMConnection *connection,
const GSList *existing_connections,
GError **error)
complete_connection (NMModem *modem,
NMConnection *connection,
const GSList *existing_connections,
GError **error)
{
NMSettingGsm *s_gsm;
NMSettingPPP *s_ppp;
@ -564,10 +564,10 @@ real_complete_connection (NMModem *modem,
}
static gboolean
real_get_user_pass (NMModem *modem,
NMConnection *connection,
const char **user,
const char **pass)
get_user_pass (NMModem *modem,
NMConnection *connection,
const char **user,
const char **pass)
{
NMSettingGsm *s_gsm;
@ -584,13 +584,13 @@ real_get_user_pass (NMModem *modem,
}
static const char *
real_get_setting_name (NMModem *modem)
get_setting_name (NMModem *modem)
{
return NM_SETTING_GSM_SETTING_NAME;
}
static void
real_deactivate (NMModem *modem, NMDevice *device)
deactivate (NMModem *modem, NMDevice *device)
{
NMModemGsmPrivate *priv = NM_MODEM_GSM_GET_PRIVATE (modem);
@ -642,13 +642,13 @@ nm_modem_gsm_class_init (NMModemGsmClass *klass)
/* Virtual methods */
object_class->dispose = dispose;
modem_class->get_user_pass = real_get_user_pass;
modem_class->get_setting_name = real_get_setting_name;
modem_class->get_best_auto_connection = real_get_best_auto_connection;
modem_class->check_connection_compatible = real_check_connection_compatible;
modem_class->complete_connection = real_complete_connection;
modem_class->act_stage1_prepare = real_act_stage1_prepare;
modem_class->deactivate = real_deactivate;
modem_class->get_user_pass = get_user_pass;
modem_class->get_setting_name = get_setting_name;
modem_class->get_best_auto_connection = get_best_auto_connection;
modem_class->check_connection_compatible = check_connection_compatible;
modem_class->complete_connection = complete_connection;
modem_class->act_stage1_prepare = act_stage1_prepare;
modem_class->deactivate = deactivate;
dbus_g_error_domain_register (NM_GSM_ERROR, NULL, NM_TYPE_GSM_ERROR);
}

16
src/modem-manager/nm-modem.c
View file

@ -497,11 +497,11 @@ nm_modem_get_secrets (NMModem *self,
}
static NMActStageReturn
real_act_stage1_prepare (NMModem *modem,
NMActRequest *req,
GPtrArray **out_hints,
const char **out_setting_name,
NMDeviceStateReason *reason)
act_stage1_prepare (NMModem *modem,
NMActRequest *req,
GPtrArray **out_hints,
const char **out_setting_name,
NMDeviceStateReason *reason)
{
*reason = NM_DEVICE_STATE_REASON_UNKNOWN;
return NM_ACT_STAGE_RETURN_FAILURE;
@ -598,7 +598,7 @@ nm_modem_complete_connection (NMModem *self,
}
static void
real_deactivate (NMModem *self, NMDevice *device)
deactivate (NMModem *self, NMDevice *device)
{
NMModemPrivate *priv;
int ifindex;
@ -1067,8 +1067,8 @@ nm_modem_class_init (NMModemClass *klass)
object_class->dispose = dispose;
object_class->finalize = finalize;
klass->act_stage1_prepare = real_act_stage1_prepare;
klass->deactivate = real_deactivate;
klass->act_stage1_prepare = act_stage1_prepare;
klass->deactivate = deactivate;
/* Properties */
g_object_class_install_property

56
src/nm-device-adsl.c
View file

@ -101,7 +101,7 @@ enum {
/**************************************************************/
static guint32
real_get_generic_capabilities (NMDevice *dev)
get_generic_capabilities (NMDevice *dev)
{
guint32 caps = NM_DEVICE_CAP_NM_SUPPORTED;
caps |= NM_DEVICE_CAP_CARRIER_DETECT;
@ -109,7 +109,7 @@ real_get_generic_capabilities (NMDevice *dev)
}
static gboolean
real_can_interrupt_activation (NMDevice *dev)
can_interrupt_activation (NMDevice *dev)
{
NMDeviceAdsl *self = NM_DEVICE_ADSL (dev);
gboolean interrupt = FALSE;
@ -124,7 +124,7 @@ real_can_interrupt_activation (NMDevice *dev)
}
static gboolean
real_is_available (NMDevice *dev)
is_available (NMDevice *dev)
{
NMDeviceAdsl *self = NM_DEVICE_ADSL (dev);
@ -136,9 +136,9 @@ real_is_available (NMDevice *dev)
}
static gboolean
real_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
NMSettingAdsl *s_adsl;
const char *protocol;
@ -171,11 +171,11 @@ real_check_connection_compatible (NMDevice *device,
}
static gboolean
real_complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
{
NMSettingAdsl *s_adsl;
@ -199,9 +199,9 @@ real_complete_connection (NMDevice *device,
}
static NMConnection *
real_get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
{
GSList *iter;
@ -418,7 +418,7 @@ netlink_notification (NMNetlinkMonitor *monitor,
}
static NMActStageReturn
real_act_stage2_config (NMDevice *device, NMDeviceStateReason *out_reason)
act_stage2_config (NMDevice *device, NMDeviceStateReason *out_reason)
{
NMDeviceAdsl *self = NM_DEVICE_ADSL (device);
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
@ -505,9 +505,9 @@ ppp_ip4_config (NMPPPManager *ppp_manager,
}
static NMActStageReturn
real_act_stage3_ip4_config_start (NMDevice *device,
NMIP4Config **out_config,
NMDeviceStateReason *reason)
act_stage3_ip4_config_start (NMDevice *device,
NMIP4Config **out_config,
NMDeviceStateReason *reason)
{
NMDeviceAdsl *self = NM_DEVICE_ADSL (device);
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
@ -563,7 +563,7 @@ real_act_stage3_ip4_config_start (NMDevice *device,
}
static void
real_deactivate (NMDevice *device)
deactivate (NMDevice *device)
{
NMDeviceAdsl *self = NM_DEVICE_ADSL (device);
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
@ -810,17 +810,17 @@ nm_device_adsl_class_init (NMDeviceAdslClass *klass)
object_class->get_property = get_property;
object_class->set_property = set_property;
parent_class->get_generic_capabilities = real_get_generic_capabilities;
parent_class->can_interrupt_activation = real_can_interrupt_activation;
parent_class->is_available = real_is_available;
parent_class->get_generic_capabilities = get_generic_capabilities;
parent_class->can_interrupt_activation = can_interrupt_activation;
parent_class->is_available = is_available;
parent_class->check_connection_compatible = real_check_connection_compatible;
parent_class->get_best_auto_connection = real_get_best_auto_connection;
parent_class->complete_connection = real_complete_connection;
parent_class->check_connection_compatible = check_connection_compatible;
parent_class->get_best_auto_connection = get_best_auto_connection;
parent_class->complete_connection = complete_connection;
parent_class->act_stage2_config = real_act_stage2_config;
parent_class->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start;
parent_class->deactivate = real_deactivate;
parent_class->act_stage2_config = act_stage2_config;
parent_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
parent_class->deactivate = deactivate;
/* properties */
g_object_class_install_property

40
src/nm-device-bond.c
View file

@ -91,7 +91,7 @@ device_state_changed (NMDevice *device,
}
static void
real_update_hw_address (NMDevice *dev)
update_hw_address (NMDevice *dev)
{
const guint8 *hw_addr;
guint8 old_addr[NM_UTILS_HWADDR_LEN_MAX];
@ -113,7 +113,7 @@ real_update_hw_address (NMDevice *dev)
}
static guint32
real_get_generic_capabilities (NMDevice *dev)
get_generic_capabilities (NMDevice *dev)
{
return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_NM_SUPPORTED;
}
@ -145,9 +145,9 @@ match_bond_connection (NMDevice *device, NMConnection *connection, GError **erro
}
static NMConnection *
real_get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
{
GSList *iter;
@ -165,19 +165,19 @@ real_get_best_auto_connection (NMDevice *dev,
}
static gboolean
real_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
return match_bond_connection (device, connection, error);
}
static gboolean
real_complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
{
NMSettingBond *s_bond, *tmp;
guint32 i = 0;
@ -293,7 +293,7 @@ connection_match_config (NMDevice *self, const GSList *connections)
/******************************************************************/
static NMActStageReturn
real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
{
NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS;
NMConnection *connection;
@ -527,16 +527,16 @@ nm_device_bond_class_init (NMDeviceBondClass *klass)
object_class->set_property = set_property;
object_class->dispose = dispose;
parent_class->get_generic_capabilities = real_get_generic_capabilities;
parent_class->update_hw_address = real_update_hw_address;
parent_class->get_best_auto_connection = real_get_best_auto_connection;
parent_class->check_connection_compatible = real_check_connection_compatible;
parent_class->complete_connection = real_complete_connection;
parent_class->get_generic_capabilities = get_generic_capabilities;
parent_class->update_hw_address = update_hw_address;
parent_class->get_best_auto_connection = get_best_auto_connection;
parent_class->check_connection_compatible = check_connection_compatible;
parent_class->complete_connection = complete_connection;
parent_class->spec_match_list = spec_match_list;
parent_class->connection_match_config = connection_match_config;
parent_class->act_stage1_prepare = real_act_stage1_prepare;
parent_class->act_stage1_prepare = act_stage1_prepare;
parent_class->enslave_slave = enslave_slave;
parent_class->release_slave = release_slave;

64
src/nm-device-bt.c
View file

@ -146,9 +146,9 @@ get_connection_bt_type (NMConnection *connection)
}
static NMConnection *
real_get_best_auto_connection (NMDevice *device,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMDevice *device,
GSList *connections,
char **specific_object)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
GSList *iter;
@ -181,9 +181,9 @@ real_get_best_auto_connection (NMDevice *device,
}
static gboolean
real_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
NMSettingConnection *s_con;
@ -237,7 +237,7 @@ real_check_connection_compatible (NMDevice *device,
}
static gboolean
real_check_connection_available (NMDevice *device, NMConnection *connection)
check_connection_available (NMDevice *device, NMConnection *connection)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
guint32 bt_type;
@ -254,11 +254,11 @@ real_check_connection_available (NMDevice *device, NMConnection *connection)
}
static gboolean
real_complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
NMSettingBluetooth *s_bt;
@ -395,7 +395,7 @@ real_complete_connection (NMDevice *device,
}
static guint32
real_get_generic_capabilities (NMDevice *dev)
get_generic_capabilities (NMDevice *dev)
{
return NM_DEVICE_CAP_NM_SUPPORTED;
}
@ -880,7 +880,7 @@ bt_connect_timeout (gpointer user_data)
}
static NMActStageReturn
real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
DBusGConnection *bus;
@ -956,9 +956,9 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
}
static NMActStageReturn
real_act_stage3_ip4_config_start (NMDevice *device,
NMIP4Config **out_config,
NMDeviceStateReason *reason)
act_stage3_ip4_config_start (NMDevice *device,
NMIP4Config **out_config,
NMDeviceStateReason *reason)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
NMActStageReturn ret;
@ -975,9 +975,9 @@ real_act_stage3_ip4_config_start (NMDevice *device,
}
static NMActStageReturn
real_act_stage3_ip6_config_start (NMDevice *device,
NMIP6Config **out_config,
NMDeviceStateReason *reason)
act_stage3_ip6_config_start (NMDevice *device,
NMIP6Config **out_config,
NMDeviceStateReason *reason)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
NMActStageReturn ret;
@ -994,7 +994,7 @@ real_act_stage3_ip6_config_start (NMDevice *device,
}
static void
real_deactivate (NMDevice *device)
deactivate (NMDevice *device)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
@ -1060,7 +1060,7 @@ real_deactivate (NMDevice *device)
/*****************************************************************************/
static gboolean
real_is_available (NMDevice *dev)
is_available (NMDevice *dev)
{
NMDeviceBt *self = NM_DEVICE_BT (dev);
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
@ -1298,17 +1298,17 @@ nm_device_bt_class_init (NMDeviceBtClass *klass)
object_class->dispose = dispose;
object_class->finalize = finalize;
device_class->get_best_auto_connection = real_get_best_auto_connection;
device_class->get_generic_capabilities = real_get_generic_capabilities;
device_class->deactivate = real_deactivate;
device_class->act_stage2_config = real_act_stage2_config;
device_class->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start;
device_class->act_stage3_ip6_config_start = real_act_stage3_ip6_config_start;
device_class->check_connection_compatible = real_check_connection_compatible;
device_class->check_connection_available = real_check_connection_available;
device_class->complete_connection = real_complete_connection;
device_class->get_best_auto_connection = get_best_auto_connection;
device_class->get_generic_capabilities = get_generic_capabilities;
device_class->deactivate = deactivate;
device_class->act_stage2_config = act_stage2_config;
device_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
device_class->act_stage3_ip6_config_start = act_stage3_ip6_config_start;
device_class->check_connection_compatible = check_connection_compatible;
device_class->check_connection_available = check_connection_available;
device_class->complete_connection = complete_connection;
device_class->hwaddr_matches = hwaddr_matches;
device_class->is_available = real_is_available;
device_class->is_available = is_available;
/* Properties */
g_object_class_install_property

82
src/nm-device-ethernet.c
View file

@ -304,7 +304,7 @@ nm_device_ethernet_init (NMDeviceEthernet * self)
}
static gboolean
real_is_up (NMDevice *device)
is_up (NMDevice *device)
{
if (!NM_DEVICE_ETHERNET_GET_PRIVATE (device)->supplicant.mgr)
return FALSE;
@ -313,7 +313,7 @@ real_is_up (NMDevice *device)
}
static gboolean
real_bring_up (NMDevice *dev)
bring_up (NMDevice *dev)
{
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (dev);
@ -323,7 +323,7 @@ real_bring_up (NMDevice *dev)
}
static void
real_take_down (NMDevice *dev)
take_down (NMDevice *dev)
{
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (dev);
@ -408,7 +408,7 @@ _set_hw_addr (NMDeviceEthernet *self, const guint8 *addr, const char *detail)
}
static void
real_update_hw_address (NMDevice *dev)
update_hw_address (NMDevice *dev)
{
const guint8 *hw_addr;
guint8 old_addr[ETH_ALEN];
@ -424,7 +424,7 @@ real_update_hw_address (NMDevice *dev)
}
static void
real_update_permanent_hw_address (NMDevice *dev)
update_permanent_hw_address (NMDevice *dev)
{
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
@ -468,7 +468,7 @@ real_update_permanent_hw_address (NMDevice *dev)
}
static void
real_update_initial_hw_address (NMDevice *dev)
update_initial_hw_address (NMDevice *dev)
{
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
@ -482,7 +482,7 @@ real_update_initial_hw_address (NMDevice *dev)
*/
current_addr = nm_device_wired_get_hwaddr (NM_DEVICE_WIRED (self));
if (!memcmp (current_addr, &zero, ETH_ALEN))
real_update_hw_address (dev);
update_hw_address (dev);
if (memcmp (&priv->initial_hw_addr, current_addr, ETH_ALEN))
memcpy (&priv->initial_hw_addr, current_addr, ETH_ALEN);
@ -497,7 +497,7 @@ real_update_initial_hw_address (NMDevice *dev)
}
static guint32
real_get_generic_capabilities (NMDevice *dev)
get_generic_capabilities (NMDevice *dev)
{
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
guint32 caps = NM_DEVICE_CAP_NONE;
@ -620,9 +620,9 @@ match_ethernet_connection (NMDevice *device, NMConnection *connection,
}
static NMConnection *
real_get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
{
GSList *iter;
@ -1047,7 +1047,7 @@ supplicant_interface_init (NMDeviceEthernet *self)
}
static NMActStageReturn
real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
{
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
NMActRequest *req;
@ -1198,7 +1198,7 @@ pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reas
}
static NMActStageReturn
real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
{
NMSettingConnection *s_con;
const char *connection_type;
@ -1225,9 +1225,9 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
}
static NMActStageReturn
real_act_stage3_ip4_config_start (NMDevice *device,
NMIP4Config **out_config,
NMDeviceStateReason *reason)
act_stage3_ip4_config_start (NMDevice *device,
NMIP4Config **out_config,
NMDeviceStateReason *reason)
{
NMSettingConnection *s_con;
const char *connection_type;
@ -1245,7 +1245,7 @@ real_act_stage3_ip4_config_start (NMDevice *device,
}
static void
real_ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
{
NMConnection *connection;
NMSettingWired *s_wired;
@ -1267,7 +1267,7 @@ real_ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
}
static void
real_deactivate (NMDevice *device)
deactivate (NMDevice *device)
{
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (device);
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
@ -1292,19 +1292,19 @@ real_deactivate (NMDevice *device)
}
static gboolean
real_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
return match_ethernet_connection (device, connection, TRUE, error);
}
static gboolean
real_complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
{
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);
NMSettingWired *s_wired;
@ -1514,22 +1514,22 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *klass)
object_class->get_property = get_property;
object_class->set_property = set_property;
parent_class->get_generic_capabilities = real_get_generic_capabilities;
parent_class->is_up = real_is_up;
parent_class->bring_up = real_bring_up;
parent_class->take_down = real_take_down;
parent_class->update_hw_address = real_update_hw_address;
parent_class->update_permanent_hw_address = real_update_permanent_hw_address;
parent_class->update_initial_hw_address = real_update_initial_hw_address;
parent_class->get_best_auto_connection = real_get_best_auto_connection;
parent_class->check_connection_compatible = real_check_connection_compatible;
parent_class->complete_connection = real_complete_connection;
parent_class->get_generic_capabilities = get_generic_capabilities;
parent_class->is_up = is_up;
parent_class->bring_up = bring_up;
parent_class->take_down = take_down;
parent_class->update_hw_address = update_hw_address;
parent_class->update_permanent_hw_address = update_permanent_hw_address;
parent_class->update_initial_hw_address = update_initial_hw_address;
parent_class->get_best_auto_connection = get_best_auto_connection;
parent_class->check_connection_compatible = check_connection_compatible;
parent_class->complete_connection = complete_connection;
parent_class->act_stage1_prepare = real_act_stage1_prepare;
parent_class->act_stage2_config = real_act_stage2_config;
parent_class->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start;
parent_class->ip4_config_pre_commit = real_ip4_config_pre_commit;
parent_class->deactivate = real_deactivate;
parent_class->act_stage1_prepare = act_stage1_prepare;
parent_class->act_stage2_config = act_stage2_config;
parent_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
parent_class->ip4_config_pre_commit = ip4_config_pre_commit;
parent_class->deactivate = deactivate;
parent_class->spec_match_list = spec_match_list;
parent_class->connection_match_config = connection_match_config;
parent_class->hwaddr_matches = hwaddr_matches;

44
src/nm-device-infiniband.c
View file

@ -122,7 +122,7 @@ nm_device_infiniband_new (const char *udi,
static void
real_update_hw_address (NMDevice *dev)
update_hw_address (NMDevice *dev)
{
const guint8 *hw_addr;
guint8 old_addr[INFINIBAND_ALEN];
@ -138,15 +138,15 @@ real_update_hw_address (NMDevice *dev)
}
static guint32
real_get_generic_capabilities (NMDevice *dev)
get_generic_capabilities (NMDevice *dev)
{
return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_NM_SUPPORTED;
}
static NMConnection *
real_get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
{
GSList *iter;
@ -182,7 +182,7 @@ real_get_best_auto_connection (NMDevice *dev,
}
static NMActStageReturn
real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
{
NMActRequest *req;
NMConnection *connection;
@ -229,7 +229,7 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
}
static void
real_ip4_config_pre_commit (NMDevice *self, NMIP4Config *config)
ip4_config_pre_commit (NMDevice *self, NMIP4Config *config)
{
NMConnection *connection;
NMSettingInfiniband *s_infiniband;
@ -247,9 +247,9 @@ real_ip4_config_pre_commit (NMDevice *self, NMIP4Config *config)
}
static gboolean
real_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
NMSettingInfiniband *s_infiniband;
const GByteArray *mac;
@ -287,11 +287,11 @@ real_check_connection_compatible (NMDevice *device,
}
static gboolean
real_complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
{
NMSettingInfiniband *s_infiniband;
const GByteArray *setting_mac;
@ -476,14 +476,14 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *klass)
object_class->get_property = get_property;
object_class->set_property = set_property;
parent_class->get_generic_capabilities = real_get_generic_capabilities;
parent_class->update_hw_address = real_update_hw_address;
parent_class->get_best_auto_connection = real_get_best_auto_connection;
parent_class->check_connection_compatible = real_check_connection_compatible;
parent_class->complete_connection = real_complete_connection;
parent_class->get_generic_capabilities = get_generic_capabilities;
parent_class->update_hw_address = update_hw_address;
parent_class->get_best_auto_connection = get_best_auto_connection;
parent_class->check_connection_compatible = check_connection_compatible;
parent_class->complete_connection = complete_connection;
parent_class->act_stage1_prepare = real_act_stage1_prepare;
parent_class->ip4_config_pre_commit = real_ip4_config_pre_commit;
parent_class->act_stage1_prepare = act_stage1_prepare;
parent_class->ip4_config_pre_commit = ip4_config_pre_commit;
parent_class->spec_match_list = spec_match_list;
parent_class->connection_match_config = connection_match_config;
parent_class->hwaddr_matches = hwaddr_matches;

80
src/nm-device-modem.c
View file

@ -56,7 +56,7 @@ enum {
};
static guint signals[LAST_SIGNAL] = { 0 };
static void real_set_enabled (NMDevice *device, gboolean enabled);
static void set_enabled (NMDevice *device, gboolean enabled);
/*****************************************************************************/
@ -161,7 +161,7 @@ modem_enabled_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
NMDeviceModem *self = NM_DEVICE_MODEM (user_data);
NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (self);
real_set_enabled (NM_DEVICE (self), nm_modem_get_mm_enabled (priv->modem));
set_enabled (NM_DEVICE (self), nm_modem_get_mm_enabled (priv->modem));
g_signal_emit (G_OBJECT (self), signals[ENABLE_CHANGED], 0);
}
@ -206,15 +206,15 @@ device_state_changed (NMDevice *device,
}
static guint32
real_get_generic_capabilities (NMDevice *device)
get_generic_capabilities (NMDevice *device)
{
return NM_DEVICE_CAP_NM_SUPPORTED;
}
static NMConnection *
real_get_best_auto_connection (NMDevice *device,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMDevice *device,
GSList *connections,
char **specific_object)
{
NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (device);
@ -222,9 +222,9 @@ real_get_best_auto_connection (NMDevice *device,
}
static gboolean
real_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (device);
@ -232,11 +232,11 @@ real_check_connection_compatible (NMDevice *device,
}
static gboolean
real_complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
{
NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (device);
@ -244,25 +244,25 @@ real_complete_connection (NMDevice *device,
}
static gboolean
real_hw_is_up (NMDevice *device)
hw_is_up (NMDevice *device)
{
return nm_modem_hw_is_up (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem, device);
}
static gboolean
real_hw_bring_up (NMDevice *device, gboolean *no_firmware)
hw_bring_up (NMDevice *device, gboolean *no_firmware)
{
return nm_modem_hw_bring_up (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem, device, no_firmware);
}
static void
real_deactivate (NMDevice *device)
deactivate (NMDevice *device)
{
nm_modem_deactivate (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem, device);
}
static NMActStageReturn
real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
{
NMActRequest *req;
@ -273,7 +273,7 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
}
static NMActStageReturn
real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
{
NMActRequest *req;
@ -284,9 +284,9 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
}
static NMActStageReturn
real_act_stage3_ip4_config_start (NMDevice *device,
NMIP4Config **out_config,
NMDeviceStateReason *reason)
act_stage3_ip4_config_start (NMDevice *device,
NMIP4Config **out_config,
NMDeviceStateReason *reason)
{
return nm_modem_stage3_ip4_config_start (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem,
device,
@ -295,9 +295,9 @@ real_act_stage3_ip4_config_start (NMDevice *device,
}
static NMActStageReturn
real_act_stage3_ip6_config_start (NMDevice *device,
NMIP6Config **out_config,
NMDeviceStateReason *reason)
act_stage3_ip6_config_start (NMDevice *device,
NMIP6Config **out_config,
NMDeviceStateReason *reason)
{
return nm_modem_stage3_ip6_config_start (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem,
device,
@ -308,13 +308,13 @@ real_act_stage3_ip6_config_start (NMDevice *device,
/*****************************************************************************/
static gboolean
real_get_enabled (NMDevice *device)
get_enabled (NMDevice *device)
{
return nm_modem_get_mm_enabled (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem);
}
static void
real_set_enabled (NMDevice *device, gboolean enabled)
set_enabled (NMDevice *device, gboolean enabled)
{
NMDeviceModem *self = NM_DEVICE_MODEM (device);
NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (self);
@ -464,19 +464,19 @@ nm_device_modem_class_init (NMDeviceModemClass *mclass)
object_class->get_property = get_property;
object_class->set_property = set_property;
device_class->get_generic_capabilities = real_get_generic_capabilities;
device_class->get_best_auto_connection = real_get_best_auto_connection;
device_class->check_connection_compatible = real_check_connection_compatible;
device_class->complete_connection = real_complete_connection;
device_class->hw_is_up = real_hw_is_up;
device_class->hw_bring_up = real_hw_bring_up;
device_class->deactivate = real_deactivate;
device_class->act_stage1_prepare = real_act_stage1_prepare;
device_class->act_stage2_config = real_act_stage2_config;
device_class->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start;
device_class->act_stage3_ip6_config_start = real_act_stage3_ip6_config_start;
device_class->get_enabled = real_get_enabled;
device_class->set_enabled = real_set_enabled;
device_class->get_generic_capabilities = get_generic_capabilities;
device_class->get_best_auto_connection = get_best_auto_connection;
device_class->check_connection_compatible = check_connection_compatible;
device_class->complete_connection = complete_connection;
device_class->hw_is_up = hw_is_up;
device_class->hw_bring_up = hw_bring_up;
device_class->deactivate = deactivate;
device_class->act_stage1_prepare = act_stage1_prepare;
device_class->act_stage2_config = act_stage2_config;
device_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
device_class->act_stage3_ip6_config_start = act_stage3_ip6_config_start;
device_class->get_enabled = get_enabled;
device_class->set_enabled = set_enabled;
/* Properties */
g_object_class_install_property

60
src/nm-device-olpc-mesh.c
View file

@ -117,7 +117,7 @@ nm_olpc_mesh_error_quark (void)
}
static guint32
real_get_generic_capabilities (NMDevice *dev)
get_generic_capabilities (NMDevice *dev)
{
return NM_DEVICE_CAP_NM_SUPPORTED;
}
@ -179,25 +179,25 @@ constructor (GType type,
}
static gboolean
real_hw_is_up (NMDevice *device)
hw_is_up (NMDevice *device)
{
return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
}
static gboolean
real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
hw_bring_up (NMDevice *dev, gboolean *no_firmware)
{
return nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), TRUE, no_firmware);
}
static void
real_hw_take_down (NMDevice *dev)
hw_take_down (NMDevice *dev)
{
nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), FALSE, NULL);
}
static gboolean
real_is_up (NMDevice *device)
is_up (NMDevice *device)
{
NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (device);
NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self);
@ -206,7 +206,7 @@ real_is_up (NMDevice *device)
}
static gboolean
real_bring_up (NMDevice *dev)
bring_up (NMDevice *dev)
{
NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (dev);
NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self);
@ -228,15 +228,15 @@ device_cleanup (NMDeviceOlpcMesh *self)
}
static void
real_take_down (NMDevice *dev)
take_down (NMDevice *dev)
{
device_cleanup (NM_DEVICE_OLPC_MESH (dev));
}
static gboolean
real_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
NMSettingConnection *s_con;
NMSettingOlpcMesh *s_mesh;
@ -265,11 +265,11 @@ real_check_connection_compatible (NMDevice *device,
#define DEFAULT_SSID "olpc-mesh"
static gboolean
real_complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
{
NMSettingOlpcMesh *s_mesh;
GByteArray *tmp;
@ -327,7 +327,7 @@ nm_device_olpc_mesh_get_address (NMDeviceOlpcMesh *self,
/****************************************************************************/
static void
real_update_hw_address (NMDevice *dev)
update_hw_address (NMDevice *dev)
{
NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (dev);
NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self);
@ -360,7 +360,7 @@ out:
static NMActStageReturn
real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
{
NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (dev);
gboolean scanning;
@ -402,7 +402,7 @@ _mesh_set_channel (NMDeviceOlpcMesh *self, guint32 channel)
}
static NMActStageReturn
real_act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
{
NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (dev);
NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self);
@ -510,19 +510,19 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *klass)
object_class->dispose = dispose;
parent_class->get_type_capabilities = NULL;
parent_class->get_generic_capabilities = real_get_generic_capabilities;
parent_class->hw_is_up = real_hw_is_up;
parent_class->hw_bring_up = real_hw_bring_up;
parent_class->hw_take_down = real_hw_take_down;
parent_class->is_up = real_is_up;
parent_class->bring_up = real_bring_up;
parent_class->take_down = real_take_down;
parent_class->update_hw_address = real_update_hw_address;
parent_class->check_connection_compatible = real_check_connection_compatible;
parent_class->complete_connection = real_complete_connection;
parent_class->get_generic_capabilities = get_generic_capabilities;
parent_class->hw_is_up = hw_is_up;
parent_class->hw_bring_up = hw_bring_up;
parent_class->hw_take_down = hw_take_down;
parent_class->is_up = is_up;
parent_class->bring_up = bring_up;
parent_class->take_down = take_down;
parent_class->update_hw_address = update_hw_address;
parent_class->check_connection_compatible = check_connection_compatible;
parent_class->complete_connection = complete_connection;
parent_class->act_stage1_prepare = real_act_stage1_prepare;
parent_class->act_stage2_config = real_act_stage2_config;
parent_class->act_stage1_prepare = act_stage1_prepare;
parent_class->act_stage2_config = act_stage2_config;
/* Properties */
g_object_class_install_property

56
src/nm-device-vlan.c
View file

@ -100,7 +100,7 @@ nm_vlan_error_quark (void)
/******************************************************************/
static guint32
real_get_generic_capabilities (NMDevice *dev)
get_generic_capabilities (NMDevice *dev)
{
/* We assume VLAN interfaces always support carrier detect */
return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_NM_SUPPORTED;
@ -130,13 +130,13 @@ get_carrier_sync (NMDeviceVlan *self)
}
static gboolean
real_hw_is_up (NMDevice *device)
hw_is_up (NMDevice *device)
{
return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
}
static gboolean
real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
hw_bring_up (NMDevice *dev, gboolean *no_firmware)
{
gboolean success = FALSE, carrier;
guint i = 20;
@ -163,13 +163,13 @@ real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
}
static void
real_hw_take_down (NMDevice *dev)
hw_take_down (NMDevice *dev)
{
nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), FALSE, NULL);
}
static void
real_update_hw_address (NMDevice *dev)
update_hw_address (NMDevice *dev)
{
NMDeviceVlan *self = NM_DEVICE_VLAN (dev);
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (self);
@ -209,14 +209,14 @@ out:
}
static gboolean
real_can_interrupt_activation (NMDevice *dev)
can_interrupt_activation (NMDevice *dev)
{
/* Can interrupt activation if the carrier drops while activating */
return NM_DEVICE_VLAN_GET_PRIVATE (dev)->carrier ? FALSE : TRUE;
}
static gboolean
real_is_available (NMDevice *dev)
is_available (NMDevice *dev)
{
return NM_DEVICE_VLAN_GET_PRIVATE (dev)->carrier ? TRUE : FALSE;
}
@ -319,9 +319,9 @@ match_vlan_connection (NMDeviceVlan *self, NMConnection *connection, GError **er
}
static NMConnection *
real_get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
{
GSList *iter;
@ -339,19 +339,19 @@ real_get_best_auto_connection (NMDevice *dev,
}
static gboolean
real_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
return match_vlan_connection (NM_DEVICE_VLAN (device), connection, error);
}
static gboolean
real_complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
{
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (device);
NMSettingVlan *s_vlan;
@ -758,17 +758,17 @@ nm_device_vlan_class_init (NMDeviceVlanClass *klass)
object_class->set_property = set_property;
object_class->dispose = dispose;
parent_class->get_generic_capabilities = real_get_generic_capabilities;
parent_class->update_hw_address = real_update_hw_address;
parent_class->hw_is_up = real_hw_is_up;
parent_class->hw_bring_up = real_hw_bring_up;
parent_class->hw_take_down = real_hw_take_down;
parent_class->can_interrupt_activation = real_can_interrupt_activation;
parent_class->is_available = real_is_available;
parent_class->get_generic_capabilities = get_generic_capabilities;
parent_class->update_hw_address = update_hw_address;
parent_class->hw_is_up = hw_is_up;
parent_class->hw_bring_up = hw_bring_up;
parent_class->hw_take_down = hw_take_down;
parent_class->can_interrupt_activation = can_interrupt_activation;
parent_class->is_available = is_available;
parent_class->get_best_auto_connection = real_get_best_auto_connection;
parent_class->check_connection_compatible = real_check_connection_compatible;
parent_class->complete_connection = real_complete_connection;
parent_class->get_best_auto_connection = get_best_auto_connection;
parent_class->check_connection_compatible = check_connection_compatible;
parent_class->complete_connection = complete_connection;
parent_class->spec_match_list = spec_match_list;
parent_class->connection_match_config = connection_match_config;

118
src/nm-device-wifi.c
View file

@ -278,7 +278,7 @@ ipw_rfkill_state_work (gpointer user_data)
/*****************************************************************/
static guint32
real_get_generic_capabilities (NMDevice *dev)
get_generic_capabilities (NMDevice *dev)
{
return NM_DEVICE_CAP_NM_SUPPORTED;
}
@ -799,13 +799,13 @@ periodic_update (gpointer user_data)
}
static gboolean
real_hw_is_up (NMDevice *device)
hw_is_up (NMDevice *device)
{
return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
}
static gboolean
real_hw_bring_up (NMDevice *device, gboolean *no_firmware)
hw_bring_up (NMDevice *device, gboolean *no_firmware)
{
if (!NM_DEVICE_WIFI_GET_PRIVATE (device)->enabled)
return FALSE;
@ -814,13 +814,13 @@ real_hw_bring_up (NMDevice *device, gboolean *no_firmware)
}
static void
real_hw_take_down (NMDevice *device)
hw_take_down (NMDevice *device)
{
nm_system_iface_set_up (nm_device_get_ip_ifindex (device), FALSE, NULL);
}
static gboolean
real_is_up (NMDevice *device)
is_up (NMDevice *device)
{
if (!NM_DEVICE_WIFI_GET_PRIVATE (device)->periodic_source_id)
return FALSE;
@ -829,7 +829,7 @@ real_is_up (NMDevice *device)
}
static gboolean
real_bring_up (NMDevice *dev)
bring_up (NMDevice *dev)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -875,7 +875,7 @@ _set_hw_addr (NMDeviceWifi *self, const guint8 *addr, const char *detail)
}
/* Can't change MAC address while device is up */
real_hw_take_down (dev);
hw_take_down (dev);
success = nm_system_iface_set_mac (nm_device_get_ip_ifindex (dev), (struct ether_addr *) addr);
if (success) {
@ -887,7 +887,7 @@ _set_hw_addr (NMDeviceWifi *self, const guint8 *addr, const char *detail)
nm_log_warn (LOGD_DEVICE | LOGD_ETHER, "(%s): failed to %s MAC address to %s",
iface, detail, mac_str);
}
real_hw_bring_up (dev, NULL);
hw_bring_up (dev, NULL);
g_free (mac_str);
return success;
@ -920,7 +920,7 @@ remove_all_aps (NMDeviceWifi *self)
}
static void
real_take_down (NMDevice *dev)
take_down (NMDevice *dev)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -936,7 +936,7 @@ real_take_down (NMDevice *dev)
}
static void
real_deactivate (NMDevice *dev)
deactivate (NMDevice *dev)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -1008,9 +1008,9 @@ is_adhoc_wpa (NMConnection *connection)
}
static gboolean
real_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (device);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -1082,7 +1082,7 @@ real_check_connection_compatible (NMDevice *device,
static gboolean
real_check_connection_available (NMDevice *device, NMConnection *connection)
check_connection_available (NMDevice *device, NMConnection *connection)
{
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
NMSettingWireless *s_wifi;
@ -1148,11 +1148,11 @@ is_manf_default_ssid (const GByteArray *ssid)
}
static gboolean
real_complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (device);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -1320,7 +1320,7 @@ real_complete_connection (NMDevice *device,
}
static gboolean
real_is_available (NMDevice *dev)
is_available (NMDevice *dev)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -1351,9 +1351,9 @@ real_is_available (NMDevice *dev)
}
static NMConnection *
real_get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMDevice *dev,
GSList *connections,
char **specific_object)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -2837,7 +2837,7 @@ error:
/****************************************************************************/
static void
real_update_hw_address (NMDevice *dev)
update_hw_address (NMDevice *dev)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
struct ifreq req;
@ -2862,7 +2862,7 @@ real_update_hw_address (NMDevice *dev)
}
static void
real_update_permanent_hw_address (NMDevice *dev)
update_permanent_hw_address (NMDevice *dev)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -2904,7 +2904,7 @@ real_update_permanent_hw_address (NMDevice *dev)
}
static void
real_update_initial_hw_address (NMDevice *dev)
update_initial_hw_address (NMDevice *dev)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -2916,7 +2916,7 @@ real_update_initial_hw_address (NMDevice *dev)
* be called from NMDevice constructor() to really get the initial address.
*/
if (!memcmp (&priv->hw_addr, &zero, ETH_ALEN))
real_update_hw_address (dev);
update_hw_address (dev);
if (memcmp (&priv->initial_hw_addr, &priv->hw_addr, ETH_ALEN))
memcpy (&priv->initial_hw_addr, &priv->hw_addr, ETH_ALEN);
@ -2931,7 +2931,7 @@ real_update_initial_hw_address (NMDevice *dev)
}
static NMActStageReturn
real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -3009,7 +3009,7 @@ done:
}
static NMActStageReturn
real_act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (dev);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -3114,7 +3114,7 @@ out:
}
static void
real_ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
{
NMConnection *connection;
NMSettingWireless *s_wifi;
@ -3208,7 +3208,7 @@ handle_ip_config_timeout (NMDeviceWifi *self,
static NMActStageReturn
real_act_stage4_ip4_config_timeout (NMDevice *dev, NMDeviceStateReason *reason)
act_stage4_ip4_config_timeout (NMDevice *dev, NMDeviceStateReason *reason)
{
NMConnection *connection;
NMSettingIP4Config *s_ip4;
@ -3230,7 +3230,7 @@ real_act_stage4_ip4_config_timeout (NMDevice *dev, NMDeviceStateReason *reason)
}
static NMActStageReturn
real_act_stage4_ip6_config_timeout (NMDevice *dev, NMDeviceStateReason *reason)
act_stage4_ip6_config_timeout (NMDevice *dev, NMDeviceStateReason *reason)
{
NMConnection *connection;
NMSettingIP6Config *s_ip6;
@ -3347,7 +3347,7 @@ activation_failure_handler (NMDevice *dev)
}
static gboolean
real_can_interrupt_activation (NMDevice *dev)
can_interrupt_activation (NMDevice *dev)
{
if (nm_device_get_state (dev) == NM_DEVICE_STATE_NEED_AUTH)
return TRUE;
@ -3357,7 +3357,7 @@ real_can_interrupt_activation (NMDevice *dev)
static guint32
real_get_type_capabilities (NMDevice *dev)
get_type_capabilities (NMDevice *dev)
{
return NM_DEVICE_WIFI_GET_PRIVATE (dev)->capabilities;
}
@ -3495,7 +3495,7 @@ nm_device_wifi_get_activation_ap (NMDeviceWifi *self)
}
static void
real_set_enabled (NMDevice *device, gboolean enabled)
set_enabled (NMDevice *device, gboolean enabled)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (device);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@ -3692,31 +3692,31 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass)
object_class->set_property = set_property;
object_class->dispose = dispose;
parent_class->get_type_capabilities = real_get_type_capabilities;
parent_class->get_generic_capabilities = real_get_generic_capabilities;
parent_class->hw_is_up = real_hw_is_up;
parent_class->hw_bring_up = real_hw_bring_up;
parent_class->hw_take_down = real_hw_take_down;
parent_class->is_up = real_is_up;
parent_class->bring_up = real_bring_up;
parent_class->take_down = real_take_down;
parent_class->update_hw_address = real_update_hw_address;
parent_class->update_permanent_hw_address = real_update_permanent_hw_address;
parent_class->update_initial_hw_address = real_update_initial_hw_address;
parent_class->get_best_auto_connection = real_get_best_auto_connection;
parent_class->is_available = real_is_available;
parent_class->check_connection_compatible = real_check_connection_compatible;
parent_class->check_connection_available = real_check_connection_available;
parent_class->complete_connection = real_complete_connection;
parent_class->set_enabled = real_set_enabled;
parent_class->get_type_capabilities = get_type_capabilities;
parent_class->get_generic_capabilities = get_generic_capabilities;
parent_class->hw_is_up = hw_is_up;
parent_class->hw_bring_up = hw_bring_up;
parent_class->hw_take_down = hw_take_down;
parent_class->is_up = is_up;
parent_class->bring_up = bring_up;
parent_class->take_down = take_down;
parent_class->update_hw_address = update_hw_address;
parent_class->update_permanent_hw_address = update_permanent_hw_address;
parent_class->update_initial_hw_address = update_initial_hw_address;
parent_class->get_best_auto_connection = get_best_auto_connection;
parent_class->is_available = is_available;
parent_class->check_connection_compatible = check_connection_compatible;
parent_class->check_connection_available = check_connection_available;
parent_class->complete_connection = complete_connection;
parent_class->set_enabled = set_enabled;
parent_class->act_stage1_prepare = real_act_stage1_prepare;
parent_class->act_stage2_config = real_act_stage2_config;
parent_class->ip4_config_pre_commit = real_ip4_config_pre_commit;
parent_class->act_stage4_ip4_config_timeout = real_act_stage4_ip4_config_timeout;
parent_class->act_stage4_ip6_config_timeout = real_act_stage4_ip6_config_timeout;
parent_class->deactivate = real_deactivate;
parent_class->can_interrupt_activation = real_can_interrupt_activation;
parent_class->act_stage1_prepare = act_stage1_prepare;
parent_class->act_stage2_config = act_stage2_config;
parent_class->ip4_config_pre_commit = ip4_config_pre_commit;
parent_class->act_stage4_ip4_config_timeout = act_stage4_ip4_config_timeout;
parent_class->act_stage4_ip6_config_timeout = act_stage4_ip6_config_timeout;
parent_class->deactivate = deactivate;
parent_class->can_interrupt_activation = can_interrupt_activation;
parent_class->spec_match_list = spec_match_list;
parent_class->hwaddr_matches = hwaddr_matches;

24
src/nm-device-wired.c
View file

@ -354,13 +354,13 @@ nm_device_wired_init (NMDeviceWired * self)
}
static gboolean
real_hw_is_up (NMDevice *device)
hw_is_up (NMDevice *device)
{
return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
}
static gboolean
real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
hw_bring_up (NMDevice *dev, gboolean *no_firmware)
{
gboolean success, carrier;
guint32 caps;
@ -377,13 +377,13 @@ real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
}
static void
real_hw_take_down (NMDevice *dev)
hw_take_down (NMDevice *dev)
{
nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), FALSE, NULL);
}
static void
real_update_hw_address (NMDevice *dev)
update_hw_address (NMDevice *dev)
{
NMDeviceWired *self = NM_DEVICE_WIRED (dev);
NMDeviceWiredPrivate *priv = NM_DEVICE_WIRED_GET_PRIVATE (self);
@ -421,7 +421,7 @@ real_update_hw_address (NMDevice *dev)
}
static gboolean
real_can_interrupt_activation (NMDevice *dev)
can_interrupt_activation (NMDevice *dev)
{
NMDeviceWired *self = NM_DEVICE_WIRED (dev);
gboolean interrupt = FALSE;
@ -437,7 +437,7 @@ real_can_interrupt_activation (NMDevice *dev)
}
static gboolean
real_is_available (NMDevice *dev)
is_available (NMDevice *dev)
{
NMDeviceWired *self = NM_DEVICE_WIRED (dev);
@ -502,12 +502,12 @@ nm_device_wired_class_init (NMDeviceWiredClass *klass)
object_class->constructor = constructor;
object_class->dispose = dispose;
parent_class->hw_is_up = real_hw_is_up;
parent_class->hw_bring_up = real_hw_bring_up;
parent_class->hw_take_down = real_hw_take_down;
parent_class->can_interrupt_activation = real_can_interrupt_activation;
parent_class->update_hw_address = real_update_hw_address;
parent_class->is_available = real_is_available;
parent_class->hw_is_up = hw_is_up;
parent_class->hw_bring_up = hw_bring_up;
parent_class->hw_take_down = hw_take_down;
parent_class->can_interrupt_activation = can_interrupt_activation;
parent_class->update_hw_address = update_hw_address;
parent_class->is_available = is_available;
parent_class->connection_match_config = connection_match_config;
}

46
src/nm-device.c
View file

@ -268,7 +268,7 @@ static gboolean nm_device_set_ip6_config (NMDevice *dev,
static gboolean nm_device_activate_ip6_config_commit (gpointer user_data);
static gboolean real_check_connection_available (NMDevice *device, NMConnection *connection);
static gboolean check_connection_available (NMDevice *device, NMConnection *connection);
static void _clear_available_connections (NMDevice *device, gboolean do_signal);
@ -488,7 +488,7 @@ nm_device_hw_is_up (NMDevice *self)
}
static guint32
real_get_generic_capabilities (NMDevice *dev)
get_generic_capabilities (NMDevice *dev)
{
return 0;
}
@ -705,7 +705,7 @@ nm_device_get_type_capabilities (NMDevice *self)
}
static guint32
real_get_type_capabilities (NMDevice *self)
get_type_capabilities (NMDevice *self)
{
return NM_DEVICE_CAP_NONE;
}
@ -1094,7 +1094,7 @@ ip6_method_matches (NMConnection *connection, const char *match)
}
static NMActStageReturn
real_act_stage1_prepare (NMDevice *self, NMDeviceStateReason *reason)
act_stage1_prepare (NMDevice *self, NMDeviceStateReason *reason)
{
NMActRequest *req;
NMActiveConnection *master_ac;
@ -1187,7 +1187,7 @@ nm_device_activate_schedule_stage1_device_prepare (NMDevice *self)
}
static NMActStageReturn
real_act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
{
/* Nothing to do */
return NM_ACT_STAGE_RETURN_SUCCESS;
@ -1809,9 +1809,9 @@ shared4_new_config (NMDevice *self, NMDeviceStateReason *reason)
/*********************************************/
static NMActStageReturn
real_act_stage3_ip4_config_start (NMDevice *self,
NMIP4Config **out_config,
NMDeviceStateReason *reason)
act_stage3_ip4_config_start (NMDevice *self,
NMIP4Config **out_config,
NMDeviceStateReason *reason)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMConnection *connection;
@ -2338,9 +2338,9 @@ done:
}
static NMActStageReturn
real_act_stage3_ip6_config_start (NMDevice *self,
NMIP6Config **out_config,
NMDeviceStateReason *reason)
act_stage3_ip6_config_start (NMDevice *self,
NMIP6Config **out_config,
NMDeviceStateReason *reason)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
const char *ip_iface;
@ -2567,7 +2567,7 @@ nm_device_activate_schedule_stage3_ip_config_start (NMDevice *self)
}
static NMActStageReturn
real_act_stage4_ip4_config_timeout (NMDevice *self, NMDeviceStateReason *reason)
act_stage4_ip4_config_timeout (NMDevice *self, NMDeviceStateReason *reason)
{
if (nm_device_ip_config_should_fail (self, FALSE)) {
*reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
@ -2651,7 +2651,7 @@ nm_device_activate_schedule_ip4_config_timeout (NMDevice *self)
static NMActStageReturn
real_act_stage4_ip6_config_timeout (NMDevice *self, NMDeviceStateReason *reason)
act_stage4_ip6_config_timeout (NMDevice *self, NMDeviceStateReason *reason)
{
if (nm_device_ip_config_should_fail (self, TRUE)) {
*reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE;
@ -4130,15 +4130,15 @@ nm_device_class_init (NMDeviceClass *klass)
object_class->constructor = constructor;
object_class->constructed = constructed;
klass->get_type_capabilities = real_get_type_capabilities;
klass->get_generic_capabilities = real_get_generic_capabilities;
klass->act_stage1_prepare = real_act_stage1_prepare;
klass->act_stage2_config = real_act_stage2_config;
klass->act_stage3_ip4_config_start = real_act_stage3_ip4_config_start;
klass->act_stage3_ip6_config_start = real_act_stage3_ip6_config_start;
klass->act_stage4_ip4_config_timeout = real_act_stage4_ip4_config_timeout;
klass->act_stage4_ip6_config_timeout = real_act_stage4_ip6_config_timeout;
klass->check_connection_available = real_check_connection_available;
klass->get_type_capabilities = get_type_capabilities;
klass->get_generic_capabilities = get_generic_capabilities;
klass->act_stage1_prepare = act_stage1_prepare;
klass->act_stage2_config = act_stage2_config;
klass->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
klass->act_stage3_ip6_config_start = act_stage3_ip6_config_start;
klass->act_stage4_ip4_config_timeout = act_stage4_ip4_config_timeout;
klass->act_stage4_ip6_config_timeout = act_stage4_ip6_config_timeout;
klass->check_connection_available = check_connection_available;
/* Properties */
g_object_class_install_property
@ -5048,7 +5048,7 @@ _del_available_connection (NMDevice *device, NMConnection *connection)
}
static gboolean
real_check_connection_available (NMDevice *device, NMConnection *connection)
check_connection_available (NMDevice *device, NMConnection *connection)
{
/* Default is to assume the connection is available unless a subclass
* overrides this with more specific checks.

78
src/wimax/nm-device-wimax.c
View file

@ -310,7 +310,7 @@ update_availability (NMDeviceWimax *self, gboolean old_available)
/* NMDeviceInterface interface */
static void
real_set_enabled (NMDevice *device, gboolean enabled)
set_enabled (NMDevice *device, gboolean enabled)
{
NMDeviceWimax *self = NM_DEVICE_WIMAX (device);
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
@ -347,7 +347,7 @@ real_set_enabled (NMDevice *device, gboolean enabled)
/* NMDevice methods */
static void
real_take_down (NMDevice *device)
take_down (NMDevice *device)
{
NMDeviceWimax *self = NM_DEVICE_WIMAX (device);
@ -356,13 +356,13 @@ real_take_down (NMDevice *device)
}
static gboolean
real_hw_is_up (NMDevice *device)
hw_is_up (NMDevice *device)
{
return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
}
static gboolean
real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
hw_bring_up (NMDevice *dev, gboolean *no_firmware)
{
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (dev);
@ -373,13 +373,13 @@ real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
}
static void
real_hw_take_down (NMDevice *dev)
hw_take_down (NMDevice *dev)
{
nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), FALSE, NULL);
}
static void
real_update_hw_address (NMDevice *dev)
update_hw_address (NMDevice *dev)
{
NMDeviceWimax *self = NM_DEVICE_WIMAX (dev);
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
@ -441,9 +441,9 @@ hwaddr_matches (NMDevice *device,
}
static gboolean
real_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
NMSettingConnection *s_con;
@ -482,7 +482,7 @@ real_check_connection_compatible (NMDevice *device,
}
static gboolean
real_check_connection_available (NMDevice *device, NMConnection *connection)
check_connection_available (NMDevice *device, NMConnection *connection)
{
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
const GSList *ns_iter = NULL;
@ -497,11 +497,11 @@ real_check_connection_available (NMDevice *device, NMConnection *connection)
}
static gboolean
real_complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
complete_connection (NMDevice *device,
NMConnection *connection,
const char *specific_object,
const GSList *existing_connections,
GError **error)
{
NMDeviceWimax *self = NM_DEVICE_WIMAX (device);
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
@ -609,9 +609,9 @@ real_complete_connection (NMDevice *device,
}
static NMConnection *
real_get_best_auto_connection (NMDevice *device,
GSList *connections,
char **specific_object)
get_best_auto_connection (NMDevice *device,
GSList *connections,
char **specific_object)
{
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
GSList *iter;
@ -655,13 +655,13 @@ real_get_best_auto_connection (NMDevice *device,
}
static guint32
real_get_generic_capabilities (NMDevice *dev)
get_generic_capabilities (NMDevice *dev)
{
return NM_DEVICE_CAP_NM_SUPPORTED;
}
static gboolean
real_is_available (NMDevice *device)
is_available (NMDevice *device)
{
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
const char *iface = nm_device_get_iface (device);
@ -725,7 +725,7 @@ clear_connected_poll (NMDeviceWimax *self)
}
static NMActStageReturn
real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
{
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
NMActRequest *req;
@ -773,7 +773,7 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
}
static NMActStageReturn
real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
{
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (device);
NMConnection *connection;
@ -841,7 +841,7 @@ force_disconnect (NMDeviceWimax *self, struct wmxsdk *sdk)
}
static void
real_deactivate (NMDevice *device)
deactivate (NMDevice *device)
{
NMDeviceWimax *self = NM_DEVICE_WIMAX (device);
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
@ -1519,22 +1519,22 @@ nm_device_wimax_class_init (NMDeviceWimaxClass *klass)
object_class->get_property = get_property;
object_class->dispose = dispose;
device_class->take_down = real_take_down;
device_class->hw_is_up = real_hw_is_up;
device_class->hw_bring_up = real_hw_bring_up;
device_class->hw_take_down = real_hw_take_down;
device_class->update_hw_address = real_update_hw_address;
device_class->check_connection_compatible = real_check_connection_compatible;
device_class->check_connection_available = real_check_connection_available;
device_class->complete_connection = real_complete_connection;
device_class->get_best_auto_connection = real_get_best_auto_connection;
device_class->get_generic_capabilities = real_get_generic_capabilities;
device_class->is_available = real_is_available;
device_class->act_stage1_prepare = real_act_stage1_prepare;
device_class->act_stage2_config = real_act_stage2_config;
device_class->deactivate = real_deactivate;
device_class->set_enabled = real_set_enabled;
device_class->hwaddr_matches = hwaddr_matches;
device_class->take_down = take_down;
device_class->hw_is_up = hw_is_up;
device_class->hw_bring_up = hw_bring_up;
device_class->hw_take_down = hw_take_down;
device_class->update_hw_address = update_hw_address;
device_class->check_connection_compatible = check_connection_compatible;
device_class->check_connection_available = check_connection_available;
device_class->complete_connection = complete_connection;
device_class->get_best_auto_connection = get_best_auto_connection;
device_class->get_generic_capabilities = get_generic_capabilities;
device_class->is_available = is_available;
device_class->act_stage1_prepare = act_stage1_prepare;
device_class->act_stage2_config = act_stage2_config;
device_class->deactivate = deactivate;
device_class->set_enabled = set_enabled;
device_class->hwaddr_matches = hwaddr_matches;
/* Properties */
g_object_class_install_property