D-Bus: Remove network_object dictionary entry from signal GroupStarted

The network_object path should be returned by the NetworkAdded signal
and not by the GroupStarted Signal. Starting a Group does not
necessarily validate the network object.

Signed-hostap: Michael Naumov <michael.naumov@intel.com>
Signed-hostap: Nirav Shah <nirav.j2.shah@intel.com>
intended-for: hostap-1
This commit is contained in:
Michael Naumov 2012-08-05 00:26:36 +03:00 committed by Jouni Malinen
parent 2ce7033678
commit a5195e56e8

View file

@ -1104,7 +1104,6 @@ void wpas_dbus_signal_p2p_group_started(struct wpa_supplicant *wpa_s,
DBusMessage *msg; DBusMessage *msg;
DBusMessageIter iter, dict_iter; DBusMessageIter iter, dict_iter;
struct wpas_dbus_priv *iface; struct wpas_dbus_priv *iface;
char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
char group_obj_path[WPAS_DBUS_OBJECT_PATH_MAX]; char group_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
iface = wpa_s->parent->global->dbus; iface = wpa_s->parent->global->dbus;
@ -1142,14 +1141,8 @@ void wpas_dbus_signal_p2p_group_started(struct wpa_supplicant *wpa_s,
client ? "client" : "GO")) client ? "client" : "GO"))
goto nomem; goto nomem;
os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
"%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
wpa_s->parent->dbus_new_path, network_id);
if (!wpa_dbus_dict_append_object_path(&dict_iter, "group_object", if (!wpa_dbus_dict_append_object_path(&dict_iter, "group_object",
group_obj_path) || group_obj_path) ||
!wpa_dbus_dict_append_object_path(&dict_iter, "network_object",
net_obj_path) ||
!wpa_dbus_dict_close_write(&iter, &dict_iter)) !wpa_dbus_dict_close_write(&iter, &dict_iter))
goto nomem; goto nomem;