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