diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2021-03-31 23:33:24 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2021-03-31 23:46:31 +0200 |
| commit | 2c27a7aadc79f3ded2e0ab13cc757266639f01e1 (patch) | |
| tree | 4edae2451304c184f10f0eca0bb4ee74c169b080 /src/mm-base-bearer.c | |
| parent | 317900635136564cce1ce74ef09a8e5fb012912b (diff) | |
base-bearer: remove default IP family property
There is no point in providing a configurable default IP family in the
bearer object, because we can always assume IPv4 as being the only
default expected.
Simplify the logic and also provide a new method to get the normalize
the IP family, using IPv4 as default always.
Diffstat (limited to 'src/mm-base-bearer.c')
| -rw-r--r-- | src/mm-base-bearer.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/mm-base-bearer.c b/src/mm-base-bearer.c index 6b8e6439..64a8057c 100644 --- a/src/mm-base-bearer.c +++ b/src/mm-base-bearer.c @@ -70,7 +70,6 @@ enum { PROP_MODEM, PROP_STATUS, PROP_CONFIG, - PROP_DEFAULT_IP_FAMILY, PROP_LAST }; @@ -92,8 +91,6 @@ struct _MMBaseBearerPrivate { gboolean ignore_disconnection_reports; /* Configuration of the bearer */ MMBearerProperties *config; - /* Default IP family of this bearer */ - MMBearerIpFamily default_ip_family; /* Cancellable for connect() */ GCancellable *connect_cancellable; @@ -1289,12 +1286,6 @@ mm_base_bearer_get_config (MMBaseBearer *self) NULL); } -MMBearerIpFamily -mm_base_bearer_get_default_ip_family (MMBaseBearer *self) -{ - return self->priv->default_ip_family; -} - /*****************************************************************************/ static void @@ -1481,9 +1472,6 @@ set_property (GObject *object, g_variant_unref (dictionary); break; } - case PROP_DEFAULT_IP_FAMILY: - self->priv->default_ip_family = g_value_get_flags (value); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1514,9 +1502,6 @@ get_property (GObject *object, case PROP_CONFIG: g_value_set_object (value, self->priv->config); break; - case PROP_DEFAULT_IP_FAMILY: - g_value_set_flags (value, self->priv->default_ip_family); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1539,7 +1524,6 @@ mm_base_bearer_init (MMBaseBearer *self) self->priv->status = MM_BEARER_STATUS_DISCONNECTED; self->priv->reason_3gpp = CONNECTION_FORBIDDEN_REASON_NONE; self->priv->reason_cdma = CONNECTION_FORBIDDEN_REASON_NONE; - self->priv->default_ip_family = MM_BEARER_IP_FAMILY_IPV4; self->priv->stats = mm_bearer_stats_new (); /* Set defaults */ @@ -1651,15 +1635,6 @@ mm_base_bearer_class_init (MMBaseBearerClass *klass) MM_TYPE_BEARER_PROPERTIES, G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_CONFIG, properties[PROP_CONFIG]); - - properties[PROP_DEFAULT_IP_FAMILY] = - g_param_spec_flags (MM_BASE_BEARER_DEFAULT_IP_FAMILY, - "Bearer default IP family", - "IP family to use for this bearer when no IP family is specified", - MM_TYPE_BEARER_IP_FAMILY, - MM_BEARER_IP_FAMILY_IPV4, - G_PARAM_READWRITE); - g_object_class_install_property (object_class, PROP_DEFAULT_IP_FAMILY, properties[PROP_DEFAULT_IP_FAMILY]); } /*****************************************************************************/ |