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

Fix up message argument parsing in NM<->NMI network property retrieval

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1214 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-12-19 05:37:18 +00:00
parent c32b0d108f
commit 948a0a8529
2 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gnome/applet/applet-dbus-info.c
View File

@@ -412,6 +412,7 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
gboolean trusted = FALSE;
DBusMessageIter iter, array_iter;
GConfClient * client;
NMGConfWSO * gconf_wso;
g_return_val_if_fail (applet != NULL, NULL);
g_return_val_if_fail (message != NULL, NULL);
@@ -464,6 +465,14 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
goto out;
}
/* Get the network's security information from GConf */
if (!(gconf_wso = nm_gconf_wso_new_deserialize_gconf (client, escaped_network)))
{
nm_warning ("%s:%d (%s): couldn't retrieve security information from "
"GConf.", __FILE__, __LINE__, __func__);
goto out;
}
/* Build reply */
reply = dbus_message_new_method_return (message);
dbus_message_iter_init_append (reply, &iter);
@@ -488,7 +497,8 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
}
dbus_message_iter_close_container (&iter, &array_iter);
/* FIXME: serialize the security info into the message */
/* Serialize the security info into the message */
nm_gconf_wso_serialize_dbus (gconf_wso, &iter);
out:
if (ap_addrs_value)

38
src/nm-dbus-nmi.c
View File

@@ -398,27 +398,43 @@ static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data
dbus_message_iter_init (reply, &iter);
/* First arg: ESSID (STRING) */
if (!dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING)
if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING)
{
nm_warning ("%s:%d (%s): a message argument (essid) was invalid.",
__FILE__, __LINE__, __func__);
goto out;
}
dbus_message_iter_get_basic (&iter, &essid);
/* Second arg: Timestamp (INT32) */
if (!dbus_message_iter_next (&iter)
|| (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_INT32))
{
nm_warning ("%s:%d (%s): a message argument (timestamp) was invalid.",
__FILE__, __LINE__, __func__);
goto out;
}
dbus_message_iter_get_basic (&iter, &timestamp_secs);
/* Third arg: trusted (BOOLEAN) */
if (!dbus_message_iter_next (&iter)
|| (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_BOOLEAN))
{
nm_warning ("%s:%d (%s): a message argument (trusted) was invalid.",
__FILE__, __LINE__, __func__);
goto out;
}
dbus_message_iter_get_basic (&iter, &trusted);
/* Fourth arg: BSSID addresses (ARRAY, STRING) */
if (!dbus_message_iter_next (&iter)
|| (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_ARRAY)
|| (dbus_message_iter_get_element_type (&iter) != DBUS_TYPE_STRING))
{
nm_warning ("%s:%d (%s): a message argument (addresses) was invalid.",
__FILE__, __LINE__, __func__);
goto out;
}
dbus_message_iter_recurse (&iter, &subiter);
while (dbus_message_iter_get_arg_type (&subiter) == DBUS_TYPE_STRING)
{
@@ -431,7 +447,11 @@ static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data
/* Unserialize access point security info */
if (!(security = nm_ap_security_new_deserialize (&iter)))
{
nm_warning ("%s:%d (%s): message arguments were invalid (could not deserialize "
"wireless network security information.", __FILE__, __LINE__, __func__);
goto out;
}
/* Construct the new access point */
ap = nm_ap_new ();
@@ -495,13 +515,29 @@ static void nm_dbus_get_networks_cb (DBusPendingCall *pcall, void *user_data)
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
{
nm_warning ("%s:%d (%s): pending call was not completed.",
__FILE__, __LINE__, __func__);
goto out;
}
if (!(reply = dbus_pending_call_steal_reply (pcall)))
{
nm_warning ("%s:%d (%s): could not retrieve the reply.",
__FILE__, __LINE__, __func__);
goto out;
}
if (message_is_error (reply))
{
DBusError err;
dbus_error_init (&err);
dbus_set_error_from_message (&err, reply);
nm_warning ("%s:%d (%s): error received: %s - %s.",
__FILE__, __LINE__, __func__, err.name, err.message);
goto out;
}
dbus_message_iter_init (reply, &iter);
dbus_message_iter_recurse (&iter, &array_iter);