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 }
1954
1955
1956 #endif /* CONFIG_P2P */
1957
1958
1959 /**
1960  * wpas_dbus_signal_prop_changed - Signals change of property
1961  * @wpa_s: %wpa_supplicant network interface data
1962  * @property: indicates which property has changed
1963  *
1964  * Sends PropertyChanged signals with path, interface and arguments
1965  * depending on which property has changed.
1966  */
1967 void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
1968                                    enum wpas_dbus_prop property)
1969 {
1970         char *prop;
1971         dbus_bool_t flush;
1972
1973         if (wpa_s->dbus_new_path == NULL)
1974                 return; /* Skip signal since D-Bus setup is not yet ready */
1975
1976         flush = FALSE;
1977         switch (property) {
1978         case WPAS_DBUS_PROP_AP_SCAN:
1979                 prop = "ApScan";
1980                 break;
1981         case WPAS_DBUS_PROP_SCANNING:
1982                 prop = "Scanning";
1983                 break;
1984         case WPAS_DBUS_PROP_STATE:
1985                 prop = "State";
1986                 break;
1987         case WPAS_DBUS_PROP_CURRENT_BSS:
1988                 prop = "CurrentBSS";
1989                 break;
1990         case WPAS_DBUS_PROP_CURRENT_NETWORK:
1991                 prop = "CurrentNetwork";
1992                 break;
1993         case WPAS_DBUS_PROP_BSSS:
1994                 prop = "BSSs";
1995                 break;
1996         case WPAS_DBUS_PROP_CURRENT_AUTH_MODE:
1997                 prop = "CurrentAuthMode";
1998                 break;
1999         case WPAS_DBUS_PROP_DISCONNECT_REASON:
2000                 prop = "DisconnectReason";
2001                 flush = TRUE;
2002                 break;
2003         default:
2004                 wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
2005                            __func__, property);
2006                 return;
2007         }
2008
2009         wpa_dbus_mark_property_changed(wpa_s->global->dbus,
2010                                        wpa_s->dbus_new_path,
2011                                        WPAS_DBUS_NEW_IFACE_INTERFACE, prop);
2012         if (flush) {
2013                 wpa_dbus_flush_object_changed_properties(
2014                         wpa_s->global->dbus->con, wpa_s->dbus_new_path);
2015         }
2016 }
2017
2018
2019 /**
2020  * wpas_dbus_bss_signal_prop_changed - Signals change of BSS property
2021  * @wpa_s: %wpa_supplicant network interface data
2022  * @property: indicates which property has changed
2023  * @id: unique BSS identifier
2024  *
2025  * Sends PropertyChanged signals with path, interface, and arguments depending
2026  * on which property has changed.
2027  */
2028 void wpas_dbus_bss_signal_prop_changed(struct wpa_supplicant *wpa_s,
2029                                        enum wpas_dbus_bss_prop property,
2030                                        unsigned int id)
2031 {
2032         char path[WPAS_DBUS_OBJECT_PATH_MAX];
2033         char *prop;
2034
2035         if (!wpa_s->dbus_new_path)
2036                 return;
2037
2038         switch (property) {
2039         case WPAS_DBUS_BSS_PROP_SIGNAL:
2040                 prop = "Signal";
2041                 break;
2042         case WPAS_DBUS_BSS_PROP_FREQ:
2043                 prop = "Frequency";
2044                 break;
2045         case WPAS_DBUS_BSS_PROP_MODE:
2046                 prop = "Mode";
2047                 break;
2048         case WPAS_DBUS_BSS_PROP_PRIVACY:
2049                 prop = "Privacy";
2050                 break;
2051         case WPAS_DBUS_BSS_PROP_RATES:
2052                 prop = "Rates";
2053                 break;
2054         case WPAS_DBUS_BSS_PROP_WPA:
2055                 prop = "WPA";
2056                 break;
2057         case WPAS_DBUS_BSS_PROP_RSN:
2058                 prop = "RSN";
2059                 break;
2060         case WPAS_DBUS_BSS_PROP_WPS:
2061                 prop = "WPS";
2062                 break;
2063         case WPAS_DBUS_BSS_PROP_IES:
2064                 prop = "IEs";
2065                 break;
2066         case WPAS_DBUS_BSS_PROP_AGE:
2067                 prop = "Age";
2068                 break;
2069         default:
2070                 wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
2071                            __func__, property);
2072                 return;
2073         }
2074
2075         os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
2076                     "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
2077                     wpa_s->dbus_new_path, id);
2078
2079         wpa_dbus_mark_property_changed(wpa_s->global->dbus, path,
2080                                        WPAS_DBUS_NEW_IFACE_BSS, prop);
2081 }
2082
2083
2084 /**
2085  * wpas_dbus_signal_debug_level_changed - Signals change of debug param
2086  * @global: wpa_global structure
2087  *
2088  * Sends PropertyChanged signals informing that debug level has changed.
2089  */
2090 void wpas_dbus_signal_debug_level_changed(struct wpa_global *global)
2091 {
2092         wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
2093                                        WPAS_DBUS_NEW_INTERFACE,
2094                                        "DebugLevel");
2095 }
2096
2097
2098 /**
2099  * wpas_dbus_signal_debug_timestamp_changed - Signals change of debug param
2100  * @global: wpa_global structure
2101  *
2102  * Sends PropertyChanged signals informing that debug timestamp has changed.
2103  */
2104 void wpas_dbus_signal_debug_timestamp_changed(struct wpa_global *global)
2105 {
2106         wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
2107                                        WPAS_DBUS_NEW_INTERFACE,
2108                                        "DebugTimestamp");
2109 }
2110
2111
2112 /**
2113  * wpas_dbus_signal_debug_show_keys_changed - Signals change of debug param
2114  * @global: wpa_global structure
2115  *
2116  * Sends PropertyChanged signals informing that debug show_keys has changed.
2117  */
2118 void wpas_dbus_signal_debug_show_keys_changed(struct wpa_global *global)
2119 {
2120         wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
2121                                        WPAS_DBUS_NEW_INTERFACE,
2122                                        "DebugShowKeys");
2123 }
2124
2125
2126 static void wpas_dbus_register(struct wpa_dbus_object_desc *obj_desc,
2127                                void *priv,
2128                                WPADBusArgumentFreeFunction priv_free,
2129                                const struct wpa_dbus_method_desc *methods,
2130                                const struct wpa_dbus_property_desc *properties,
2131                                const struct wpa_dbus_signal_desc *signals)
2132 {
2133         int n;
2134
2135         obj_desc->user_data = priv;
2136         obj_desc->user_data_free_func = priv_free;
2137         obj_desc->methods = methods;
2138         obj_desc->properties = properties;
2139         obj_desc->signals = signals;
2140
2141         for (n = 0; properties && properties->dbus_property; properties++)
2142                 n++;
2143
2144         obj_desc->prop_changed_flags = os_zalloc(n);
2145         if (!obj_desc->prop_changed_flags)
2146                 wpa_printf(MSG_DEBUG, "dbus: %s: can't register handlers",
2147                            __func__);
2148 }
2149
2150
2151 static const struct wpa_dbus_method_desc wpas_dbus_global_methods[] = {
2152         { "CreateInterface", WPAS_DBUS_NEW_INTERFACE,
2153           (WPADBusMethodHandler) wpas_dbus_handler_create_interface,
2154           {
2155                   { "args", "a{sv}", ARG_IN },
2156                   { "path", "o", ARG_OUT },
2157                   END_ARGS
2158           }
2159         },
2160         { "RemoveInterface", WPAS_DBUS_NEW_INTERFACE,
2161           (WPADBusMethodHandler) wpas_dbus_handler_remove_interface,
2162           {
2163                   { "path", "o", ARG_IN },
2164                   END_ARGS
2165           }
2166         },
2167         { "GetInterface", WPAS_DBUS_NEW_INTERFACE,
2168           (WPADBusMethodHandler) wpas_dbus_handler_get_interface,
2169           {
2170                   { "ifname", "s", ARG_IN },
2171                   { "path", "o", ARG_OUT },
2172                   END_ARGS
2173           }
2174         },
2175         { "ExpectDisconnect", WPAS_DBUS_NEW_INTERFACE,
2176           (WPADBusMethodHandler) wpas_dbus_handler_expect_disconnect,
2177           {
2178                 END_ARGS
2179           }
2180         },
2181         { NULL, NULL, NULL, { END_ARGS } }
2182 };
2183
2184 static const struct wpa_dbus_property_desc wpas_dbus_global_properties[] = {
2185         { "DebugLevel", WPAS_DBUS_NEW_INTERFACE, "s",
2186           wpas_dbus_getter_debug_level,
2187           wpas_dbus_setter_debug_level,
2188           NULL
2189         },
2190         { "DebugTimestamp", WPAS_DBUS_NEW_INTERFACE, "b",
2191           wpas_dbus_getter_debug_timestamp,
2192           wpas_dbus_setter_debug_timestamp,
2193           NULL
2194         },
2195         { "DebugShowKeys", WPAS_DBUS_NEW_INTERFACE, "b",
2196           wpas_dbus_getter_debug_show_keys,
2197           wpas_dbus_setter_debug_show_keys,
2198           NULL
2199         },
2200         { "Interfaces", WPAS_DBUS_NEW_INTERFACE, "ao",
2201           wpas_dbus_getter_interfaces,
2202           NULL,
2203           NULL
2204         },
2205         { "EapMethods", WPAS_DBUS_NEW_INTERFACE, "as",
2206           wpas_dbus_getter_eap_methods,
2207           NULL,
2208           NULL
2209         },
2210         { "Capabilities", WPAS_DBUS_NEW_INTERFACE, "as",
2211           wpas_dbus_getter_global_capabilities,
2212           NULL,
2213           NULL
2214         },
2215 #ifdef CONFIG_WIFI_DISPLAY
2216         { "WFDIEs", WPAS_DBUS_NEW_INTERFACE, "ay",
2217           wpas_dbus_getter_global_wfd_ies,
2218           wpas_dbus_setter_global_wfd_ies,
2219           NULL
2220         },
2221 #endif /* CONFIG_WIFI_DISPLAY */
2222         { NULL, NULL, NULL, NULL, NULL, NULL }
2223 };
2224
2225 static const struct wpa_dbus_signal_desc wpas_dbus_global_signals[] = {
2226         { "InterfaceAdded", WPAS_DBUS_NEW_INTERFACE,
2227           {
2228                   { "path", "o", ARG_OUT },
2229                   { "properties", "a{sv}", ARG_OUT },
2230                   END_ARGS
2231           }
2232         },
2233         { "InterfaceRemoved", WPAS_DBUS_NEW_INTERFACE,
2234           {
2235                   { "path", "o", ARG_OUT },
2236                   END_ARGS
2237           }
2238         },
2239         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
2240         { "PropertiesChanged", WPAS_DBUS_NEW_INTERFACE,
2241           {
2242                   { "properties", "a{sv}", ARG_OUT },
2243                   END_ARGS
2244           }
2245         },
2246         { NULL, NULL, { END_ARGS } }
2247 };
2248
2249
2250 static char * uscore_to_dbus(const char *uscore)
2251 {
2252         const char *p = uscore;
2253         char *str, *s;
2254         dbus_bool_t last_was_uscore = TRUE;
2255
2256         s = str = os_zalloc(os_strlen(uscore) + 1);
2257         if (!str)
2258                 return NULL;
2259         while (p && *p) {
2260                 if (*p == '_') {
2261                         last_was_uscore = TRUE;
2262                 } else {
2263                         *s++ = last_was_uscore ? toupper(*p) : *p;
2264                         last_was_uscore = FALSE;
2265                 }
2266                 p++;
2267         }
2268
2269         return str;
2270 }
2271
2272
2273 static int wpa_dbus_ctrl_iface_props_init(struct wpas_dbus_priv *priv);
2274
2275
2276 static void wpa_dbus_ctrl_iface_props_deinit(struct wpas_dbus_priv *priv)
2277 {
2278         int idx = priv->globals_start;
2279
2280         /* Free all allocated property values */
2281         while (priv->all_interface_properties[idx].dbus_property)
2282                 os_free((char *)
2283                         priv->all_interface_properties[idx++].dbus_property);
2284         os_free((char *) priv->all_interface_properties);
2285 }
2286
2287
2288 /**
2289  * wpas_dbus_ctrl_iface_init - Initialize dbus control interface
2290  * @global: Pointer to global data from wpa_supplicant_init()
2291  * Returns: 0 on success or -1 on failure
2292  *
2293  * Initialize the dbus control interface for wpa_supplicant and start
2294  * receiving commands from external programs over the bus.
2295  */
2296 int wpas_dbus_ctrl_iface_init(struct wpas_dbus_priv *priv)
2297 {
2298         struct wpa_dbus_object_desc *obj_desc;
2299         int ret;
2300
2301         ret = wpa_dbus_ctrl_iface_props_init(priv);
2302         if (ret < 0) {
2303                 wpa_printf(MSG_ERROR,
2304                            "dbus: Not enough memory to init interface properties");
2305                 return -1;
2306         }
2307
2308         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
2309         if (!obj_desc) {
2310                 wpa_printf(MSG_ERROR,
2311                            "Not enough memory to create object description");
2312                 goto error;
2313         }
2314
2315         wpas_dbus_register(obj_desc, priv->global, NULL,
2316                            wpas_dbus_global_methods,
2317                            wpas_dbus_global_properties,
2318                            wpas_dbus_global_signals);
2319
2320         wpa_printf(MSG_DEBUG, "dbus: Register D-Bus object '%s'",
2321                    WPAS_DBUS_NEW_PATH);
2322         ret = wpa_dbus_ctrl_iface_init(priv, WPAS_DBUS_NEW_PATH,
2323                                        WPAS_DBUS_NEW_SERVICE,
2324                                        obj_desc);
2325         if (ret < 0) {
2326                 free_dbus_object_desc(obj_desc);
2327                 goto error;
2328         }
2329
2330         priv->dbus_new_initialized = 1;
2331         return 0;
2332
2333 error:
2334         wpa_dbus_ctrl_iface_props_deinit(priv);
2335         return -1;
2336 }
2337
2338
2339 /**
2340  * wpas_dbus_ctrl_iface_deinit - Deinitialize dbus ctrl interface for
2341  * wpa_supplicant
2342  * @priv: Pointer to dbus private data from wpas_dbus_init()
2343  *
2344  * Deinitialize the dbus control interface that was initialized with
2345  * wpas_dbus_ctrl_iface_init().
2346  */
2347 void wpas_dbus_ctrl_iface_deinit(struct wpas_dbus_priv *priv)
2348 {
2349         if (!priv->dbus_new_initialized)
2350                 return;
2351         wpa_printf(MSG_DEBUG, "dbus: Unregister D-Bus object '%s'",
2352                    WPAS_DBUS_NEW_PATH);
2353         dbus_connection_unregister_object_path(priv->con, WPAS_DBUS_NEW_PATH);
2354         wpa_dbus_ctrl_iface_props_deinit(priv);
2355 }
2356
2357
2358 static void wpa_dbus_free(void *ptr)
2359 {
2360         os_free(ptr);
2361 }
2362
2363
2364 static const struct wpa_dbus_property_desc wpas_dbus_network_properties[] = {
2365         { "Properties", WPAS_DBUS_NEW_IFACE_NETWORK, "a{sv}",
2366           wpas_dbus_getter_network_properties,
2367           wpas_dbus_setter_network_properties,
2368           NULL
2369         },
2370         { "Enabled", WPAS_DBUS_NEW_IFACE_NETWORK, "b",
2371           wpas_dbus_getter_enabled,
2372           wpas_dbus_setter_enabled,
2373           NULL
2374         },
2375         { NULL, NULL, NULL, NULL, NULL, NULL }
2376 };
2377
2378
2379 static const struct wpa_dbus_signal_desc wpas_dbus_network_signals[] = {
2380         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
2381         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_NETWORK,
2382           {
2383                   { "properties", "a{sv}", ARG_OUT },
2384                   END_ARGS
2385           }
2386         },
2387         { NULL, NULL, { END_ARGS } }
2388 };
2389
2390
2391 /**
2392  * wpas_dbus_register_network - Register a configured network with dbus
2393  * @wpa_s: wpa_supplicant interface structure
2394  * @ssid: network configuration data
2395  * Returns: 0 on success, -1 on failure
2396  *
2397  * Registers network representing object with dbus
2398  */
2399 int wpas_dbus_register_network(struct wpa_supplicant *wpa_s,
2400                                struct wpa_ssid *ssid)
2401 {
2402         struct wpas_dbus_priv *ctrl_iface;
2403         struct wpa_dbus_object_desc *obj_desc;
2404         struct network_handler_args *arg;
2405         char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
2406
2407 #ifdef CONFIG_P2P
2408         /*
2409          * If it is a persistent group register it as such.
2410          * This is to handle cases where an interface is being initialized
2411          * with a list of networks read from config.
2412          */
2413         if (network_is_persistent_group(ssid))
2414                 return wpas_dbus_register_persistent_group(wpa_s, ssid);
2415 #endif /* CONFIG_P2P */
2416
2417         /* Do nothing if the control interface is not turned on */
2418         if (wpa_s == NULL || wpa_s->global == NULL || !wpa_s->dbus_new_path)
2419                 return 0;
2420         ctrl_iface = wpa_s->global->dbus;
2421         if (ctrl_iface == NULL)
2422                 return 0;
2423
2424         os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
2425                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
2426                     wpa_s->dbus_new_path, ssid->id);
2427
2428         wpa_printf(MSG_DEBUG, "dbus: Register network object '%s'",
2429                    net_obj_path);
2430         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
2431         if (!obj_desc) {
2432                 wpa_printf(MSG_ERROR,
2433                            "Not enough memory to create object description");
2434                 goto err;
2435         }
2436
2437         /* allocate memory for handlers arguments */
2438         arg = os_zalloc(sizeof(struct network_handler_args));
2439         if (!arg) {
2440                 wpa_printf(MSG_ERROR,
2441                            "Not enough memory to create arguments for method");
2442                 goto err;
2443         }
2444
2445         arg->wpa_s = wpa_s;
2446         arg->ssid = ssid;
2447
2448         wpas_dbus_register(obj_desc, arg, wpa_dbus_free, NULL,
2449                            wpas_dbus_network_properties,
2450                            wpas_dbus_network_signals);
2451
2452         if (wpa_dbus_register_object_per_iface(ctrl_iface, net_obj_path,
2453                                                wpa_s->ifname, obj_desc))
2454                 goto err;
2455
2456         wpas_dbus_signal_network_added(wpa_s, ssid->id);
2457
2458         return 0;
2459
2460 err:
2461         free_dbus_object_desc(obj_desc);
2462         return -1;
2463 }
2464
2465
2466 /**
2467  * wpas_dbus_unregister_network - Unregister a configured network from dbus
2468  * @wpa_s: wpa_supplicant interface structure
2469  * @nid: network id
2470  * Returns: 0 on success, -1 on failure
2471  *
2472  * Unregisters network representing object from dbus
2473  */
2474 int wpas_dbus_unregister_network(struct wpa_supplicant *wpa_s, int nid)
2475 {
2476         struct wpas_dbus_priv *ctrl_iface;
2477         char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
2478         int ret;
2479 #ifdef CONFIG_P2P
2480         struct wpa_ssid *ssid;
2481
2482         ssid = wpa_config_get_network(wpa_s->conf, nid);
2483
2484         /* If it is a persistent group unregister it as such */
2485         if (ssid && network_is_persistent_group(ssid))
2486                 return wpas_dbus_unregister_persistent_group(wpa_s, nid);
2487 #endif /* CONFIG_P2P */
2488
2489         /* Do nothing if the control interface is not turned on */
2490         if (wpa_s->global == NULL || wpa_s->dbus_new_path == NULL)
2491                 return 0;
2492         ctrl_iface = wpa_s->global->dbus;
2493         if (ctrl_iface == NULL)
2494                 return 0;
2495
2496         os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
2497                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
2498                     wpa_s->dbus_new_path, nid);
2499
2500         wpa_printf(MSG_DEBUG, "dbus: Unregister network object '%s'",
2501                    net_obj_path);
2502         ret = wpa_dbus_unregister_object_per_iface(ctrl_iface, net_obj_path);
2503
2504         if (!ret)
2505                 wpas_dbus_signal_network_removed(wpa_s, nid);
2506
2507         return ret;
2508 }
2509
2510
2511 static const struct wpa_dbus_property_desc wpas_dbus_bss_properties[] = {
2512         { "SSID", WPAS_DBUS_NEW_IFACE_BSS, "ay",
2513           wpas_dbus_getter_bss_ssid,
2514           NULL,
2515           NULL
2516         },
2517         { "BSSID", WPAS_DBUS_NEW_IFACE_BSS, "ay",
2518           wpas_dbus_getter_bss_bssid,
2519           NULL,
2520           NULL
2521         },
2522         { "Privacy", WPAS_DBUS_NEW_IFACE_BSS, "b",
2523           wpas_dbus_getter_bss_privacy,
2524           NULL,
2525           NULL
2526         },
2527         { "Mode", WPAS_DBUS_NEW_IFACE_BSS, "s",
2528           wpas_dbus_getter_bss_mode,
2529           NULL,
2530           NULL
2531         },
2532         { "Signal", WPAS_DBUS_NEW_IFACE_BSS, "n",
2533           wpas_dbus_getter_bss_signal,
2534           NULL,
2535           NULL
2536         },
2537         { "Frequency", WPAS_DBUS_NEW_IFACE_BSS, "q",
2538           wpas_dbus_getter_bss_frequency,
2539           NULL,
2540           NULL
2541         },
2542         { "Rates", WPAS_DBUS_NEW_IFACE_BSS, "au",
2543           wpas_dbus_getter_bss_rates,
2544           NULL,
2545           NULL
2546         },
2547         { "WPA", WPAS_DBUS_NEW_IFACE_BSS, "a{sv}",
2548           wpas_dbus_getter_bss_wpa,
2549           NULL,
2550           NULL
2551         },
2552         { "RSN", WPAS_DBUS_NEW_IFACE_BSS, "a{sv}",
2553           wpas_dbus_getter_bss_rsn,
2554           NULL,
2555           NULL
2556         },
2557         { "WPS", WPAS_DBUS_NEW_IFACE_BSS, "a{sv}",
2558           wpas_dbus_getter_bss_wps,
2559           NULL,
2560           NULL
2561         },
2562         { "IEs", WPAS_DBUS_NEW_IFACE_BSS, "ay",
2563           wpas_dbus_getter_bss_ies,
2564           NULL,
2565           NULL
2566         },
2567         { "Age", WPAS_DBUS_NEW_IFACE_BSS, "u",
2568           wpas_dbus_getter_bss_age,
2569           NULL,
2570           NULL
2571         },
2572         { NULL, NULL, NULL, NULL, NULL, NULL }
2573 };
2574
2575
2576 static const struct wpa_dbus_signal_desc wpas_dbus_bss_signals[] = {
2577         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
2578         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_BSS,
2579           {
2580                   { "properties", "a{sv}", ARG_OUT },
2581                   END_ARGS
2582           }
2583         },
2584         { NULL, NULL, { END_ARGS } }
2585 };
2586
2587
2588 /**
2589  * wpas_dbus_unregister_bss - Unregister a scanned BSS from dbus
2590  * @wpa_s: wpa_supplicant interface structure
2591  * @bssid: scanned network bssid
2592  * @id: unique BSS identifier
2593  * Returns: 0 on success, -1 on failure
2594  *
2595  * Unregisters BSS representing object from dbus
2596  */
2597 int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
2598                              u8 bssid[ETH_ALEN], unsigned int id)
2599 {
2600         struct wpas_dbus_priv *ctrl_iface;
2601         char bss_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
2602
2603         /* Do nothing if the control interface is not turned on */
2604         if (wpa_s == NULL || wpa_s->global == NULL || !wpa_s->dbus_new_path)
2605                 return 0;
2606         ctrl_iface = wpa_s->global->dbus;
2607         if (ctrl_iface == NULL)
2608                 return 0;
2609
2610         os_snprintf(bss_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
2611                     "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
2612                     wpa_s->dbus_new_path, id);
2613
2614         wpa_printf(MSG_DEBUG, "dbus: Unregister BSS object '%s'",
2615                    bss_obj_path);
2616         if (wpa_dbus_unregister_object_per_iface(ctrl_iface, bss_obj_path)) {
2617                 wpa_printf(MSG_ERROR, "dbus: Cannot unregister BSS object %s",
2618                            bss_obj_path);
2619                 return -1;
2620         }
2621
2622         wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
2623         wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
2624
2625         return 0;
2626 }
2627
2628
2629 /**
2630  * wpas_dbus_register_bss - Register a scanned BSS with dbus
2631  * @wpa_s: wpa_supplicant interface structure
2632  * @bssid: scanned network bssid
2633  * @id: unique BSS identifier
2634  * Returns: 0 on success, -1 on failure
2635  *
2636  * Registers BSS representing object with dbus
2637  */
2638 int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
2639                            u8 bssid[ETH_ALEN], unsigned int id)
2640 {
2641         struct wpas_dbus_priv *ctrl_iface;
2642         struct wpa_dbus_object_desc *obj_desc;
2643         char bss_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
2644         struct bss_handler_args *arg;
2645
2646         /* Do nothing if the control interface is not turned on */
2647         if (wpa_s == NULL || wpa_s->global == NULL || !wpa_s->dbus_new_path)
2648                 return 0;
2649         ctrl_iface = wpa_s->global->dbus;
2650         if (ctrl_iface == NULL)
2651                 return 0;
2652
2653         os_snprintf(bss_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
2654                     "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
2655                     wpa_s->dbus_new_path, id);
2656
2657         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
2658         if (!obj_desc) {
2659                 wpa_printf(MSG_ERROR,
2660                            "Not enough memory to create object description");
2661                 goto err;
2662         }
2663
2664         arg = os_zalloc(sizeof(struct bss_handler_args));
2665         if (!arg) {
2666                 wpa_printf(MSG_ERROR,
2667                            "Not enough memory to create arguments for handler");
2668                 goto err;
2669         }
2670         arg->wpa_s = wpa_s;
2671         arg->id = id;
2672
2673         wpas_dbus_register(obj_desc, arg, wpa_dbus_free, NULL,
2674                            wpas_dbus_bss_properties,
2675                            wpas_dbus_bss_signals);
2676
2677         wpa_printf(MSG_DEBUG, "dbus: Register BSS object '%s'",
2678                    bss_obj_path);
2679         if (wpa_dbus_register_object_per_iface(ctrl_iface, bss_obj_path,
2680                                                wpa_s->ifname, obj_desc)) {
2681                 wpa_printf(MSG_ERROR,
2682                            "Cannot register BSSID dbus object %s.",
2683                            bss_obj_path);
2684                 goto err;
2685         }
2686
2687         wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
2688         wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
2689
2690         return 0;
2691
2692 err:
2693         free_dbus_object_desc(obj_desc);
2694         return -1;
2695 }
2696
2697
2698 static const struct wpa_dbus_method_desc wpas_dbus_interface_methods[] = {
2699         { "Scan", WPAS_DBUS_NEW_IFACE_INTERFACE,
2700           (WPADBusMethodHandler) wpas_dbus_handler_scan,
2701           {
2702                   { "args", "a{sv}", ARG_IN },
2703                   END_ARGS
2704           }
2705         },
2706         { "SignalPoll", WPAS_DBUS_NEW_IFACE_INTERFACE,
2707           (WPADBusMethodHandler) wpas_dbus_handler_signal_poll,
2708           {
2709                   { "args", "a{sv}", ARG_OUT },
2710                   END_ARGS
2711           }
2712         },
2713         { "Disconnect", WPAS_DBUS_NEW_IFACE_INTERFACE,
2714           (WPADBusMethodHandler) wpas_dbus_handler_disconnect,
2715           {
2716                   END_ARGS
2717           }
2718         },
2719         { "AddNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE,
2720           (WPADBusMethodHandler) wpas_dbus_handler_add_network,
2721           {
2722                   { "args", "a{sv}", ARG_IN },
2723                   { "path", "o", ARG_OUT },
2724                   END_ARGS
2725           }
2726         },
2727         { "Reassociate", WPAS_DBUS_NEW_IFACE_INTERFACE,
2728           (WPADBusMethodHandler) wpas_dbus_handler_reassociate,
2729           {
2730                   END_ARGS
2731           }
2732         },
2733         { "Reattach", WPAS_DBUS_NEW_IFACE_INTERFACE,
2734           (WPADBusMethodHandler) wpas_dbus_handler_reattach,
2735           {
2736                   END_ARGS
2737           }
2738         },
2739         { "Reconnect", WPAS_DBUS_NEW_IFACE_INTERFACE,
2740           (WPADBusMethodHandler) wpas_dbus_handler_reconnect,
2741           {
2742                   END_ARGS
2743           }
2744         },
2745         { "RemoveNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE,
2746           (WPADBusMethodHandler) wpas_dbus_handler_remove_network,
2747           {
2748                   { "path", "o", ARG_IN },
2749                   END_ARGS
2750           }
2751         },
2752         { "RemoveAllNetworks", WPAS_DBUS_NEW_IFACE_INTERFACE,
2753           (WPADBusMethodHandler) wpas_dbus_handler_remove_all_networks,
2754           {
2755                   END_ARGS
2756           }
2757         },
2758         { "SelectNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE,
2759           (WPADBusMethodHandler) wpas_dbus_handler_select_network,
2760           {
2761                   { "path", "o", ARG_IN },
2762                   END_ARGS
2763           }
2764         },
2765         { "NetworkReply", WPAS_DBUS_NEW_IFACE_INTERFACE,
2766           (WPADBusMethodHandler) wpas_dbus_handler_network_reply,
2767           {
2768                   { "path", "o", ARG_IN },
2769                   { "field", "s", ARG_IN },
2770                   { "value", "s", ARG_IN },
2771                   END_ARGS
2772           }
2773         },
2774 #ifndef CONFIG_NO_CONFIG_BLOBS
2775         { "AddBlob", WPAS_DBUS_NEW_IFACE_INTERFACE,
2776           (WPADBusMethodHandler) wpas_dbus_handler_add_blob,
2777           {
2778                   { "name", "s", ARG_IN },
2779                   { "data", "ay", ARG_IN },
2780                   END_ARGS
2781           }
2782         },
2783         { "GetBlob", WPAS_DBUS_NEW_IFACE_INTERFACE,
2784           (WPADBusMethodHandler) wpas_dbus_handler_get_blob,
2785           {
2786                   { "name", "s", ARG_IN },
2787                   { "data", "ay", ARG_OUT },
2788                   END_ARGS
2789           }
2790         },
2791         { "RemoveBlob", WPAS_DBUS_NEW_IFACE_INTERFACE,
2792           (WPADBusMethodHandler) wpas_dbus_handler_remove_blob,
2793           {
2794                   { "name", "s", ARG_IN },
2795                   END_ARGS
2796           }
2797         },
2798 #endif /* CONFIG_NO_CONFIG_BLOBS */
2799         { "SetPKCS11EngineAndModulePath", WPAS_DBUS_NEW_IFACE_INTERFACE,
2800           (WPADBusMethodHandler)
2801           wpas_dbus_handler_set_pkcs11_engine_and_module_path,
2802           {
2803                   { "pkcs11_engine_path", "s", ARG_IN },
2804                   { "pkcs11_module_path", "s", ARG_IN },
2805                   END_ARGS
2806           }
2807         },
2808 #ifdef CONFIG_WPS
2809         { "Start", WPAS_DBUS_NEW_IFACE_WPS,
2810           (WPADBusMethodHandler) wpas_dbus_handler_wps_start,
2811           {
2812                   { "args", "a{sv}", ARG_IN },
2813                   { "output", "a{sv}", ARG_OUT },
2814                   END_ARGS
2815           }
2816         },
2817         { "Cancel", WPAS_DBUS_NEW_IFACE_WPS,
2818           (WPADBusMethodHandler) wpas_dbus_handler_wps_cancel,
2819           {
2820                   END_ARGS
2821           }
2822         },
2823 #endif /* CONFIG_WPS */
2824 #ifdef CONFIG_P2P
2825         { "Find", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2826           (WPADBusMethodHandler) wpas_dbus_handler_p2p_find,
2827           {
2828                   { "args", "a{sv}", ARG_IN },
2829                   END_ARGS
2830           }
2831         },
2832         { "StopFind", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2833           (WPADBusMethodHandler) wpas_dbus_handler_p2p_stop_find,
2834           {
2835                   END_ARGS
2836           }
2837         },
2838         { "Listen", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2839           (WPADBusMethodHandler) wpas_dbus_handler_p2p_listen,
2840           {
2841                   { "timeout", "i", ARG_IN },
2842                   END_ARGS
2843           }
2844         },
2845         { "ExtendedListen", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2846           (WPADBusMethodHandler) wpas_dbus_handler_p2p_extendedlisten,
2847           {
2848                   { "args", "a{sv}", ARG_IN },
2849                   END_ARGS
2850           }
2851         },
2852         { "PresenceRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2853           (WPADBusMethodHandler) wpas_dbus_handler_p2p_presence_request,
2854           {
2855                   { "args", "a{sv}", ARG_IN },
2856                   END_ARGS
2857           }
2858         },
2859         { "ProvisionDiscoveryRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2860           (WPADBusMethodHandler) wpas_dbus_handler_p2p_prov_disc_req,
2861           {
2862                   { "peer", "o", ARG_IN },
2863                   { "config_method", "s", ARG_IN },
2864                   END_ARGS
2865           }
2866         },
2867         { "Connect", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2868           (WPADBusMethodHandler) wpas_dbus_handler_p2p_connect,
2869           {
2870                   { "args", "a{sv}", ARG_IN },
2871                   { "generated_pin", "s", ARG_OUT },
2872                   END_ARGS
2873           }
2874         },
2875         { "GroupAdd", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2876           (WPADBusMethodHandler) wpas_dbus_handler_p2p_group_add,
2877           {
2878                   { "args", "a{sv}", ARG_IN },
2879                   END_ARGS
2880           }
2881         },
2882         { "Cancel", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2883           (WPADBusMethodHandler) wpas_dbus_handler_p2p_cancel,
2884           {
2885                   END_ARGS
2886           }
2887         },
2888         { "Invite", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2889           (WPADBusMethodHandler) wpas_dbus_handler_p2p_invite,
2890           {
2891                   { "args", "a{sv}", ARG_IN },
2892                   END_ARGS
2893           }
2894         },
2895         { "Disconnect", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2896           (WPADBusMethodHandler) wpas_dbus_handler_p2p_disconnect,
2897           {
2898                   END_ARGS
2899           }
2900         },
2901         { "RejectPeer", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2902           (WPADBusMethodHandler) wpas_dbus_handler_p2p_rejectpeer,
2903           {
2904                   { "peer", "o", ARG_IN },
2905                   END_ARGS
2906           }
2907         },
2908         { "RemoveClient", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2909           (WPADBusMethodHandler) wpas_dbus_handler_p2p_remove_client,
2910           {
2911                   { "args", "a{sv}", ARG_IN },
2912                   END_ARGS
2913           }
2914         },
2915         { "Flush", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2916           (WPADBusMethodHandler) wpas_dbus_handler_p2p_flush,
2917           {
2918                   END_ARGS
2919           }
2920         },
2921         { "AddService", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2922           (WPADBusMethodHandler) wpas_dbus_handler_p2p_add_service,
2923           {
2924                   { "args", "a{sv}", ARG_IN },
2925                   END_ARGS
2926           }
2927         },
2928         { "DeleteService", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2929           (WPADBusMethodHandler) wpas_dbus_handler_p2p_delete_service,
2930           {
2931                   { "args", "a{sv}", ARG_IN },
2932                   END_ARGS
2933           }
2934         },
2935         { "FlushService", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2936           (WPADBusMethodHandler) wpas_dbus_handler_p2p_flush_service,
2937           {
2938                   END_ARGS
2939           }
2940         },
2941         { "ServiceDiscoveryRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2942           (WPADBusMethodHandler) wpas_dbus_handler_p2p_service_sd_req,
2943           {
2944                   { "args", "a{sv}", ARG_IN },
2945                   { "ref", "t", ARG_OUT },
2946                   END_ARGS
2947           }
2948         },
2949         { "ServiceDiscoveryResponse", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2950           (WPADBusMethodHandler) wpas_dbus_handler_p2p_service_sd_res,
2951           {
2952                   { "args", "a{sv}", ARG_IN },
2953                   END_ARGS
2954           }
2955         },
2956         { "ServiceDiscoveryCancelRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2957           (WPADBusMethodHandler) wpas_dbus_handler_p2p_service_sd_cancel_req,
2958           {
2959                   { "args", "t", ARG_IN },
2960                   END_ARGS
2961           }
2962         },
2963         { "ServiceUpdate", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2964           (WPADBusMethodHandler) wpas_dbus_handler_p2p_service_update,
2965           {
2966                   END_ARGS
2967           }
2968         },
2969         { "ServiceDiscoveryExternal", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2970           (WPADBusMethodHandler) wpas_dbus_handler_p2p_serv_disc_external,
2971           {
2972                   { "arg", "i", ARG_IN },
2973                   END_ARGS
2974           }
2975         },
2976         { "AddPersistentGroup", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2977           (WPADBusMethodHandler) wpas_dbus_handler_add_persistent_group,
2978           {
2979                   { "args", "a{sv}", ARG_IN },
2980                   { "path", "o", ARG_OUT },
2981                   END_ARGS
2982           }
2983         },
2984         { "RemovePersistentGroup", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2985           (WPADBusMethodHandler) wpas_dbus_handler_remove_persistent_group,
2986           {
2987                   { "path", "o", ARG_IN },
2988                   END_ARGS
2989           }
2990         },
2991         { "RemoveAllPersistentGroups", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
2992           (WPADBusMethodHandler)
2993           wpas_dbus_handler_remove_all_persistent_groups,
2994           {
2995                   END_ARGS
2996           }
2997         },
2998 #endif /* CONFIG_P2P */
2999         { "FlushBSS", WPAS_DBUS_NEW_IFACE_INTERFACE,
3000           (WPADBusMethodHandler) wpas_dbus_handler_flush_bss,
3001           {
3002                   { "age", "u", ARG_IN },
3003                   END_ARGS
3004           }
3005         },
3006 #ifdef CONFIG_AP
3007         { "SubscribeProbeReq", WPAS_DBUS_NEW_IFACE_INTERFACE,
3008           (WPADBusMethodHandler) wpas_dbus_handler_subscribe_preq,
3009           {
3010                   END_ARGS
3011           }
3012         },
3013         { "UnsubscribeProbeReq", WPAS_DBUS_NEW_IFACE_INTERFACE,
3014           (WPADBusMethodHandler) wpas_dbus_handler_unsubscribe_preq,
3015           {
3016                   END_ARGS
3017           }
3018         },
3019 #endif /* CONFIG_AP */
3020         { "EAPLogoff", WPAS_DBUS_NEW_IFACE_INTERFACE,
3021           (WPADBusMethodHandler) wpas_dbus_handler_eap_logoff,
3022           {
3023                   END_ARGS
3024           }
3025         },
3026         { "EAPLogon", WPAS_DBUS_NEW_IFACE_INTERFACE,
3027           (WPADBusMethodHandler) wpas_dbus_handler_eap_logon,
3028           {
3029                   END_ARGS
3030           }
3031         },
3032 #ifdef CONFIG_AUTOSCAN
3033         { "AutoScan", WPAS_DBUS_NEW_IFACE_INTERFACE,
3034           (WPADBusMethodHandler) wpas_dbus_handler_autoscan,
3035           {
3036                   { "arg", "s", ARG_IN },
3037                   END_ARGS
3038           }
3039         },
3040 #endif /* CONFIG_AUTOSCAN */
3041 #ifdef CONFIG_TDLS
3042         { "TDLSDiscover", WPAS_DBUS_NEW_IFACE_INTERFACE,
3043           (WPADBusMethodHandler) wpas_dbus_handler_tdls_discover,
3044           {
3045                   { "peer_address", "s", ARG_IN },
3046                   END_ARGS
3047           }
3048         },
3049         { "TDLSSetup", WPAS_DBUS_NEW_IFACE_INTERFACE,
3050           (WPADBusMethodHandler) wpas_dbus_handler_tdls_setup,
3051           {
3052                   { "peer_address", "s", ARG_IN },
3053                   END_ARGS
3054           }
3055         },
3056         { "TDLSStatus", WPAS_DBUS_NEW_IFACE_INTERFACE,
3057           (WPADBusMethodHandler) wpas_dbus_handler_tdls_status,
3058           {
3059                   { "peer_address", "s", ARG_IN },
3060                   { "status", "s", ARG_OUT },
3061                   END_ARGS
3062           }
3063         },
3064         { "TDLSTeardown", WPAS_DBUS_NEW_IFACE_INTERFACE,
3065           (WPADBusMethodHandler) wpas_dbus_handler_tdls_teardown,
3066           {
3067                   { "peer_address", "s", ARG_IN },
3068                   END_ARGS
3069           }
3070         },
3071 #endif /* CONFIG_TDLS */
3072 #ifndef CONFIG_NO_CONFIG_WRITE
3073         { "SaveConfig", WPAS_DBUS_NEW_IFACE_INTERFACE,
3074           (WPADBusMethodHandler) wpas_dbus_handler_save_config,
3075           {
3076                   END_ARGS
3077           }
3078         },
3079 #endif /* CONFIG_NO_CONFIG_WRITE */
3080         { NULL, NULL, NULL, { END_ARGS } }
3081 };
3082
3083 static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
3084         { "Capabilities", WPAS_DBUS_NEW_IFACE_INTERFACE, "a{sv}",
3085           wpas_dbus_getter_capabilities,
3086           NULL,
3087           NULL
3088         },
3089         { "State", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3090           wpas_dbus_getter_state,
3091           NULL,
3092           NULL
3093         },
3094         { "Scanning", WPAS_DBUS_NEW_IFACE_INTERFACE, "b",
3095           wpas_dbus_getter_scanning,
3096           NULL,
3097           NULL
3098         },
3099         { "ApScan", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
3100           wpas_dbus_getter_ap_scan,
3101           wpas_dbus_setter_ap_scan,
3102           NULL
3103         },
3104         { "BSSExpireAge", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
3105           wpas_dbus_getter_bss_expire_age,
3106           wpas_dbus_setter_bss_expire_age,
3107           NULL
3108         },
3109         { "BSSExpireCount", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
3110           wpas_dbus_getter_bss_expire_count,
3111           wpas_dbus_setter_bss_expire_count,
3112           NULL
3113         },
3114         { "Country", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3115           wpas_dbus_getter_country,
3116           wpas_dbus_setter_country,
3117           NULL
3118         },
3119         { "Ifname", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3120           wpas_dbus_getter_ifname,
3121           NULL,
3122           NULL
3123         },
3124         { "Driver", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3125           wpas_dbus_getter_driver,
3126           NULL,
3127           NULL
3128         },
3129         { "BridgeIfname", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3130           wpas_dbus_getter_bridge_ifname,
3131           NULL,
3132           NULL
3133         },
3134         { "CurrentBSS", WPAS_DBUS_NEW_IFACE_INTERFACE, "o",
3135           wpas_dbus_getter_current_bss,
3136           NULL,
3137           NULL
3138         },
3139         { "CurrentNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE, "o",
3140           wpas_dbus_getter_current_network,
3141           NULL,
3142           NULL
3143         },
3144         { "CurrentAuthMode", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3145           wpas_dbus_getter_current_auth_mode,
3146           NULL,
3147           NULL
3148         },
3149         { "Blobs", WPAS_DBUS_NEW_IFACE_INTERFACE, "a{say}",
3150           wpas_dbus_getter_blobs,
3151           NULL,
3152           NULL
3153         },
3154         { "BSSs", WPAS_DBUS_NEW_IFACE_INTERFACE, "ao",
3155           wpas_dbus_getter_bsss,
3156           NULL,
3157           NULL
3158         },
3159         { "Networks", WPAS_DBUS_NEW_IFACE_INTERFACE, "ao",
3160           wpas_dbus_getter_networks,
3161           NULL,
3162           NULL
3163         },
3164         { "FastReauth", WPAS_DBUS_NEW_IFACE_INTERFACE, "b",
3165           wpas_dbus_getter_fast_reauth,
3166           wpas_dbus_setter_fast_reauth,
3167           NULL
3168         },
3169         { "ScanInterval", WPAS_DBUS_NEW_IFACE_INTERFACE, "i",
3170           wpas_dbus_getter_scan_interval,
3171           wpas_dbus_setter_scan_interval,
3172           NULL
3173         },
3174         { "PKCS11EnginePath", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3175           wpas_dbus_getter_pkcs11_engine_path,
3176           NULL,
3177           NULL
3178         },
3179         { "PKCS11ModulePath", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
3180           wpas_dbus_getter_pkcs11_module_path,
3181           NULL,
3182           NULL
3183         },
3184 #ifdef CONFIG_WPS
3185         { "ProcessCredentials", WPAS_DBUS_NEW_IFACE_WPS, "b",
3186           wpas_dbus_getter_process_credentials,
3187           wpas_dbus_setter_process_credentials,
3188           NULL
3189         },
3190         { "ConfigMethods", WPAS_DBUS_NEW_IFACE_WPS, "s",
3191           wpas_dbus_getter_config_methods,
3192           wpas_dbus_setter_config_methods,
3193           NULL
3194         },
3195 #endif /* CONFIG_WPS */
3196 #ifdef CONFIG_P2P
3197         { "P2PDeviceConfig", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "a{sv}",
3198           wpas_dbus_getter_p2p_device_config,
3199           wpas_dbus_setter_p2p_device_config,
3200           NULL
3201         },
3202         { "Peers", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "ao",
3203           wpas_dbus_getter_p2p_peers,
3204           NULL,
3205           NULL
3206         },
3207         { "Role", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "s",
3208           wpas_dbus_getter_p2p_role,
3209           NULL,
3210           NULL
3211         },
3212         { "Group", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "o",
3213           wpas_dbus_getter_p2p_group,
3214           NULL,
3215           NULL
3216         },
3217         { "PeerGO", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "o",
3218           wpas_dbus_getter_p2p_peergo,
3219           NULL,
3220           NULL
3221         },
3222         { "PersistentGroups", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "ao",
3223           wpas_dbus_getter_persistent_groups,
3224           NULL,
3225           NULL
3226         },
3227 #endif /* CONFIG_P2P */
3228         { "DisconnectReason", WPAS_DBUS_NEW_IFACE_INTERFACE, "i",
3229           wpas_dbus_getter_disconnect_reason,
3230           NULL,
3231           NULL
3232         },
3233         { NULL, NULL, NULL, NULL, NULL, NULL }
3234 };
3235
3236 static const struct wpa_dbus_signal_desc wpas_dbus_interface_signals[] = {
3237         { "ScanDone", WPAS_DBUS_NEW_IFACE_INTERFACE,
3238           {
3239                   { "success", "b", ARG_OUT },
3240                   END_ARGS
3241           }
3242         },
3243         { "BSSAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
3244           {
3245                   { "path", "o", ARG_OUT },
3246                   { "properties", "a{sv}", ARG_OUT },
3247                   END_ARGS
3248           }
3249         },
3250         { "BSSRemoved", WPAS_DBUS_NEW_IFACE_INTERFACE,
3251           {
3252                   { "path", "o", ARG_OUT },
3253                   END_ARGS
3254           }
3255         },
3256         { "BlobAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
3257           {
3258                   { "name", "s", ARG_OUT },
3259                   END_ARGS
3260           }
3261         },
3262         { "BlobRemoved", WPAS_DBUS_NEW_IFACE_INTERFACE,
3263           {
3264                   { "name", "s", ARG_OUT },
3265                   END_ARGS
3266           }
3267         },
3268         { "NetworkAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
3269           {
3270                   { "path", "o", ARG_OUT },
3271                   { "properties", "a{sv}", ARG_OUT },
3272                   END_ARGS
3273           }
3274         },
3275         { "NetworkRemoved", WPAS_DBUS_NEW_IFACE_INTERFACE,
3276           {
3277                   { "path", "o", ARG_OUT },
3278                   END_ARGS
3279           }
3280         },
3281         { "NetworkSelected", WPAS_DBUS_NEW_IFACE_INTERFACE,
3282           {
3283                   { "path", "o", ARG_OUT },
3284                   END_ARGS
3285           }
3286         },
3287         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
3288         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_INTERFACE,
3289           {
3290                   { "properties", "a{sv}", ARG_OUT },
3291                   END_ARGS
3292           }
3293         },
3294 #ifdef CONFIG_WPS
3295         { "Event", WPAS_DBUS_NEW_IFACE_WPS,
3296           {
3297                   { "name", "s", ARG_OUT },
3298                   { "args", "a{sv}", ARG_OUT },
3299                   END_ARGS
3300           }
3301         },
3302         { "Credentials", WPAS_DBUS_NEW_IFACE_WPS,
3303           {
3304                   { "credentials", "a{sv}", ARG_OUT },
3305                   END_ARGS
3306           }
3307         },
3308         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
3309         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_WPS,
3310           {
3311                   { "properties", "a{sv}", ARG_OUT },
3312                   END_ARGS
3313           }
3314         },
3315 #endif /* CONFIG_WPS */
3316 #ifdef CONFIG_P2P
3317         { "DeviceFound", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3318           {
3319                   { "path", "o", ARG_OUT },
3320                   END_ARGS
3321           }
3322         },
3323         { "DeviceLost", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3324           {
3325                   { "path", "o", ARG_OUT },
3326                   END_ARGS
3327           }
3328         },
3329         { "FindStopped", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3330           {
3331                   END_ARGS
3332           }
3333         },
3334         { "ProvisionDiscoveryRequestDisplayPin", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3335           {
3336                   { "peer_object", "o", ARG_OUT },
3337                   { "pin", "s", ARG_OUT },
3338                   END_ARGS
3339           }
3340         },
3341         { "ProvisionDiscoveryResponseDisplayPin", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3342           {
3343                   { "peer_object", "o", ARG_OUT },
3344                   { "pin", "s", ARG_OUT },
3345                   END_ARGS
3346           }
3347         },
3348         { "ProvisionDiscoveryRequestEnterPin", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3349           {
3350                   { "peer_object", "o", ARG_OUT },
3351                   END_ARGS
3352           }
3353         },
3354         { "ProvisionDiscoveryResponseEnterPin", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3355           {
3356                   { "peer_object", "o", ARG_OUT },
3357                   END_ARGS
3358           }
3359         },
3360         { "ProvisionDiscoveryPBCRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3361           {
3362                   { "peer_object", "o", ARG_OUT },
3363                   END_ARGS
3364           }
3365         },
3366         { "ProvisionDiscoveryPBCResponse", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3367           {
3368                   { "peer_object", "o", ARG_OUT },
3369                   END_ARGS
3370           }
3371         },
3372         { "ProvisionDiscoveryFailure", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3373           {
3374                   { "peer_object", "o", ARG_OUT },
3375                   { "status", "i", ARG_OUT },
3376                   END_ARGS
3377           }
3378         },
3379         { "GroupStarted", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3380           {
3381                   { "properties", "a{sv}", ARG_OUT },
3382                   END_ARGS
3383           }
3384         },
3385         { "GroupFormationFailure", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3386           {
3387                   { "reason", "s", ARG_OUT },
3388                   END_ARGS
3389           }
3390         },
3391         { "GONegotiationSuccess", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3392           {
3393                   { "properties", "a{sv}", ARG_OUT },
3394                   END_ARGS
3395           }
3396         },
3397         { "GONegotiationFailure", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3398           {
3399                   { "properties", "a{sv}", ARG_OUT },
3400                   END_ARGS
3401           }
3402         },
3403         { "GONegotiationRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3404           {
3405                   { "path", "o", ARG_OUT },
3406                   { "dev_passwd_id", "q", ARG_OUT },
3407                   { "device_go_intent", "y", ARG_OUT },
3408                   END_ARGS
3409           }
3410         },
3411         { "InvitationResult", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3412           {
3413                   { "invite_result", "a{sv}", ARG_OUT },
3414                   END_ARGS
3415           }
3416         },
3417         { "GroupFinished", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3418           {
3419                   { "properties", "a{sv}", ARG_OUT },
3420                   END_ARGS
3421           }
3422         },
3423         { "ServiceDiscoveryRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3424           {
3425                   { "sd_request", "a{sv}", ARG_OUT },
3426                   END_ARGS
3427           }
3428         },
3429         { "ServiceDiscoveryResponse", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3430           {
3431                   { "sd_response", "a{sv}", ARG_OUT },
3432                   END_ARGS
3433           }
3434         },
3435         { "PersistentGroupAdded", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3436           {
3437                   { "path", "o", ARG_OUT },
3438                   { "properties", "a{sv}", ARG_OUT },
3439                   END_ARGS
3440           }
3441         },
3442         { "PersistentGroupRemoved", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3443           {
3444                   { "path", "o", ARG_OUT },
3445                   END_ARGS
3446           }
3447         },
3448         { "WpsFailed", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3449           {
3450                   { "name", "s", ARG_OUT },
3451                   { "args", "a{sv}", ARG_OUT },
3452                   END_ARGS
3453           }
3454         },
3455         { "InvitationReceived", WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3456           {
3457                   { "properties", "a{sv}", ARG_OUT },
3458                   END_ARGS
3459           }
3460         },
3461 #endif /* CONFIG_P2P */
3462 #ifdef CONFIG_AP
3463         { "ProbeRequest", WPAS_DBUS_NEW_IFACE_INTERFACE,
3464           {
3465                   { "args", "a{sv}", ARG_OUT },
3466                   END_ARGS
3467           }
3468         },
3469 #endif /* CONFIG_AP */
3470         { "Certification", WPAS_DBUS_NEW_IFACE_INTERFACE,
3471           {
3472                   { "certification", "a{sv}", ARG_OUT },
3473                   END_ARGS
3474           }
3475         },
3476         { "EAP", WPAS_DBUS_NEW_IFACE_INTERFACE,
3477           {
3478                   { "status", "s", ARG_OUT },
3479                   { "parameter", "s", ARG_OUT },
3480                   END_ARGS
3481           }
3482         },
3483         { "StaAuthorized", WPAS_DBUS_NEW_IFACE_INTERFACE,
3484           {
3485                   { "name", "s", ARG_OUT },
3486                   END_ARGS
3487           }
3488         },
3489         { "StaDeauthorized", WPAS_DBUS_NEW_IFACE_INTERFACE,
3490           {
3491                   { "name", "s", ARG_OUT },
3492                   END_ARGS
3493           }
3494         },
3495         { "NetworkRequest", WPAS_DBUS_NEW_IFACE_INTERFACE,
3496           {
3497                   { "path", "o", ARG_OUT },
3498                   { "field", "s", ARG_OUT },
3499                   { "text", "s", ARG_OUT },
3500                   END_ARGS
3501           }
3502         },
3503         { NULL, NULL, { END_ARGS } }
3504 };
3505
3506
3507 static int wpa_dbus_ctrl_iface_props_init(struct wpas_dbus_priv *priv)
3508 {
3509         size_t all_size;
3510         unsigned int i, j, count, num_const, num_globals;
3511         const char *global_name;
3512         static const char * const ignored_globals[] = {
3513                 "bss_expiration_age", "bss_expiration_scan_count",
3514                 "ap_scan", "country", "fast_reauth",
3515                 "pkcs11_engine_path", "pkcs11_module_path"
3516         };
3517
3518         /* wpas_dbus_interface_properties terminates with a NULL element */
3519         num_const = ARRAY_SIZE(wpas_dbus_interface_properties) - 1;
3520
3521         num_globals = wpa_config_get_num_global_field_names();
3522         priv->globals_start = num_const;
3523
3524         /* allocate enough for all properties + terminating NULL element */
3525         all_size = (num_globals + num_const + 1) *
3526                 sizeof(wpas_dbus_interface_properties[0]);
3527         priv->all_interface_properties = os_zalloc(all_size);
3528         if (!priv->all_interface_properties) {
3529                 wpa_printf(MSG_ERROR,
3530                            "dbus: Not enough memory for interface properties");
3531                 return -1;
3532         }
3533
3534         /* Copy constant interface properties to the start of the array */
3535         os_memcpy(priv->all_interface_properties,
3536                   wpas_dbus_interface_properties,
3537                   sizeof(wpas_dbus_interface_properties));
3538
3539         /* Dynamically construct interface global properties */
3540         for (i = 0, count = num_const; i < num_globals; i++) {
3541                 struct wpa_dbus_property_desc *desc;
3542                 int no_var = 0;
3543
3544                 /* ignore globals that are actually just methods */
3545                 global_name = wpa_config_get_global_field_name(i, &no_var);
3546                 if (no_var)
3547                         continue;
3548                 /* Ignore fields already explicitly exposed */
3549                 for (j = 0; j < ARRAY_SIZE(ignored_globals); j++) {
3550                         if (os_strcmp(global_name, ignored_globals[j]) == 0)
3551                                 break;
3552                 }
3553                 if (j < ARRAY_SIZE(ignored_globals))
3554                         continue;
3555
3556                 desc = &priv->all_interface_properties[count++];
3557                 desc->dbus_property = uscore_to_dbus(global_name);
3558                 if (!desc->dbus_property) {
3559                         wpa_printf(MSG_ERROR,
3560                                    "dbus: Not enough memory for D-Bus property name");
3561                         goto error;
3562                 }
3563                 desc->dbus_interface = WPAS_DBUS_NEW_IFACE_INTERFACE;
3564                 desc->type = "s";
3565                 desc->getter = wpas_dbus_getter_iface_global;
3566                 desc->setter = wpas_dbus_setter_iface_global;
3567                 desc->data = global_name;
3568         }
3569
3570         return 0;
3571
3572 error:
3573         wpa_dbus_ctrl_iface_props_deinit(priv);
3574         return -1;
3575 }
3576
3577
3578 /**
3579  * wpas_dbus_register_interface - Register an interface with D-Bus
3580  * @wpa_s: wpa_supplicant interface structure
3581  * Returns: 0 on success, -1 on failure
3582  */
3583 int wpas_dbus_register_interface(struct wpa_supplicant *wpa_s)
3584 {
3585         struct wpa_dbus_object_desc *obj_desc = NULL;
3586         struct wpas_dbus_priv *ctrl_iface = wpa_s->global->dbus;
3587         int next;
3588
3589         /* Do nothing if the control interface is not turned on */
3590         if (ctrl_iface == NULL)
3591                 return 0;
3592
3593         /* Create and set the interface's object path */
3594         wpa_s->dbus_new_path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
3595         if (wpa_s->dbus_new_path == NULL)
3596                 return -1;
3597         next = ctrl_iface->next_objid++;
3598         os_snprintf(wpa_s->dbus_new_path, WPAS_DBUS_OBJECT_PATH_MAX,
3599                     WPAS_DBUS_NEW_PATH_INTERFACES "/%u",
3600                     next);
3601
3602         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
3603         if (!obj_desc) {
3604                 wpa_printf(MSG_ERROR,
3605                            "Not enough memory to create object description");
3606                 goto err;
3607         }
3608
3609         wpas_dbus_register(obj_desc, wpa_s, NULL, wpas_dbus_interface_methods,
3610                            ctrl_iface->all_interface_properties,
3611                            wpas_dbus_interface_signals);
3612
3613         wpa_printf(MSG_DEBUG, "dbus: Register interface object '%s'",
3614                    wpa_s->dbus_new_path);
3615         if (wpa_dbus_register_object_per_iface(ctrl_iface,
3616                                                wpa_s->dbus_new_path,
3617                                                wpa_s->ifname, obj_desc))
3618                 goto err;
3619
3620         wpas_dbus_signal_interface_added(wpa_s);
3621
3622         return 0;
3623
3624 err:
3625         os_free(wpa_s->dbus_new_path);
3626         wpa_s->dbus_new_path = NULL;
3627         free_dbus_object_desc(obj_desc);
3628         return -1;
3629 }
3630
3631
3632 /**
3633  * wpas_dbus_unregister_interface - Unregister the interface from D-Bus
3634  * @wpa_s: wpa_supplicant interface structure
3635  * Returns: 0 on success, -1 on failure
3636  */
3637 int wpas_dbus_unregister_interface(struct wpa_supplicant *wpa_s)
3638 {
3639         struct wpas_dbus_priv *ctrl_iface;
3640
3641         /* Do nothing if the control interface is not turned on */
3642         if (wpa_s == NULL || wpa_s->global == NULL)
3643                 return 0;
3644         ctrl_iface = wpa_s->global->dbus;
3645         if (ctrl_iface == NULL || wpa_s->dbus_new_path == NULL)
3646                 return 0;
3647
3648         wpa_printf(MSG_DEBUG, "dbus: Unregister interface object '%s'",
3649                    wpa_s->dbus_new_path);
3650
3651 #ifdef CONFIG_AP
3652         if (wpa_s->preq_notify_peer) {
3653                 wpas_dbus_unsubscribe_noc(ctrl_iface);
3654                 os_free(wpa_s->preq_notify_peer);
3655                 wpa_s->preq_notify_peer = NULL;
3656         }
3657 #endif /* CONFIG_AP */
3658
3659         if (wpa_dbus_unregister_object_per_iface(ctrl_iface,
3660                                                  wpa_s->dbus_new_path))
3661                 return -1;
3662
3663         wpas_dbus_signal_interface_removed(wpa_s);
3664
3665         os_free(wpa_s->dbus_new_path);
3666         wpa_s->dbus_new_path = NULL;
3667
3668         return 0;
3669 }
3670
3671 #ifdef CONFIG_P2P
3672
3673 static const struct wpa_dbus_property_desc wpas_dbus_p2p_peer_properties[] = {
3674         { "DeviceName", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
3675           wpas_dbus_getter_p2p_peer_device_name,
3676           NULL,
3677           NULL
3678         },
3679         { "Manufacturer", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
3680           wpas_dbus_getter_p2p_peer_manufacturer,
3681           NULL,
3682           NULL
3683         },
3684         { "ModelName", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
3685           wpas_dbus_getter_p2p_peer_modelname,
3686           NULL,
3687           NULL
3688         },
3689         { "ModelNumber", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
3690           wpas_dbus_getter_p2p_peer_modelnumber,
3691           NULL,
3692           NULL
3693         },
3694         { "SerialNumber", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
3695           wpas_dbus_getter_p2p_peer_serialnumber,
3696           NULL,
3697           NULL
3698         },
3699         { "PrimaryDeviceType", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ay",
3700           wpas_dbus_getter_p2p_peer_primary_device_type,
3701           NULL,
3702           NULL
3703         },
3704         { "config_method", WPAS_DBUS_NEW_IFACE_P2P_PEER, "q",
3705           wpas_dbus_getter_p2p_peer_config_method,
3706           NULL,
3707           NULL
3708         },
3709         { "level", WPAS_DBUS_NEW_IFACE_P2P_PEER, "i",
3710           wpas_dbus_getter_p2p_peer_level,
3711           NULL,
3712           NULL
3713         },
3714         { "devicecapability", WPAS_DBUS_NEW_IFACE_P2P_PEER, "y",
3715           wpas_dbus_getter_p2p_peer_device_capability,
3716           NULL,
3717           NULL
3718         },
3719         { "groupcapability", WPAS_DBUS_NEW_IFACE_P2P_PEER, "y",
3720           wpas_dbus_getter_p2p_peer_group_capability,
3721           NULL,
3722           NULL
3723         },
3724         { "SecondaryDeviceTypes", WPAS_DBUS_NEW_IFACE_P2P_PEER, "aay",
3725           wpas_dbus_getter_p2p_peer_secondary_device_types,
3726           NULL,
3727           NULL
3728         },
3729         { "VendorExtension", WPAS_DBUS_NEW_IFACE_P2P_PEER, "aay",
3730           wpas_dbus_getter_p2p_peer_vendor_extension,
3731           NULL,
3732           NULL
3733         },
3734         { "IEs", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ay",
3735           wpas_dbus_getter_p2p_peer_ies,
3736           NULL,
3737           NULL
3738         },
3739         { "DeviceAddress", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ay",
3740           wpas_dbus_getter_p2p_peer_device_address,
3741           NULL,
3742           NULL
3743         },
3744         { "Groups", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ao",
3745           wpas_dbus_getter_p2p_peer_groups,
3746           NULL,
3747           NULL
3748         },
3749         { NULL, NULL, NULL, NULL, NULL, NULL }
3750 };
3751
3752 static const struct wpa_dbus_signal_desc wpas_dbus_p2p_peer_signals[] = {
3753         /* Deprecated: use org.freedesktop.DBus.Properties.PropertiesChanged */
3754         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_P2P_PEER,
3755           {
3756                   { "properties", "a{sv}", ARG_OUT },
3757                   END_ARGS
3758           }
3759         },
3760         { NULL, NULL, { END_ARGS } }
3761 };
3762
3763 /**
3764  * wpas_dbus_signal_peer - Send a peer related event signal
3765  * @wpa_s: %wpa_supplicant network interface data
3766  * @dev: peer device object
3767  * @interface: name of the interface emitting this signal.
3768  *      In case of peer objects, it would be emitted by either
3769  *      the "interface object" or by "peer objects"
3770  * @sig_name: signal name - DeviceFound
3771  *
3772  * Notify listeners about event related with newly found p2p peer device
3773  */
3774 static void wpas_dbus_signal_peer(struct wpa_supplicant *wpa_s,
3775                                   const u8 *dev_addr, const char *interface,
3776                                   const char *sig_name)
3777 {
3778         struct wpas_dbus_priv *iface;
3779         DBusMessage *msg;
3780         DBusMessageIter iter;
3781         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
3782
3783         if (wpa_s->p2p_mgmt)
3784                 wpa_s = wpa_s->parent;
3785
3786         iface = wpa_s->global->dbus;
3787
3788         /* Do nothing if the control interface is not turned on */
3789         if (iface == NULL || !wpa_s->dbus_new_path)
3790                 return;
3791
3792         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
3793                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/" COMPACT_MACSTR,
3794                     wpa_s->dbus_new_path, MAC2STR(dev_addr));
3795
3796         msg = dbus_message_new_signal(wpa_s->dbus_new_path, interface,
3797                                       sig_name);
3798         if (msg == NULL)
3799                 return;
3800
3801         dbus_message_iter_init_append(msg, &iter);
3802         path = peer_obj_path;
3803         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
3804                                             &path))
3805                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
3806         else
3807                 dbus_connection_send(iface->con, msg, NULL);
3808
3809         dbus_message_unref(msg);
3810 }
3811
3812
3813 /**
3814  * wpas_dbus_signal_peer_found - Send a peer found signal
3815  * @wpa_s: %wpa_supplicant network interface data
3816  * @dev_addr: Peer P2P Device Address
3817  *
3818  * Notify listeners about find a p2p peer device found
3819  */
3820 void wpas_dbus_signal_peer_device_found(struct wpa_supplicant *wpa_s,
3821                                         const u8 *dev_addr)
3822 {
3823         wpas_dbus_signal_peer(wpa_s, dev_addr,
3824                               WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3825                               "DeviceFound");
3826 }
3827
3828 /**
3829  * wpas_dbus_signal_peer_lost - Send a peer lost signal
3830  * @wpa_s: %wpa_supplicant network interface data
3831  * @dev_addr: Peer P2P Device Address
3832  *
3833  * Notify listeners about lost a p2p peer device
3834  */
3835 void wpas_dbus_signal_peer_device_lost(struct wpa_supplicant *wpa_s,
3836                                        const u8 *dev_addr)
3837 {
3838         wpas_dbus_signal_peer(wpa_s, dev_addr,
3839                               WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3840                               "DeviceLost");
3841 }
3842
3843 /**
3844  * wpas_dbus_register_peer - Register a discovered peer object with dbus
3845  * @wpa_s: wpa_supplicant interface structure
3846  * @dev_addr: P2P Device Address of the peer
3847  * Returns: 0 on success, -1 on failure
3848  *
3849  * Registers network representing object with dbus
3850  */
3851 int wpas_dbus_register_peer(struct wpa_supplicant *wpa_s, const u8 *dev_addr)
3852 {
3853         struct wpas_dbus_priv *ctrl_iface;
3854         struct wpa_dbus_object_desc *obj_desc;
3855         struct peer_handler_args *arg;
3856         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
3857
3858         /* Do nothing if the control interface is not turned on */
3859         if (wpa_s == NULL || wpa_s->global == NULL)
3860                 return 0;
3861
3862         ctrl_iface = wpa_s->global->dbus;
3863         if (ctrl_iface == NULL)
3864                 return 0;
3865
3866         wpa_s = wpa_s->parent->parent;
3867         if (!wpa_s->dbus_new_path)
3868                 return 0;
3869
3870         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
3871                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/" COMPACT_MACSTR,
3872                     wpa_s->dbus_new_path, MAC2STR(dev_addr));
3873
3874         wpa_printf(MSG_INFO, "dbus: Register peer object '%s'",
3875                    peer_obj_path);
3876         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
3877         if (!obj_desc) {
3878                 wpa_printf(MSG_ERROR,
3879                            "Not enough memory to create object description");
3880                 goto err;
3881         }
3882
3883         /* allocate memory for handlers arguments */
3884         arg = os_zalloc(sizeof(struct peer_handler_args));
3885         if (!arg) {
3886                 wpa_printf(MSG_ERROR,
3887                            "Not enough memory to create arguments for method");
3888                 goto err;
3889         }
3890
3891         arg->wpa_s = wpa_s;
3892         os_memcpy(arg->p2p_device_addr, dev_addr, ETH_ALEN);
3893
3894         wpas_dbus_register(obj_desc, arg, wpa_dbus_free,
3895                            NULL,
3896                            wpas_dbus_p2p_peer_properties,
3897                            wpas_dbus_p2p_peer_signals);
3898
3899         if (wpa_dbus_register_object_per_iface(ctrl_iface, peer_obj_path,
3900                                                wpa_s->ifname, obj_desc))
3901                 goto err;
3902
3903         return 0;
3904
3905 err:
3906         free_dbus_object_desc(obj_desc);
3907         return -1;
3908 }
3909
3910 /**
3911  * wpas_dbus_unregister_peer - Unregister a peer object with dbus
3912  * @wpa_s: wpa_supplicant interface structure
3913  * @dev_addr: p2p device addr
3914  * Returns: 0 on success, -1 on failure
3915  *
3916  * Registers network representing object with dbus
3917  */
3918 int wpas_dbus_unregister_peer(struct wpa_supplicant *wpa_s,
3919                                   const u8 *dev_addr)
3920 {
3921         struct wpas_dbus_priv *ctrl_iface;
3922         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
3923         int ret;
3924
3925         /* Do nothing if the control interface is not turned on */
3926         if (wpa_s == NULL || wpa_s->global == NULL)
3927                 return 0;
3928
3929         wpa_s = wpa_s->parent->parent;
3930         if (!wpa_s->dbus_new_path)
3931                 return 0;
3932
3933         ctrl_iface = wpa_s->global->dbus;
3934         if (ctrl_iface == NULL)
3935                 return 0;
3936
3937         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
3938                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/" COMPACT_MACSTR,
3939                     wpa_s->dbus_new_path, MAC2STR(dev_addr));
3940
3941         wpa_printf(MSG_INFO, "dbus: Unregister peer object '%s'",
3942                    peer_obj_path);
3943         ret = wpa_dbus_unregister_object_per_iface(ctrl_iface, peer_obj_path);
3944
3945         return ret;
3946 }
3947
3948
3949 /**
3950  * wpas_dbus_signal_p2p_find_stopped - Send P2P Find stopped signal
3951  * @wpa_s: %wpa_supplicant network interface data
3952  *
3953  * Notify listeners about P2P Find stopped
3954  */
3955 void wpas_dbus_signal_p2p_find_stopped(struct wpa_supplicant *wpa_s)
3956 {
3957         struct wpas_dbus_priv *iface;
3958         DBusMessage *msg;
3959
3960         iface = wpa_s->global->dbus;
3961
3962         /* Do nothing if the control interface is not turned on */
3963         if (iface == NULL || !wpa_s->dbus_new_path)
3964                 return;
3965
3966         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
3967                                       WPAS_DBUS_NEW_IFACE_P2PDEVICE,
3968                                       "FindStopped");
3969         if (msg == NULL)
3970                 return;
3971
3972         dbus_connection_send(iface->con, msg, NULL);
3973
3974         dbus_message_unref(msg);
3975 }
3976
3977
3978 /**
3979  * wpas_dbus_signal_peer_groups_changed - Send peer group change property signal
3980  * @wpa_s: %wpa_supplicant network interface data
3981  * @dev_addr: P2P Device Address
3982  *
3983  * Notify listeners about peer Groups property changes.
3984  */
3985 void wpas_dbus_signal_peer_groups_changed(struct wpa_supplicant *wpa_s,
3986                                           const u8 *dev_addr)
3987 {
3988         char peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
3989
3990         if (wpa_s->p2p_mgmt)
3991                 wpa_s = wpa_s->parent;
3992
3993         if (!wpa_s->dbus_new_path)
3994                 return;
3995         os_snprintf(peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
3996                     "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/" COMPACT_MACSTR,
3997                     wpa_s->dbus_new_path, MAC2STR(dev_addr));
3998
3999         wpa_dbus_mark_property_changed(wpa_s->global->dbus, peer_obj_path,
4000                                        WPAS_DBUS_NEW_IFACE_P2P_PEER, "Groups");
4001 }
4002
4003
4004 static const struct wpa_dbus_property_desc wpas_dbus_p2p_group_properties[] = {
4005         { "Members", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "ao",
4006           wpas_dbus_getter_p2p_group_members,
4007           NULL,
4008           NULL
4009         },
4010         { "Group", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "o",
4011           wpas_dbus_getter_p2p_group,
4012           NULL,
4013           NULL
4014         },
4015         { "Role", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "s",
4016           wpas_dbus_getter_p2p_role,
4017           NULL,
4018           NULL
4019         },
4020         { "SSID", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "ay",
4021           wpas_dbus_getter_p2p_group_ssid,
4022           NULL,
4023           NULL
4024         },
4025         { "BSSID", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "ay",
4026           wpas_dbus_getter_p2p_group_bssid,
4027           NULL,
4028           NULL
4029         },
4030         { "Frequency", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "q",
4031           wpas_dbus_getter_p2p_group_frequency,
4032           NULL,
4033           NULL
4034         },
4035         { "Passphrase", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "s",
4036           wpas_dbus_getter_p2p_group_passphrase,
4037           NULL,
4038           NULL
4039         },
4040         { "PSK", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "ay",
4041           wpas_dbus_getter_p2p_group_psk,
4042           NULL,
4043           NULL
4044         },
4045         { "WPSVendorExtensions", WPAS_DBUS_NEW_IFACE_P2P_GROUP, "aay",
4046           wpas_dbus_getter_p2p_group_vendor_ext,
4047           wpas_dbus_setter_p2p_group_vendor_ext,
4048           NULL
4049         },
4050         { NULL, NULL, NULL, NULL, NULL, NULL }
4051 };
4052
4053 static const struct wpa_dbus_signal_desc wpas_dbus_p2p_group_signals[] = {
4054         { "PeerJoined", WPAS_DBUS_NEW_IFACE_P2P_GROUP,
4055           {
4056                   { "peer", "o", ARG_OUT },
4057                   END_ARGS
4058           }
4059         },
4060         { "PeerDisconnected", WPAS_DBUS_NEW_IFACE_P2P_GROUP,
4061           {
4062                   { "peer", "o", ARG_OUT },
4063                   END_ARGS
4064           }
4065         },
4066         { NULL, NULL, { END_ARGS } }
4067 };
4068
4069 /**
4070  * wpas_dbus_register_p2p_group - Register a p2p group object with dbus
4071  * @wpa_s: wpa_supplicant interface structure
4072  * @ssid: SSID struct
4073  * Returns: 0 on success, -1 on failure
4074  *
4075  * Registers p2p group representing object with dbus
4076  */
4077 void wpas_dbus_register_p2p_group(struct wpa_supplicant *wpa_s,
4078                                   struct wpa_ssid *ssid)
4079 {
4080         struct wpas_dbus_priv *ctrl_iface;
4081         struct wpa_dbus_object_desc *obj_desc;
4082         char group_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
4083
4084         /* Do nothing if the control interface is not turned on */
4085         if (wpa_s == NULL || wpa_s->global == NULL)
4086                 return;
4087
4088         ctrl_iface = wpa_s->global->dbus;
4089         if (ctrl_iface == NULL)
4090                 return;
4091
4092         if (wpa_s->dbus_groupobj_path) {
4093                 wpa_printf(MSG_INFO, "%s: Group object '%s' already exists",
4094                            __func__, wpa_s->dbus_groupobj_path);
4095                 return;
4096         }
4097
4098         if (wpas_dbus_get_group_obj_path(wpa_s, ssid, group_obj_path) < 0)
4099                 return;
4100
4101         wpa_s->dbus_groupobj_path = os_strdup(group_obj_path);
4102         if (wpa_s->dbus_groupobj_path == NULL)
4103                 return;
4104
4105         wpa_printf(MSG_INFO, "dbus: Register group object '%s'",
4106                    group_obj_path);
4107         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
4108         if (!obj_desc) {
4109                 wpa_printf(MSG_ERROR,
4110                            "Not enough memory to create object description");
4111                 goto err;
4112         }
4113
4114         wpas_dbus_register(obj_desc, wpa_s, NULL, NULL,
4115                            wpas_dbus_p2p_group_properties,
4116                            wpas_dbus_p2p_group_signals);
4117
4118         if (wpa_dbus_register_object_per_iface(ctrl_iface, group_obj_path,
4119                                                wpa_s->ifname, obj_desc))
4120                 goto err;
4121
4122         return;
4123
4124 err:
4125         if (wpa_s->dbus_groupobj_path) {
4126                 os_free(wpa_s->dbus_groupobj_path);
4127                 wpa_s->dbus_groupobj_path = NULL;
4128         }
4129
4130         free_dbus_object_desc(obj_desc);
4131 }
4132
4133 /**
4134  * wpas_dbus_unregister_p2p_group - Unregister a p2p group object from dbus
4135  * @wpa_s: wpa_supplicant interface structure
4136  * @ssid: network name of the p2p group started
4137  */
4138 void wpas_dbus_unregister_p2p_group(struct wpa_supplicant *wpa_s,
4139                                     const struct wpa_ssid *ssid)
4140 {
4141         struct wpas_dbus_priv *ctrl_iface;
4142
4143         /* Do nothing if the control interface is not turned on */
4144         if (wpa_s == NULL || wpa_s->global == NULL)
4145                 return;
4146
4147         if (wpa_s->p2p_mgmt)
4148                 wpa_s = wpa_s->parent;
4149
4150         ctrl_iface = wpa_s->global->dbus;
4151         if (ctrl_iface == NULL)
4152                 return;
4153
4154         if (!wpa_s->dbus_groupobj_path) {
4155                 wpa_printf(MSG_DEBUG,
4156                            "%s: Group object '%s' already unregistered",
4157                            __func__, wpa_s->dbus_groupobj_path);
4158                 return;
4159         }
4160
4161         peer_groups_changed(wpa_s);
4162
4163         wpa_printf(MSG_DEBUG, "dbus: Unregister group object '%s'",
4164                    wpa_s->dbus_groupobj_path);
4165
4166         wpa_dbus_unregister_object_per_iface(ctrl_iface,
4167                                              wpa_s->dbus_groupobj_path);
4168
4169         os_free(wpa_s->dbus_groupobj_path);
4170         wpa_s->dbus_groupobj_path = NULL;
4171 }
4172
4173 static const struct wpa_dbus_property_desc
4174         wpas_dbus_persistent_group_properties[] = {
4175         { "Properties", WPAS_DBUS_NEW_IFACE_PERSISTENT_GROUP, "a{sv}",
4176           wpas_dbus_getter_persistent_group_properties,
4177           wpas_dbus_setter_persistent_group_properties,
4178           NULL
4179         },
4180         { NULL, NULL, NULL, NULL, NULL, NULL }
4181 };
4182
4183 /* No signals intended for persistent group objects */
4184
4185 /**
4186  * wpas_dbus_register_persistent_group - Register a configured(saved)
4187  *      persistent group with dbus
4188  * @wpa_s: wpa_supplicant interface structure
4189  * @ssid: persistent group (still represented as a network within wpa)
4190  *        configuration data
4191  * Returns: 0 on success, -1 on failure
4192  *
4193  * Registers a persistent group representing object with dbus.
4194  */
4195 int wpas_dbus_register_persistent_group(struct wpa_supplicant *wpa_s,
4196                                         struct wpa_ssid *ssid)
4197 {
4198         struct wpas_dbus_priv *ctrl_iface;
4199         struct wpa_dbus_object_desc *obj_desc;
4200         struct network_handler_args *arg;
4201         char pgrp_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
4202
4203         /* Do nothing if the control interface is not turned on */
4204         if (wpa_s == NULL || wpa_s->global == NULL)
4205                 return 0;
4206         wpa_s = wpa_s->parent->parent;
4207         if (!wpa_s->dbus_new_path)
4208                 return 0;
4209
4210         /* Make sure ssid is a persistent group */
4211         if (ssid->disabled != 2 && !ssid->p2p_persistent_group)
4212                 return -1; /* should we return w/o complaining? */
4213
4214         if (wpa_s->p2p_mgmt)
4215                 wpa_s = wpa_s->parent;
4216
4217         ctrl_iface = wpa_s->global->dbus;
4218         if (ctrl_iface == NULL)
4219                 return 0;
4220
4221         /*
4222          * Intentionally not coming up with different numbering scheme
4223          * for persistent groups.
4224          */
4225         os_snprintf(pgrp_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
4226                     "%s/" WPAS_DBUS_NEW_PERSISTENT_GROUPS_PART "/%u",
4227                     wpa_s->dbus_new_path, ssid->id);
4228
4229         wpa_printf(MSG_DEBUG, "dbus: Register persistent group object '%s'",
4230                    pgrp_obj_path);
4231         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
4232         if (!obj_desc) {
4233                 wpa_printf(MSG_ERROR,
4234                            "dbus: Not enough memory to create object description");
4235                 goto err;
4236         }
4237
4238         /*
4239          * Reusing the same context structure as that for networks
4240          * since these are represented using same data structure.
4241          */
4242         /* allocate memory for handlers arguments */
4243         arg = os_zalloc(sizeof(struct network_handler_args));
4244         if (!arg) {
4245                 wpa_printf(MSG_ERROR,
4246                            "dbus: Not enough memory to create arguments for method");
4247                 goto err;
4248         }
4249
4250         arg->wpa_s = wpa_s;
4251         arg->ssid = ssid;
4252
4253         wpas_dbus_register(obj_desc, arg, wpa_dbus_free, NULL,
4254                            wpas_dbus_persistent_group_properties,
4255                            NULL);
4256
4257         if (wpa_dbus_register_object_per_iface(ctrl_iface, pgrp_obj_path,
4258                                                wpa_s->ifname, obj_desc))
4259                 goto err;
4260
4261         wpas_dbus_signal_persistent_group_added(wpa_s, ssid->id);
4262
4263         return 0;
4264
4265 err:
4266         free_dbus_object_desc(obj_desc);
4267         return -1;
4268 }
4269
4270
4271 /**
4272  * wpas_dbus_unregister_persistent_group - Unregister a persistent_group
4273  *      from dbus
4274  * @wpa_s: wpa_supplicant interface structure
4275  * @nid: network id
4276  * Returns: 0 on success, -1 on failure
4277  *
4278  * Unregisters persistent group representing object from dbus
4279  *
4280  * NOTE: There is a slight issue with the semantics here. While the
4281  * implementation simply means the persistent group is unloaded from memory,
4282  * it should not get interpreted as the group is actually being erased/removed
4283  * from persistent storage as well.
4284  */
4285 int wpas_dbus_unregister_persistent_group(struct wpa_supplicant *wpa_s,
4286                                           int nid)
4287 {
4288         struct wpas_dbus_priv *ctrl_iface;
4289         char pgrp_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
4290         int ret;
4291
4292         /* Do nothing if the control interface is not turned on */
4293         if (wpa_s == NULL || wpa_s->global == NULL)
4294                 return 0;
4295
4296         wpa_s = wpa_s->parent->parent;
4297
4298         ctrl_iface = wpa_s->global->dbus;
4299         if (ctrl_iface == NULL || !wpa_s->dbus_new_path)
4300                 return 0;
4301
4302         os_snprintf(pgrp_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
4303                     "%s/" WPAS_DBUS_NEW_PERSISTENT_GROUPS_PART "/%u",
4304                     wpa_s->dbus_new_path, nid);
4305
4306         wpa_printf(MSG_DEBUG, "dbus: Unregister persistent group object '%s'",
4307                    pgrp_obj_path);
4308         ret = wpa_dbus_unregister_object_per_iface(ctrl_iface, pgrp_obj_path);
4309
4310         if (!ret)
4311                 wpas_dbus_signal_persistent_group_removed(wpa_s, nid);
4312
4313         return ret;
4314 }
4315
4316 #endif /* CONFIG_P2P */