diff options
| author | Michael Biebl <biebl@debian.org> | 2020-10-05 22:27:18 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-10-05 22:27:18 +0200 |
| commit | aafc1dbe4712c86189bbc1d4d54ad8cb4c69be7e (patch) | |
| tree | a2a9bb4d007339a0b1304540388230ccedac32bd /libnm-core/nm-setting-ppp.c | |
| parent | e7b44ef4c80907346ec7492a09c45277459924fc (diff) | |
New upstream version 1.27.90 upstream/1.27.90
Diffstat (limited to 'libnm-core/nm-setting-ppp.c')
| -rw-r--r-- | libnm-core/nm-setting-ppp.c | 1010 |
1 files changed, 514 insertions, 496 deletions
diff --git a/libnm-core/nm-setting-ppp.c b/libnm-core/nm-setting-ppp.c index 090f3c08..6c7fa278 100644 --- a/libnm-core/nm-setting-ppp.c +++ b/libnm-core/nm-setting-ppp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2007 - 2013 Red Hat, Inc. * Copyright (C) 2007 - 2008 Novell, Inc. @@ -22,51 +22,50 @@ /*****************************************************************************/ -NM_GOBJECT_PROPERTIES_DEFINE_BASE ( - PROP_NOAUTH, - PROP_REFUSE_EAP, - PROP_REFUSE_PAP, - PROP_REFUSE_CHAP, - PROP_REFUSE_MSCHAP, - PROP_REFUSE_MSCHAPV2, - PROP_NOBSDCOMP, - PROP_NODEFLATE, - PROP_NO_VJ_COMP, - PROP_REQUIRE_MPPE, - PROP_REQUIRE_MPPE_128, - PROP_MPPE_STATEFUL, - PROP_CRTSCTS, - PROP_BAUD, - PROP_MRU, - PROP_MTU, - PROP_LCP_ECHO_FAILURE, - PROP_LCP_ECHO_INTERVAL, -); +NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_NOAUTH, + PROP_REFUSE_EAP, + PROP_REFUSE_PAP, + PROP_REFUSE_CHAP, + PROP_REFUSE_MSCHAP, + PROP_REFUSE_MSCHAPV2, + PROP_NOBSDCOMP, + PROP_NODEFLATE, + PROP_NO_VJ_COMP, + PROP_REQUIRE_MPPE, + PROP_REQUIRE_MPPE_128, + PROP_MPPE_STATEFUL, + PROP_CRTSCTS, + PROP_BAUD, + PROP_MRU, + PROP_MTU, + PROP_LCP_ECHO_FAILURE, + PROP_LCP_ECHO_INTERVAL, ); typedef struct { - guint32 baud; - guint32 mru; - guint32 mtu; - guint32 lcp_echo_failure; - guint32 lcp_echo_interval; - bool noauth:1; - bool refuse_eap:1; - bool refuse_pap:1; - bool refuse_chap:1; - bool refuse_mschap:1; - bool refuse_mschapv2:1; - bool nobsdcomp:1; - bool nodeflate:1; - bool no_vj_comp:1; - bool require_mppe:1; - bool require_mppe_128:1; - bool mppe_stateful:1; - bool crtscts:1; + guint32 baud; + guint32 mru; + guint32 mtu; + guint32 lcp_echo_failure; + guint32 lcp_echo_interval; + bool noauth : 1; + bool refuse_eap : 1; + bool refuse_pap : 1; + bool refuse_chap : 1; + bool refuse_mschap : 1; + bool refuse_mschapv2 : 1; + bool nobsdcomp : 1; + bool nodeflate : 1; + bool no_vj_comp : 1; + bool require_mppe : 1; + bool require_mppe_128 : 1; + bool mppe_stateful : 1; + bool crtscts : 1; } NMSettingPppPrivate; -G_DEFINE_TYPE (NMSettingPpp, nm_setting_ppp, NM_TYPE_SETTING) +G_DEFINE_TYPE(NMSettingPpp, nm_setting_ppp, NM_TYPE_SETTING) -#define NM_SETTING_PPP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPP, NMSettingPppPrivate)) +#define NM_SETTING_PPP_GET_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE((o), NM_TYPE_SETTING_PPP, NMSettingPppPrivate)) /*****************************************************************************/ @@ -77,11 +76,11 @@ G_DEFINE_TYPE (NMSettingPpp, nm_setting_ppp, NM_TYPE_SETTING) * Returns: the #NMSettingPpp:noauth property of the setting **/ gboolean -nm_setting_ppp_get_noauth (NMSettingPpp *setting) +nm_setting_ppp_get_noauth(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->noauth; + return NM_SETTING_PPP_GET_PRIVATE(setting)->noauth; } /** @@ -91,11 +90,11 @@ nm_setting_ppp_get_noauth (NMSettingPpp *setting) * Returns: the #NMSettingPpp:refuse-eap property of the setting **/ gboolean -nm_setting_ppp_get_refuse_eap (NMSettingPpp *setting) +nm_setting_ppp_get_refuse_eap(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->refuse_eap; + return NM_SETTING_PPP_GET_PRIVATE(setting)->refuse_eap; } /** @@ -105,11 +104,11 @@ nm_setting_ppp_get_refuse_eap (NMSettingPpp *setting) * Returns: the #NMSettingPpp:refuse-pap property of the setting **/ gboolean -nm_setting_ppp_get_refuse_pap (NMSettingPpp *setting) +nm_setting_ppp_get_refuse_pap(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->refuse_pap; + return NM_SETTING_PPP_GET_PRIVATE(setting)->refuse_pap; } /** @@ -119,11 +118,11 @@ nm_setting_ppp_get_refuse_pap (NMSettingPpp *setting) * Returns: the #NMSettingPpp:refuse-chap property of the setting **/ gboolean -nm_setting_ppp_get_refuse_chap (NMSettingPpp *setting) +nm_setting_ppp_get_refuse_chap(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->refuse_chap; + return NM_SETTING_PPP_GET_PRIVATE(setting)->refuse_chap; } /** @@ -133,11 +132,11 @@ nm_setting_ppp_get_refuse_chap (NMSettingPpp *setting) * Returns: the #NMSettingPpp:refuse-mschap property of the setting **/ gboolean -nm_setting_ppp_get_refuse_mschap (NMSettingPpp *setting) +nm_setting_ppp_get_refuse_mschap(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->refuse_mschap; + return NM_SETTING_PPP_GET_PRIVATE(setting)->refuse_mschap; } /** @@ -147,11 +146,11 @@ nm_setting_ppp_get_refuse_mschap (NMSettingPpp *setting) * Returns: the #NMSettingPpp:refuse-mschapv2 property of the setting **/ gboolean -nm_setting_ppp_get_refuse_mschapv2 (NMSettingPpp *setting) +nm_setting_ppp_get_refuse_mschapv2(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->refuse_mschapv2; + return NM_SETTING_PPP_GET_PRIVATE(setting)->refuse_mschapv2; } /** @@ -161,11 +160,11 @@ nm_setting_ppp_get_refuse_mschapv2 (NMSettingPpp *setting) * Returns: the #NMSettingPpp:nobsdcomp property of the setting **/ gboolean -nm_setting_ppp_get_nobsdcomp (NMSettingPpp *setting) +nm_setting_ppp_get_nobsdcomp(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->nobsdcomp; + return NM_SETTING_PPP_GET_PRIVATE(setting)->nobsdcomp; } /** @@ -175,11 +174,11 @@ nm_setting_ppp_get_nobsdcomp (NMSettingPpp *setting) * Returns: the #NMSettingPpp:nodeflate property of the setting **/ gboolean -nm_setting_ppp_get_nodeflate (NMSettingPpp *setting) +nm_setting_ppp_get_nodeflate(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->nodeflate; + return NM_SETTING_PPP_GET_PRIVATE(setting)->nodeflate; } /** @@ -189,11 +188,11 @@ nm_setting_ppp_get_nodeflate (NMSettingPpp *setting) * Returns: the #NMSettingPpp:no-vj-comp property of the setting **/ gboolean -nm_setting_ppp_get_no_vj_comp (NMSettingPpp *setting) +nm_setting_ppp_get_no_vj_comp(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->no_vj_comp; + return NM_SETTING_PPP_GET_PRIVATE(setting)->no_vj_comp; } /** @@ -203,11 +202,11 @@ nm_setting_ppp_get_no_vj_comp (NMSettingPpp *setting) * Returns: the #NMSettingPpp:require-mppe property of the setting **/ gboolean -nm_setting_ppp_get_require_mppe (NMSettingPpp *setting) +nm_setting_ppp_get_require_mppe(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->require_mppe; + return NM_SETTING_PPP_GET_PRIVATE(setting)->require_mppe; } /** @@ -217,11 +216,11 @@ nm_setting_ppp_get_require_mppe (NMSettingPpp *setting) * Returns: the #NMSettingPpp:require-mppe-128 property of the setting **/ gboolean -nm_setting_ppp_get_require_mppe_128 (NMSettingPpp *setting) +nm_setting_ppp_get_require_mppe_128(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->require_mppe_128; + return NM_SETTING_PPP_GET_PRIVATE(setting)->require_mppe_128; } /** @@ -231,11 +230,11 @@ nm_setting_ppp_get_require_mppe_128 (NMSettingPpp *setting) * Returns: the #NMSettingPpp:mppe-stateful property of the setting **/ gboolean -nm_setting_ppp_get_mppe_stateful (NMSettingPpp *setting) +nm_setting_ppp_get_mppe_stateful(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->mppe_stateful; + return NM_SETTING_PPP_GET_PRIVATE(setting)->mppe_stateful; } /** @@ -245,11 +244,11 @@ nm_setting_ppp_get_mppe_stateful (NMSettingPpp *setting) * Returns: the #NMSettingPpp:crtscts property of the setting **/ gboolean -nm_setting_ppp_get_crtscts (NMSettingPpp *setting) +nm_setting_ppp_get_crtscts(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), FALSE); - return NM_SETTING_PPP_GET_PRIVATE (setting)->crtscts; + return NM_SETTING_PPP_GET_PRIVATE(setting)->crtscts; } /** @@ -259,11 +258,11 @@ nm_setting_ppp_get_crtscts (NMSettingPpp *setting) * Returns: the #NMSettingPpp:baud property of the setting **/ guint32 -nm_setting_ppp_get_baud (NMSettingPpp *setting) +nm_setting_ppp_get_baud(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), 0); - return NM_SETTING_PPP_GET_PRIVATE (setting)->baud; + return NM_SETTING_PPP_GET_PRIVATE(setting)->baud; } /** @@ -273,11 +272,11 @@ nm_setting_ppp_get_baud (NMSettingPpp *setting) * Returns: the #NMSettingPpp:mru property of the setting **/ guint32 -nm_setting_ppp_get_mru (NMSettingPpp *setting) +nm_setting_ppp_get_mru(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), 0); - return NM_SETTING_PPP_GET_PRIVATE (setting)->mru; + return NM_SETTING_PPP_GET_PRIVATE(setting)->mru; } /** @@ -287,11 +286,11 @@ nm_setting_ppp_get_mru (NMSettingPpp *setting) * Returns: the #NMSettingPpp:mtu property of the setting **/ guint32 -nm_setting_ppp_get_mtu (NMSettingPpp *setting) +nm_setting_ppp_get_mtu(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), 0); - return NM_SETTING_PPP_GET_PRIVATE (setting)->mtu; + return NM_SETTING_PPP_GET_PRIVATE(setting)->mtu; } /** @@ -301,11 +300,11 @@ nm_setting_ppp_get_mtu (NMSettingPpp *setting) * Returns: the #NMSettingPpp:lcp-echo-failure property of the setting **/ guint32 -nm_setting_ppp_get_lcp_echo_failure (NMSettingPpp *setting) +nm_setting_ppp_get_lcp_echo_failure(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), 0); - return NM_SETTING_PPP_GET_PRIVATE (setting)->lcp_echo_failure; + return NM_SETTING_PPP_GET_PRIVATE(setting)->lcp_echo_failure; } /** @@ -315,191 +314,192 @@ nm_setting_ppp_get_lcp_echo_failure (NMSettingPpp *setting) * Returns: the #NMSettingPpp:lcp-echo-interval property of the setting **/ guint32 -nm_setting_ppp_get_lcp_echo_interval (NMSettingPpp *setting) +nm_setting_ppp_get_lcp_echo_interval(NMSettingPpp *setting) { - g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0); + g_return_val_if_fail(NM_IS_SETTING_PPP(setting), 0); - return NM_SETTING_PPP_GET_PRIVATE (setting)->lcp_echo_interval; + return NM_SETTING_PPP_GET_PRIVATE(setting)->lcp_echo_interval; } static gboolean -verify (NMSetting *setting, NMConnection *connection, GError **error) +verify(NMSetting *setting, NMConnection *connection, GError **error) { - NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (setting); - - /* FIXME: Do we even want this or can we just let pppd evaluate the options? */ - if (priv->mru > 0) { - if (priv->mru < 128 || priv->mru > 16384) { - g_set_error (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("'%d' is out of valid range <128-16384>"), - priv->mru); - g_prefix_error (error, "%s.%s: ", NM_SETTING_PPP_SETTING_NAME, NM_SETTING_PPP_MRU); - return FALSE; - } - } - - if (priv->lcp_echo_failure > 0) { - /* lcp_echo_interval must also be non-zero */ - if (priv->lcp_echo_interval == 0) { - g_set_error (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("setting this property requires non-zero '%s' property"), - NM_SETTING_PPP_LCP_ECHO_INTERVAL); - g_prefix_error (error, "%s.%s: ", NM_SETTING_PPP_SETTING_NAME, NM_SETTING_PPP_LCP_ECHO_FAILURE); - return FALSE; - } - } - - return TRUE; + NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE(setting); + + /* FIXME: Do we even want this or can we just let pppd evaluate the options? */ + if (priv->mru > 0) { + if (priv->mru < 128 || priv->mru > 16384) { + g_set_error(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("'%d' is out of valid range <128-16384>"), + priv->mru); + g_prefix_error(error, "%s.%s: ", NM_SETTING_PPP_SETTING_NAME, NM_SETTING_PPP_MRU); + return FALSE; + } + } + + if (priv->lcp_echo_failure > 0) { + /* lcp_echo_interval must also be non-zero */ + if (priv->lcp_echo_interval == 0) { + g_set_error(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("setting this property requires non-zero '%s' property"), + NM_SETTING_PPP_LCP_ECHO_INTERVAL); + g_prefix_error(error, + "%s.%s: ", + NM_SETTING_PPP_SETTING_NAME, + NM_SETTING_PPP_LCP_ECHO_FAILURE); + return FALSE; + } + } + + return TRUE; } /*****************************************************************************/ static void -get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) +get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMSettingPpp *setting = NM_SETTING_PPP (object); - - switch (prop_id) { - case PROP_NOAUTH: - g_value_set_boolean (value, nm_setting_ppp_get_noauth (setting)); - break; - case PROP_REFUSE_EAP: - g_value_set_boolean (value, nm_setting_ppp_get_refuse_eap (setting)); - break; - case PROP_REFUSE_PAP: - g_value_set_boolean (value, nm_setting_ppp_get_refuse_pap (setting)); - break; - case PROP_REFUSE_CHAP: - g_value_set_boolean (value, nm_setting_ppp_get_refuse_chap (setting)); - break; - case PROP_REFUSE_MSCHAP: - g_value_set_boolean (value, nm_setting_ppp_get_refuse_mschap (setting)); - break; - case PROP_REFUSE_MSCHAPV2: - g_value_set_boolean (value, nm_setting_ppp_get_refuse_mschapv2 (setting)); - break; - case PROP_NOBSDCOMP: - g_value_set_boolean (value, nm_setting_ppp_get_nobsdcomp (setting)); - break; - case PROP_NODEFLATE: - g_value_set_boolean (value, nm_setting_ppp_get_nodeflate (setting)); - break; - case PROP_NO_VJ_COMP: - g_value_set_boolean (value, nm_setting_ppp_get_no_vj_comp (setting)); - break; - case PROP_REQUIRE_MPPE: - g_value_set_boolean (value, nm_setting_ppp_get_require_mppe (setting)); - break; - case PROP_REQUIRE_MPPE_128: - g_value_set_boolean (value, nm_setting_ppp_get_require_mppe_128 (setting)); - break; - case PROP_MPPE_STATEFUL: - g_value_set_boolean (value, nm_setting_ppp_get_mppe_stateful (setting)); - break; - case PROP_CRTSCTS: - g_value_set_boolean (value, nm_setting_ppp_get_crtscts (setting)); - break; - case PROP_BAUD: - g_value_set_uint (value, nm_setting_ppp_get_baud (setting)); - break; - case PROP_MRU: - g_value_set_uint (value, nm_setting_ppp_get_mru (setting)); - break; - case PROP_MTU: - g_value_set_uint (value, nm_setting_ppp_get_mtu (setting)); - break; - case PROP_LCP_ECHO_FAILURE: - g_value_set_uint (value, nm_setting_ppp_get_lcp_echo_failure (setting)); - break; - case PROP_LCP_ECHO_INTERVAL: - g_value_set_uint (value, nm_setting_ppp_get_lcp_echo_interval (setting)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + NMSettingPpp *setting = NM_SETTING_PPP(object); + + switch (prop_id) { + case PROP_NOAUTH: + g_value_set_boolean(value, nm_setting_ppp_get_noauth(setting)); + break; + case PROP_REFUSE_EAP: + g_value_set_boolean(value, nm_setting_ppp_get_refuse_eap(setting)); + break; + case PROP_REFUSE_PAP: + g_value_set_boolean(value, nm_setting_ppp_get_refuse_pap(setting)); + break; + case PROP_REFUSE_CHAP: + g_value_set_boolean(value, nm_setting_ppp_get_refuse_chap(setting)); + break; + case PROP_REFUSE_MSCHAP: + g_value_set_boolean(value, nm_setting_ppp_get_refuse_mschap(setting)); + break; + case PROP_REFUSE_MSCHAPV2: + g_value_set_boolean(value, nm_setting_ppp_get_refuse_mschapv2(setting)); + break; + case PROP_NOBSDCOMP: + g_value_set_boolean(value, nm_setting_ppp_get_nobsdcomp(setting)); + break; + case PROP_NODEFLATE: + g_value_set_boolean(value, nm_setting_ppp_get_nodeflate(setting)); + break; + case PROP_NO_VJ_COMP: + g_value_set_boolean(value, nm_setting_ppp_get_no_vj_comp(setting)); + break; + case PROP_REQUIRE_MPPE: + g_value_set_boolean(value, nm_setting_ppp_get_require_mppe(setting)); + break; + case PROP_REQUIRE_MPPE_128: + g_value_set_boolean(value, nm_setting_ppp_get_require_mppe_128(setting)); + break; + case PROP_MPPE_STATEFUL: + g_value_set_boolean(value, nm_setting_ppp_get_mppe_stateful(setting)); + break; + case PROP_CRTSCTS: + g_value_set_boolean(value, nm_setting_ppp_get_crtscts(setting)); + break; + case PROP_BAUD: + g_value_set_uint(value, nm_setting_ppp_get_baud(setting)); + break; + case PROP_MRU: + g_value_set_uint(value, nm_setting_ppp_get_mru(setting)); + break; + case PROP_MTU: + g_value_set_uint(value, nm_setting_ppp_get_mtu(setting)); + break; + case PROP_LCP_ECHO_FAILURE: + g_value_set_uint(value, nm_setting_ppp_get_lcp_echo_failure(setting)); + break; + case PROP_LCP_ECHO_INTERVAL: + g_value_set_uint(value, nm_setting_ppp_get_lcp_echo_interval(setting)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } } static void -set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) +set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (object); - - switch (prop_id) { - case PROP_NOAUTH: - priv->noauth = g_value_get_boolean (value); - break; - case PROP_REFUSE_EAP: - priv->refuse_eap = g_value_get_boolean (value); - break; - case PROP_REFUSE_PAP: - priv->refuse_pap = g_value_get_boolean (value); - break; - case PROP_REFUSE_CHAP: - priv->refuse_chap = g_value_get_boolean (value); - break; - case PROP_REFUSE_MSCHAP: - priv->refuse_mschap = g_value_get_boolean (value); - break; - case PROP_REFUSE_MSCHAPV2: - priv->refuse_mschapv2 = g_value_get_boolean (value); - break; - case PROP_NOBSDCOMP: - priv->nobsdcomp = g_value_get_boolean (value); - break; - case PROP_NODEFLATE: - priv->nodeflate = g_value_get_boolean (value); - break; - case PROP_NO_VJ_COMP: - priv->no_vj_comp = g_value_get_boolean (value); - break; - case PROP_REQUIRE_MPPE: - priv->require_mppe = g_value_get_boolean (value); - break; - case PROP_REQUIRE_MPPE_128: - priv->require_mppe_128 = g_value_get_boolean (value); - break; - case PROP_MPPE_STATEFUL: - priv->mppe_stateful = g_value_get_boolean (value); - break; - case PROP_CRTSCTS: - priv->crtscts = g_value_get_boolean (value); - break; - case PROP_BAUD: - priv->baud = g_value_get_uint (value); - break; - case PROP_MRU: - priv->mru = g_value_get_uint (value); - break; - case PROP_MTU: - priv->mtu = g_value_get_uint (value); - break; - case PROP_LCP_ECHO_FAILURE: - priv->lcp_echo_failure = g_value_get_uint (value); - break; - case PROP_LCP_ECHO_INTERVAL: - priv->lcp_echo_interval = g_value_get_uint (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE(object); + + switch (prop_id) { + case PROP_NOAUTH: + priv->noauth = g_value_get_boolean(value); + break; + case PROP_REFUSE_EAP: + priv->refuse_eap = g_value_get_boolean(value); + break; + case PROP_REFUSE_PAP: + priv->refuse_pap = g_value_get_boolean(value); + break; + case PROP_REFUSE_CHAP: + priv->refuse_chap = g_value_get_boolean(value); + break; + case PROP_REFUSE_MSCHAP: + priv->refuse_mschap = g_value_get_boolean(value); + break; + case PROP_REFUSE_MSCHAPV2: + priv->refuse_mschapv2 = g_value_get_boolean(value); + break; + case PROP_NOBSDCOMP: + priv->nobsdcomp = g_value_get_boolean(value); + break; + case PROP_NODEFLATE: + priv->nodeflate = g_value_get_boolean(value); + break; + case PROP_NO_VJ_COMP: + priv->no_vj_comp = g_value_get_boolean(value); + break; + case PROP_REQUIRE_MPPE: + priv->require_mppe = g_value_get_boolean(value); + break; + case PROP_REQUIRE_MPPE_128: + priv->require_mppe_128 = g_value_get_boolean(value); + break; + case PROP_MPPE_STATEFUL: + priv->mppe_stateful = g_value_get_boolean(value); + break; + case PROP_CRTSCTS: + priv->crtscts = g_value_get_boolean(value); + break; + case PROP_BAUD: + priv->baud = g_value_get_uint(value); + break; + case PROP_MRU: + priv->mru = g_value_get_uint(value); + break; + case PROP_MTU: + priv->mtu = g_value_get_uint(value); + break; + case PROP_LCP_ECHO_FAILURE: + priv->lcp_echo_failure = g_value_get_uint(value); + break; + case PROP_LCP_ECHO_INTERVAL: + priv->lcp_echo_interval = g_value_get_uint(value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } } /*****************************************************************************/ static void -nm_setting_ppp_init (NMSettingPpp *self) +nm_setting_ppp_init(NMSettingPpp *self) { - NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (self); + NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE(self); - priv->noauth = TRUE; + priv->noauth = TRUE; } /** @@ -510,251 +510,269 @@ nm_setting_ppp_init (NMSettingPpp *self) * Returns: (transfer full): the new empty #NMSettingPpp object **/ NMSetting * -nm_setting_ppp_new (void) +nm_setting_ppp_new(void) { - return (NMSetting *) g_object_new (NM_TYPE_SETTING_PPP, NULL); + return (NMSetting *) g_object_new(NM_TYPE_SETTING_PPP, NULL); } static void -nm_setting_ppp_class_init (NMSettingPppClass *klass) +nm_setting_ppp_class_init(NMSettingPppClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - NMSettingClass *setting_class = NM_SETTING_CLASS (klass); - - g_type_class_add_private (klass, sizeof (NMSettingPppPrivate)); - - object_class->get_property = get_property; - object_class->set_property = set_property; - - setting_class->verify = verify; - - /** - * NMSettingPpp:noauth: - * - * If %TRUE, do not require the other side (usually the PPP server) to - * authenticate itself to the client. If %FALSE, require authentication - * from the remote side. In almost all cases, this should be %TRUE. - **/ - obj_properties[PROP_NOAUTH] = - g_param_spec_boolean (NM_SETTING_PPP_NOAUTH, "", "", - TRUE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:refuse-eap: - * - * If %TRUE, the EAP authentication method will not be used. - **/ - obj_properties[PROP_REFUSE_EAP] = - g_param_spec_boolean (NM_SETTING_PPP_REFUSE_EAP, "", "", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:refuse-pap: - * - * If %TRUE, the PAP authentication method will not be used. - **/ - obj_properties[PROP_REFUSE_PAP] = - g_param_spec_boolean (NM_SETTING_PPP_REFUSE_PAP, "", "", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:refuse-chap: - * - * If %TRUE, the CHAP authentication method will not be used. - **/ - obj_properties[PROP_REFUSE_CHAP] = - g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP, "", "", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:refuse-mschap: - * - * If %TRUE, the MSCHAP authentication method will not be used. - **/ - obj_properties[PROP_REFUSE_MSCHAP] = - g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAP, "", "", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:refuse-mschapv2: - * - * If %TRUE, the MSCHAPv2 authentication method will not be used. - **/ - obj_properties[PROP_REFUSE_MSCHAPV2] = - g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAPV2, "", "", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:nobsdcomp: - * - * If %TRUE, BSD compression will not be requested. - **/ - obj_properties[PROP_NOBSDCOMP] = - g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP, "", "", - FALSE, - G_PARAM_READWRITE | - NM_SETTING_PARAM_FUZZY_IGNORE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:nodeflate: - * - * If %TRUE, "deflate" compression will not be requested. - **/ - obj_properties[PROP_NODEFLATE] = - g_param_spec_boolean (NM_SETTING_PPP_NODEFLATE, "", "", - FALSE, - G_PARAM_READWRITE | - NM_SETTING_PARAM_FUZZY_IGNORE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:no-vj-comp: - * - * If %TRUE, Van Jacobsen TCP header compression will not be requested. - **/ - obj_properties[PROP_NO_VJ_COMP] = - g_param_spec_boolean (NM_SETTING_PPP_NO_VJ_COMP, "", "", - FALSE, - G_PARAM_READWRITE | - NM_SETTING_PARAM_FUZZY_IGNORE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:require-mppe: - * - * If %TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for - * the PPP session. If either 64-bit or 128-bit MPPE is not available the - * session will fail. Note that MPPE is not used on mobile broadband - * connections. - **/ - obj_properties[PROP_REQUIRE_MPPE] = - g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE, "", "", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:require-mppe-128: - * - * If %TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be - * required for the PPP session, and the "require-mppe" property must also - * be set to %TRUE. If 128-bit MPPE is not available the session will fail. - **/ - obj_properties[PROP_REQUIRE_MPPE_128] = - g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE_128, "", "", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:mppe-stateful: - * - * If %TRUE, stateful MPPE is used. See pppd documentation for more - * information on stateful MPPE. - **/ - obj_properties[PROP_MPPE_STATEFUL] = - g_param_spec_boolean (NM_SETTING_PPP_MPPE_STATEFUL, "", "", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:crtscts: - * - * If %TRUE, specify that pppd should set the serial port to use hardware - * flow control with RTS and CTS signals. This value should normally be set - * to %FALSE. - **/ - obj_properties[PROP_CRTSCTS] = - g_param_spec_boolean (NM_SETTING_PPP_CRTSCTS, "", "", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:baud: - * - * If non-zero, instruct pppd to set the serial port to the specified - * baudrate. This value should normally be left as 0 to automatically - * choose the speed. - **/ - obj_properties[PROP_BAUD] = - g_param_spec_uint (NM_SETTING_PPP_BAUD, "", "", - 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | - NM_SETTING_PARAM_FUZZY_IGNORE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:mru: - * - * If non-zero, instruct pppd to request that the peer send packets no - * larger than the specified size. If non-zero, the MRU should be between - * 128 and 16384. - */ - obj_properties[PROP_MRU] = - g_param_spec_uint (NM_SETTING_PPP_MRU, "", "", - 0, 16384, 0, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:mtu: - * - * If non-zero, instruct pppd to send packets no larger than the specified - * size. - **/ - obj_properties[PROP_MTU] = - g_param_spec_uint (NM_SETTING_PPP_MTU, "", "", - 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | - NM_SETTING_PARAM_FUZZY_IGNORE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:lcp-echo-failure: - * - * If non-zero, instruct pppd to presume the connection to the peer has - * failed if the specified number of LCP echo-requests go unanswered by the - * peer. The "lcp-echo-interval" property must also be set to a non-zero - * value if this property is used. - **/ - obj_properties[PROP_LCP_ECHO_FAILURE] = - g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_FAILURE, "", "", - 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | - NM_SETTING_PARAM_FUZZY_IGNORE | - G_PARAM_STATIC_STRINGS); - - /** - * NMSettingPpp:lcp-echo-interval: - * - * If non-zero, instruct pppd to send an LCP echo-request frame to the peer - * every n seconds (where n is the specified value). Note that some PPP - * peers will respond to echo requests and some will not, and it is not - * possible to autodetect this. - **/ - obj_properties[PROP_LCP_ECHO_INTERVAL] = - g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_INTERVAL, "", "", - 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | - NM_SETTING_PARAM_FUZZY_IGNORE | - G_PARAM_STATIC_STRINGS); - - g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); - - _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PPP); + GObjectClass * object_class = G_OBJECT_CLASS(klass); + NMSettingClass *setting_class = NM_SETTING_CLASS(klass); + + g_type_class_add_private(klass, sizeof(NMSettingPppPrivate)); + + object_class->get_property = get_property; + object_class->set_property = set_property; + + setting_class->verify = verify; + + /** + * NMSettingPpp:noauth: + * + * If %TRUE, do not require the other side (usually the PPP server) to + * authenticate itself to the client. If %FALSE, require authentication + * from the remote side. In almost all cases, this should be %TRUE. + **/ + obj_properties[PROP_NOAUTH] = g_param_spec_boolean(NM_SETTING_PPP_NOAUTH, + "", + "", + TRUE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:refuse-eap: + * + * If %TRUE, the EAP authentication method will not be used. + **/ + obj_properties[PROP_REFUSE_EAP] = + g_param_spec_boolean(NM_SETTING_PPP_REFUSE_EAP, + "", + "", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:refuse-pap: + * + * If %TRUE, the PAP authentication method will not be used. + **/ + obj_properties[PROP_REFUSE_PAP] = + g_param_spec_boolean(NM_SETTING_PPP_REFUSE_PAP, + "", + "", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:refuse-chap: + * + * If %TRUE, the CHAP authentication method will not be used. + **/ + obj_properties[PROP_REFUSE_CHAP] = + g_param_spec_boolean(NM_SETTING_PPP_REFUSE_CHAP, + "", + "", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:refuse-mschap: + * + * If %TRUE, the MSCHAP authentication method will not be used. + **/ + obj_properties[PROP_REFUSE_MSCHAP] = + g_param_spec_boolean(NM_SETTING_PPP_REFUSE_MSCHAP, + "", + "", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:refuse-mschapv2: + * + * If %TRUE, the MSCHAPv2 authentication method will not be used. + **/ + obj_properties[PROP_REFUSE_MSCHAPV2] = + g_param_spec_boolean(NM_SETTING_PPP_REFUSE_MSCHAPV2, + "", + "", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:nobsdcomp: + * + * If %TRUE, BSD compression will not be requested. + **/ + obj_properties[PROP_NOBSDCOMP] = g_param_spec_boolean( + NM_SETTING_PPP_NOBSDCOMP, + "", + "", + FALSE, + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:nodeflate: + * + * If %TRUE, "deflate" compression will not be requested. + **/ + obj_properties[PROP_NODEFLATE] = g_param_spec_boolean( + NM_SETTING_PPP_NODEFLATE, + "", + "", + FALSE, + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:no-vj-comp: + * + * If %TRUE, Van Jacobsen TCP header compression will not be requested. + **/ + obj_properties[PROP_NO_VJ_COMP] = g_param_spec_boolean( + NM_SETTING_PPP_NO_VJ_COMP, + "", + "", + FALSE, + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:require-mppe: + * + * If %TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for + * the PPP session. If either 64-bit or 128-bit MPPE is not available the + * session will fail. Note that MPPE is not used on mobile broadband + * connections. + **/ + obj_properties[PROP_REQUIRE_MPPE] = + g_param_spec_boolean(NM_SETTING_PPP_REQUIRE_MPPE, + "", + "", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:require-mppe-128: + * + * If %TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be + * required for the PPP session, and the "require-mppe" property must also + * be set to %TRUE. If 128-bit MPPE is not available the session will fail. + **/ + obj_properties[PROP_REQUIRE_MPPE_128] = + g_param_spec_boolean(NM_SETTING_PPP_REQUIRE_MPPE_128, + "", + "", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:mppe-stateful: + * + * If %TRUE, stateful MPPE is used. See pppd documentation for more + * information on stateful MPPE. + **/ + obj_properties[PROP_MPPE_STATEFUL] = + g_param_spec_boolean(NM_SETTING_PPP_MPPE_STATEFUL, + "", + "", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:crtscts: + * + * If %TRUE, specify that pppd should set the serial port to use hardware + * flow control with RTS and CTS signals. This value should normally be set + * to %FALSE. + **/ + obj_properties[PROP_CRTSCTS] = g_param_spec_boolean(NM_SETTING_PPP_CRTSCTS, + "", + "", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:baud: + * + * If non-zero, instruct pppd to set the serial port to the specified + * baudrate. This value should normally be left as 0 to automatically + * choose the speed. + **/ + obj_properties[PROP_BAUD] = g_param_spec_uint(NM_SETTING_PPP_BAUD, + "", + "", + 0, + G_MAXUINT32, + 0, + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE + | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:mru: + * + * If non-zero, instruct pppd to request that the peer send packets no + * larger than the specified size. If non-zero, the MRU should be between + * 128 and 16384. + */ + obj_properties[PROP_MRU] = g_param_spec_uint(NM_SETTING_PPP_MRU, + "", + "", + 0, + 16384, + 0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:mtu: + * + * If non-zero, instruct pppd to send packets no larger than the specified + * size. + **/ + obj_properties[PROP_MTU] = g_param_spec_uint(NM_SETTING_PPP_MTU, + "", + "", + 0, + G_MAXUINT32, + 0, + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE + | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:lcp-echo-failure: + * + * If non-zero, instruct pppd to presume the connection to the peer has + * failed if the specified number of LCP echo-requests go unanswered by the + * peer. The "lcp-echo-interval" property must also be set to a non-zero + * value if this property is used. + **/ + obj_properties[PROP_LCP_ECHO_FAILURE] = g_param_spec_uint( + NM_SETTING_PPP_LCP_ECHO_FAILURE, + "", + "", + 0, + G_MAXUINT32, + 0, + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingPpp:lcp-echo-interval: + * + * If non-zero, instruct pppd to send an LCP echo-request frame to the peer + * every n seconds (where n is the specified value). Note that some PPP + * peers will respond to echo requests and some will not, and it is not + * possible to autodetect this. + **/ + obj_properties[PROP_LCP_ECHO_INTERVAL] = g_param_spec_uint( + NM_SETTING_PPP_LCP_ECHO_INTERVAL, + "", + "", + 0, + G_MAXUINT32, + 0, + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); + + g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); + + _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_PPP); } |