colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bearer: ensure only valid bearers are exported

Browse Source 
We setup bearer export in DBus only if the input properties are the expected
ones.
This commit is contained in:
Aleksander Morgado
2011-12-12 17:54:14 +01:00
parent e00d3127d5
commit 667e3edfbd
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mm-bearer.c
View File

@@ -235,14 +235,10 @@ mm_bearer_new (MMBaseModem *modem,
/* Ensure only one capability is set */
g_assert_cmpuint (mm_count_bits_set (capability), ==, 1);
/* Build the unique path for the Bearer, and create the object */
path = g_strdup_printf (MM_DBUS_BEARER_PREFIX "%d", id++);
/* Create the object */
bearer = g_object_new (MM_TYPE_BEARER,
MM_BEARER_PATH, path,
MM_BEARER_MODEM, modem,
MM_BEARER_CAPABILITY, capability,
NULL);
g_free (path);
/* Parse and set input properties */
if (!parse_input_properties (bearer, capability, properties, error)) {
@@ -257,6 +253,15 @@ mm_bearer_new (MMBaseModem *modem,
mm_gdbus_bearer_set_ip4_config (MM_GDBUS_BEARER (bearer), NULL);
mm_gdbus_bearer_set_ip6_config (MM_GDBUS_BEARER (bearer), NULL);
/* Set modem and path ONLY after having checked input properties, so that
* we don't export invalid bearers. */
path = g_strdup_printf (MM_DBUS_BEARER_PREFIX "%d", id++);
g_object_set (bearer,
MM_BEARER_PATH, path,
MM_BEARER_MODEM, modem,
NULL);
g_free (path);
return bearer;
}
@@ -433,7 +438,7 @@ mm_bearer_class_init (MMBearerClass *klass)
"Path",
"DBus path of the Bearer",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_PATH, properties[PROP_PATH]);
properties[PROP_MODEM] =