]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
D-Bus: Remove network_object dictionary entry from signal GroupStarted
authorMichael Naumov <michael.naumov@intel.com>
Sat, 4 Aug 2012 21:26:36 +0000 (00:26 +0300)
committerJouni Malinen <j@w1.fi>
Sat, 4 Aug 2012 21:26:36 +0000 (00:26 +0300)
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

wpa_supplicant/dbus/dbus_new.c

index a9957abb30cc4eae6f9a9f52b65828ad02eb5d95..e2b1e49c1a569b4a84761b998441a8a2c8cf467c 100644 (file)
@@ -1104,7 +1104,6 @@ void wpas_dbus_signal_p2p_group_started(struct wpa_supplicant *wpa_s,
        DBusMessage *msg;
        DBusMessageIter iter, dict_iter;
        struct wpas_dbus_priv *iface;
-       char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
        char group_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
 
        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"))
                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",
                                             group_obj_path) ||
-          !wpa_dbus_dict_append_object_path(&dict_iter, "network_object",
-                                            net_obj_path) ||
           !wpa_dbus_dict_close_write(&iter, &dict_iter))
                goto nomem;