diff options
Diffstat (limited to 'libmm-common')
| -rw-r--r-- | libmm-common/Makefile.am | 8 | ||||
| -rw-r--r-- | libmm-common/libmm-common.h | 2 | ||||
| -rw-r--r-- | libmm-common/mm-bearer-ip-config.c (renamed from libmm-common/mm-common-bearer-ip-config.c) | 126 | ||||
| -rw-r--r-- | libmm-common/mm-bearer-ip-config.h | 73 | ||||
| -rw-r--r-- | libmm-common/mm-common-bearer-ip-config.h | 73 |
5 files changed, 158 insertions, 124 deletions
diff --git a/libmm-common/Makefile.am b/libmm-common/Makefile.am index 2af348d4..c712079c 100644 --- a/libmm-common/Makefile.am +++ b/libmm-common/Makefile.am @@ -153,7 +153,7 @@ mm-common-simple-properties.c: mm-errors-types.h mm-enums-types.h mm-common-connect-properties.c: mm-errors-types.h mm-common-bearer-properties.c: mm-errors-types.h mm-sms-properties.c: mm-errors-types.h -mm-common-bearer-ip-config.c: mm-errors-types.h +mm-bearer-ip-config.c: mm-errors-types.h mm-common-location-3gpp.c: mm-errors-types.h mm-errors-quarks.c: mm-errors-types.h mm-unlock-retries.c: mm-enums-types.h @@ -167,7 +167,7 @@ include_HEADERS = \ mm-common-connect-properties.h \ mm-common-bearer-properties.h \ mm-sms-properties.h \ - mm-common-bearer-ip-config.h \ + mm-bearer-ip-config.h \ mm-common-location-3gpp.h \ mm-unlock-retries.h \ mm-gdbus-manager.h \ @@ -192,8 +192,8 @@ libmm_common_la_SOURCES = \ mm-common-bearer-properties.c \ mm-sms-properties.h \ mm-sms-properties.c \ - mm-common-bearer-ip-config.h \ - mm-common-bearer-ip-config.c \ + mm-bearer-ip-config.h \ + mm-bearer-ip-config.c \ mm-common-location-3gpp.h \ mm-common-location-3gpp.c \ mm-unlock-retries.h \ diff --git a/libmm-common/libmm-common.h b/libmm-common/libmm-common.h index 7e266f37..f53d2bcf 100644 --- a/libmm-common/libmm-common.h +++ b/libmm-common/libmm-common.h @@ -30,7 +30,7 @@ #include "mm-common-connect-properties.h" #include "mm-sms-properties.h" #include "mm-common-bearer-properties.h" -#include "mm-common-bearer-ip-config.h" +#include "mm-bearer-ip-config.h" #include "mm-common-location-3gpp.h" #include "mm-unlock-retries.h" #include "mm-gdbus-manager.h" diff --git a/libmm-common/mm-common-bearer-ip-config.c b/libmm-common/mm-bearer-ip-config.c index bcc65c30..06e7830e 100644 --- a/libmm-common/mm-common-bearer-ip-config.c +++ b/libmm-common/mm-bearer-ip-config.c @@ -16,9 +16,9 @@ #include <string.h> #include "mm-errors-types.h" -#include "mm-common-bearer-ip-config.h" +#include "mm-bearer-ip-config.h" -G_DEFINE_TYPE (MMCommonBearerIpConfig, mm_common_bearer_ip_config, G_TYPE_OBJECT); +G_DEFINE_TYPE (MMBearerIpConfig, mm_bearer_ip_config, G_TYPE_OBJECT); #define PROPERTY_METHOD "method" #define PROPERTY_ADDRESS "address" @@ -28,7 +28,7 @@ G_DEFINE_TYPE (MMCommonBearerIpConfig, mm_common_bearer_ip_config, G_TYPE_OBJECT #define PROPERTY_DNS3 "dns3" #define PROPERTY_GATEWAY "gateway" -struct _MMCommonBearerIpConfigPrivate { +struct _MMBearerIpConfigPrivate { MMBearerIpMethod method; gchar *address; guint prefix; @@ -39,39 +39,49 @@ struct _MMCommonBearerIpConfigPrivate { /*****************************************************************************/ void -mm_common_bearer_ip_config_set_method (MMCommonBearerIpConfig *self, - MMBearerIpMethod method) +mm_bearer_ip_config_set_method (MMBearerIpConfig *self, + MMBearerIpMethod method) { + g_return_if_fail (MM_IS_BEARER_IP_CONFIG (self)); + self->priv->method = method; } void -mm_common_bearer_ip_config_set_address (MMCommonBearerIpConfig *self, - const gchar *address) +mm_bearer_ip_config_set_address (MMBearerIpConfig *self, + const gchar *address) { + g_return_if_fail (MM_IS_BEARER_IP_CONFIG (self)); + g_free (self->priv->address); self->priv->address = g_strdup (address); } void -mm_common_bearer_ip_config_set_prefix (MMCommonBearerIpConfig *self, - guint prefix) +mm_bearer_ip_config_set_prefix (MMBearerIpConfig *self, + guint prefix) { + g_return_if_fail (MM_IS_BEARER_IP_CONFIG (self)); + self->priv->prefix = prefix; } void -mm_common_bearer_ip_config_set_dns (MMCommonBearerIpConfig *self, - const gchar **dns) +mm_bearer_ip_config_set_dns (MMBearerIpConfig *self, + const gchar **dns) { + g_return_if_fail (MM_IS_BEARER_IP_CONFIG (self)); + g_strfreev (self->priv->dns); self->priv->dns = g_strdupv ((gchar **)dns); } void -mm_common_bearer_ip_config_set_gateway (MMCommonBearerIpConfig *self, - const gchar *gateway) +mm_bearer_ip_config_set_gateway (MMBearerIpConfig *self, + const gchar *gateway) { + g_return_if_fail (MM_IS_BEARER_IP_CONFIG (self)); + g_free (self->priv->gateway); self->priv->gateway = g_strdup (gateway); } @@ -79,45 +89,57 @@ mm_common_bearer_ip_config_set_gateway (MMCommonBearerIpConfig *self, /*****************************************************************************/ MMBearerIpMethod -mm_common_bearer_ip_config_get_method (MMCommonBearerIpConfig *self) +mm_bearer_ip_config_get_method (MMBearerIpConfig *self) { + g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), MM_BEARER_IP_METHOD_UNKNOWN); + return self->priv->method; } const gchar * -mm_common_bearer_ip_config_get_address (MMCommonBearerIpConfig *self) +mm_bearer_ip_config_get_address (MMBearerIpConfig *self) { + g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), NULL); + return self->priv->address; } guint -mm_common_bearer_ip_config_get_prefix (MMCommonBearerIpConfig *self) +mm_bearer_ip_config_get_prefix (MMBearerIpConfig *self) { + g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), 0); + return self->priv->prefix; } const gchar ** -mm_common_bearer_ip_config_get_dns (MMCommonBearerIpConfig *self) +mm_bearer_ip_config_get_dns (MMBearerIpConfig *self) { + g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), NULL); + return (const gchar **)self->priv->dns; } const gchar * -mm_common_bearer_ip_config_get_gateway (MMCommonBearerIpConfig *self) +mm_bearer_ip_config_get_gateway (MMBearerIpConfig *self) { + g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), NULL); + return self->priv->gateway; } /*****************************************************************************/ GVariant * -mm_common_bearer_ip_config_get_dictionary (MMCommonBearerIpConfig *self) +mm_bearer_ip_config_get_dictionary (MMBearerIpConfig *self) { GVariantBuilder builder; /* We do allow self==NULL. We'll just report method=unknown in this case */ - g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); + if (self) + g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), NULL); + g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); g_variant_builder_add (&builder, "{sv}", PROPERTY_METHOD, @@ -172,34 +194,44 @@ mm_common_bearer_ip_config_get_dictionary (MMCommonBearerIpConfig *self) /*****************************************************************************/ -MMCommonBearerIpConfig * -mm_common_bearer_ip_config_new_from_dictionary (GVariant *dictionary, - GError **error) +MMBearerIpConfig * +mm_bearer_ip_config_new_from_dictionary (GVariant *dictionary, + GError **error) { GVariantIter iter; gchar *key; GVariant *value; - MMCommonBearerIpConfig *self; + MMBearerIpConfig *self; gchar *dns_array[4] = { 0 }; gboolean method_received = FALSE; - self = mm_common_bearer_ip_config_new (); + self = mm_bearer_ip_config_new (); if (!dictionary) return self; + if (!g_variant_is_of_type (dictionary, G_VARIANT_TYPE ("a{sv}"))) { + g_set_error (error, + MM_CORE_ERROR, + MM_CORE_ERROR_INVALID_ARGS, + "Cannot create IP config from dictionary: " + "invalid variant type received"); + g_object_unref (self); + return NULL; + } + g_variant_iter_init (&iter, dictionary); while (g_variant_iter_next (&iter, "{sv}", &key, &value)) { if (g_str_equal (key, PROPERTY_METHOD)) { method_received = TRUE; - mm_common_bearer_ip_config_set_method ( + mm_bearer_ip_config_set_method ( self, (MMBearerIpMethod) g_variant_get_uint32 (value)); } else if (g_str_equal (key, PROPERTY_ADDRESS)) - mm_common_bearer_ip_config_set_address ( + mm_bearer_ip_config_set_address ( self, g_variant_get_string (value, NULL)); else if (g_str_equal (key, PROPERTY_PREFIX)) - mm_common_bearer_ip_config_set_prefix ( + mm_bearer_ip_config_set_prefix ( self, g_variant_get_uint32 (value)); else if (g_str_equal (key, PROPERTY_DNS1)) { @@ -212,7 +244,7 @@ mm_common_bearer_ip_config_new_from_dictionary (GVariant *dictionary, g_free (dns_array[2]); dns_array[2] = g_variant_dup_string (value, NULL); } else if (g_str_equal (key, PROPERTY_GATEWAY)) - mm_common_bearer_ip_config_set_gateway ( + mm_bearer_ip_config_set_gateway ( self, g_variant_get_string (value, NULL)); @@ -221,7 +253,7 @@ mm_common_bearer_ip_config_new_from_dictionary (GVariant *dictionary, } if (dns_array[0]) - mm_common_bearer_ip_config_set_dns (self, (const gchar **)dns_array); + mm_bearer_ip_config_set_dns (self, (const gchar **)dns_array); if (!method_received) { g_set_error (error, @@ -240,15 +272,17 @@ mm_common_bearer_ip_config_new_from_dictionary (GVariant *dictionary, /*****************************************************************************/ -MMCommonBearerIpConfig * -mm_common_bearer_ip_config_dup (MMCommonBearerIpConfig *orig) +MMBearerIpConfig * +mm_bearer_ip_config_dup (MMBearerIpConfig *orig) { GVariant *dict; - MMCommonBearerIpConfig *copy; + MMBearerIpConfig *copy; GError *error = NULL; - dict = mm_common_bearer_ip_config_get_dictionary (orig); - copy = mm_common_bearer_ip_config_new_from_dictionary (dict, &error); + g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (orig), NULL); + + dict = mm_bearer_ip_config_get_dictionary (orig); + copy = mm_bearer_ip_config_new_from_dictionary (dict, &error); g_assert_no_error (error); g_variant_unref (dict); @@ -257,19 +291,19 @@ mm_common_bearer_ip_config_dup (MMCommonBearerIpConfig *orig) /*****************************************************************************/ -MMCommonBearerIpConfig * -mm_common_bearer_ip_config_new (void) +MMBearerIpConfig * +mm_bearer_ip_config_new (void) { - return (MM_COMMON_BEARER_IP_CONFIG ( - g_object_new (MM_TYPE_COMMON_BEARER_IP_CONFIG, NULL))); + return (MM_BEARER_IP_CONFIG ( + g_object_new (MM_TYPE_BEARER_IP_CONFIG, NULL))); } static void -mm_common_bearer_ip_config_init (MMCommonBearerIpConfig *self) +mm_bearer_ip_config_init (MMBearerIpConfig *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), - MM_TYPE_COMMON_BEARER_IP_CONFIG, - MMCommonBearerIpConfigPrivate); + MM_TYPE_BEARER_IP_CONFIG, + MMBearerIpConfigPrivate); /* Some defaults */ self->priv->method = MM_BEARER_IP_METHOD_UNKNOWN; @@ -278,21 +312,21 @@ mm_common_bearer_ip_config_init (MMCommonBearerIpConfig *self) static void finalize (GObject *object) { - MMCommonBearerIpConfig *self = MM_COMMON_BEARER_IP_CONFIG (object); + MMBearerIpConfig *self = MM_BEARER_IP_CONFIG (object); g_free (self->priv->address); g_free (self->priv->gateway); g_strfreev (self->priv->dns); - G_OBJECT_CLASS (mm_common_bearer_ip_config_parent_class)->finalize (object); + G_OBJECT_CLASS (mm_bearer_ip_config_parent_class)->finalize (object); } static void -mm_common_bearer_ip_config_class_init (MMCommonBearerIpConfigClass *klass) +mm_bearer_ip_config_class_init (MMBearerIpConfigClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (object_class, sizeof (MMCommonBearerIpConfigPrivate)); + g_type_class_add_private (object_class, sizeof (MMBearerIpConfigPrivate)); object_class->finalize = finalize; } diff --git a/libmm-common/mm-bearer-ip-config.h b/libmm-common/mm-bearer-ip-config.h new file mode 100644 index 00000000..7fc6dd69 --- /dev/null +++ b/libmm-common/mm-bearer-ip-config.h @@ -0,0 +1,73 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details: + * + * Copyright (C) 2012 Google, Inc. + */ + +#ifndef MM_BEARER_IP_CONFIG_H +#define MM_BEARER_IP_CONFIG_H + +#include <ModemManager.h> +#include <glib-object.h> + +G_BEGIN_DECLS + +#define MM_TYPE_BEARER_IP_CONFIG (mm_bearer_ip_config_get_type ()) +#define MM_BEARER_IP_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BEARER_IP_CONFIG, MMBearerIpConfig)) +#define MM_BEARER_IP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BEARER_IP_CONFIG, MMBearerIpConfigClass)) +#define MM_IS_BEARER_IP_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BEARER_IP_CONFIG)) +#define MM_IS_BEARER_IP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BEARER_IP_CONFIG)) +#define MM_BEARER_IP_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BEARER_IP_CONFIG, MMBearerIpConfigClass)) + +typedef struct _MMBearerIpConfig MMBearerIpConfig; +typedef struct _MMBearerIpConfigClass MMBearerIpConfigClass; +typedef struct _MMBearerIpConfigPrivate MMBearerIpConfigPrivate; + +struct _MMBearerIpConfig { + GObject parent; + MMBearerIpConfigPrivate *priv; +}; + +struct _MMBearerIpConfigClass { + GObjectClass parent; +}; + +GType mm_bearer_ip_config_get_type (void); + +MMBearerIpConfig *mm_bearer_ip_config_new (void); +MMBearerIpConfig *mm_bearer_ip_config_new_from_dictionary (GVariant *dictionary, + GError **error); + +MMBearerIpConfig *mm_bearer_ip_config_dup (MMBearerIpConfig *orig); + +MMBearerIpMethod mm_bearer_ip_config_get_method (MMBearerIpConfig *self); +const gchar *mm_bearer_ip_config_get_address (MMBearerIpConfig *self); +guint mm_bearer_ip_config_get_prefix (MMBearerIpConfig *self); +const gchar **mm_bearer_ip_config_get_dns (MMBearerIpConfig *self); +const gchar *mm_bearer_ip_config_get_gateway (MMBearerIpConfig *self); + +void mm_bearer_ip_config_set_method (MMBearerIpConfig *self, + MMBearerIpMethod ip_method); +void mm_bearer_ip_config_set_address (MMBearerIpConfig *self, + const gchar *address); +void mm_bearer_ip_config_set_prefix (MMBearerIpConfig *self, + guint prefix); +void mm_bearer_ip_config_set_dns (MMBearerIpConfig *self, + const gchar **dns); +void mm_bearer_ip_config_set_gateway (MMBearerIpConfig *self, + const gchar *gateway); + +GVariant *mm_bearer_ip_config_get_dictionary (MMBearerIpConfig *self); + +G_END_DECLS + +#endif /* MM_BEARER_IP_CONFIG_H */ diff --git a/libmm-common/mm-common-bearer-ip-config.h b/libmm-common/mm-common-bearer-ip-config.h deleted file mode 100644 index 4dab99b5..00000000 --- a/libmm-common/mm-common-bearer-ip-config.h +++ /dev/null @@ -1,73 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details: - * - * Copyright (C) 2012 Google, Inc. - */ - -#ifndef MM_COMMON_BEARER_IP_CONFIG_H -#define MM_COMMON_BEARER_IP_CONFIG_H - -#include <ModemManager.h> -#include <glib-object.h> - -G_BEGIN_DECLS - -#define MM_TYPE_COMMON_BEARER_IP_CONFIG (mm_common_bearer_ip_config_get_type ()) -#define MM_COMMON_BEARER_IP_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_COMMON_BEARER_IP_CONFIG, MMCommonBearerIpConfig)) -#define MM_COMMON_BEARER_IP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_COMMON_BEARER_IP_CONFIG, MMCommonBearerIpConfigClass)) -#define MM_IS_COMMON_BEARER_IP_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_COMMON_BEARER_IP_CONFIG)) -#define MM_IS_COMMON_BEARER_IP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_COMMON_BEARER_IP_CONFIG)) -#define MM_COMMON_BEARER_IP_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_COMMON_BEARER_IP_CONFIG, MMCommonBearerIpConfigClass)) - -typedef struct _MMCommonBearerIpConfig MMCommonBearerIpConfig; -typedef struct _MMCommonBearerIpConfigClass MMCommonBearerIpConfigClass; -typedef struct _MMCommonBearerIpConfigPrivate MMCommonBearerIpConfigPrivate; - -struct _MMCommonBearerIpConfig { - GObject parent; - MMCommonBearerIpConfigPrivate *priv; -}; - -struct _MMCommonBearerIpConfigClass { - GObjectClass parent; -}; - -GType mm_common_bearer_ip_config_get_type (void); - -MMCommonBearerIpConfig *mm_common_bearer_ip_config_new (void); -MMCommonBearerIpConfig *mm_common_bearer_ip_config_new_from_dictionary (GVariant *dictionary, - GError **error); - -MMCommonBearerIpConfig *mm_common_bearer_ip_config_dup (MMCommonBearerIpConfig *orig); - -MMBearerIpMethod mm_common_bearer_ip_config_get_method (MMCommonBearerIpConfig *self); -const gchar *mm_common_bearer_ip_config_get_address (MMCommonBearerIpConfig *self); -guint mm_common_bearer_ip_config_get_prefix (MMCommonBearerIpConfig *self); -const gchar **mm_common_bearer_ip_config_get_dns (MMCommonBearerIpConfig *self); -const gchar *mm_common_bearer_ip_config_get_gateway (MMCommonBearerIpConfig *self); - -void mm_common_bearer_ip_config_set_method (MMCommonBearerIpConfig *self, - MMBearerIpMethod ip_method); -void mm_common_bearer_ip_config_set_address (MMCommonBearerIpConfig *self, - const gchar *address); -void mm_common_bearer_ip_config_set_prefix (MMCommonBearerIpConfig *self, - guint prefix); -void mm_common_bearer_ip_config_set_dns (MMCommonBearerIpConfig *self, - const gchar **dns); -void mm_common_bearer_ip_config_set_gateway (MMCommonBearerIpConfig *self, - const gchar *gateway); - -GVariant *mm_common_bearer_ip_config_get_dictionary (MMCommonBearerIpConfig *self); - -G_END_DECLS - -#endif /* MM_COMMON_BEARER_IP_CONFIG_H */ |