wpa_supplicant/dbus/dbus_new.c

   1 /*
   2  * WPA Supplicant / dbus-based control interface
   3  * Copyright (c) 2006, Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
   4  * Copyright (c) 2009-2010, Witold Sowa <witold.sowa@gmail.com>
   5  * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
   6  *
   7  * This software may be distributed under the terms of the BSD license.
   8  * See README for more details.
   9  */
  10
  11 #include "includes.h"
  12
  13 #include "common.h"
  14 #include "common/ieee802_11_defs.h"
  15 #include "wps/wps.h"
  16 #include "../config.h"
  17 #include "../wpa_supplicant_i.h"
  18 #include "../bss.h"
  19 #include "../wpas_glue.h"
  20 #include "dbus_new_helpers.h"
  21 #include "dbus_dict_helpers.h"
  22 #include "dbus_new.h"
  23 #include "dbus_new_handlers.h"
  24 #include "dbus_common_i.h"
  25 #include "dbus_new_handlers_p2p.h"
  26 #include "p2p/p2p.h"
  27 #include "../p2p_supplicant.h"
  28
  29 #ifdef CONFIG_AP /* until needed by something else */
  30
  31 /*
  32  * NameOwnerChanged handling
  33  *
  34  * Some services we provide allow an application to register for
  35  * a signal that it needs. While it can also unregister, we must
  36  * be prepared for the case where the application simply crashes
  37  * and thus doesn't clean up properly. The way to handle this in
  38  * DBus is to register for the NameOwnerChanged signal which will
  39  * signal an owner change to NULL if the peer closes the socket
  40  * for whatever reason.
  41  *
  42  * Handle this signal via a filter function whenever necessary.
  43  * The code below also handles refcounting in case in the future
  44  * there will be multiple instances of this subscription scheme.
  45  */
  46 static const char wpas_dbus_noc_filter_str[] =
  47         "interface=org.freedesktop.DBus,member=NameOwnerChanged";
  48
  49
  50 static DBusHandlerResult noc_filter(DBusConnection *conn,
  51                                     DBusMessage *message, void *data)
  52 {
  53         struct wpas_dbus_priv *priv = data;
  54
  55         if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_SIGNAL)
  56                 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
  57
  58         if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS,
  59                                    "NameOwnerChanged")) {
  60                 const char *name;
  61                 const char *prev_owner;
  62                 const char *new_owner;
  63                 DBusError derr;
  64                 struct wpa_supplicant *wpa_s;
  65
  66                 dbus_error_init(&derr);
  67
  68                 if (!dbus_message_get_args(message, &derr,
  69                                            DBUS_TYPE_STRING, &name,
  70                                            DBUS_TYPE_STRING, &prev_owner,
  71                                            DBUS_TYPE_STRING, &new_owner,
  72                                            DBUS_TYPE_INVALID)) {
  73                         /* Ignore this error */
  74                         dbus_error_free(&derr);
  75                         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
  76                 }
  77
  78                 for (wpa_s = priv->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
  79                         if (wpa_s->preq_notify_peer != NULL &&
  80                             os_strcmp(name, wpa_s->preq_notify_peer) == 0 &&
  81                             (new_owner == NULL || os_strlen(new_owner) == 0)) {
  82                                 /* probe request owner disconnected */
  83                                 os_free(wpa_s->preq_notify_peer);
  84                                 wpa_s->preq_notify_peer = NULL;
  85                                 wpas_dbus_unsubscribe_noc(priv);
  86                         }
  87                 }
  88         }
  89
  90         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
  91 }
  92
  93
  94 void wpas_dbus_subscribe_noc(struct wpas_dbus_priv *priv)
  95 {
  96         priv->dbus_noc_refcnt++;
  97         if (priv->dbus_noc_refcnt > 1)
  98                 return;
  99
 100         if (!dbus_connection_add_filter(priv->con, noc_filter, priv, NULL)) {
 101                 wpa_printf(MSG_ERROR, "dbus: failed to add filter");
 102                 return;
 103         }
 104
 105         dbus_bus_add_match(priv->con, wpas_dbus_noc_filter_str, NULL);
 106 }
 107
 108
 109 void wpas_dbus_unsubscribe_noc(struct wpas_dbus_priv *priv)
 110 {
 111         priv->dbus_noc_refcnt--;
 112         if (priv->dbus_noc_refcnt > 0)
 113                 return;
 114
 115         dbus_bus_remove_match(priv->con, wpas_dbus_noc_filter_str, NULL);
 116         dbus_connection_remove_filter(priv->con, noc_filter, priv);
 117 }
 118
 119 #endif /* CONFIG_AP */
 120
 121
 122 /**
 123  * wpas_dbus_signal_interface - Send a interface related event signal
 124  * @wpa_s: %wpa_supplicant network interface data
 125  * @sig_name: signal name - InterfaceAdded or InterfaceRemoved
 126  * @properties: Whether to add second argument with object properties
 127  *
 128  * Notify listeners about event related with interface
 129  */
 130 static void wpas_dbus_signal_interface(struct wpa_supplicant *wpa_s,
 131                                        const char *sig_name, int properties)
 132 {
 133         struct wpas_dbus_priv *iface;
 134         DBusMessage *msg;
 135         DBusMessageIter iter;
 136
 137         iface = wpa_s->global->dbus;
 138
 139         /* Do nothing if the control interface is not turned on */
 140         if (iface == NULL || !wpa_s->dbus_new_path)
 141                 return;
 142
 143         msg = dbus_message_new_signal(WPAS_DBUS_NEW_PATH,
 144                                       WPAS_DBUS_NEW_INTERFACE, sig_name);
 145         if (msg == NULL)
 146                 return;
 147
 148         dbus_message_iter_init_append(msg, &iter);
 149         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
 150                                             &wpa_s->dbus_new_path) ||
 151             (properties &&
 152              !wpa_dbus_get_object_properties(
 153                      iface, wpa_s->dbus_new_path,
 154                      WPAS_DBUS_NEW_IFACE_INTERFACE, &iter)))
 155                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 156         else
 157                 dbus_connection_send(iface->con, msg, NULL);
 158         dbus_message_unref(msg);
 159 }
 160
 161
 162 /**
 163  * wpas_dbus_signal_interface_added - Send a interface created signal
 164  * @wpa_s: %wpa_supplicant network interface data
 165  *
 166  * Notify listeners about creating new interface
 167  */
 168 static void wpas_dbus_signal_interface_added(struct wpa_supplicant *wpa_s)
 169 {
 170         wpas_dbus_signal_interface(wpa_s, "InterfaceAdded", TRUE);
 171 }
 172
 173
 174 /**
 175  * wpas_dbus_signal_interface_removed - Send a interface removed signal
 176  * @wpa_s: %wpa_supplicant network interface data
 177  *
 178  * Notify listeners about removing interface
 179  */
 180 static void wpas_dbus_signal_interface_removed(struct wpa_supplicant *wpa_s)
 181 {
 182         wpas_dbus_signal_interface(wpa_s, "InterfaceRemoved", FALSE);
 183
 184 }
 185
 186
 187 /**
 188  * wpas_dbus_signal_scan_done - send scan done signal
 189  * @wpa_s: %wpa_supplicant network interface data
 190  * @success: indicates if scanning succeed or failed
 191  *
 192  * Notify listeners about finishing a scan
 193  */
 194 void wpas_dbus_signal_scan_done(struct wpa_supplicant *wpa_s, int success)
 195 {
 196         struct wpas_dbus_priv *iface;
 197         DBusMessage *msg;
 198         dbus_bool_t succ;
 199
 200         iface = wpa_s->global->dbus;
 201
 202         /* Do nothing if the control interface is not turned on */
 203         if (iface == NULL || !wpa_s->dbus_new_path)
 204                 return;
 205
 206         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 207                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 208                                       "ScanDone");
 209         if (msg == NULL)
 210                 return;
 211
 212         succ = success ? TRUE : FALSE;
 213         if (dbus_message_append_args(msg, DBUS_TYPE_BOOLEAN, &succ,
 214                                      DBUS_TYPE_INVALID))
 215                 dbus_connection_send(iface->con, msg, NULL);
 216         else
 217                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 218         dbus_message_unref(msg);
 219 }
 220
 221
 222 /**
 223  * wpas_dbus_signal_bss - Send a BSS related event signal
 224  * @wpa_s: %wpa_supplicant network interface data
 225  * @bss_obj_path: BSS object path
 226  * @sig_name: signal name - BSSAdded or BSSRemoved
 227  * @properties: Whether to add second argument with object properties
 228  *
 229  * Notify listeners about event related with BSS
 230  */
 231 static void wpas_dbus_signal_bss(struct wpa_supplicant *wpa_s,
 232                                  const char *bss_obj_path,
 233                                  const char *sig_name, int properties)
 234 {
 235         struct wpas_dbus_priv *iface;
 236         DBusMessage *msg;
 237         DBusMessageIter iter;
 238
 239         iface = wpa_s->global->dbus;
 240
 241         /* Do nothing if the control interface is not turned on */
 242         if (iface == NULL || !wpa_s->dbus_new_path)
 243                 return;
 244
 245         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 246                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 247                                       sig_name);
 248         if (msg == NULL)
 249                 return;
 250
 251         dbus_message_iter_init_append(msg, &iter);
 252         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
 253                                             &bss_obj_path) ||
 254             (properties &&
 255              !wpa_dbus_get_object_properties(iface, bss_obj_path,
 256                                              WPAS_DBUS_NEW_IFACE_BSS,
 257                                              &iter)))
 258                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 259         else
 260                 dbus_connection_send(iface->con, msg, NULL);
 261         dbus_message_unref(msg);
 262 }
 263
 264
 265 /**
 266  * wpas_dbus_signal_bss_added - Send a BSS added signal
 267  * @wpa_s: %wpa_supplicant network interface data
 268  * @bss_obj_path: new BSS object path
 269  *
 270  * Notify listeners about adding new BSS
 271  */
 272 static void wpas_dbus_signal_bss_added(struct wpa_supplicant *wpa_s,
 273                                        const char *bss_obj_path)
 274 {
 275         wpas_dbus_signal_bss(wpa_s, bss_obj_path, "BSSAdded", TRUE);
 276 }
 277
 278
 279 /**
 280  * wpas_dbus_signal_bss_removed - Send a BSS removed signal
 281  * @wpa_s: %wpa_supplicant network interface data
 282  * @bss_obj_path: BSS object path
 283  *
 284  * Notify listeners about removing BSS
 285  */
 286 static void wpas_dbus_signal_bss_removed(struct wpa_supplicant *wpa_s,
 287                                          const char *bss_obj_path)
 288 {
 289         wpas_dbus_signal_bss(wpa_s, bss_obj_path, "BSSRemoved", FALSE);
 290 }
 291
 292
 293 /**
 294  * wpas_dbus_signal_blob - Send a blob related event signal
 295  * @wpa_s: %wpa_supplicant network interface data
 296  * @name: blob name
 297  * @sig_name: signal name - BlobAdded or BlobRemoved
 298  *
 299  * Notify listeners about event related with blob
 300  */
 301 static void wpas_dbus_signal_blob(struct wpa_supplicant *wpa_s,
 302                                   const char *name, const char *sig_name)
 303 {
 304         struct wpas_dbus_priv *iface;
 305         DBusMessage *msg;
 306
 307         iface = wpa_s->global->dbus;
 308
 309         /* Do nothing if the control interface is not turned on */
 310         if (iface == NULL || !wpa_s->dbus_new_path)
 311                 return;
 312
 313         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 314                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 315                                       sig_name);
 316         if (msg == NULL)
 317                 return;
 318
 319         if (dbus_message_append_args(msg, DBUS_TYPE_STRING, &name,
 320                                      DBUS_TYPE_INVALID))
 321                 dbus_connection_send(iface->con, msg, NULL);
 322         else
 323                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 324         dbus_message_unref(msg);
 325 }
 326
 327
 328 /**
 329  * wpas_dbus_signal_blob_added - Send a blob added signal
 330  * @wpa_s: %wpa_supplicant network interface data
 331  * @name: blob name
 332  *
 333  * Notify listeners about adding a new blob
 334  */
 335 void wpas_dbus_signal_blob_added(struct wpa_supplicant *wpa_s,
 336                                  const char *name)
 337 {
 338         wpas_dbus_signal_blob(wpa_s, name, "BlobAdded");
 339 }
 340
 341
 342 /**
 343  * wpas_dbus_signal_blob_removed - Send a blob removed signal
 344  * @wpa_s: %wpa_supplicant network interface data
 345  * @name: blob name
 346  *
 347  * Notify listeners about removing blob
 348  */
 349 void wpas_dbus_signal_blob_removed(struct wpa_supplicant *wpa_s,
 350                                    const char *name)
 351 {
 352         wpas_dbus_signal_blob(wpa_s, name, "BlobRemoved");
 353 }
 354
 355
 356 /**
 357  * wpas_dbus_signal_network - Send a network related event signal
 358  * @wpa_s: %wpa_supplicant network interface data
 359  * @id: new network id
 360  * @sig_name: signal name - NetworkAdded, NetworkRemoved or NetworkSelected
 361  * @properties: determines if add second argument with object properties
 362  *
 363  * Notify listeners about event related with configured network
 364  */
 365 static void wpas_dbus_signal_network(struct wpa_supplicant *wpa_s,
 366                                      int id, const char *sig_name,
 367                                      int properties)
 368 {
 369         struct wpas_dbus_priv *iface;
 370         DBusMessage *msg;
 371         DBusMessageIter iter;
 372         char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
 373
 374         iface = wpa_s->global->dbus;
 375
 376         /* Do nothing if the control interface is not turned on */
 377         if (iface == NULL || !wpa_s->dbus_new_path)
 378                 return;
 379
 380         os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
 381                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
 382                     wpa_s->dbus_new_path, id);
 383
 384         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 385                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 386                                       sig_name);
 387         if (msg == NULL)
 388                 return;
 389
 390         dbus_message_iter_init_append(msg, &iter);
 391         path = net_obj_path;
 392         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
 393                                             &path) ||
 394             (properties &&
 395              !wpa_dbus_get_object_properties(
 396                      iface, net_obj_path, WPAS_DBUS_NEW_IFACE_NETWORK,
 397                      &iter)))
 398                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 399         else
 400                 dbus_connection_send(iface->con, msg, NULL);
 401         dbus_message_unref(msg);
 402 }
 403
 404
 405 /**
 406  * wpas_dbus_signal_network_added - Send a network added signal
 407  * @wpa_s: %wpa_supplicant network interface data
 408  * @id: new network id
 409  *
 410  * Notify listeners about adding new network
 411  */
 412 static void wpas_dbus_signal_network_added(struct wpa_supplicant *wpa_s,
 413                                            int id)
 414 {
 415         wpas_dbus_signal_network(wpa_s, id, "NetworkAdded", TRUE);
 416 }
 417
 418
 419 /**
 420  * wpas_dbus_signal_network_removed - Send a network removed signal
 421  * @wpa_s: %wpa_supplicant network interface data
 422  * @id: network id
 423  *
 424  * Notify listeners about removing a network
 425  */
 426 static void wpas_dbus_signal_network_removed(struct wpa_supplicant *wpa_s,
 427                                              int id)
 428 {
 429         wpas_dbus_signal_network(wpa_s, id, "NetworkRemoved", FALSE);
 430 }
 431
 432
 433 /**
 434  * wpas_dbus_signal_network_selected - Send a network selected signal
 435  * @wpa_s: %wpa_supplicant network interface data
 436  * @id: network id
 437  *
 438  * Notify listeners about selecting a network
 439  */
 440 void wpas_dbus_signal_network_selected(struct wpa_supplicant *wpa_s, int id)
 441 {
 442         wpas_dbus_signal_network(wpa_s, id, "NetworkSelected", FALSE);
 443 }
 444
 445
 446 /**
 447  * wpas_dbus_signal_network_request - Indicate that additional information
 448  * (EAP password, etc.) is required to complete the association to this SSID
 449  * @wpa_s: %wpa_supplicant network interface data
 450  * @rtype: The specific additional information required
 451  * @default_text: Optional description of required information
 452  *
 453  * Request additional information or passwords to complete an association
 454  * request.
 455  */
 456 void wpas_dbus_signal_network_request(struct wpa_supplicant *wpa_s,
 457                                       struct wpa_ssid *ssid,
 458                                       enum wpa_ctrl_req_type rtype,
 459                                       const char *default_txt)
 460 {
 461         struct wpas_dbus_priv *iface;
 462         DBusMessage *msg;
 463         DBusMessageIter iter;
 464         char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
 465         const char *field, *txt = NULL, *net_ptr;
 466
 467         iface = wpa_s->global->dbus;
 468
 469         /* Do nothing if the control interface is not turned on */
 470         if (iface == NULL || !wpa_s->dbus_new_path)
 471                 return;
 472
 473         field = wpa_supplicant_ctrl_req_to_string(rtype, default_txt, &txt);
 474         if (field == NULL)
 475                 return;
 476
 477         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 478                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 479                                       "NetworkRequest");
 480         if (msg == NULL)
 481                 return;
 482
 483         os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
 484                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
 485                     wpa_s->dbus_new_path, ssid->id);
 486         net_ptr = &net_obj_path[0];
 487
 488         dbus_message_iter_init_append(msg, &iter);
 489         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
 490                                             &net_ptr) ||
 491             !dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &field) ||
 492             !dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &txt))
 493                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 494         else
 495                 dbus_connection_send(iface->con, msg, NULL);
 496         dbus_message_unref(msg);
 497 }
 498
 499
 500 /**
 501  * wpas_dbus_signal_network_enabled_changed - Signals Enabled property changes
 502  * @wpa_s: %wpa_supplicant network interface data
 503  * @ssid: configured network which Enabled property has changed
 504  *
 505  * Sends PropertyChanged signals containing new value of Enabled property
 506  * for specified network
 507  */
 508 void wpas_dbus_signal_network_enabled_changed(struct wpa_supplicant *wpa_s,
 509                                               struct wpa_ssid *ssid)
 510 {
 511
 512         char path[WPAS_DBUS_OBJECT_PATH_MAX];
 513
 514         if (!wpa_s->dbus_new_path)
 515                 return;
 516         os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
 517                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%d",
 518                     wpa_s->dbus_new_path, ssid->id);
 519
 520         wpa_dbus_mark_property_changed(wpa_s->global->dbus, path,
 521                                        WPAS_DBUS_NEW_IFACE_NETWORK, "Enabled");
 522 }
 523
 524
 525 #ifdef CONFIG_WPS
 526
 527 /**
 528  * wpas_dbus_signal_wps_event_pbc_overlap - Signals PBC overlap WPS event
 529  * @wpa_s: %wpa_supplicant network interface data
 530  *
 531  * Sends Event dbus signal with name "pbc-overlap" and empty dict as arguments
 532  */
 533 void wpas_dbus_signal_wps_event_pbc_overlap(struct wpa_supplicant *wpa_s)
 534 {
 535
 536         DBusMessage *msg;
 537         DBusMessageIter iter, dict_iter;
 538         struct wpas_dbus_priv *iface;
 539         char *key = "pbc-overlap";
 540
 541         iface = wpa_s->global->dbus;
 542
 543         /* Do nothing if the control interface is not turned on */
 544         if (iface == NULL || !wpa_s->dbus_new_path)
 545                 return;
 546
 547         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 548                                       WPAS_DBUS_NEW_IFACE_WPS, "Event");
 549         if (msg == NULL)
 550                 return;
 551
 552         dbus_message_iter_init_append(msg, &iter);
 553
 554         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
 555             !wpa_dbus_dict_open_write(&iter, &dict_iter) ||
 556             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 557                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 558         else
 559                 dbus_connection_send(iface->con, msg, NULL);
 560
 561         dbus_message_unref(msg);
 562 }
 563
 564
 565 /**
 566  * wpas_dbus_signal_wps_event_success - Signals Success WPS event
 567  * @wpa_s: %wpa_supplicant network interface data
 568  *
 569  * Sends Event dbus signal with name "success" and empty dict as arguments
 570  */
 571 void wpas_dbus_signal_wps_event_success(struct wpa_supplicant *wpa_s)
 572 {
 573
 574         DBusMessage *msg;
 575         DBusMessageIter iter, dict_iter;
 576         struct wpas_dbus_priv *iface;
 577         char *key = "success";
 578
 579         iface = wpa_s->global->dbus;
 580
 581         /* Do nothing if the control interface is not turned on */
 582         if (iface == NULL || !wpa_s->dbus_new_path)
 583                 return;
 584
 585         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 586                                       WPAS_DBUS_NEW_IFACE_WPS, "Event");
 587         if (msg == NULL)
 588                 return;
 589
 590         dbus_message_iter_init_append(msg, &iter);
 591
 592         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
 593             !wpa_dbus_dict_open_write(&iter, &dict_iter) ||
 594             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 595                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 596         else
 597                 dbus_connection_send(iface->con, msg, NULL);
 598
 599         dbus_message_unref(msg);
 600 }
 601
 602
 603 /**
 604  * wpas_dbus_signal_wps_event_fail - Signals Fail WPS event
 605  * @wpa_s: %wpa_supplicant network interface data
 606  * @fail: WPS failure information
 607  *
 608  * Sends Event dbus signal with name "fail" and dictionary containing
 609  * "msg field with fail message number (int32) as arguments
 610  */
 611 void wpas_dbus_signal_wps_event_fail(struct wpa_supplicant *wpa_s,
 612                                      struct wps_event_fail *fail)
 613 {
 614
 615         DBusMessage *msg;
 616         DBusMessageIter iter, dict_iter;
 617         struct wpas_dbus_priv *iface;
 618         char *key = "fail";
 619
 620         iface = wpa_s->global->dbus;
 621
 622         /* Do nothing if the control interface is not turned on */
 623         if (iface == NULL || !wpa_s->dbus_new_path)
 624                 return;
 625
 626         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 627                                       WPAS_DBUS_NEW_IFACE_WPS, "Event");
 628         if (msg == NULL)
 629                 return;
 630
 631         dbus_message_iter_init_append(msg, &iter);
 632
 633         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
 634             !wpa_dbus_dict_open_write(&iter, &dict_iter) ||
 635             !wpa_dbus_dict_append_int32(&dict_iter, "msg", fail->msg) ||
 636             !wpa_dbus_dict_append_int32(&dict_iter, "config_error",
 637                                         fail->config_error) ||
 638             !wpa_dbus_dict_append_int32(&dict_iter, "error_indication",
 639                                         fail->error_indication) ||
 640             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 641                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 642         else
 643                 dbus_connection_send(iface->con, msg, NULL);
 644
 645         dbus_message_unref(msg);
 646 }
 647
 648
 649 /**
 650  * wpas_dbus_signal_wps_event_m2d - Signals M2D WPS event
 651  * @wpa_s: %wpa_supplicant network interface data
 652  * @m2d: M2D event data information
 653  *
 654  * Sends Event dbus signal with name "m2d" and dictionary containing
 655  * fields of wps_event_m2d structure.
 656  */
 657 void wpas_dbus_signal_wps_event_m2d(struct wpa_supplicant *wpa_s,
 658                                     struct wps_event_m2d *m2d)
 659 {
 660
 661         DBusMessage *msg;
 662         DBusMessageIter iter, dict_iter;
 663         struct wpas_dbus_priv *iface;
 664         char *key = "m2d";
 665
 666         iface = wpa_s->global->dbus;
 667
 668         /* Do nothing if the control interface is not turned on */
 669         if (iface == NULL || !wpa_s->dbus_new_path)
 670                 return;
 671
 672         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 673                                       WPAS_DBUS_NEW_IFACE_WPS, "Event");
 674         if (msg == NULL)
 675                 return;
 676
 677         dbus_message_iter_init_append(msg, &iter);
 678
 679         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
 680             !wpa_dbus_dict_open_write(&iter, &dict_iter) ||
 681             !wpa_dbus_dict_append_uint16(&dict_iter, "config_methods",
 682                                          m2d->config_methods) ||
 683             !wpa_dbus_dict_append_byte_array(&dict_iter, "manufacturer",
 684                                              (const char *) m2d->manufacturer,
 685                                              m2d->manufacturer_len) ||
 686             !wpa_dbus_dict_append_byte_array(&dict_iter, "model_name",
 687                                              (const char *) m2d->model_name,
 688                                              m2d->model_name_len) ||
 689             !wpa_dbus_dict_append_byte_array(&dict_iter, "model_number",
 690                                              (const char *) m2d->model_number,
 691                                              m2d->model_number_len) ||
 692             !wpa_dbus_dict_append_byte_array(&dict_iter, "serial_number",
 693                                              (const char *)
 694                                              m2d->serial_number,
 695                                              m2d->serial_number_len) ||
 696             !wpa_dbus_dict_append_byte_array(&dict_iter, "dev_name",
 697                                              (const char *) m2d->dev_name,
 698                                              m2d->dev_name_len) ||
 699             !wpa_dbus_dict_append_byte_array(&dict_iter, "primary_dev_type",
 700                                              (const char *)
 701                                              m2d->primary_dev_type, 8) ||
 702             !wpa_dbus_dict_append_uint16(&dict_iter, "config_error",
 703                                          m2d->config_error) ||
 704             !wpa_dbus_dict_append_uint16(&dict_iter, "dev_password_id",
 705                                          m2d->dev_password_id) ||
 706             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 707                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 708         else
 709                 dbus_connection_send(iface->con, msg, NULL);
 710
 711         dbus_message_unref(msg);
 712 }
 713
 714
 715 /**
 716  * wpas_dbus_signal_wps_cred - Signals new credentials
 717  * @wpa_s: %wpa_supplicant network interface data
 718  * @cred: WPS Credential information
 719  *
 720  * Sends signal with credentials in directory argument
 721  */
 722 void wpas_dbus_signal_wps_cred(struct wpa_supplicant *wpa_s,
 723                                const struct wps_credential *cred)
 724 {
 725         DBusMessage *msg;
 726         DBusMessageIter iter, dict_iter;
 727         struct wpas_dbus_priv *iface;
 728         char *auth_type[5]; /* we have five possible authentication types */
 729         int at_num = 0;
 730         char *encr_type[3]; /* we have three possible encryption types */
 731         int et_num = 0;
 732
 733         iface = wpa_s->global->dbus;
 734
 735         /* Do nothing if the control interface is not turned on */
 736         if (iface == NULL || !wpa_s->dbus_new_path)
 737                 return;
 738
 739         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 740                                       WPAS_DBUS_NEW_IFACE_WPS,
 741                                       "Credentials");
 742         if (msg == NULL)
 743                 return;
 744
 745         dbus_message_iter_init_append(msg, &iter);
 746         if (!wpa_dbus_dict_open_write(&iter, &dict_iter))
 747                 goto nomem;
 748
 749         if (cred->auth_type & WPS_AUTH_OPEN)
 750                 auth_type[at_num++] = "open";
 751         if (cred->auth_type & WPS_AUTH_WPAPSK)
 752                 auth_type[at_num++] = "wpa-psk";
 753         if (cred->auth_type & WPS_AUTH_WPA)
 754                 auth_type[at_num++] = "wpa-eap";
 755         if (cred->auth_type & WPS_AUTH_WPA2)
 756                 auth_type[at_num++] = "wpa2-eap";
 757         if (cred->auth_type & WPS_AUTH_WPA2PSK)
 758                 auth_type[at_num++] = "wpa2-psk";
 759
 760         if (cred->encr_type & WPS_ENCR_NONE)
 761                 encr_type[et_num++] = "none";
 762         if (cred->encr_type & WPS_ENCR_TKIP)
 763                 encr_type[et_num++] = "tkip";
 764         if (cred->encr_type & WPS_ENCR_AES)
 765                 encr_type[et_num++] = "aes";
 766
 767         if ((wpa_s->current_ssid &&
 768              !wpa_dbus_dict_append_byte_array(
 769                      &dict_iter, "BSSID",
 770                      (const char *) wpa_s->current_ssid->bssid, ETH_ALEN)) ||
 771             !wpa_dbus_dict_append_byte_array(&dict_iter, "SSID",
 772                                              (const char *) cred->ssid,
 773                                              cred->ssid_len) ||
 774             !wpa_dbus_dict_append_string_array(&dict_iter, "AuthType",
 775                                                (const char **) auth_type,
 776                                                at_num) ||
 777             !wpa_dbus_dict_append_string_array(&dict_iter, "EncrType",
 778                                                (const char **) encr_type,
 779                                                et_num) ||
 780             !wpa_dbus_dict_append_byte_array(&dict_iter, "Key",
 781                                              (const char *) cred->key,
 782                                              cred->key_len) ||
 783             !wpa_dbus_dict_append_uint32(&dict_iter, "KeyIndex",
 784                                          cred->key_idx) ||
 785             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 786                 goto nomem;
 787
 788         dbus_connection_send(iface->con, msg, NULL);
 789
 790 nomem:
 791         dbus_message_unref(msg);
 792 }
 793
 794 #endif /* CONFIG_WPS */
 795
 796 void wpas_dbus_signal_certification(struct wpa_supplicant *wpa_s,
 797                                     int depth, const char *subject,
 798                                     const char *altsubject[],
 799                                     int num_altsubject,
 800                                     const char *cert_hash,
 801                                     const struct wpabuf *cert)
 802 {
 803         struct wpas_dbus_priv *iface;
 804         DBusMessage *msg;
 805         DBusMessageIter iter, dict_iter;
 806
 807         iface = wpa_s->global->dbus;
 808
 809         /* Do nothing if the control interface is not turned on */
 810         if (iface == NULL || !wpa_s->dbus_new_path)
 811                 return;
 812
 813         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 814                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 815                                       "Certification");
 816         if (msg == NULL)
 817                 return;
 818
 819         dbus_message_iter_init_append(msg, &iter);
 820         if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
 821             !wpa_dbus_dict_append_uint32(&dict_iter, "depth", depth) ||
 822             !wpa_dbus_dict_append_string(&dict_iter, "subject", subject) ||
 823             (altsubject && num_altsubject &&
 824              !wpa_dbus_dict_append_string_array(&dict_iter, "altsubject",
 825                                                 altsubject, num_altsubject)) ||
 826             (cert_hash &&
 827              !wpa_dbus_dict_append_string(&dict_iter, "cert_hash",
 828                                           cert_hash)) ||
 829             (cert &&
 830              !wpa_dbus_dict_append_byte_array(&dict_iter, "cert",
 831                                               wpabuf_head(cert),
 832                                               wpabuf_len(cert))) ||
 833             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 834                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 835         else
 836                 dbus_connection_send(iface->con, msg, NULL);
 837         dbus_message_unref(msg);
 838 }
 839
 840
 841 void wpas_dbus_signal_eap_status(struct wpa_supplicant *wpa_s,
 842                                  const char *status, const char *parameter)
 843 {
 844         struct wpas_dbus_priv *iface;
 845         DBusMessage *msg;
 846         DBusMessageIter iter;
 847
 848         iface = wpa_s->global->dbus;
 849
 850         /* Do nothing if the control interface is not turned on */
 851         if (iface == NULL || !wpa_s->dbus_new_path)
 852                 return;
 853
 854         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 855                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 856                                       "EAP");
 857         if (msg == NULL)
 858                 return;
 859
 860         dbus_message_iter_init_append(msg, &iter);
 861
 862         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &status) ||
 863             !dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING,
 864                                             &parameter))
 865                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 866         else
 867                 dbus_connection_send(iface->con, msg, NULL);
 868         dbus_message_unref(msg);
 869 }
 870
 871
 872 /**
 873  * wpas_dbus_signal_sta - Send a station related event signal
 874  * @wpa_s: %wpa_supplicant network interface data
 875  * @sta: station mac address
 876  * @sig_name: signal name - StaAuthorized or StaDeauthorized
 877  *
 878  * Notify listeners about event related with station
 879  */
 880 static void wpas_dbus_signal_sta(struct wpa_supplicant *wpa_s,
 881                                  const u8 *sta, const char *sig_name)
 882 {
 883         struct wpas_dbus_priv *iface;
 884         DBusMessage *msg;
 885         char sta_mac[WPAS_DBUS_OBJECT_PATH_MAX];
 886         char *dev_mac;
 887
 888         os_snprintf(sta_mac, WPAS_DBUS_OBJECT_PATH_MAX, MACSTR, MAC2STR(sta));
 889         dev_mac = sta_mac;
 890
 891         iface = wpa_s->global->dbus;
 892
 893         /* Do nothing if the control interface is not turned on */
 894         if (iface == NULL || !wpa_s->dbus_new_path)
 895                 return;
 896
 897         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 898                                       WPAS_DBUS_NEW_IFACE_INTERFACE, sig_name);
 899         if (msg == NULL)
 900                 return;
 901
 902         if (dbus_message_append_args(msg, DBUS_TYPE_STRING, &dev_mac,
 903                                      DBUS_TYPE_INVALID))
 904                 dbus_connection_send(iface->con, msg, NULL);
 905         else
 906                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 907         dbus_message_unref(msg);
 908
 909         wpa_printf(MSG_DEBUG, "dbus: Station MAC address '%s' '%s'",
 910                    sta_mac, sig_name);
 911 }
 912
 913
 914 /**
 915  * wpas_dbus_signal_sta_authorized - Send a STA authorized signal
 916  * @wpa_s: %wpa_supplicant network interface data
 917  * @sta: station mac address
 918  *
 919  * Notify listeners a new station has been authorized
 920  */
 921 void wpas_dbus_signal_sta_authorized(struct wpa_supplicant *wpa_s,
 922                                      const u8 *sta)
 923 {
 924         wpas_dbus_signal_sta(wpa_s, sta, "StaAuthorized");
 925 }
 926
 927
 928 /**
 929  * wpas_dbus_signal_sta_deauthorized - Send a STA deauthorized signal
 930  * @wpa_s: %wpa_supplicant network interface data
 931  * @sta: station mac address
 932  *
 933  * Notify listeners a station has been deauthorized
 934  */
 935 void wpas_dbus_signal_sta_deauthorized(struct wpa_supplicant *wpa_s,
 936                                        const u8 *sta)
 937 {
 938         wpas_dbus_signal_sta(wpa_s, sta, "StaDeauthorized");
 939 }
 940
 941
 942 #ifdef CONFIG_P2P
 943
 944 /**
 945  * wpas_dbus_signal_p2p_group_removed - Signals P2P group was removed
 946  * @wpa_s: %wpa_supplicant network interface data
 947  * @role: role of this device (client or GO)
 948  * Sends signal with i/f name and role as string arguments
 949  */
 950 void wpas_dbus_signal_p2p_group_removed(struct wpa_supplicant *wpa_s,
 951                                         const char *role)
 952 {
 953         DBusMessage *msg;
 954         DBusMessageIter iter, dict_iter;
 955         struct wpas_dbus_priv *iface = wpa_s->global->dbus;
 956         struct wpa_supplicant *parent;
 957
 958         /* Do nothing if the control interface is not turned on */
 959         if (iface == NULL)
 960                 return;
 961
 962         parent = wpa_s->parent;
 963         if (parent->p2p_mgmt)
 964                 parent = parent->parent;
 965
 966         if (!wpa_s->dbus_groupobj_path || !wpa_s->dbus_new_path ||
 967             !parent->dbus_new_path)
 968                 return;
 969
 970         msg = dbus_message_new_signal(parent->dbus_new_path,
 971                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
 972                                       "GroupFinished");
 973         if (msg == NULL)
 974                 return;
 975
 976         dbus_message_iter_init_append(msg, &iter);
 977         if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
 978             !wpa_dbus_dict_append_object_path(&dict_iter,
 979                                               "interface_object",
 980                                               wpa_s->dbus_new_path) ||
 981             !wpa_dbus_dict_append_string(&dict_iter, "role", role) ||
 982             !wpa_dbus_dict_append_object_path(&dict_iter, "group_object",
 983                                               wpa_s->dbus_groupobj_path) ||
 984             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 985                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 986         else
 987                 dbus_connection_send(iface->con, msg, NULL);
 988         dbus_message_unref(msg);
 989 }
 990
 991
 992 /**
 993  * wpas_dbus_signal_p2p_provision_discovery - Signals various PD events
 994  *
 995  * @dev_addr - who sent the request or responded to our request.
 996  * @request - Will be 1 if request, 0 for response.
 997  * @status - valid only in case of response
 998  * @config_methods - wps config methods
 999  * @generated_pin - pin to be displayed in case of WPS_CONFIG_DISPLAY method
1000  *
1001  * Sends following provision discovery related events:
1002  *      ProvisionDiscoveryRequestDisplayPin
1003  *      ProvisionDiscoveryResponseDisplayPin
1004  *      ProvisionDiscoveryRequestEnterPin
1005  *      ProvisionDiscoveryResponseEnterPin
1006  *      ProvisionDiscoveryPBCRequest
1007  *      ProvisionDiscoveryPBCResponse
1008  *
1009  *      TODO::
1010  *      ProvisionDiscoveryFailure (timeout case)
1011  */
1012 void wpas_dbus_signal_p2p_provision_discovery(struct wpa_supplicant *wpa_s,
1013                                               const u8 *dev_addr, int request,
1014                                               enum p2p_prov_disc_status status,
1015                                               u16 config_methods,
1016                                               unsigned int generated_pin)
1017 {
1018         DBusMessage *msg;
1019         DBusMessageIter iter;
1020         struct wpas_dbus_priv *iface;
1021         char *_signal;
1022         int add_pin = 0;
1023         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
1024         int error_ret = 1;
1025         char pin[9], *p_pin = NULL;
1026
1027         iface = wpa_s->global->dbus;
1028
1029         /* Do nothing if the control interface is not turned on */
1030         if (iface == NULL)
1031                 return;
1032
1033         if (wpa_s->p2p_mgmt)
1034                 wpa_s = wpa_s->parent;
1035         if (!wpa_s->dbus_new_path)
1036                 return;
1037
1038         if (request || !status) {
1039                 if (config_methods & WPS_CONFIG_DISPLAY)
1040                         _signal = request ?
1041                                  "ProvisionDiscoveryRequestDisplayPin" :
1042                                  "ProvisionDiscoveryResponseEnterPin";
1043                 else if (config_methods & WPS_CONFIG_KEYPAD)
1044                         _signal = request ?
1045                                  "ProvisionDiscoveryRequestEnterPin" :
1046                                  "ProvisionDiscoveryResponseDisplayPin";
1047                 else if (config_methods & WPS_CONFIG_PUSHBUTTON)
1048                         _signal = request ? "ProvisionDiscoveryPBCRequest" :
1049                                    "ProvisionDiscoveryPBCResponse";
1050                 else
1051                         return; /* Unknown or un-supported method */
1052         } else {
1053                 /* Explicit check for failure response */
1054                 _signal = "ProvisionDiscoveryFailure";
1055         }
1056
1057         add_pin = ((request && (config_methods & WPS_CONFIG_DISPLAY)) ||
1058                    (!request && !status &&
1059                         (config_methods & WPS_CONFIG_KEYPAD)));
1060
1061         if (add_pin) {
1062                 os_snprintf(pin, sizeof(pin), "%08d", generated_pin);
1063                 p_pin = pin;
1064         }
1065
1066         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
1067                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE, _signal);
1068         if (msg == NULL)
1069                 return;
1070
1071         /* Check if this is a known peer */
1072         if (!p2p_peer_known(wpa_s->global->p2p, dev_addr))
1073                 goto error;
1074
1075         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1076                         "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/"
1077                         COMPACT_MACSTR,
1078                         wpa_s->dbus_new_path, MAC2STR(dev_addr));
1079
1080         path = peer_obj_path;
1081
1082         dbus_message_iter_init_append(msg, &iter);
1083
1084         if (!dbus_message_iter_append_basic(&iter,
1085                                             DBUS_TYPE_OBJECT_PATH,
1086                                             &path))
1087                         goto error;
1088
1089         if (!request && status)
1090                 /* Attach status to ProvisionDiscoveryFailure */
1091                 error_ret = !dbus_message_iter_append_basic(&iter,
1092                                                     DBUS_TYPE_INT32,
1093                                                     &status);
1094         else
1095                 error_ret = (add_pin &&
1096                                  !dbus_message_iter_append_basic(&iter,
1097                                                         DBUS_TYPE_STRING,
1098                                                         &p_pin));
1099
1100 error:
1101         if (!error_ret)
1102                 dbus_connection_send(iface->con, msg, NULL);
1103         else
1104                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
1105
1106         dbus_message_unref(msg);
1107 }
1108
1109
1110 /**
1111  * wpas_dbus_signal_p2p_go_neg_req - Signal P2P GO Negotiation Request RX
1112  * @wpa_s: %wpa_supplicant network interface data
1113  * @src: Source address of the message triggering this notification
1114  * @dev_passwd_id: WPS Device Password Id
1115  * @go_intent: Peer's GO Intent value
1116  *
1117  * Sends signal to notify that a peer P2P Device is requesting group owner
1118  * negotiation with us.
1119  */
1120 void wpas_dbus_signal_p2p_go_neg_req(struct wpa_supplicant *wpa_s,
1121                                      const u8 *src, u16 dev_passwd_id,
1122                                      u8 go_intent)
1123 {
1124         DBusMessage *msg;
1125         DBusMessageIter iter;
1126         struct wpas_dbus_priv *iface;
1127         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
1128
1129         iface = wpa_s->global->dbus;
1130
1131         /* Do nothing if the control interface is not turned on */
1132         if (iface == NULL)
1133                 return;
1134
1135         if (wpa_s->p2p_mgmt)
1136                 wpa_s = wpa_s->parent;
1137         if (!wpa_s->dbus_new_path)
1138                 return;
1139
1140         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1141                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/" COMPACT_MACSTR,
1142                     wpa_s->dbus_new_path, MAC2STR(src));
1143         path = peer_obj_path;
1144
1145         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
1146                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
1147                                       "GONegotiationRequest");
1148         if (msg == NULL)
1149                 return;
1150
1151         dbus_message_iter_init_append(msg, &iter);
1152
1153         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
1154                                             &path) ||
1155             !dbus_message_iter_append_basic(&iter, DBUS_TYPE_UINT16,
1156                                             &dev_passwd_id) ||
1157             !dbus_message_iter_append_basic(&iter, DBUS_TYPE_BYTE,
1158                                             &go_intent))
1159                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
1160         else
1161                 dbus_connection_send(iface->con, msg, NULL);
1162
1163         dbus_message_unref(msg);
1164 }
1165
1166
1167 static int wpas_dbus_get_group_obj_path(struct wpa_supplicant *wpa_s,
1168                                         const struct wpa_ssid *ssid,
1169                                         char *group_obj_path)
1170 {
1171         char group_name[3];
1172
1173         if (!wpa_s->dbus_new_path ||
1174             os_memcmp(ssid->ssid, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN))
1175                 return -1;
1176
1177         os_memcpy(group_name, ssid->ssid + P2P_WILDCARD_SSID_LEN, 2);
1178         group_name[2] = '\0';
1179
1180         os_snprintf(group_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1181                     "%s/" WPAS_DBUS_NEW_P2P_GROUPS_PART "/%s",
1182                     wpa_s->dbus_new_path, group_name);
1183
1184         return 0;
1185 }
1186
1187
1188 struct group_changed_data {
1189         struct wpa_supplicant *wpa_s;
1190         struct p2p_peer_info *info;
1191 };
1192
1193
1194 static int match_group_where_peer_is_client(struct p2p_group *group,
1195                                             void *user_data)
1196 {
1197         struct group_changed_data *data = user_data;
1198         const struct p2p_group_config *cfg;
1199         struct wpa_supplicant *wpa_s_go;
1200
1201         if (!p2p_group_is_client_connected(group, data->info->p2p_device_addr))
1202                 return 1;
1203
1204         cfg = p2p_group_get_config(group);
1205
1206         wpa_s_go = wpas_get_p2p_go_iface(data->wpa_s, cfg->ssid,
1207                                          cfg->ssid_len);
1208         if (wpa_s_go != NULL && wpa_s_go == data->wpa_s) {
1209                 wpas_dbus_signal_peer_groups_changed(
1210                         data->wpa_s->parent, data->info->p2p_device_addr);
1211                 return 0;
1212         }
1213
1214         return 1;
1215 }
1216
1217
1218 static void signal_peer_groups_changed(struct p2p_peer_info *info,
1219                                        void *user_data)
1220 {
1221         struct group_changed_data *data = user_data;
1222         struct wpa_supplicant *wpa_s_go;
1223
1224         wpa_s_go = wpas_get_p2p_client_iface(data->wpa_s,
1225                                              info->p2p_device_addr);
1226         if (wpa_s_go != NULL && wpa_s_go == data->wpa_s) {
1227                 wpas_dbus_signal_peer_groups_changed(data->wpa_s->parent,
1228                                                      info->p2p_device_addr);
1229                 return;
1230         }
1231
1232         data->info = info;
1233         p2p_loop_on_all_groups(data->wpa_s->global->p2p,
1234                                match_group_where_peer_is_client, data);
1235         data->info = NULL;
1236 }
1237
1238
1239 static void peer_groups_changed(struct wpa_supplicant *wpa_s)
1240 {
1241         struct group_changed_data data;
1242
1243         os_memset(&data, 0, sizeof(data));
1244         data.wpa_s = wpa_s;
1245
1246         p2p_loop_on_known_peers(wpa_s->global->p2p,
1247                                 signal_peer_groups_changed, &data);
1248 }
1249
1250
1251 /**
1252  * wpas_dbus_signal_p2p_group_started - Signals P2P group has
1253  * started. Emitted when a group is successfully started
1254  * irrespective of the role (client/GO) of the current device
1255  *
1256  * @wpa_s: %wpa_supplicant network interface data
1257  * @ssid: SSID object
1258  * @client: this device is P2P client
1259  * @network_id: network id of the group started, use instead of ssid->id
1260  *      to account for persistent groups
1261  */
1262 void wpas_dbus_signal_p2p_group_started(struct wpa_supplicant *wpa_s,
1263                                         const struct wpa_ssid *ssid,
1264                                         int client, int network_id)
1265 {
1266         DBusMessage *msg;
1267         DBusMessageIter iter, dict_iter;
1268         struct wpas_dbus_priv *iface;
1269         struct wpa_supplicant *parent;
1270
1271         parent = wpa_s->parent;
1272         if (parent->p2p_mgmt)
1273                 parent = parent->parent;
1274
1275         iface = parent->global->dbus;
1276
1277         /* Do nothing if the control interface is not turned on */
1278         if (iface == NULL || !parent->dbus_new_path || !wpa_s->dbus_new_path)
1279                 return;
1280
1281         if (wpa_s->dbus_groupobj_path == NULL)
1282                 return;
1283
1284         /* New interface has been created for this group */
1285         msg = dbus_message_new_signal(parent->dbus_new_path,
1286                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
1287                                       "GroupStarted");
1288         if (msg == NULL)
1289                 return;
1290
1291         dbus_message_iter_init_append(msg, &iter);
1292         /*
1293          * In case the device supports creating a separate interface the
1294          * DBus client will need to know the object path for the interface
1295          * object this group was created on, so include it here.
1296          */
1297         if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
1298             !wpa_dbus_dict_append_object_path(&dict_iter,
1299                                               "interface_object",
1300                                               wpa_s->dbus_new_path) ||
1301             !wpa_dbus_dict_append_string(&dict_iter, "role",
1302                                          client ? "client" : "GO") ||
1303             !wpa_dbus_dict_append_object_path(&dict_iter, "group_object",
1304                                               wpa_s->dbus_groupobj_path) ||
1305             !wpa_dbus_dict_close_write(&iter, &dict_iter)) {
1306                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
1307         } else {
1308                 dbus_connection_send(iface->con, msg, NULL);
1309                 if (client)
1310                         peer_groups_changed(wpa_s);
1311         }
1312         dbus_message_unref(msg);
1313 }
1314
1315
1316 /**
1317  * wpas_dbus_signal_p2p_go_neg_resp - Emit GONegotiation Success/Failure signal
1318  * @wpa_s: %wpa_supplicant network interface data
1319  * @res: Result of the GO Neg Request
1320  */
1321 void wpas_dbus_signal_p2p_go_neg_resp(struct wpa_supplicant *wpa_s,
1322                                       struct p2p_go_neg_results *res)
1323 {
1324         DBusMessage *msg;
1325         DBusMessageIter iter, dict_iter;
1326         DBusMessageIter iter_dict_entry, iter_dict_val, iter_dict_array;
1327         struct wpas_dbus_priv *iface;
1328         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
1329         dbus_int32_t freqs[P2P_MAX_CHANNELS];
1330         dbus_int32_t *f_array = freqs;
1331
1332
1333         iface = wpa_s->global->dbus;
1334
1335         if (wpa_s->p2p_mgmt)
1336                 wpa_s = wpa_s->parent;
1337
1338         os_memset(freqs, 0, sizeof(freqs));
1339         /* Do nothing if the control interface is not turned on */
1340         if (iface == NULL || !wpa_s->dbus_new_path)
1341                 return;
1342
1343         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1344                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/" COMPACT_MACSTR,
1345                     wpa_s->dbus_new_path, MAC2STR(res->peer_device_addr));
1346         path = peer_obj_path;
1347
1348         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
1349                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
1350                                       res->status ? "GONegotiationFailure" :
1351                                                     "GONegotiationSuccess");
1352         if (msg == NULL)
1353                 return;
1354
1355         dbus_message_iter_init_append(msg, &iter);
1356         if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
1357             !wpa_dbus_dict_append_object_path(&dict_iter, "peer_object",
1358                                               path) ||
1359             !wpa_dbus_dict_append_int32(&dict_iter, "status", res->status))
1360                 goto err;
1361
1362         if (!res->status) {
1363                 int i = 0;
1364                 int freq_list_num = 0;
1365
1366                 if ((res->role_go &&
1367                      !wpa_dbus_dict_append_string(&dict_iter, "passphrase",
1368                                                   res->passphrase)) ||
1369                     !wpa_dbus_dict_append_string(&dict_iter, "role_go",
1370                                                  res->role_go ? "GO" :
1371                                                  "client") ||
1372                     !wpa_dbus_dict_append_int32(&dict_iter, "frequency",
1373                                                 res->freq) ||
1374                     !wpa_dbus_dict_append_byte_array(&dict_iter, "ssid",
1375                                                      (const char *) res->ssid,
1376                                                      res->ssid_len) ||
1377                     !wpa_dbus_dict_append_byte_array(&dict_iter,
1378                                                      "peer_device_addr",
1379                                                      (const char *)
1380                                                      res->peer_device_addr,
1381                                                      ETH_ALEN) ||
1382                     !wpa_dbus_dict_append_byte_array(&dict_iter,
1383                                                      "peer_interface_addr",
1384                                                      (const char *)
1385                                                      res->peer_interface_addr,
1386                                                      ETH_ALEN) ||
1387                     !wpa_dbus_dict_append_string(&dict_iter, "wps_method",
1388                                                  p2p_wps_method_text(
1389                                                          res->wps_method)))
1390                         goto err;
1391
1392                 for (i = 0; i < P2P_MAX_CHANNELS; i++) {
1393                         if (res->freq_list[i]) {
1394                                 freqs[i] = res->freq_list[i];
1395                                 freq_list_num++;
1396                         }
1397                 }
1398
1399                 if (!wpa_dbus_dict_begin_array(&dict_iter,
1400                                                "frequency_list",
1401                                                DBUS_TYPE_INT32_AS_STRING,
1402                                                &iter_dict_entry,
1403                                                &iter_dict_val,
1404                                                &iter_dict_array) ||
1405                     !dbus_message_iter_append_fixed_array(&iter_dict_array,
1406                                                           DBUS_TYPE_INT32,
1407                                                           &f_array,
1408                                                           freq_list_num) ||
1409                     !wpa_dbus_dict_end_array(&dict_iter,
1410                                              &iter_dict_entry,
1411                                              &iter_dict_val,
1412                                              &iter_dict_array) ||
1413                     !wpa_dbus_dict_append_int32(&dict_iter, "persistent_group",
1414                                                 res->persistent_group) ||
1415                     !wpa_dbus_dict_append_uint32(&dict_iter,
1416                                                  "peer_config_timeout",
1417                                                  res->peer_config_timeout))
1418                         goto err;
1419         }
1420
1421         if (!wpa_dbus_dict_close_write(&iter, &dict_iter))
1422                 goto err;
1423
1424         dbus_connection_send(iface->con, msg, NULL);
1425 err:
1426         dbus_message_unref(msg);
1427 }
1428
1429
1430 /**
1431  * wpas_dbus_signal_p2p_invitation_result - Emit InvitationResult signal
1432  * @wpa_s: %wpa_supplicant network interface data
1433  * @status: Status of invitation process
1434  * @bssid: Basic Service Set Identifier
1435  */
1436 void wpas_dbus_signal_p2p_invitation_result(struct wpa_supplicant *wpa_s,
1437                                             int status, const u8 *bssid)
1438 {
1439         DBusMessage *msg;
1440         DBusMessageIter iter, dict_iter;
1441         struct wpas_dbus_priv *iface;
1442
1443         wpa_printf(MSG_DEBUG, "%s", __func__);
1444
1445         iface = wpa_s->global->dbus;
1446         /* Do nothing if the control interface is not turned on */
1447         if (iface == NULL)
1448                 return;
1449
1450         if (wpa_s->p2p_mgmt)
1451                 wpa_s = wpa_s->parent;
1452         if (!wpa_s->dbus_new_path)
1453                 return;
1454
1455         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
1456                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
1457                                       "InvitationResult");
1458
1459         if (msg == NULL)
1460                 return;
1461
1462         dbus_message_iter_init_append(msg, &iter);
1463         if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
1464             !wpa_dbus_dict_append_int32(&dict_iter, "status", status) ||
1465             (bssid &&
1466              !wpa_dbus_dict_append_byte_array(&dict_iter, "BSSID",
1467                                               (const char *) bssid,
1468                                               ETH_ALEN)) ||
1469             !wpa_dbus_dict_close_write(&iter, &dict_iter))
1470                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
1471         else
1472                 dbus_connection_send(iface->con, msg, NULL);
1473         dbus_message_unref(msg);
1474 }
1475
1476
1477 /**
1478  *
1479  * Method to emit a signal for a peer joining the group.
1480  * The signal will carry path to the group member object
1481  * constructed using p2p i/f addr used for connecting.
1482  *
1483  * @wpa_s: %wpa_supplicant network interface data
1484  * @peer_addr: P2P Device Address of the peer joining the group
1485  */
1486 void wpas_dbus_signal_p2p_peer_joined(struct wpa_supplicant *wpa_s,
1487                                       const u8 *peer_addr)
1488 {
1489         struct wpas_dbus_priv *iface;
1490         DBusMessage *msg;
1491         DBusMessageIter iter;
1492         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
1493         struct wpa_supplicant *parent;
1494
1495         iface = wpa_s->global->dbus;
1496
1497         /* Do nothing if the control interface is not turned on */
1498         if (iface == NULL)
1499                 return;
1500
1501         if (!wpa_s->dbus_groupobj_path)
1502                 return;
1503
1504         parent = wpa_s->parent;
1505         if (parent->p2p_mgmt)
1506                 parent = parent->parent;
1507         if (!parent->dbus_new_path)
1508                 return;
1509
1510         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1511                         "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/"
1512                         COMPACT_MACSTR,
1513                         parent->dbus_new_path, MAC2STR(peer_addr));
1514
1515         msg = dbus_message_new_signal(wpa_s->dbus_groupobj_path,
1516                                       WPAS_DBUS_NEW_IFACE_P2P_GROUP,
1517                                       "PeerJoined");
1518         if (msg == NULL)
1519                 return;
1520
1521         dbus_message_iter_init_append(msg, &iter);
1522         path = peer_obj_path;
1523         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
1524                                             &path)) {
1525                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
1526         } else {
1527                 dbus_connection_send(iface->con, msg, NULL);
1528                 wpas_dbus_signal_peer_groups_changed(parent, peer_addr);
1529         }
1530         dbus_message_unref(msg);
1531 }
1532
1533
1534 /**
1535  *
1536  * Method to emit a signal for a peer disconnecting the group.
1537  * The signal will carry path to the group member object
1538  * constructed using the P2P Device Address of the peer.
1539  *
1540  * @wpa_s: %wpa_supplicant network interface data
1541  * @peer_addr: P2P Device Address of the peer joining the group
1542  */
1543 void wpas_dbus_signal_p2p_peer_disconnected(struct wpa_supplicant *wpa_s,
1544                                             const u8 *peer_addr)
1545 {
1546         struct wpas_dbus_priv *iface;
1547         DBusMessage *msg;
1548         DBusMessageIter iter;
1549         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
1550         struct wpa_supplicant *parent;
1551
1552         iface = wpa_s->global->dbus;
1553
1554         /* Do nothing if the control interface is not turned on */
1555         if (iface == NULL)
1556                 return;
1557
1558         if (!wpa_s->dbus_groupobj_path)
1559                 return;
1560
1561         parent = wpa_s->parent;
1562         if (parent->p2p_mgmt)
1563                 parent = parent->parent;
1564         if (!parent->dbus_new_path)
1565                 return;
1566
1567         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1568                         "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/"
1569                         COMPACT_MACSTR,
1570                         parent->dbus_new_path, MAC2STR(peer_addr));
1571
1572         msg = dbus_message_new_signal(wpa_s->dbus_groupobj_path,
1573                                       WPAS_DBUS_NEW_IFACE_P2P_GROUP,
1574                                       "PeerDisconnected");
1575         if (msg == NULL)
1576                 return;
1577
1578         dbus_message_iter_init_append(msg, &iter);
1579         path = peer_obj_path;
1580         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
1581                                             &path)) {
1582                 wpa_printf(MSG_ERROR,
1583                            "dbus: Failed to construct PeerDisconnected signal");
1584         } else {
1585                 dbus_connection_send(iface->con, msg, NULL);
1586                 wpas_dbus_signal_peer_groups_changed(parent, peer_addr);
1587         }
1588         dbus_message_unref(msg);
1589 }
1590
1591
1592 /**
1593  *
1594  * Method to emit a signal for a service discovery request.
1595  * The signal will carry station address, frequency, dialog token,
1596  * update indicator and it tlvs
1597  *
1598  * @wpa_s: %wpa_supplicant network interface data
1599  * @sa: station addr (p2p i/f) of the peer
1600  * @dialog_token: service discovery request dialog token
1601  * @update_indic: service discovery request update indicator
1602  * @tlvs: service discovery request genrated byte array of tlvs
1603  * @tlvs_len: service discovery request tlvs length
1604  */
1605 void wpas_dbus_signal_p2p_sd_request(struct wpa_supplicant *wpa_s,
1606                                      int freq, const u8 *sa, u8 dialog_token,
1607                                      u16 update_indic, const u8 *tlvs,
1608                                      size_t tlvs_len)
1609 {
1610         DBusMessage *msg;
1611         DBusMessageIter iter, dict_iter;
1612         struct wpas_dbus_priv *iface;
1613         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
1614
1615         iface = wpa_s->global->dbus;
1616
1617         /* Do nothing if the control interface is not turned on */
1618         if (iface == NULL)
1619                 return;
1620
1621         if (wpa_s->p2p_mgmt)
1622                 wpa_s = wpa_s->parent;
1623         if (!wpa_s->dbus_new_path)
1624                 return;
1625
1626         /* Check if this is a known peer */
1627         if (!p2p_peer_known(wpa_s->global->p2p, sa))
1628                 return;
1629
1630         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
1631                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
1632                                       "ServiceDiscoveryRequest");
1633         if (msg == NULL)
1634                 return;
1635
1636         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1637                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/"
1638                     COMPACT_MACSTR, wpa_s->dbus_new_path, MAC2STR(sa));
1639
1640         path = peer_obj_path;
1641
1642         dbus_message_iter_init_append(msg, &iter);
1643         if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
1644             !wpa_dbus_dict_append_object_path(&dict_iter, "peer_object",
1645                                               path) ||
1646             !wpa_dbus_dict_append_int32(&dict_iter, "frequency", freq) ||
1647             !wpa_dbus_dict_append_int32(&dict_iter, "dialog_token",
1648                                         dialog_token) ||
1649             !wpa_dbus_dict_append_uint16(&dict_iter, "update_indicator",
1650                                          update_indic) ||
1651             !wpa_dbus_dict_append_byte_array(&dict_iter, "tlvs",
1652                                              (const char *) tlvs,
1653                                              tlvs_len) ||
1654             !wpa_dbus_dict_close_write(&iter, &dict_iter))
1655                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
1656         else
1657                 dbus_connection_send(iface->con, msg, NULL);
1658         dbus_message_unref(msg);
1659 }
1660
1661
1662 /**
1663  *
1664  * Method to emit a signal for a service discovery response.
1665  * The signal will carry station address, update indicator and it
1666  * tlvs
1667  *
1668  * @wpa_s: %wpa_supplicant network interface data
1669  * @sa: station addr (p2p i/f) of the peer
1670  * @update_indic: service discovery request update indicator
1671  * @tlvs: service discovery request genrated byte array of tlvs
1672  * @tlvs_len: service discovery request tlvs length
1673  */
1674 void wpas_dbus_signal_p2p_sd_response(struct wpa_supplicant *wpa_s,
1675                                       const u8 *sa, u16 update_indic,
1676                                       const u8 *tlvs, size_t tlvs_len)
1677 {
1678         DBusMessage *msg;
1679         DBusMessageIter iter, dict_iter;
1680         struct wpas_dbus_priv *iface;
1681         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
1682
1683         iface = wpa_s->global->dbus;
1684
1685         /* Do nothing if the control interface is not turned on */
1686         if (iface == NULL)
1687                 return;
1688
1689         if (wpa_s->p2p_mgmt)
1690                 wpa_s = wpa_s->parent;
1691         if (!wpa_s->dbus_new_path)
1692                 return;
1693
1694         /* Check if this is a known peer */
1695         if (!p2p_peer_known(wpa_s->global->p2p, sa))
1696                 return;
1697
1698         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
1699                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
1700                                       "ServiceDiscoveryResponse");
1701         if (msg == NULL)
1702                 return;
1703
1704         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1705                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/"
1706                     COMPACT_MACSTR, wpa_s->dbus_new_path, MAC2STR(sa));
1707
1708         path = peer_obj_path;
1709
1710         dbus_message_iter_init_append(msg, &iter);
1711         if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
1712             !wpa_dbus_dict_append_object_path(&dict_iter, "peer_object",
1713                                               path) ||
1714             !wpa_dbus_dict_append_uint16(&dict_iter, "update_indicator",
1715                                          update_indic) ||
1716             !wpa_dbus_dict_append_byte_array(&dict_iter, "tlvs",
1717                                              (const char *) tlvs,
1718                                              tlvs_len) ||
1719             !wpa_dbus_dict_close_write(&iter, &dict_iter))
1720                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
1721         else
1722                 dbus_connection_send(iface->con, msg, NULL);
1723         dbus_message_unref(msg);
1724 }
1725
1726
1727 /**
1728  * wpas_dbus_signal_persistent_group - Send a persistent group related
1729  *      event signal
1730  * @wpa_s: %wpa_supplicant network interface data
1731  * @id: new persistent group id
1732  * @sig_name: signal name - PersistentGroupAdded, PersistentGroupRemoved
1733  * @properties: determines if add second argument with object properties
1734  *
1735  * Notify listeners about an event related to persistent groups.
1736  */
1737 static void wpas_dbus_signal_persistent_group(struct wpa_supplicant *wpa_s,
1738                                               int id, const char *sig_name,
1739                                               int properties)
1740 {
1741         struct wpas_dbus_priv *iface;
1742         DBusMessage *msg;
1743         DBusMessageIter iter;
1744         char pgrp_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
1745
1746         iface = wpa_s->global->dbus;
1747
1748         /* Do nothing if the control interface is not turned on */
1749         if (iface == NULL)
1750                 return;
1751
1752         if (wpa_s->p2p_mgmt)
1753                 wpa_s = wpa_s->parent;
1754         if (!wpa_s->dbus_new_path)
1755                 return;
1756
1757         os_snprintf(pgrp_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1758                     "%s/" WPAS_DBUS_NEW_PERSISTENT_GROUPS_PART "/%u",
1759                     wpa_s->dbus_new_path, id);
1760
1761         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
1762                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
1763                                       sig_name);
1764         if (msg == NULL)
1765                 return;
1766
1767         dbus_message_iter_init_append(msg, &iter);
1768         path = pgrp_obj_path;
1769         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
1770                                             &path) ||
1771             (properties &&
1772              !wpa_dbus_get_object_properties(
1773                      iface, pgrp_obj_path,
1774                      WPAS_DBUS_NEW_IFACE_PERSISTENT_GROUP, &iter)))
1775                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
1776         else
1777                 dbus_connection_send(iface->con, msg, NULL);
1778
1779         dbus_message_unref(msg);
1780 }
1781
1782
1783 /**
1784  * wpas_dbus_signal_persistent_group_added - Send a persistent_group
1785  *      added signal
1786  * @wpa_s: %wpa_supplicant network interface data
1787  * @id: new persistent group id
1788  *
1789  * Notify listeners about addition of a new persistent group.
1790  */
1791 static void wpas_dbus_signal_persistent_group_added(
1792         struct wpa_supplicant *wpa_s, int id)
1793 {
1794         wpas_dbus_signal_persistent_group(wpa_s, id, "PersistentGroupAdded",
1795                                           TRUE);
1796 }
1797
1798
1799 /**
1800  * wpas_dbus_signal_persistent_group_removed - Send a persistent_group
1801  *      removed signal
1802  * @wpa_s: %wpa_supplicant network interface data
1803  * @id: persistent group id
1804  *
1805  * Notify listeners about removal of a persistent group.
1806  */
1807 static void wpas_dbus_signal_persistent_group_removed(
1808         struct wpa_supplicant *wpa_s, int id)
1809 {
1810         wpas_dbus_signal_persistent_group(wpa_s, id, "PersistentGroupRemoved",
1811                                           FALSE);
1812 }
1813
1814
1815 /**
1816  * wpas_dbus_signal_p2p_wps_failed - Signals WpsFailed event
1817  * @wpa_s: %wpa_supplicant network interface data
1818  * @fail: WPS failure information
1819  *
1820  * Sends Event dbus signal with name "fail" and dictionary containing
1821  * "msg" field with fail message number (int32) as arguments
1822  */
1823 void wpas_dbus_signal_p2p_wps_failed(struct wpa_supplicant *wpa_s,
1824                                      struct wps_event_fail *fail)
1825 {
1826
1827         DBusMessage *msg;
1828         DBusMessageIter iter, dict_iter;
1829         struct wpas_dbus_priv *iface;
1830         char *key = "fail";
1831
1832         iface = wpa_s->global->dbus;
1833
1834         /* Do nothing if the control interface is not turned on */
1835         if (iface == NULL)
1836                 return;
1837
1838         if (wpa_s->p2p_mgmt)
1839                 wpa_s = wpa_s->parent;
1840
1841         if (!wpa_s->dbus_new_path)
1842                 return;
1843         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
1844                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
1845                                       "WpsFailed");
1846         if (msg == NULL)
1847                 return;
1848
1849         dbus_message_iter_init_append(msg, &iter);
1850
1851         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
1852             !wpa_dbus_dict_open_write(&iter, &dict_iter) ||
1853             !wpa_dbus_dict_append_int32(&dict_iter, "msg", fail->msg) ||
1854             !wpa_dbus_dict_append_int16(&dict_iter, "config_error",
1855                                         fail->config_error) ||
1856             !wpa_dbus_dict_close_write(&iter, &dict_iter))
1857                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
1858         else
1859                 dbus_connection_send(iface->con, msg, NULL);
1860
1861         dbus_message_unref(msg);
1862 }
1863
1864
1865 /**
1866  * wpas_dbus_signal_p2p_group_formation_failure - Signals GroupFormationFailure event
1867  * @wpa_s: %wpa_supplicant network interface data
1868  * @reason: indicates the reason code for group formation failure
1869  *
1870  * Sends Event dbus signal and string reason code when available.
1871  */
1872 void wpas_dbus_signal_p2p_group_formation_failure(struct wpa_supplicant *wpa_s,
1873                                                   const char *reason)
1874 {
1875         DBusMessage *msg;
1876         struct wpas_dbus_priv *iface;
1877
1878         iface = wpa_s->global->dbus;
1879
1880         /* Do nothing if the control interface is not turned on */
1881         if (iface == NULL)
1882                 return;
1883
1884         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
1885                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
1886                                       "GroupFormationFailure");
1887         if (msg == NULL)
1888                 return;
1889
1890         if (dbus_message_append_args(msg, DBUS_TYPE_STRING, &reason,
1891                                      DBUS_TYPE_INVALID))
1892                 dbus_connection_send(iface->con, msg, NULL);
1893         else
1894                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
1895
1896         dbus_message_unref(msg);
1897 }
1898
1899
1900 /**
1901  * wpas_dbus_signal_p2p_invitation_received - Emit InvitationReceived signal
1902  * @wpa_s: %wpa_supplicant network interface data
1903  * @sa: Source address of the Invitation Request
1904  * @dev_add: GO Device Address
1905  * @bssid: P2P Group BSSID or %NULL if not received
1906  * @id: Persistent group id or %0 if not persistent group
1907  * @op_freq: Operating frequency for the group
1908  */
1909
1910 void wpas_dbus_signal_p2p_invitation_received(struct wpa_supplicant *wpa_s,
1911                                               const u8 *sa, const u8 *dev_addr,
1912                                               const u8 *bssid, int id,
1913                                               int op_freq)
1914 {
1915         DBusMessage *msg;
1916         DBusMessageIter iter, dict_iter;
1917         struct wpas_dbus_priv *iface;
1918
1919         iface = wpa_s->global->dbus;
1920
1921         /* Do nothing if the control interface is not turned on */
1922         if (iface == NULL)
1923                 return;
1924
1925         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
1926                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
1927                                       "InvitationReceived");
1928         if (msg == NULL)
1929                 return;
1930
1931         dbus_message_iter_init_append(msg, &iter);
1932         if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
1933             (sa &&
1934              !wpa_dbus_dict_append_byte_array(&dict_iter, "sa",
1935                                               (const char *) sa, ETH_ALEN)) ||
1936             (dev_addr &&
1937              !wpa_dbus_dict_append_byte_array(&dict_iter, "go_dev_addr",
1938                                               (const char *) dev_addr,
1939                                               ETH_ALEN)) ||
1940             (bssid &&
1941              !wpa_dbus_dict_append_byte_array(&dict_iter, "bssid",
1942                                               (const char *) bssid,
1943                                               ETH_ALEN)) ||
1944             (id &&
1945              !wpa_dbus_dict_append_int32(&dict_iter, "persistent_id", id)) ||
1946             !wpa_dbus_dict_append_int32(&dict_iter, "op_freq", op_freq) ||
1947             !wpa_dbus_dict_close_write(&iter, &dict_iter)) {
1948                 dbus_message_unref(msg);
1949                 return;
1950         }
1951
1952         dbus_connection_send(iface->con, msg, NULL);
1953         dbus_message_unref(msg);
1954 }
1955
1956
1957 #endif /* CONFIG_P2P */
1958
1959
1960 /**
1961  * wpas_dbus_signal_prop_changed - Signals change of property
1962  * @wpa_s: %wpa_supplicant network interface data
1963  * @property: indicates which property has changed
1964  *
1965  * Sends PropertyChanged signals with path, interface and arguments
1966  * depending on which property has changed.
1967  */
1968 void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
1969                                    enum wpas_dbus_prop property)
1970 {
1971         char *prop;
1972         dbus_bool_t flush;
1973
1974         if (wpa_s->dbus_new_path == NULL)
1975                 return; /* Skip signal since D-Bus setup is not yet ready */
1976
1977         flush = FALSE;
1978         switch (property) {
1979         case WPAS_DBUS_PROP_AP_SCAN:
1980                 prop = "ApScan";
1981                 break;
1982         case WPAS_DBUS_PROP_SCANNING:
1983                 prop = "Scanning";
1984                 break;
1985         case WPAS_DBUS_PROP_STATE:
1986                 prop = "State";
1987                 break;
1988         case WPAS_DBUS_PROP_CURRENT_BSS:
1989                 prop = "CurrentBSS";
1990                 break;
1991         case WPAS_DBUS_PROP_CURRENT_NETWORK:
1992                 prop = "CurrentNetwork";
1993                 break;
1994         case WPAS_DBUS_PROP_BSSS:
1995                 prop = "BSSs";
1996                 break;
1997         case WPAS_DBUS_PROP_CURRENT_AUTH_MODE:
1998                 prop = "CurrentAuthMode";
1999                 break;
2000         case WPAS_DBUS_PROP_DISCONNECT_REASON:
2001                 prop = "DisconnectReason";
2002                 flush = TRUE;
2003                 break;
2004         default:
2005                 wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
2006                            __func__, property);
2007                 return;
2008         }
2009
2010         wpa_dbus_mark_property_changed(wpa_s->global->dbus,
2011                                        wpa_s->dbus_new_path,
2012                                        WPAS_DBUS_NEW_IFACE_INTERFACE, prop);
2013         if (flush) {
2014                 wpa_dbus_flush_object_changed_properties(
2015                         wpa_s->global->dbus->con, wpa_s->dbus_new_path);
2016         }
2017 }
2018
2019
2020 /**
2021  * wpas_dbus_bss_signal_prop_changed - Signals change of BSS property
2022  * @wpa_s: %wpa_supplicant network interface data
2023  * @property: indicates which property has changed
2024  * @id: unique BSS identifier
2025  *
2026  * Sends PropertyChanged signals with path, interface, and arguments depending
2027  * on which property has changed.
2028  */
2029 void wpas_dbus_bss_signal_prop_changed(struct wpa_supplicant *wpa_s,
2030                                        enum wpas_dbus_bss_prop property,
2031                                        unsigned int id)
2032 {
2033         char path[WPAS_DBUS_OBJECT_PATH_MAX];
2034         char *prop;
2035
2036         if (!wpa_s->dbus_new_path)
2037                 return;
2038
2039         switch (property) {
2040         case WPAS_DBUS_BSS_PROP_SIGNAL:
2041                 prop = "Signal";
2042                 break;
2043         case WPAS_DBUS_BSS_PROP_FREQ:
2044                 prop = "Frequency";
2045                 break;
2046         case WPAS_DBUS_BSS_PROP_MODE:
2047                 prop = "Mode";
2048                 break;
2049         case WPAS_DBUS_BSS_PROP_PRIVACY:
2050                 prop = "Privacy";
2051                 break;
2052         case WPAS_DBUS_BSS_PROP_RATES:
2053                 prop = "Rates";
2054                 break;
2055         case WPAS_DBUS_BSS_PROP_WPA:
2056                 prop = "WPA";
2057                 break;
2058         case WPAS_DBUS_BSS_PROP_RSN:
2059                 prop = "RSN";
2060                 break;
2061         case WPAS_DBUS_BSS_PROP_WPS:
2062                 prop = "WPS";
2063                 break;
2064         case WPAS_DBUS_BSS_PROP_IES:
2065                 prop = "IEs";
2066                 break;
2067         case WPAS_DBUS_BSS_PROP_AGE:
2068                 prop = "Age";
2069                 break;
2070         default:
2071                 wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
2072                            __func__, property);
2073                 return;
2074         }
2075
2076         os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
2077                     "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
2078                     wpa_s->dbus_new_path, id);
2079
2080         wpa_dbus_mark_property_changed(wpa_s->global->dbus, path,
2081                                        WPAS_DBUS_NEW_IFACE_BSS, prop);
2082 }
2083
2084
2085 /**
2086  * wpas_dbus_signal_debug_level_changed - Signals change of debug param
2087  * @global: wpa_global structure
2088  *
2089  * Sends PropertyChanged signals informing that debug level has changed.
2090  */
2091 void wpas_dbus_signal_debug_level_changed(struct wpa_global *global)
2092 {
2093         wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
2094                                        WPAS_DBUS_NEW_INTERFACE,
2095                                        "DebugLevel");
2096 }
2097
2098
2099 /**
2100  * wpas_dbus_signal_debug_timestamp_changed - Signals change of debug param
2101  * @global: wpa_global structure
2102  *
2103  * Sends PropertyChanged signals informing that debug timestamp has changed.
2104  */
2105 void wpas_dbus_signal_debug_timestamp_changed(struct wpa_global *global)
2106 {
2107         wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
2108                                        WPAS_DBUS_NEW_INTERFACE,
2109                                        "DebugTimestamp");
2110 }
2111
2112
2113 /**
2114  * wpas_dbus_signal_debug_show_keys_changed - Signals change of debug param
2115  * @global: wpa_global structure
2116  *
2117  * Sends PropertyChanged signals informing that debug show_keys has changed.
2118  */
2119 void wpas_dbus_signal_debug_show_keys_changed(struct wpa_global *global)
2120 {
2121         wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
2122                                        WPAS_DBUS_NEW_INTERFACE,
2123                                        "DebugShowKeys");
2124 }
2125
2126
2127 static void wpas_dbus_register(struct wpa_dbus_object_desc *obj_desc,
2128                                void *priv,
2129                                WPADBusArgumentFreeFunction priv_free,
2130                                const struct wpa_dbus_method_desc *methods,
2131                                const struct wpa_dbus_property_desc *properties,
2132                                const struct wpa_dbus_signal_desc *signals)
2133 {
2134         int n;
2135
2136         obj_desc->user_data = priv;
2137         obj_desc->user_data_free_func = priv_free;
2138         obj_desc->methods = methods;
2139         obj_desc->properties = properties;
2140         obj_desc->signals = signals;
2141
2142         for (n = 0; properties && properties->dbus_property; properties++)
2143                 n++;
2144
2145         obj_desc->prop_changed_flags = os_zalloc(n);
2146         if (!obj_desc->prop_changed_flags)
2147                 wpa_printf(MSG_DEBUG, "dbus: %s: can't register handlers",
2148                            __func__);
2149 }
2150
2151
2152 static const struct wpa_dbus_method_desc wpas_dbus_global_methods[] = {
2153         { "CreateInterface", WPAS_DBUS_NEW_INTERFACE,
2154           (WPADBusMethodHandler) wpas_dbus_handler_create_interface,
2155           {
2156                   { "args", "a{sv}", ARG_IN },
2157                   { "path", "o", ARG_OUT },
2158                   END_ARGS
2159           }
2160         },
2161         { "RemoveInterface", WPAS_DBUS_NEW_INTERFACE,
2162           (WPADBusMethodHandler) wpas_dbus_handler_remove_interface,
2163           {
2164                   { "path", "o", ARG_IN },
2165                   END_ARGS
2166           }
2167         },
2168         { "GetInterface", WPAS_DBUS_NEW_INTERFACE,
2169           (WPADBusMethodHandler) wpas_dbus_handler_get_interface,
2170           {
2171                   { "ifname", "s", ARG_IN },
2172                   { "path", "o", ARG_OUT },
2173                   END_ARGS
2174           }
2175         },
2176         { "ExpectDisconnect", WPAS_DBUS_NEW_INTERFACE,
2177           (WPADBusMethodHandler) wpas_dbus_handler_expect_disconnect,
2178           {
2179                 END_ARGS
2180           }
2181         },
2182         { NULL, NULL, NULL, { END_ARGS } }
2183 };
2184
2185 static const struct wpa_dbus_property_desc wpas_dbus_global_properties[] = {
2186         { "DebugLevel", WPAS_DBUS_NEW_INTERFACE, "s",
2187           wpas_dbus_getter_debug_level,
2188           wpas_dbus_setter_debug_level,
2189           NULL
2190         },
2191         { "DebugTimestamp", WPAS_DBUS_NEW_INTERFACE, "b",
2192           wpas_dbus_getter_debug_timestamp,
2193           wpas_dbus_setter_debug_timestamp,
2194           NULL
2195         },
2196         { "DebugShowKeys", WPAS_DBUS_NEW_INTERFACE, "b",
2197           wpas_dbus_getter_debug_show_keys,
2198           wpas_dbus_setter_debug_show_keys,
2199           NULL
2200         },
2201         { "Interfaces", WPAS_DBUS_NEW_INTERFACE, "ao",
2202           wpas_dbus_getter_interfaces,
2203           NULL,
2204           NULL
2205         },
2206         { "EapMethods", WPAS_DBUS_NEW_INTERFACE, "as",
2207           wpas_dbus_getter_eap_methods,
2208           NULL,
2209           NULL
2210         },
2211         { "Capabilities", WPAS_DBUS_NEW_INTERFACE, "as",
2212           wpas_dbus_getter_global_capabilities,
2213           NULL,
2214           NULL
2215         },
2216 #ifdef CONFIG_WIFI_DISPLAY
2217         { "WFDIEs", WPAS_DBUS_NEW_INTERFACE, "ay",
2218           wpas_dbus_getter_global_wfd_ies,
2219           wpas_dbus_setter_global_wfd_ies,
2220           NULL
2221         },
2222 #endif /* CONFIG_WIFI_DISPLAY */
2223         { NULL, NULL, NULL, NULL, NULL, NULL }
2224 };
2225
2226 static const struct wpa_dbus_signal_desc wpas_dbus_global_signals[] = {
2227         { "InterfaceAdded", WPAS_DBUS_NEW_INTERFACE,
2228           {
2229                   { "path", "o", ARG_OUT },
2230                   { "properties", "a{sv}", ARG_OUT },
2231                   END_ARGS
2232           }
2233         },
2234         { "InterfaceRemoved", WPAS_DBUS_NEW_INTERFACE,
2235           {
2236                   { "path", "o", ARG_OUT },
2237                   END_ARGS
2238           }
2239         },
2240         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
2241         { "PropertiesChanged", WPAS_DBUS_NEW_INTERFACE,
2242           {
2243                   { "properties", "a{sv}", ARG_OUT },
2244                   END_ARGS
2245           }
2246         },
2247         { NULL, NULL, { END_ARGS } }
2248 };
2249
2250
2251 static char * uscore_to_dbus(const char *uscore)
2252 {
2253         const char *p = uscore;
2254         char *str, *s;
2255         dbus_bool_t last_was_uscore = TRUE;
2256
2257         s = str = os_zalloc(os_strlen(uscore) + 1);
2258         if (!str)
2259                 return NULL;
2260         while (p && *p) {
2261                 if (*p == '_') {
2262                         last_was_uscore = TRUE;
2263                 } else {
2264                         *s++ = last_was_uscore ? toupper(*p) : *p;
2265                         last_was_uscore = FALSE;
2266                 }
2267                 p++;
2268         }
2269
2270         return str;
2271 }
2272
2273
2274 static int wpa_dbus_ctrl_iface_props_init(struct wpas_dbus_priv *priv);
2275
2276
2277 static void wpa_dbus_ctrl_iface_props_deinit(struct wpas_dbus_priv *priv)
2278 {
2279         int idx = priv->globals_start;
2280
2281         /* Free all allocated property values */
2282         while (priv->all_interface_properties[idx].dbus_property)
2283                 os_free((char *)
2284                         priv->all_interface_properties[idx++].dbus_property);
2285         os_free((char *) priv->all_interface_properties);
2286 }
2287
2288
2289 /**
2290  * wpas_dbus_ctrl_iface_init - Initialize dbus control interface
2291  * @global: Pointer to global data from wpa_supplicant_init()
2292  * Returns: 0 on success or -1 on failure
2293  *
2294  * Initialize the dbus control interface for wpa_supplicant and start
2295  * receiving commands from external programs over the bus.
2296  */
2297 int wpas_dbus_ctrl_iface_init(struct wpas_dbus_priv *priv)
2298 {
2299         struct wpa_dbus_object_desc *obj_desc;
2300         int ret;
2301
2302         ret = wpa_dbus_ctrl_iface_props_init(priv);
2303         if (ret < 0) {
2304                 wpa_printf(MSG_ERROR,
2305                            "dbus: Not enough memory to init interface properties");
2306                 return -1;
2307         }
2308
2309         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
2310         if (!obj_desc) {
2311                 wpa_printf(MSG_ERROR,
2312                            "Not enough memory to create object description");
2313                 goto error;
2314         }
2315
2316         wpas_dbus_register(obj_desc, priv->global, NULL,
2317                            wpas_dbus_global_methods,
2318                            wpas_dbus_global_properties,
2319                            wpas_dbus_global_signals);
2320
2321         wpa_printf(MSG_DEBUG, "dbus: Register D-Bus object '%s'",
2322                    WPAS_DBUS_NEW_PATH);
2323         ret = wpa_dbus_ctrl_iface_init(priv, WPAS_DBUS_NEW_PATH,
2324                                        WPAS_DBUS_NEW_SERVICE,
2325                                        obj_desc);
2326         if (ret < 0) {
2327                 free_dbus_object_desc(obj_desc);
2328                 goto error;
2329         }
2330
2331         priv->dbus_new_initialized = 1;
2332         return 0;
2333
2334 error:
2335         wpa_dbus_ctrl_iface_props_deinit(priv);
2336         return -1;
2337 }
2338
2339
2340 /**
2341  * wpas_dbus_ctrl_iface_deinit - Deinitialize dbus ctrl interface for
2342  * wpa_supplicant
2343  * @priv: Pointer to dbus private data from wpas_dbus_init()
2344  *
2345  * Deinitialize the dbus control interface that was initialized with
2346  * wpas_dbus_ctrl_iface_init().
2347  */
2348 void wpas_dbus_ctrl_iface_deinit(struct wpas_dbus_priv *priv)
2349 {
2350         if (!priv->dbus_new_initialized)
2351                 return;
2352         wpa_printf(MSG_DEBUG, "dbus: Unregister D-Bus object '%s'",
2353                    WPAS_DBUS_NEW_PATH);
2354         dbus_connection_unregister_object_path(priv->con, WPAS_DBUS_NEW_PATH);
2355         wpa_dbus_ctrl_iface_props_deinit(priv);
2356 }
2357
2358
2359 static void wpa_dbus_free(void *ptr)
2360 {
2361         os_free(ptr);
2362 }
2363
2364
2365 static const struct wpa_dbus_property_desc wpas_dbus_network_properties[] = {
2366         { "Properties", WPAS_DBUS_NEW_IFACE_NETWORK, "a{sv}",
2367           wpas_dbus_getter_network_properties,
2368           wpas_dbus_setter_network_properties,
2369           NULL
2370         },
2371         { "Enabled", WPAS_DBUS_NEW_IFACE_NETWORK, "b",
2372           wpas_dbus_getter_enabled,
2373           wpas_dbus_setter_enabled,
2374           NULL
2375         },
2376         { NULL, NULL, NULL, NULL, NULL, NULL }
2377 };
2378
2379
2380 static const struct wpa_dbus_signal_desc wpas_dbus_network_signals[] = {
2381         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
2382         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_NETWORK,
2383           {
2384                   { "properties", "a{sv}", ARG_OUT },
2385                   END_ARGS
2386           }
2387         },
2388         { NULL, NULL, { END_ARGS } }
2389 };
2390
2391
2392 /**
2393  * wpas_dbus_register_network - Register a configured network with dbus
2394  * @wpa_s: wpa_supplicant interface structure
2395  * @ssid: network configuration data
2396  * Returns: 0 on success, -1 on failure
2397  *
2398  * Registers network representing object with dbus
2399  */
2400 int wpas_dbus_register_network(struct wpa_supplicant *wpa_s,
2401                                struct wpa_ssid *ssid)
2402 {
2403         struct wpas_dbus_priv *ctrl_iface;
2404         struct wpa_dbus_object_desc *obj_desc;
2405         struct network_handler_args *arg;
2406         char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
2407
2408 #ifdef CONFIG_P2P
2409         /*
2410          * If it is a persistent group register it as such.
2411          * This is to handle cases where an interface is being initialized
2412          * with a list of networks read from config.
2413          */
2414         if (network_is_persistent_group(ssid))
2415                 return wpas_dbus_register_persistent_group(wpa_s, ssid);
2416 #endif /* CONFIG_P2P */
2417
2418         /* Do nothing if the control interface is not turned on */
2419         if (wpa_s == NULL || wpa_s->global == NULL || !wpa_s->dbus_new_path)
2420                 return 0;
2421         ctrl_iface = wpa_s->global->dbus;
2422         if (ctrl_iface == NULL)
2423                 return 0;
2424
2425         os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
2426                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
2427                     wpa_s->dbus_new_path, ssid->id);
2428
2429         wpa_printf(MSG_DEBUG, "dbus: Register network object '%s'",
2430                    net_obj_path);
2431         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
2432         if (!obj_desc) {
2433                 wpa_printf(MSG_ERROR,
2434                            "Not enough memory to create object description");
2435                 goto err;
2436         }
2437
2438         /* allocate memory for handlers arguments */
2439         arg = os_zalloc(sizeof(struct network_handler_args));
2440         if (!arg) {
2441                 wpa_printf(MSG_ERROR,
2442                            "Not enough memory to create arguments for method");
2443                 goto err;
2444         }
2445
2446         arg->wpa_s = wpa_s;
2447         arg->ssid = ssid;
2448
2449         wpas_dbus_register(obj_desc, arg, wpa_dbus_free, NULL,
2450                            wpas_dbus_network_properties,
2451                            wpas_dbus_network_signals);
2452
2453         if (wpa_dbus_register_object_per_iface(ctrl_iface, net_obj_path,
2454                                                wpa_s->ifname, obj_desc))
2455                 goto err;
2456
2457         wpas_dbus_signal_network_added(wpa_s, ssid->id);
2458
2459         return 0;
2460
2461 err:
2462         free_dbus_object_desc(obj_desc);
2463         return -1;
2464 }
2465
2466
2467 /**
2468  * wpas_dbus_unregister_network - Unregister a configured network from dbus
2469  * @wpa_s: wpa_supplicant interface structure
2470  * @nid: network id
2471  * Returns: 0 on success, -1 on failure
2472  *
2473  * Unregisters network representing object from dbus
2474  */
2475 int wpas_dbus_unregister_network(struct wpa_supplicant *wpa_s, int nid)
2476 {
2477         struct wpas_dbus_priv *ctrl_iface;
2478         char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
2479         int ret;
2480 #ifdef CONFIG_P2P
2481         struct wpa_ssid *ssid;
2482
2483         ssid = wpa_config_get_network(wpa_s->conf, nid);
2484
2485         /* If it is a persistent group unregister it as such */
2486         if (ssid && network_is_persistent_group(ssid))
2487                 return wpas_dbus_unregister_persistent_group(wpa_s, nid);
2488 #endif /* CONFIG_P2P */
2489
2490         /* Do nothing if the control interface is not turned on */
2491         if (wpa_s->global == NULL || wpa_s->dbus_new_path == NULL)
2492                 return 0;
2493         ctrl_iface = wpa_s->global->dbus;
2494         if (ctrl_iface == NULL)
2495                 return 0;
2496
2497         os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
2498                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
2499                     wpa_s->dbus_new_path, nid);
2500
2501         wpa_printf(MSG_DEBUG, "dbus: Unregister network object '%s'",
2502                    net_obj_path);
2503         ret = wpa_dbus_unregister_object_per_iface(ctrl_iface, net_obj_path);
2504
2505         if (!ret)
2506                 wpas_dbus_signal_network_removed(wpa_s, nid);
2507
2508         return ret;
2509 }
2510
2511
2512 static const struct wpa_dbus_property_desc wpas_dbus_bss_properties[] = {
2513         { "SSID", WPAS_DBUS_NEW_IFACE_BSS, "ay",
2514           wpas_dbus_getter_bss_ssid,
2515           NULL,
2516           NULL
2517         },
2518         { "BSSID", WPAS_DBUS_NEW_IFACE_BSS, "ay",
2519           wpas_dbus_getter_bss_bssid,
2520           NULL,
2521           NULL
2522         },
2523         { "Privacy", WPAS_DBUS_NEW_IFACE_BSS, "b",
2524           wpas_dbus_getter_bss_privacy,
2525           NULL,
2526           NULL
2527         },
2528         { "Mode", WPAS_DBUS_NEW_IFACE_BSS, "s",
2529           wpas_dbus_getter_bss_mode,
2530           NULL,
2531           NULL
2532         },
2533         { "Signal", WPAS_DBUS_NEW_IFACE_BSS, "n",
2534           wpas_dbus_getter_bss_signal,
2535           NULL,
2536           NULL
2537         },
2538         { "Frequency", WPAS_DBUS_NEW_IFACE_BSS, "q",
2539           wpas_dbus_getter_bss_frequency,
2540           NULL,
2541           NULL
2542         },
2543         { "Rates", WPAS_DBUS_NEW_IFACE_BSS, "au",
2544           wpas_dbus_getter_bss_rates,
2545           NULL,
2546           NULL
2547         },
2548         { "WPA", WPAS_DBUS_NEW_IFACE_BSS, "a{sv}",
2549           wpas_dbus_getter_bss_wpa,
2550           NULL,
2551           NULL
2552         },
2553         { "RSN", WPAS_DBUS_NEW_IFACE_BSS, "a{sv}",
2554           wpas_dbus_getter_bss_rsn,
2555           NULL,
2556           NULL
2557         },
2558         { "WPS", WPAS_DBUS_NEW_IFACE_BSS, "a{sv}",
2559           wpas_dbus_getter_bss_wps,
2560           NULL,
2561           NULL
2562         },
2563         { "IEs", WPAS_DBUS_NEW_IFACE_BSS, "ay",
2564           wpas_dbus_getter_bss_ies,
2565           NULL,
2566           NULL
2567         },
2568         { "Age", WPAS_DBUS_NEW_IFACE_BSS, "u",
2569           wpas_dbus_getter_bss_age,
2570           NULL,
2571           NULL
2572         },
2573         { NULL, NULL, NULL, NULL, NULL, NULL }
2574 };
2575
2576
2577 static const struct wpa_dbus_signal_desc wpas_dbus_bss_signals[] = {
2578         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
2579         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_BSS,
2580           {
2581                   { "properties", "a{sv}", ARG_OUT },
2582                   END_ARGS
2583           }
2584         },
2585         { NULL, NULL, { END_ARGS } }
2586 };
2587
2588
2589 /**
2590  * wpas_dbus_unregister_bss - Unregister a scanned BSS from dbus
2591  * @wpa_s: wpa_supplicant interface structure
2592  * @bssid: scanned network bssid
2593  * @id: unique BSS identifier
2594  * Returns: 0 on success, -1 on failure
2595  *
2596  * Unregisters BSS representing object from dbus
2597  */
2598 int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
2599                              u8 bssid[ETH_ALEN], unsigned int id)
2600 {
2601         struct wpas_dbus_priv *ctrl_iface;
2602         char bss_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
2603
2604         /* Do nothing if the control interface is not turned on */
2605         if (wpa_s == NULL || wpa_s->global == NULL || !wpa_s->dbus_new_path)
2606                 return 0;
2607         ctrl_iface = wpa_s->global->dbus;
2608         if (ctrl_iface == NULL)
2609                 return 0;
2610
2611         os_snprintf(bss_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
2612                     "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
2613                     wpa_s->dbus_new_path, id);
2614
2615         wpa_printf(MSG_DEBUG, "dbus: Unregister BSS object '%s'",
2616                    bss_obj_path);
2617         if (wpa_dbus_unregister_object_per_iface(ctrl_iface, bss_obj_path)) {
2618                 wpa_printf(MSG_ERROR, "dbus: Cannot unregister BSS object %s",
2619                            bss_obj_path);
2620                 return -1;
2621         }
2622
2623         wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
2624         wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
2625
2626         return 0;
2627 }
2628
2629
2630 /**
2631  * wpas_dbus_register_bss - Register a scanned BSS with dbus
2632  * @wpa_s: wpa_supplicant interface structure
2633  * @bssid: scanned network bssid
2634  * @id: unique BSS identifier
2635  * Returns: 0 on success, -1 on failure
2636  *
2637  * Registers BSS representing object with dbus
2638  */
2639 int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
2640                            u8 bssid[ETH_ALEN], unsigned int id)
2641 {
2642         struct wpas_dbus_priv *ctrl_iface;
2643         struct wpa_dbus_object_desc *obj_desc;
2644         char bss_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
2645         struct bss_handler_args *arg;
2646
2647         /* Do nothing if the control interface is not turned on */
2648         if (wpa_s == NULL || wpa_s->global == NULL || !wpa_s->dbus_new_path)
2649                 return 0;
2650         ctrl_iface = wpa_s->global->dbus;
2651         if (ctrl_iface == NULL)
2652                 return 0;
2653
2654         os_snprintf(bss_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
2655                     "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
2656                     wpa_s->dbus_new_path, id);
2657
2658         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
2659         if (!obj_desc) {
2660                 wpa_printf(MSG_ERROR,
2661                            "Not enough memory to create object description");
2662                 goto err;
2663         }
2664
2665         arg = os_zalloc(sizeof(struct bss_handler_args));
2666         if (!arg) {
2667                 wpa_printf(MSG_ERROR,
2668                            "Not enough memory to create arguments for handler");
2669                 goto err;
2670         }
2671         arg->wpa_s = wpa_s;
2672         arg->id = id;
2673
2674         wpas_dbus_register(obj_desc, arg, wpa_dbus_free, NULL,
2675                            wpas_dbus_bss_properties,
2676                            wpas_dbus_bss_signals);
2677
2678         wpa_printf(MSG_DEBUG, "dbus: Register BSS object '%s'",
2679                    bss_obj_path);
2680         if (wpa_dbus_register_object_per_iface(ctrl_iface, bss_obj_path,
2681                                                wpa_s->ifname, obj_desc)) {
2682                 wpa_printf(MSG_ERROR,
2683                            "Cannot register BSSID dbus object %s.",
2684                            bss_obj_path);
2685                 goto err;
2686         }
2687
2688         wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
2689         wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
2690
2691         return 0;
2692
2693 err:
2694         free_dbus_object_desc(obj_desc);
2695         return -1;
2696 }
2697
2698
2699 static const struct wpa_dbus_method_desc wpas_dbus_interface_methods[] = {
2700         { "Scan", WPAS_DBUS_NEW_IFACE_INTERFACE,
2701           (WPADBusMethodHandler) wpas_dbus_handler_scan,
2702           {
2703                   { "args", "a{sv}", ARG_IN },
2704                   END_ARGS
2705           }
2706         },
2707         { "SignalPoll", WPAS_DBUS_NEW_IFACE_INTERFACE,
2708           (WPADBusMethodHandler) wpas_dbus_handler_signal_poll,
2709           {
2710                   { "args", "a{sv}", ARG_OUT },
2711                   END_ARGS
2712           }
2713         },
2714         { "Disconnect", WPAS_DBUS_NEW_IFACE_INTERFACE,
2715           (WPADBusMethodHandler) wpas_dbus_handler_disconnect,
2716           {
2717                   END_ARGS
2718           }
2719         },
2720         { "AddNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE,
2721           (WPADBusMethodHandler) wpas_dbus_handler_add_network,
2722           {
2723                   { "args", "a{sv}", ARG_IN },
2724                   { "path", "o", ARG_OUT },
2725                   END_ARGS
2726           }
2727         },
2728         { "Reassociate", WPAS_DBUS_NEW_IFACE_INTERFACE,
2729           (WPADBusMethodHandler) wpas_dbus_handler_reassociate,
2730           {
2731                   END_ARGS
2732           }
2733         },
2734         { "Reattach", WPAS_DBUS_NEW_IFACE_INTERFACE,
2735           (WPADBusMethodHandler) wpas_dbus_handler_reattach,
2736           {
2737                   END_ARGS
2738           }
2739         },
2740         { "Reconnect", WPAS_DBUS_NEW_IFACE_INTERFACE,
2741           (WPADBusMethodHandler) wpas_dbus_handler_reconnect,
2742           {
2743                   END_ARGS
2744           }
2745         },
2746         { "RemoveNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE,
2747           (WPADBusMethodHandler) wpas_dbus_handler_remove_network,
2748           {
2749                   { "path", "o", ARG_IN },
2750                   END_ARGS
2751           }
2752         },
2753         { "RemoveAllNetworks", WPAS_DBUS_NEW_IFACE_INTERFACE,
2754           (WPADBusMethodHandler) wpas_dbus_handler_remove_all_networks,
2755           {
2756                   END_ARGS
2757           }
2758         },
2759         { "SelectNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE,
2760           (WPADBusMethodHandler) wpas_dbus_handler_select_network,
2761           {
2762                   { "path", "o", ARG_IN },
2763                   END_ARGS
2764           }
2765         },
2766         { "NetworkReply", WPAS_DBUS_NEW_IFACE_INTERFACE,
2767           (WPADBusMethodHandler) wpas_dbus_handler_network_reply,
2768           {
2769                   { "path", "o", ARG_IN },
2770                   { "field", "s", ARG_IN },
2771                   { "value", "s", ARG_IN },
2772                   END_ARGS
2773           }
2774         },
2775 #ifndef CONFIG_NO_CONFIG_BLOBS
2776         { "AddBlob", WPAS_DBUS_NEW_IFACE_INTERFACE,
2777           (WPADBusMethodHandler) wpas_dbus_handler_add_blob,
2778           {
2779                   { "name", "s", ARG_IN },
2780                   { "data", "ay", ARG_IN },
2781                   END_ARGS
2782           }
2783         },
2784         { "GetBlob", WPAS_DBUS_NEW_IFACE_INTERFACE,
2785           (WPADBusMethodHandler) wpas_dbus_handler_get_blob,
2786           {
2787                   { "name", "s", ARG_IN },
2788                   { "data", "ay", ARG_OUT },
2789                   END_ARGS
2790           }
2791         },
2792         { "RemoveBlob", WPAS_DBUS_NEW_IFACE_INTERFACE,
2793           (WPADBusMethodHandler) wpas_dbus_handler_remove_blob,
2794           {
2795                   { "name", "s", ARG_IN },
2796                   END_ARGS
2797           }
2798         },
2799 #endif /* CONFIG_NO_CONFIG_BLOBS */
2800         { "SetPKCS11EngineAndModulePath", WPAS_DBUS_NEW_IFACE_INTERFACE,
2801           (WPADBusMethodHandler)
2802           wpas_dbus_handler_set_pkcs11_engine_and_module_path,
2803           {
2804                   { "pkcs11_engine_path", "s", ARG_IN },
2805                   { "pkcs11_module_path", "s", ARG_IN },
2806                   END_ARGS
2807           }
2808         },
2809 #ifdef CONFIG_WPS
2810         { "Start", WPAS_DBUS_NEW_IFACE_WPS,
2811           (WPADBusMethodHandler) wpas_dbus_handler_wps_start,
2812           {
2813                   { "args", "a{sv}", ARG_IN },
2814                   { "output", "a{sv}", ARG_OUT },
2815                   END_ARGS
2816           }
2817         },
2818         { "Cancel", WPAS_DBUS_NEW_IFACE_WPS,
2819           (WPADBusMethodHandler) wpas_dbus_handler_wps_cancel,
2820           {
2821                   END_ARGS
2822           }
2823         },
2824 #endif /* CONFIG_WPS */
2825 #ifdef CONFIG_P2P
2826         { "Find", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2827           (WPADBusMethodHandler) wpas_dbus_handler_p2p_find,
2828           {
2829                   { "args", "a{sv}", ARG_IN },
2830                   END_ARGS
2831           }
2832         },
2833         { "StopFind", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2834           (WPADBusMethodHandler) wpas_dbus_handler_p2p_stop_find,
2835           {
2836                   END_ARGS
2837           }
2838         },
2839         { "Listen", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2840           (WPADBusMethodHandler) wpas_dbus_handler_p2p_listen,
2841           {
2842                   { "timeout", "i", ARG_IN },
2843                   END_ARGS
2844           }
2845         },
2846         { "ExtendedListen", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2847           (WPADBusMethodHandler) wpas_dbus_handler_p2p_extendedlisten,
2848           {
2849                   { "args", "a{sv}", ARG_IN },
2850                   END_ARGS
2851           }
2852         },
2853         { "PresenceRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2854           (WPADBusMethodHandler) wpas_dbus_handler_p2p_presence_request,
2855           {
2856                   { "args", "a{sv}", ARG_IN },
2857                   END_ARGS
2858           }
2859         },
2860         { "ProvisionDiscoveryRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2861           (WPADBusMethodHandler) wpas_dbus_handler_p2p_prov_disc_req,
2862           {
2863                   { "peer", "o", ARG_IN },
2864                   { "config_method", "s", ARG_IN },
2865                   END_ARGS
2866           }
2867         },
2868         { "Connect", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2869           (WPADBusMethodHandler) wpas_dbus_handler_p2p_connect,
2870           {
2871                   { "args", "a{sv}", ARG_IN },
2872                   { "generated_pin", "s", ARG_OUT },
2873                   END_ARGS
2874           }
2875         },
2876         { "GroupAdd", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2877           (WPADBusMethodHandler) wpas_dbus_handler_p2p_group_add,
2878           {
2879                   { "args", "a{sv}", ARG_IN },
2880                   END_ARGS
2881           }
2882         },
2883         { "Cancel", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2884           (WPADBusMethodHandler) wpas_dbus_handler_p2p_cancel,
2885           {
2886                   END_ARGS
2887           }
2888         },
2889         { "Invite", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2890           (WPADBusMethodHandler) wpas_dbus_handler_p2p_invite,
2891           {
2892                   { "args", "a{sv}", ARG_IN },
2893                   END_ARGS
2894           }
2895         },
2896         { "Disconnect", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2897           (WPADBusMethodHandler) wpas_dbus_handler_p2p_disconnect,
2898           {
2899                   END_ARGS
2900           }
2901         },
2902         { "RejectPeer", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2903           (WPADBusMethodHandler) wpas_dbus_handler_p2p_rejectpeer,
2904           {
2905                   { "peer", "o", ARG_IN },
2906                   END_ARGS
2907           }
2908         },
2909         { "RemoveClient", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2910           (WPADBusMethodHandler) wpas_dbus_handler_p2p_remove_client,
2911           {
2912                   { "args", "a{sv}", ARG_IN },
2913                   END_ARGS
2914           }
2915         },
2916         { "Flush", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2917           (WPADBusMethodHandler) wpas_dbus_handler_p2p_flush,
2918           {
2919                   END_ARGS
2920           }
2921         },
2922         { "AddService", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2923           (WPADBusMethodHandler) wpas_dbus_handler_p2p_add_service,
2924           {
2925                   { "args", "a{sv}", ARG_IN },
2926                   END_ARGS
2927           }
2928         },
2929         { "DeleteService", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2930           (WPADBusMethodHandler) wpas_dbus_handler_p2p_delete_service,
2931           {
2932                   { "args", "a{sv}", ARG_IN },
2933                   END_ARGS
2934           }
2935         },
2936         { "FlushService", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2937           (WPADBusMethodHandler) wpas_dbus_handler_p2p_flush_service,
2938           {
2939                   END_ARGS
2940           }
2941         },
2942         { "ServiceDiscoveryRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2943           (WPADBusMethodHandler) wpas_dbus_handler_p2p_service_sd_req,
2944           {
2945                   { "args", "a{sv}", ARG_IN },
2946                   { "ref", "t", ARG_OUT },
2947                   END_ARGS
2948           }
2949         },
2950         { "ServiceDiscoveryResponse", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2951           (WPADBusMethodHandler) wpas_dbus_handler_p2p_service_sd_res,
2952           {
2953                   { "args", "a{sv}", ARG_IN },
2954                   END_ARGS
2955           }
2956         },
2957         { "ServiceDiscoveryCancelRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2958           (WPADBusMethodHandler) wpas_dbus_handler_p2p_service_sd_cancel_req,
2959           {
2960                   { "args", "t", ARG_IN },
2961                   END_ARGS
2962           }
2963         },
2964         { "ServiceUpdate", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2965           (WPADBusMethodHandler) wpas_dbus_handler_p2p_service_update,
2966           {
2967                   END_ARGS
2968           }
2969         },
2970         { "ServiceDiscoveryExternal", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2971           (WPADBusMethodHandler) wpas_dbus_handler_p2p_serv_disc_external,
2972           {
2973                   { "arg", "i", ARG_IN },
2974                   END_ARGS
2975           }
2976         },
2977         { "AddPersistentGroup", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2978           (WPADBusMethodHandler) wpas_dbus_handler_add_persistent_group,
2979           {
2980                   { "args", "a{sv}", ARG_IN },
2981                   { "path", "o", ARG_OUT },
2982                   END_ARGS
2983           }
2984         },
2985         { "RemovePersistentGroup", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2986           (WPADBusMethodHandler) wpas_dbus_handler_remove_persistent_group,
2987           {
2988                   { "path", "o", ARG_IN },
2989                   END_ARGS
2990           }
2991         },
2992         { "RemoveAllPersistentGroups", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2993           (WPADBusMethodHandler)
2994           wpas_dbus_handler_remove_all_persistent_groups,
2995           {
2996                   END_ARGS
2997           }
2998         },
2999 #endif /* CONFIG_P2P */
3000         { "FlushBSS", WPAS_DBUS_NEW_IFACE_INTERFACE,
3001           (WPADBusMethodHandler) wpas_dbus_handler_flush_bss,
3002           {
3003                   { "age", "u", ARG_IN },
3004                   END_ARGS
3005           }
3006         },
3007 #ifdef CONFIG_AP
3008         { "SubscribeProbeReq", WPAS_DBUS_NEW_IFACE_INTERFACE,
3009           (WPADBusMethodHandler) wpas_dbus_handler_subscribe_preq,
3010           {
3011                   END_ARGS
3012           }
3013         },
3014         { "UnsubscribeProbeReq", WPAS_DBUS_NEW_IFACE_INTERFACE,
3015           (WPADBusMethodHandler) wpas_dbus_handler_unsubscribe_preq,
3016           {
3017                   END_ARGS
3018           }
3019         },
3020 #endif /* CONFIG_AP */
3021         { "EAPLogoff", WPAS_DBUS_NEW_IFACE_INTERFACE,
3022           (WPADBusMethodHandler) wpas_dbus_handler_eap_logoff,
3023           {
3024                   END_ARGS
3025           }
3026         },
3027         { "EAPLogon", WPAS_DBUS_NEW_IFACE_INTERFACE,
3028           (WPADBusMethodHandler) wpas_dbus_handler_eap_logon,
3029           {
3030                   END_ARGS
3031           }
3032         },
3033 #ifdef CONFIG_AUTOSCAN
3034         { "AutoScan", WPAS_DBUS_NEW_IFACE_INTERFACE,
3035           (WPADBusMethodHandler) wpas_dbus_handler_autoscan,
3036           {
3037                   { "arg", "s", ARG_IN },
3038                   END_ARGS
3039           }
3040         },
3041 #endif /* CONFIG_AUTOSCAN */
3042 #ifdef CONFIG_TDLS
3043         { "TDLSDiscover", WPAS_DBUS_NEW_IFACE_INTERFACE,
3044           (WPADBusMethodHandler) wpas_dbus_handler_tdls_discover,
3045           {
3046                   { "peer_address", "s", ARG_IN },
3047                   END_ARGS
3048           }
3049         },
3050         { "TDLSSetup", WPAS_DBUS_NEW_IFACE_INTERFACE,
3051           (WPADBusMethodHandler) wpas_dbus_handler_tdls_setup,
3052           {
3053                   { "peer_address", "s", ARG_IN },
3054                   END_ARGS
3055           }
3056         },
3057         { "TDLSStatus", WPAS_DBUS_NEW_IFACE_INTERFACE,
3058           (WPADBusMethodHandler) wpas_dbus_handler_tdls_status,
3059           {
3060                   { "peer_address", "s", ARG_IN },
3061                   { "status", "s", ARG_OUT },
3062                   END_ARGS
3063           }
3064         },
3065         { "TDLSTeardown", WPAS_DBUS_NEW_IFACE_INTERFACE,
3066           (WPADBusMethodHandler) wpas_dbus_handler_tdls_teardown,
3067           {
3068                   { "peer_address", "s", ARG_IN },
3069                   END_ARGS
3070           }
3071         },
3072 #endif /* CONFIG_TDLS */
3073 #ifndef CONFIG_NO_CONFIG_WRITE
3074         { "SaveConfig", WPAS_DBUS_NEW_IFACE_INTERFACE,
3075           (WPADBusMethodHandler) wpas_dbus_handler_save_config,
3076           {
3077                   END_ARGS
3078           }
3079         },
3080 #endif /* CONFIG_NO_CONFIG_WRITE */
3081         { NULL, NULL, NULL, { END_ARGS } }
3082 };
3083
3084 static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
3085         { "Capabilities", WPAS_DBUS_NEW_IFACE_INTERFACE, "a{sv}",
3086           wpas_dbus_getter_capabilities,
3087           NULL,
3088           NULL
3089         },
3090         { "State", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3091           wpas_dbus_getter_state,
3092           NULL,
3093           NULL
3094         },
3095         { "Scanning", WPAS_DBUS_NEW_IFACE_INTERFACE, "b",
3096           wpas_dbus_getter_scanning,
3097           NULL,
3098           NULL
3099         },
3100         { "ApScan", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
3101           wpas_dbus_getter_ap_scan,
3102           wpas_dbus_setter_ap_scan,
3103           NULL
3104         },
3105         { "BSSExpireAge", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
3106           wpas_dbus_getter_bss_expire_age,
3107           wpas_dbus_setter_bss_expire_age,
3108           NULL
3109         },
3110         { "BSSExpireCount", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
3111           wpas_dbus_getter_bss_expire_count,
3112           wpas_dbus_setter_bss_expire_count,
3113           NULL
3114         },
3115         { "Country", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3116           wpas_dbus_getter_country,
3117           wpas_dbus_setter_country,
3118           NULL
3119         },
3120         { "Ifname", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3121           wpas_dbus_getter_ifname,
3122           NULL,
3123           NULL
3124         },
3125         { "Driver", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3126           wpas_dbus_getter_driver,
3127           NULL,
3128           NULL
3129         },
3130         { "BridgeIfname", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3131           wpas_dbus_getter_bridge_ifname,
3132           NULL,
3133           NULL
3134         },
3135         { "CurrentBSS", WPAS_DBUS_NEW_IFACE_INTERFACE, "o",
3136           wpas_dbus_getter_current_bss,
3137           NULL,
3138           NULL
3139         },
3140         { "CurrentNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE, "o",
3141           wpas_dbus_getter_current_network,
3142           NULL,
3143           NULL
3144         },
3145         { "CurrentAuthMode", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3146           wpas_dbus_getter_current_auth_mode,
3147           NULL,
3148           NULL
3149         },
3150         { "Blobs", WPAS_DBUS_NEW_IFACE_INTERFACE, "a{say}",
3151           wpas_dbus_getter_blobs,
3152           NULL,
3153           NULL
3154         },
3155         { "BSSs", WPAS_DBUS_NEW_IFACE_INTERFACE, "ao",
3156           wpas_dbus_getter_bsss,
3157           NULL,
3158           NULL
3159         },
3160         { "Networks", WPAS_DBUS_NEW_IFACE_INTERFACE, "ao",
3161           wpas_dbus_getter_networks,
3162           NULL,
3163           NULL
3164         },
3165         { "FastReauth", WPAS_DBUS_NEW_IFACE_INTERFACE, "b",
3166           wpas_dbus_getter_fast_reauth,
3167           wpas_dbus_setter_fast_reauth,
3168           NULL
3169         },
3170         { "ScanInterval", WPAS_DBUS_NEW_IFACE_INTERFACE, "i",
3171           wpas_dbus_getter_scan_interval,
3172           wpas_dbus_setter_scan_interval,
3173           NULL
3174         },
3175         { "PKCS11EnginePath", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3176           wpas_dbus_getter_pkcs11_engine_path,
3177           NULL,
3178           NULL
3179         },
3180         { "PKCS11ModulePath", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3181           wpas_dbus_getter_pkcs11_module_path,
3182           NULL,
3183           NULL
3184         },
3185 #ifdef CONFIG_WPS
3186         { "ProcessCredentials", WPAS_DBUS_NEW_IFACE_WPS, "b",
3187           wpas_dbus_getter_process_credentials,
3188           wpas_dbus_setter_process_credentials,
3189           NULL
3190         },
3191         { "ConfigMethods", WPAS_DBUS_NEW_IFACE_WPS, "s",
3192           wpas_dbus_getter_config_methods,
3193           wpas_dbus_setter_config_methods,
3194           NULL
3195         },
3196 #endif /* CONFIG_WPS */
3197 #ifdef CONFIG_P2P
3198         { "P2PDeviceConfig", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "a{sv}",
3199           wpas_dbus_getter_p2p_device_config,
3200           wpas_dbus_setter_p2p_device_config,
3201           NULL
3202         },
3203         { "Peers", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "ao",
3204           wpas_dbus_getter_p2p_peers,
3205           NULL,
3206           NULL
3207         },
3208         { "Role", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "s",
3209           wpas_dbus_getter_p2p_role,
3210           NULL,
3211           NULL
3212         },
3213         { "Group", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "o",
3214           wpas_dbus_getter_p2p_group,
3215           NULL,
3216           NULL
3217         },
3218         { "PeerGO", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "o",
3219           wpas_dbus_getter_p2p_peergo,
3220           NULL,
3221           NULL
3222         },
3223         { "PersistentGroups", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "ao",
3224           wpas_dbus_getter_persistent_groups,
3225           NULL,
3226           NULL
3227         },
3228 #endif /* CONFIG_P2P */
3229         { "DisconnectReason", WPAS_DBUS_NEW_IFACE_INTERFACE, "i",
3230           wpas_dbus_getter_disconnect_reason,
3231           NULL,
3232           NULL
3233         },
3234         { NULL, NULL, NULL, NULL, NULL, NULL }
3235 };
3236
3237 static const struct wpa_dbus_signal_desc wpas_dbus_interface_signals[] = {
3238         { "ScanDone", WPAS_DBUS_NEW_IFACE_INTERFACE,
3239           {
3240                   { "success", "b", ARG_OUT },
3241                   END_ARGS
3242           }
3243         },
3244         { "BSSAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
3245           {
3246                   { "path", "o", ARG_OUT },
3247                   { "properties", "a{sv}", ARG_OUT },
3248                   END_ARGS
3249           }
3250         },
3251         { "BSSRemoved", WPAS_DBUS_NEW_IFACE_INTERFACE,
3252           {
3253                   { "path", "o", ARG_OUT },
3254                   END_ARGS
3255           }
3256         },
3257         { "BlobAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
3258           {
3259                   { "name", "s", ARG_OUT },
3260                   END_ARGS
3261           }
3262         },
3263         { "BlobRemoved", WPAS_DBUS_NEW_IFACE_INTERFACE,
3264           {
3265                   { "name", "s", ARG_OUT },
3266                   END_ARGS
3267           }
3268         },
3269         { "NetworkAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
3270           {
3271                   { "path", "o", ARG_OUT },
3272                   { "properties", "a{sv}", ARG_OUT },
3273                   END_ARGS
3274           }
3275         },
3276         { "NetworkRemoved", WPAS_DBUS_NEW_IFACE_INTERFACE,
3277           {
3278                   { "path", "o", ARG_OUT },
3279                   END_ARGS
3280           }
3281         },
3282         { "NetworkSelected", WPAS_DBUS_NEW_IFACE_INTERFACE,
3283           {
3284                   { "path", "o", ARG_OUT },
3285                   END_ARGS
3286           }
3287         },
3288         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
3289         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_INTERFACE,
3290           {
3291                   { "properties", "a{sv}", ARG_OUT },
3292                   END_ARGS
3293           }
3294         },
3295 #ifdef CONFIG_WPS
3296         { "Event", WPAS_DBUS_NEW_IFACE_WPS,
3297           {
3298                   { "name", "s", ARG_OUT },
3299                   { "args", "a{sv}", ARG_OUT },
3300                   END_ARGS
3301           }
3302         },
3303         { "Credentials", WPAS_DBUS_NEW_IFACE_WPS,
3304           {
3305                   { "credentials", "a{sv}", ARG_OUT },
3306                   END_ARGS
3307           }
3308         },
3309         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
3310         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_WPS,
3311           {
3312                   { "properties", "a{sv}", ARG_OUT },
3313                   END_ARGS
3314           }
3315         },
3316 #endif /* CONFIG_WPS */
3317 #ifdef CONFIG_P2P
3318         { "DeviceFound", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3319           {
3320                   { "path", "o", ARG_OUT },
3321                   END_ARGS
3322           }
3323         },
3324         { "DeviceLost", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3325           {
3326                   { "path", "o", ARG_OUT },
3327                   END_ARGS
3328           }
3329         },
3330         { "FindStopped", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3331           {
3332                   END_ARGS
3333           }
3334         },
3335         { "ProvisionDiscoveryRequestDisplayPin", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3336           {
3337                   { "peer_object", "o", ARG_OUT },
3338                   { "pin", "s", ARG_OUT },
3339                   END_ARGS
3340           }
3341         },
3342         { "ProvisionDiscoveryResponseDisplayPin", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3343           {
3344                   { "peer_object", "o", ARG_OUT },
3345                   { "pin", "s", ARG_OUT },
3346                   END_ARGS
3347           }
3348         },
3349         { "ProvisionDiscoveryRequestEnterPin", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3350           {
3351                   { "peer_object", "o", ARG_OUT },
3352                   END_ARGS
3353           }
3354         },
3355         { "ProvisionDiscoveryResponseEnterPin", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3356           {
3357                   { "peer_object", "o", ARG_OUT },
3358                   END_ARGS
3359           }
3360         },
3361         { "ProvisionDiscoveryPBCRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3362           {
3363                   { "peer_object", "o", ARG_OUT },
3364                   END_ARGS
3365           }
3366         },
3367         { "ProvisionDiscoveryPBCResponse", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3368           {
3369                   { "peer_object", "o", ARG_OUT },
3370                   END_ARGS
3371           }
3372         },
3373         { "ProvisionDiscoveryFailure", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3374           {
3375                   { "peer_object", "o", ARG_OUT },
3376                   { "status", "i", ARG_OUT },
3377                   END_ARGS
3378           }
3379         },
3380         { "GroupStarted", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3381           {
3382                   { "properties", "a{sv}", ARG_OUT },
3383                   END_ARGS
3384           }
3385         },
3386         { "GroupFormationFailure", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3387           {
3388                   { "reason", "s", ARG_OUT },
3389                   END_ARGS
3390           }
3391         },
3392         { "GONegotiationSuccess", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3393           {
3394                   { "properties", "a{sv}", ARG_OUT },
3395                   END_ARGS
3396           }
3397         },
3398         { "GONegotiationFailure", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3399           {
3400                   { "properties", "a{sv}", ARG_OUT },
3401                   END_ARGS
3402           }
3403         },
3404         { "GONegotiationRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3405           {
3406                   { "path", "o", ARG_OUT },
3407                   { "dev_passwd_id", "q", ARG_OUT },
3408                   { "device_go_intent", "y", ARG_OUT },
3409                   END_ARGS
3410           }
3411         },
3412         { "InvitationResult", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3413           {
3414                   { "invite_result", "a{sv}", ARG_OUT },
3415                   END_ARGS
3416           }
3417         },
3418         { "GroupFinished", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3419           {
3420                   { "properties", "a{sv}", ARG_OUT },
3421                   END_ARGS
3422           }
3423         },
3424         { "ServiceDiscoveryRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3425           {
3426                   { "sd_request", "a{sv}", ARG_OUT },
3427                   END_ARGS
3428           }
3429         },
3430         { "ServiceDiscoveryResponse", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3431           {
3432                   { "sd_response", "a{sv}", ARG_OUT },
3433                   END_ARGS
3434           }
3435         },
3436         { "PersistentGroupAdded", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3437           {
3438                   { "path", "o", ARG_OUT },
3439                   { "properties", "a{sv}", ARG_OUT },
3440                   END_ARGS
3441           }
3442         },
3443         { "PersistentGroupRemoved", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3444           {
3445                   { "path", "o", ARG_OUT },
3446                   END_ARGS
3447           }
3448         },
3449         { "WpsFailed", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3450           {
3451                   { "name", "s", ARG_OUT },
3452                   { "args", "a{sv}", ARG_OUT },
3453                   END_ARGS
3454           }
3455         },
3456         { "InvitationReceived", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3457           {
3458                   { "properties", "a{sv}", ARG_OUT },
3459                   END_ARGS
3460           }
3461         },
3462 #endif /* CONFIG_P2P */
3463 #ifdef CONFIG_AP
3464         { "ProbeRequest", WPAS_DBUS_NEW_IFACE_INTERFACE,
3465           {
3466                   { "args", "a{sv}", ARG_OUT },
3467                   END_ARGS
3468           }
3469         },
3470 #endif /* CONFIG_AP */
3471         { "Certification", WPAS_DBUS_NEW_IFACE_INTERFACE,
3472           {
3473                   { "certification", "a{sv}", ARG_OUT },
3474                   END_ARGS
3475           }
3476         },
3477         { "EAP", WPAS_DBUS_NEW_IFACE_INTERFACE,
3478           {
3479                   { "status", "s", ARG_OUT },
3480                   { "parameter", "s", ARG_OUT },
3481                   END_ARGS
3482           }
3483         },
3484         { "StaAuthorized", WPAS_DBUS_NEW_IFACE_INTERFACE,
3485           {
3486                   { "name", "s", ARG_OUT },
3487                   END_ARGS
3488           }
3489         },
3490         { "StaDeauthorized", WPAS_DBUS_NEW_IFACE_INTERFACE,
3491           {
3492                   { "name", "s", ARG_OUT },
3493                   END_ARGS
3494           }
3495         },
3496         { "NetworkRequest", WPAS_DBUS_NEW_IFACE_INTERFACE,
3497           {
3498                   { "path", "o", ARG_OUT },
3499                   { "field", "s", ARG_OUT },
3500                   { "text", "s", ARG_OUT },
3501                   END_ARGS
3502           }
3503         },
3504         { NULL, NULL, { END_ARGS } }
3505 };
3506
3507
3508 static int wpa_dbus_ctrl_iface_props_init(struct wpas_dbus_priv *priv)
3509 {
3510         size_t all_size;
3511         unsigned int i, j, count, num_const, num_globals;
3512         const char *global_name;
3513         static const char * const ignored_globals[] = {
3514                 "bss_expiration_age", "bss_expiration_scan_count",
3515                 "ap_scan", "country", "fast_reauth",
3516                 "pkcs11_engine_path", "pkcs11_module_path"
3517         };
3518
3519         /* wpas_dbus_interface_properties terminates with a NULL element */
3520         num_const = ARRAY_SIZE(wpas_dbus_interface_properties) - 1;
3521
3522         num_globals = wpa_config_get_num_global_field_names();
3523         priv->globals_start = num_const;
3524
3525         /* allocate enough for all properties + terminating NULL element */
3526         all_size = (num_globals + num_const + 1) *
3527                 sizeof(wpas_dbus_interface_properties[0]);
3528         priv->all_interface_properties = os_zalloc(all_size);
3529         if (!priv->all_interface_properties) {
3530                 wpa_printf(MSG_ERROR,
3531                            "dbus: Not enough memory for interface properties");
3532                 return -1;
3533         }
3534
3535         /* Copy constant interface properties to the start of the array */
3536         os_memcpy(priv->all_interface_properties,
3537                   wpas_dbus_interface_properties,
3538                   sizeof(wpas_dbus_interface_properties));
3539
3540         /* Dynamically construct interface global properties */
3541         for (i = 0, count = num_const; i < num_globals; i++) {
3542                 struct wpa_dbus_property_desc *desc;
3543                 int no_var = 0;
3544
3545                 /* ignore globals that are actually just methods */
3546                 global_name = wpa_config_get_global_field_name(i, &no_var);
3547                 if (no_var)
3548                         continue;
3549                 /* Ignore fields already explicitly exposed */
3550                 for (j = 0; j < ARRAY_SIZE(ignored_globals); j++) {
3551                         if (os_strcmp(global_name, ignored_globals[j]) == 0)
3552                                 break;
3553                 }
3554                 if (j < ARRAY_SIZE(ignored_globals))
3555                         continue;
3556
3557                 desc = &priv->all_interface_properties[count++];
3558                 desc->dbus_property = uscore_to_dbus(global_name);
3559                 if (!desc->dbus_property) {
3560                         wpa_printf(MSG_ERROR,
3561                                    "dbus: Not enough memory for D-Bus property name");
3562                         goto error;
3563                 }
3564                 desc->dbus_interface = WPAS_DBUS_NEW_IFACE_INTERFACE;
3565                 desc->type = "s";
3566                 desc->getter = wpas_dbus_getter_iface_global;
3567                 desc->setter = wpas_dbus_setter_iface_global;
3568                 desc->data = global_name;
3569         }
3570
3571         return 0;
3572
3573 error:
3574         wpa_dbus_ctrl_iface_props_deinit(priv);
3575         return -1;
3576 }
3577
3578
3579 /**
3580  * wpas_dbus_register_interface - Register an interface with D-Bus
3581  * @wpa_s: wpa_supplicant interface structure
3582  * Returns: 0 on success, -1 on failure
3583  */
3584 int wpas_dbus_register_interface(struct wpa_supplicant *wpa_s)
3585 {
3586         struct wpa_dbus_object_desc *obj_desc = NULL;
3587         struct wpas_dbus_priv *ctrl_iface = wpa_s->global->dbus;
3588         int next;
3589
3590         /* Do nothing if the control interface is not turned on */
3591         if (ctrl_iface == NULL)
3592                 return 0;
3593
3594         /* Create and set the interface's object path */
3595         wpa_s->dbus_new_path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
3596         if (wpa_s->dbus_new_path == NULL)
3597                 return -1;
3598         next = ctrl_iface->next_objid++;
3599         os_snprintf(wpa_s->dbus_new_path, WPAS_DBUS_OBJECT_PATH_MAX,
3600                     WPAS_DBUS_NEW_PATH_INTERFACES "/%u",
3601                     next);
3602
3603         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
3604         if (!obj_desc) {
3605                 wpa_printf(MSG_ERROR,
3606                            "Not enough memory to create object description");
3607                 goto err;
3608         }
3609
3610         wpas_dbus_register(obj_desc, wpa_s, NULL, wpas_dbus_interface_methods,
3611                            ctrl_iface->all_interface_properties,
3612                            wpas_dbus_interface_signals);
3613
3614         wpa_printf(MSG_DEBUG, "dbus: Register interface object '%s'",
3615                    wpa_s->dbus_new_path);
3616         if (wpa_dbus_register_object_per_iface(ctrl_iface,
3617                                                wpa_s->dbus_new_path,
3618                                                wpa_s->ifname, obj_desc))
3619                 goto err;
3620
3621         wpas_dbus_signal_interface_added(wpa_s);
3622
3623         return 0;
3624
3625 err:
3626         os_free(wpa_s->dbus_new_path);
3627         wpa_s->dbus_new_path = NULL;
3628         free_dbus_object_desc(obj_desc);
3629         return -1;
3630 }
3631
3632
3633 /**
3634  * wpas_dbus_unregister_interface - Unregister the interface from D-Bus
3635  * @wpa_s: wpa_supplicant interface structure
3636  * Returns: 0 on success, -1 on failure
3637  */
3638 int wpas_dbus_unregister_interface(struct wpa_supplicant *wpa_s)
3639 {
3640         struct wpas_dbus_priv *ctrl_iface;
3641
3642         /* Do nothing if the control interface is not turned on */
3643         if (wpa_s == NULL || wpa_s->global == NULL)
3644                 return 0;
3645         ctrl_iface = wpa_s->global->dbus;
3646         if (ctrl_iface == NULL || wpa_s->dbus_new_path == NULL)
3647                 return 0;
3648
3649         wpa_printf(MSG_DEBUG, "dbus: Unregister interface object '%s'",
3650                    wpa_s->dbus_new_path);
3651
3652 #ifdef CONFIG_AP
3653         if (wpa_s->preq_notify_peer) {
3654                 wpas_dbus_unsubscribe_noc(ctrl_iface);
3655                 os_free(wpa_s->preq_notify_peer);
3656                 wpa_s->preq_notify_peer = NULL;
3657         }
3658 #endif /* CONFIG_AP */
3659
3660         if (wpa_dbus_unregister_object_per_iface(ctrl_iface,
3661                                                  wpa_s->dbus_new_path))
3662                 return -1;
3663
3664         wpas_dbus_signal_interface_removed(wpa_s);
3665
3666         os_free(wpa_s->dbus_new_path);
3667         wpa_s->dbus_new_path = NULL;
3668
3669         return 0;
3670 }
3671
3672 #ifdef CONFIG_P2P
3673
3674 static const struct wpa_dbus_property_desc wpas_dbus_p2p_peer_properties[] = {
3675         { "DeviceName", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
3676           wpas_dbus_getter_p2p_peer_device_name,
3677           NULL,
3678           NULL
3679         },
3680         { "Manufacturer", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
3681           wpas_dbus_getter_p2p_peer_manufacturer,
3682           NULL,
3683           NULL
3684         },
3685         { "ModelName", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
3686           wpas_dbus_getter_p2p_peer_modelname,
3687           NULL,
3688           NULL
3689         },
3690         { "ModelNumber", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
3691           wpas_dbus_getter_p2p_peer_modelnumber,
3692           NULL,
3693           NULL
3694         },
3695         { "SerialNumber", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
3696           wpas_dbus_getter_p2p_peer_serialnumber,
3697           NULL,
3698           NULL
3699         },
3700         { "PrimaryDeviceType", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ay",
3701           wpas_dbus_getter_p2p_peer_primary_device_type,
3702           NULL,
3703           NULL
3704         },
3705         { "config_method", WPAS_DBUS_NEW_IFACE_P2P_PEER, "q",
3706           wpas_dbus_getter_p2p_peer_config_method,
3707           NULL,
3708           NULL
3709         },
3710         { "level", WPAS_DBUS_NEW_IFACE_P2P_PEER, "i",
3711           wpas_dbus_getter_p2p_peer_level,
3712           NULL,
3713           NULL
3714         },
3715         { "devicecapability", WPAS_DBUS_NEW_IFACE_P2P_PEER, "y",
3716           wpas_dbus_getter_p2p_peer_device_capability,
3717           NULL,
3718           NULL
3719         },
3720         { "groupcapability", WPAS_DBUS_NEW_IFACE_P2P_PEER, "y",
3721           wpas_dbus_getter_p2p_peer_group_capability,
3722           NULL,
3723           NULL
3724         },
3725         { "SecondaryDeviceTypes", WPAS_DBUS_NEW_IFACE_P2P_PEER, "aay",
3726           wpas_dbus_getter_p2p_peer_secondary_device_types,
3727           NULL,
3728           NULL
3729         },
3730         { "VendorExtension", WPAS_DBUS_NEW_IFACE_P2P_PEER, "aay",
3731           wpas_dbus_getter_p2p_peer_vendor_extension,
3732           NULL,
3733           NULL
3734         },
3735         { "IEs", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ay",
3736           wpas_dbus_getter_p2p_peer_ies,
3737           NULL,
3738           NULL
3739         },
3740         { "DeviceAddress", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ay",
3741           wpas_dbus_getter_p2p_peer_device_address,
3742           NULL,
3743           NULL
3744         },
3745         { "Groups", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ao",
3746           wpas_dbus_getter_p2p_peer_groups,
3747           NULL,
3748           NULL
3749         },
3750         { NULL, NULL, NULL, NULL, NULL, NULL }
3751 };
3752
3753 static const struct wpa_dbus_signal_desc wpas_dbus_p2p_peer_signals[] = {
3754         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
3755         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_P2P_PEER,
3756           {
3757                   { "properties", "a{sv}", ARG_OUT },
3758                   END_ARGS
3759           }
3760         },
3761         { NULL, NULL, { END_ARGS } }
3762 };
3763
3764 /**
3765  * wpas_dbus_signal_peer - Send a peer related event signal
3766  * @wpa_s: %wpa_supplicant network interface data
3767  * @dev: peer device object
3768  * @interface: name of the interface emitting this signal.
3769  *      In case of peer objects, it would be emitted by either
3770  *      the "interface object" or by "peer objects"
3771  * @sig_name: signal name - DeviceFound
3772  *
3773  * Notify listeners about event related with newly found p2p peer device
3774  */
3775 static void wpas_dbus_signal_peer(struct wpa_supplicant *wpa_s,
3776                                   const u8 *dev_addr, const char *interface,
3777                                   const char *sig_name)
3778 {
3779         struct wpas_dbus_priv *iface;
3780         DBusMessage *msg;
3781         DBusMessageIter iter;
3782         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
3783
3784         if (wpa_s->p2p_mgmt)
3785                 wpa_s = wpa_s->parent;
3786
3787         iface = wpa_s->global->dbus;
3788
3789         /* Do nothing if the control interface is not turned on */
3790         if (iface == NULL || !wpa_s->dbus_new_path)
3791                 return;
3792
3793         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
3794                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/" COMPACT_MACSTR,
3795                     wpa_s->dbus_new_path, MAC2STR(dev_addr));
3796
3797         msg = dbus_message_new_signal(wpa_s->dbus_new_path, interface,
3798                                       sig_name);
3799         if (msg == NULL)
3800                 return;
3801
3802         dbus_message_iter_init_append(msg, &iter);
3803         path = peer_obj_path;
3804         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
3805                                             &path))
3806                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
3807         else
3808                 dbus_connection_send(iface->con, msg, NULL);
3809
3810         dbus_message_unref(msg);
3811 }
3812
3813
3814 /**
3815  * wpas_dbus_signal_peer_found - Send a peer found signal
3816  * @wpa_s: %wpa_supplicant network interface data
3817  * @dev_addr: Peer P2P Device Address
3818  *
3819  * Notify listeners about find a p2p peer device found
3820  */
3821 void wpas_dbus_signal_peer_device_found(struct wpa_supplicant *wpa_s,
3822                                         const u8 *dev_addr)
3823 {
3824         wpas_dbus_signal_peer(wpa_s, dev_addr,
3825                               WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3826                               "DeviceFound");
3827 }
3828
3829 /**
3830  * wpas_dbus_signal_peer_lost - Send a peer lost signal
3831  * @wpa_s: %wpa_supplicant network interface data
3832  * @dev_addr: Peer P2P Device Address
3833  *
3834  * Notify listeners about lost a p2p peer device
3835  */
3836 void wpas_dbus_signal_peer_device_lost(struct wpa_supplicant *wpa_s,
3837                                        const u8 *dev_addr)
3838 {
3839         wpas_dbus_signal_peer(wpa_s, dev_addr,
3840                               WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3841                               "DeviceLost");
3842 }
3843
3844 /**
3845  * wpas_dbus_register_peer - Register a discovered peer object with dbus
3846  * @wpa_s: wpa_supplicant interface structure
3847  * @dev_addr: P2P Device Address of the peer
3848  * Returns: 0 on success, -1 on failure
3849  *
3850  * Registers network representing object with dbus
3851  */
3852 int wpas_dbus_register_peer(struct wpa_supplicant *wpa_s, const u8 *dev_addr)
3853 {
3854         struct wpas_dbus_priv *ctrl_iface;
3855         struct wpa_dbus_object_desc *obj_desc;
3856         struct peer_handler_args *arg;
3857         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
3858
3859         /* Do nothing if the control interface is not turned on */
3860         if (wpa_s == NULL || wpa_s->global == NULL)
3861                 return 0;
3862
3863         ctrl_iface = wpa_s->global->dbus;
3864         if (ctrl_iface == NULL)
3865                 return 0;
3866
3867         wpa_s = wpa_s->parent->parent;
3868         if (!wpa_s->dbus_new_path)
3869                 return 0;
3870
3871         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
3872                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/" COMPACT_MACSTR,
3873                     wpa_s->dbus_new_path, MAC2STR(dev_addr));
3874
3875         wpa_printf(MSG_INFO, "dbus: Register peer object '%s'",
3876                    peer_obj_path);
3877         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
3878         if (!obj_desc) {
3879                 wpa_printf(MSG_ERROR,
3880                            "Not enough memory to create object description");
3881                 goto err;
3882         }
3883
3884         /* allocate memory for handlers arguments */
3885         arg = os_zalloc(sizeof(struct peer_handler_args));
3886         if (!arg) {
3887                 wpa_printf(MSG_ERROR,
3888                            "Not enough memory to create arguments for method");
3889                 goto err;
3890         }
3891
3892         arg->wpa_s = wpa_s;
3893         os_memcpy(arg->p2p_device_addr, dev_addr, ETH_ALEN);
3894
3895         wpas_dbus_register(obj_desc, arg, wpa_dbus_free,
3896                            NULL,
3897                            wpas_dbus_p2p_peer_properties,
3898                            wpas_dbus_p2p_peer_signals);
3899
3900         if (wpa_dbus_register_object_per_iface(ctrl_iface, peer_obj_path,
3901                                                wpa_s->ifname, obj_desc))
3902                 goto err;
3903
3904         return 0;
3905
3906 err:
3907         free_dbus_object_desc(obj_desc);
3908         return -1;
3909 }
3910
3911 /**
3912  * wpas_dbus_unregister_peer - Unregister a peer object with dbus
3913  * @wpa_s: wpa_supplicant interface structure
3914  * @dev_addr: p2p device addr
3915  * Returns: 0 on success, -1 on failure
3916  *
3917  * Registers network representing object with dbus
3918  */
3919 int wpas_dbus_unregister_peer(struct wpa_supplicant *wpa_s,
3920                                   const u8 *dev_addr)
3921 {
3922         struct wpas_dbus_priv *ctrl_iface;
3923         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
3924         int ret;
3925
3926         /* Do nothing if the control interface is not turned on */
3927         if (wpa_s == NULL || wpa_s->global == NULL)
3928                 return 0;
3929
3930         wpa_s = wpa_s->parent->parent;
3931         if (!wpa_s->dbus_new_path)
3932                 return 0;
3933
3934         ctrl_iface = wpa_s->global->dbus;
3935         if (ctrl_iface == NULL)
3936                 return 0;
3937
3938         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
3939                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/" COMPACT_MACSTR,
3940                     wpa_s->dbus_new_path, MAC2STR(dev_addr));
3941
3942         wpa_printf(MSG_INFO, "dbus: Unregister peer object '%s'",
3943                    peer_obj_path);
3944         ret = wpa_dbus_unregister_object_per_iface(ctrl_iface, peer_obj_path);
3945
3946         return ret;
3947 }
3948
3949
3950 /**
3951  * wpas_dbus_signal_p2p_find_stopped - Send P2P Find stopped signal
3952  * @wpa_s: %wpa_supplicant network interface data
3953  *
3954  * Notify listeners about P2P Find stopped
3955  */
3956 void wpas_dbus_signal_p2p_find_stopped(struct wpa_supplicant *wpa_s)
3957 {
3958         struct wpas_dbus_priv *iface;
3959         DBusMessage *msg;
3960
3961         iface = wpa_s->global->dbus;
3962
3963         /* Do nothing if the control interface is not turned on */
3964         if (iface == NULL || !wpa_s->dbus_new_path)
3965                 return;
3966
3967         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
3968                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3969                                       "FindStopped");
3970         if (msg == NULL)
3971                 return;
3972
3973         dbus_connection_send(iface->con, msg, NULL);
3974
3975         dbus_message_unref(msg);
3976 }
3977
3978
3979 /**
3980  * wpas_dbus_signal_peer_groups_changed - Send peer group change property signal
3981  * @wpa_s: %wpa_supplicant network interface data
3982  * @dev_addr: P2P Device Address
3983  *
3984  * Notify listeners about peer Groups property changes.
3985  */
3986 void wpas_dbus_signal_peer_groups_changed(struct wpa_supplicant *wpa_s,
3987                                           const u8 *dev_addr)
3988 {
3989         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
3990
3991         if (wpa_s->p2p_mgmt)
3992                 wpa_s = wpa_s->parent;
3993
3994         if (!wpa_s->dbus_new_path)
3995                 return;
3996         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
3997                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/" COMPACT_MACSTR,
3998                     wpa_s->dbus_new_path, MAC2STR(dev_addr));
3999
4000         wpa_dbus_mark_property_changed(wpa_s->global->dbus, peer_obj_path,
4001                                        WPAS_DBUS_NEW_IFACE_P2P_PEER, "Groups");
4002 }
4003
4004
4005 static const struct wpa_dbus_property_desc wpas_dbus_p2p_group_properties[] = {
4006         { "Members", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "ao",
4007           wpas_dbus_getter_p2p_group_members,
4008           NULL,
4009           NULL
4010         },
4011         { "Group", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "o",
4012           wpas_dbus_getter_p2p_group,
4013           NULL,
4014           NULL
4015         },
4016         { "Role", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "s",
4017           wpas_dbus_getter_p2p_role,
4018           NULL,
4019           NULL
4020         },
4021         { "SSID", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "ay",
4022           wpas_dbus_getter_p2p_group_ssid,
4023           NULL,
4024           NULL
4025         },
4026         { "BSSID", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "ay",
4027           wpas_dbus_getter_p2p_group_bssid,
4028           NULL,
4029           NULL
4030         },
4031         { "Frequency", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "q",
4032           wpas_dbus_getter_p2p_group_frequency,
4033           NULL,
4034           NULL
4035         },
4036         { "Passphrase", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "s",
4037           wpas_dbus_getter_p2p_group_passphrase,
4038           NULL,
4039           NULL
4040         },
4041         { "PSK", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "ay",
4042           wpas_dbus_getter_p2p_group_psk,
4043           NULL,
4044           NULL
4045         },
4046         { "WPSVendorExtensions", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "aay",
4047           wpas_dbus_getter_p2p_group_vendor_ext,
4048           wpas_dbus_setter_p2p_group_vendor_ext,
4049           NULL
4050         },
4051         { NULL, NULL, NULL, NULL, NULL, NULL }
4052 };
4053
4054 static const struct wpa_dbus_signal_desc wpas_dbus_p2p_group_signals[] = {
4055         { "PeerJoined", WPAS_DBUS_NEW_IFACE_P2P_GROUP,
4056           {
4057                   { "peer", "o", ARG_OUT },
4058                   END_ARGS
4059           }
4060         },
4061         { "PeerDisconnected", WPAS_DBUS_NEW_IFACE_P2P_GROUP,
4062           {
4063                   { "peer", "o", ARG_OUT },
4064                   END_ARGS
4065           }
4066         },
4067         { NULL, NULL, { END_ARGS } }
4068 };
4069
4070 /**
4071  * wpas_dbus_register_p2p_group - Register a p2p group object with dbus
4072  * @wpa_s: wpa_supplicant interface structure
4073  * @ssid: SSID struct
4074  * Returns: 0 on success, -1 on failure
4075  *
4076  * Registers p2p group representing object with dbus
4077  */
4078 void wpas_dbus_register_p2p_group(struct wpa_supplicant *wpa_s,
4079                                   struct wpa_ssid *ssid)
4080 {
4081         struct wpas_dbus_priv *ctrl_iface;
4082         struct wpa_dbus_object_desc *obj_desc;
4083         char group_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
4084
4085         /* Do nothing if the control interface is not turned on */
4086         if (wpa_s == NULL || wpa_s->global == NULL)
4087                 return;
4088
4089         ctrl_iface = wpa_s->global->dbus;
4090         if (ctrl_iface == NULL)
4091                 return;
4092
4093         if (wpa_s->dbus_groupobj_path) {
4094                 wpa_printf(MSG_INFO, "%s: Group object '%s' already exists",
4095                            __func__, wpa_s->dbus_groupobj_path);
4096                 return;
4097         }
4098
4099         if (wpas_dbus_get_group_obj_path(wpa_s, ssid, group_obj_path) < 0)
4100                 return;
4101
4102         wpa_s->dbus_groupobj_path = os_strdup(group_obj_path);
4103         if (wpa_s->dbus_groupobj_path == NULL)
4104                 return;
4105
4106         wpa_printf(MSG_INFO, "dbus: Register group object '%s'",
4107                    group_obj_path);
4108         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
4109         if (!obj_desc) {
4110                 wpa_printf(MSG_ERROR,
4111                            "Not enough memory to create object description");
4112                 goto err;
4113         }
4114
4115         wpas_dbus_register(obj_desc, wpa_s, NULL, NULL,
4116                            wpas_dbus_p2p_group_properties,
4117                            wpas_dbus_p2p_group_signals);
4118
4119         if (wpa_dbus_register_object_per_iface(ctrl_iface, group_obj_path,
4120                                                wpa_s->ifname, obj_desc))
4121                 goto err;
4122
4123         return;
4124
4125 err:
4126         if (wpa_s->dbus_groupobj_path) {
4127                 os_free(wpa_s->dbus_groupobj_path);
4128                 wpa_s->dbus_groupobj_path = NULL;
4129         }
4130
4131         free_dbus_object_desc(obj_desc);
4132 }
4133
4134 /**
4135  * wpas_dbus_unregister_p2p_group - Unregister a p2p group object from dbus
4136  * @wpa_s: wpa_supplicant interface structure
4137  * @ssid: network name of the p2p group started
4138  */
4139 void wpas_dbus_unregister_p2p_group(struct wpa_supplicant *wpa_s,
4140                                     const struct wpa_ssid *ssid)
4141 {
4142         struct wpas_dbus_priv *ctrl_iface;
4143
4144         /* Do nothing if the control interface is not turned on */
4145         if (wpa_s == NULL || wpa_s->global == NULL)
4146                 return;
4147
4148         if (wpa_s->p2p_mgmt)
4149                 wpa_s = wpa_s->parent;
4150
4151         ctrl_iface = wpa_s->global->dbus;
4152         if (ctrl_iface == NULL)
4153                 return;
4154
4155         if (!wpa_s->dbus_groupobj_path) {
4156                 wpa_printf(MSG_DEBUG,
4157                            "%s: Group object '%s' already unregistered",
4158                            __func__, wpa_s->dbus_groupobj_path);
4159                 return;
4160         }
4161
4162         peer_groups_changed(wpa_s);
4163
4164         wpa_printf(MSG_DEBUG, "dbus: Unregister group object '%s'",
4165                    wpa_s->dbus_groupobj_path);
4166
4167         wpa_dbus_unregister_object_per_iface(ctrl_iface,
4168                                              wpa_s->dbus_groupobj_path);
4169
4170         os_free(wpa_s->dbus_groupobj_path);
4171         wpa_s->dbus_groupobj_path = NULL;
4172 }
4173
4174 static const struct wpa_dbus_property_desc
4175         wpas_dbus_persistent_group_properties[] = {
4176         { "Properties", WPAS_DBUS_NEW_IFACE_PERSISTENT_GROUP, "a{sv}",
4177           wpas_dbus_getter_persistent_group_properties,
4178           wpas_dbus_setter_persistent_group_properties,
4179           NULL
4180         },
4181         { NULL, NULL, NULL, NULL, NULL, NULL }
4182 };
4183
4184 /* No signals intended for persistent group objects */
4185
4186 /**
4187  * wpas_dbus_register_persistent_group - Register a configured(saved)
4188  *      persistent group with dbus
4189  * @wpa_s: wpa_supplicant interface structure
4190  * @ssid: persistent group (still represented as a network within wpa)
4191  *        configuration data
4192  * Returns: 0 on success, -1 on failure
4193  *
4194  * Registers a persistent group representing object with dbus.
4195  */
4196 int wpas_dbus_register_persistent_group(struct wpa_supplicant *wpa_s,
4197                                         struct wpa_ssid *ssid)
4198 {
4199         struct wpas_dbus_priv *ctrl_iface;
4200         struct wpa_dbus_object_desc *obj_desc;
4201         struct network_handler_args *arg;
4202         char pgrp_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
4203
4204         /* Do nothing if the control interface is not turned on */
4205         if (wpa_s == NULL || wpa_s->global == NULL)
4206                 return 0;
4207         wpa_s = wpa_s->parent->parent;
4208         if (!wpa_s->dbus_new_path)
4209                 return 0;
4210
4211         /* Make sure ssid is a persistent group */
4212         if (ssid->disabled != 2 && !ssid->p2p_persistent_group)
4213                 return -1; /* should we return w/o complaining? */
4214
4215         if (wpa_s->p2p_mgmt)
4216                 wpa_s = wpa_s->parent;
4217
4218         ctrl_iface = wpa_s->global->dbus;
4219         if (ctrl_iface == NULL)
4220                 return 0;
4221
4222         /*
4223          * Intentionally not coming up with different numbering scheme
4224          * for persistent groups.
4225          */
4226         os_snprintf(pgrp_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
4227                     "%s/" WPAS_DBUS_NEW_PERSISTENT_GROUPS_PART "/%u",
4228                     wpa_s->dbus_new_path, ssid->id);
4229
4230         wpa_printf(MSG_DEBUG, "dbus: Register persistent group object '%s'",
4231                    pgrp_obj_path);
4232         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
4233         if (!obj_desc) {
4234                 wpa_printf(MSG_ERROR,
4235                            "dbus: Not enough memory to create object description");
4236                 goto err;
4237         }
4238
4239         /*
4240          * Reusing the same context structure as that for networks
4241          * since these are represented using same data structure.
4242          */
4243         /* allocate memory for handlers arguments */
4244         arg = os_zalloc(sizeof(struct network_handler_args));
4245         if (!arg) {
4246                 wpa_printf(MSG_ERROR,
4247                            "dbus: Not enough memory to create arguments for method");
4248                 goto err;
4249         }
4250
4251         arg->wpa_s = wpa_s;
4252         arg->ssid = ssid;
4253
4254         wpas_dbus_register(obj_desc, arg, wpa_dbus_free, NULL,
4255                            wpas_dbus_persistent_group_properties,
4256                            NULL);
4257
4258         if (wpa_dbus_register_object_per_iface(ctrl_iface, pgrp_obj_path,
4259                                                wpa_s->ifname, obj_desc))
4260                 goto err;
4261
4262         wpas_dbus_signal_persistent_group_added(wpa_s, ssid->id);
4263
4264         return 0;
4265
4266 err:
4267         free_dbus_object_desc(obj_desc);
4268         return -1;
4269 }
4270
4271
4272 /**
4273  * wpas_dbus_unregister_persistent_group - Unregister a persistent_group
4274  *      from dbus
4275  * @wpa_s: wpa_supplicant interface structure
4276  * @nid: network id
4277  * Returns: 0 on success, -1 on failure
4278  *
4279  * Unregisters persistent group representing object from dbus
4280  *
4281  * NOTE: There is a slight issue with the semantics here. While the
4282  * implementation simply means the persistent group is unloaded from memory,
4283  * it should not get interpreted as the group is actually being erased/removed
4284  * from persistent storage as well.
4285  */
4286 int wpas_dbus_unregister_persistent_group(struct wpa_supplicant *wpa_s,
4287                                           int nid)
4288 {
4289         struct wpas_dbus_priv *ctrl_iface;
4290         char pgrp_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
4291         int ret;
4292
4293         /* Do nothing if the control interface is not turned on */
4294         if (wpa_s == NULL || wpa_s->global == NULL)
4295                 return 0;
4296
4297         wpa_s = wpa_s->parent->parent;
4298
4299         ctrl_iface = wpa_s->global->dbus;
4300         if (ctrl_iface == NULL || !wpa_s->dbus_new_path)
4301                 return 0;
4302
4303         os_snprintf(pgrp_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
4304                     "%s/" WPAS_DBUS_NEW_PERSISTENT_GROUPS_PART "/%u",
4305                     wpa_s->dbus_new_path, nid);
4306
4307         wpa_printf(MSG_DEBUG, "dbus: Unregister persistent group object '%s'",
4308                    pgrp_obj_path);
4309         ret = wpa_dbus_unregister_object_per_iface(ctrl_iface, pgrp_obj_path);
4310
4311         if (!ret)
4312                 wpas_dbus_signal_persistent_group_removed(wpa_s, nid);
4313
4314         return ret;
4315 }
4316
4317 #endif /* CONFIG_P2P */