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 program is free software; you can redistribute it and/or modify
   8  * it under the terms of the GNU General Public License version 2 as
   9  * published by the Free Software Foundation.
  10  *
  11  * Alternatively, this software may be distributed under the terms of BSD
  12  * license.
  13  *
  14  * See README and COPYING for more details.
  15  */
  16
  17 #include "includes.h"
  18
  19 #include "common.h"
  20 #include "wps/wps.h"
  21 #include "../config.h"
  22 #include "../wpa_supplicant_i.h"
  23 #include "../bss.h"
  24 #include "dbus_new_helpers.h"
  25 #include "dbus_dict_helpers.h"
  26 #include "dbus_new.h"
  27 #include "dbus_new_handlers.h"
  28 #include "dbus_common.h"
  29 #include "dbus_common_i.h"
  30
  31
  32 /**
  33  * wpas_dbus_signal_interface - Send a interface related event signal
  34  * @wpa_s: %wpa_supplicant network interface data
  35  * @sig_name: signal name - InterfaceAdded or InterfaceRemoved
  36  * @properties: Whether to add second argument with object properties
  37  *
  38  * Notify listeners about event related with interface
  39  */
  40 static void wpas_dbus_signal_interface(struct wpa_supplicant *wpa_s,
  41                                        const char *sig_name, int properties)
  42 {
  43         struct wpas_dbus_priv *iface;
  44         DBusMessage *msg;
  45         DBusMessageIter iter, iter_dict;
  46
  47         iface = wpa_s->global->dbus;
  48
  49         /* Do nothing if the control interface is not turned on */
  50         if (iface == NULL)
  51                 return;
  52
  53         msg = dbus_message_new_signal(WPAS_DBUS_NEW_PATH,
  54                                       WPAS_DBUS_NEW_INTERFACE, sig_name);
  55         if (msg == NULL)
  56                 return;
  57
  58         dbus_message_iter_init_append(msg, &iter);
  59         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
  60                                             &wpa_s->dbus_new_path))
  61                 goto err;
  62
  63         if (properties) {
  64                 if (!wpa_dbus_dict_open_write(&iter, &iter_dict))
  65                         goto err;
  66
  67                 wpa_dbus_get_object_properties(iface, wpa_s->dbus_new_path,
  68                                                WPAS_DBUS_NEW_IFACE_INTERFACE,
  69                                                &iter_dict);
  70
  71                 if (!wpa_dbus_dict_close_write(&iter, &iter_dict))
  72                         goto err;
  73         }
  74
  75         dbus_connection_send(iface->con, msg, NULL);
  76         dbus_message_unref(msg);
  77         return;
  78
  79 err:
  80         wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
  81         dbus_message_unref(msg);
  82 }
  83
  84
  85 /**
  86  * wpas_dbus_signal_interface_added - Send a interface created signal
  87  * @wpa_s: %wpa_supplicant network interface data
  88  *
  89  * Notify listeners about creating new interface
  90  */
  91 static void wpas_dbus_signal_interface_added(struct wpa_supplicant *wpa_s)
  92 {
  93         wpas_dbus_signal_interface(wpa_s, "InterfaceAdded", TRUE);
  94 }
  95
  96
  97 /**
  98  * wpas_dbus_signal_interface_removed - Send a interface removed signal
  99  * @wpa_s: %wpa_supplicant network interface data
 100  *
 101  * Notify listeners about removing interface
 102  */
 103 static void wpas_dbus_signal_interface_removed(struct wpa_supplicant *wpa_s)
 104 {
 105         wpas_dbus_signal_interface(wpa_s, "InterfaceRemoved", FALSE);
 106
 107 }
 108
 109
 110 /**
 111  * wpas_dbus_signal_scan_done - send scan done signal
 112  * @wpa_s: %wpa_supplicant network interface data
 113  * @success: indicates if scanning succeed or failed
 114  *
 115  * Notify listeners about finishing a scan
 116  */
 117 void wpas_dbus_signal_scan_done(struct wpa_supplicant *wpa_s, int success)
 118 {
 119         struct wpas_dbus_priv *iface;
 120         DBusMessage *msg;
 121         dbus_bool_t succ;
 122
 123         iface = wpa_s->global->dbus;
 124
 125         /* Do nothing if the control interface is not turned on */
 126         if (iface == NULL)
 127                 return;
 128
 129         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 130                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 131                                       "ScanDone");
 132         if (msg == NULL)
 133                 return;
 134
 135         succ = success ? TRUE : FALSE;
 136         if (dbus_message_append_args(msg, DBUS_TYPE_BOOLEAN, &succ,
 137                                      DBUS_TYPE_INVALID))
 138                 dbus_connection_send(iface->con, msg, NULL);
 139         else
 140                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 141         dbus_message_unref(msg);
 142 }
 143
 144
 145 /**
 146  * wpas_dbus_signal_blob - Send a BSS related event signal
 147  * @wpa_s: %wpa_supplicant network interface data
 148  * @bss_obj_path: BSS object path
 149  * @sig_name: signal name - BSSAdded or BSSRemoved
 150  * @properties: Whether to add second argument with object properties
 151  *
 152  * Notify listeners about event related with BSS
 153  */
 154 static void wpas_dbus_signal_bss(struct wpa_supplicant *wpa_s,
 155                                  const char *bss_obj_path,
 156                                  const char *sig_name, int properties)
 157 {
 158         struct wpas_dbus_priv *iface;
 159         DBusMessage *msg;
 160         DBusMessageIter iter, iter_dict;
 161
 162         iface = wpa_s->global->dbus;
 163
 164         /* Do nothing if the control interface is not turned on */
 165         if (iface == NULL)
 166                 return;
 167
 168         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 169                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 170                                       sig_name);
 171         if (msg == NULL)
 172                 return;
 173
 174         dbus_message_iter_init_append(msg, &iter);
 175         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
 176                                             &bss_obj_path))
 177                 goto err;
 178
 179         if (properties) {
 180                 if (!wpa_dbus_dict_open_write(&iter, &iter_dict))
 181                         goto err;
 182
 183                 wpa_dbus_get_object_properties(iface, bss_obj_path,
 184                                                WPAS_DBUS_NEW_IFACE_BSS,
 185                                                &iter_dict);
 186
 187                 if (!wpa_dbus_dict_close_write(&iter, &iter_dict))
 188                         goto err;
 189         }
 190
 191         dbus_connection_send(iface->con, msg, NULL);
 192         dbus_message_unref(msg);
 193         return;
 194
 195 err:
 196         wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 197         dbus_message_unref(msg);
 198 }
 199
 200
 201 /**
 202  * wpas_dbus_signal_bss_added - Send a BSS added signal
 203  * @wpa_s: %wpa_supplicant network interface data
 204  * @bss_obj_path: new BSS object path
 205  *
 206  * Notify listeners about adding new BSS
 207  */
 208 static void wpas_dbus_signal_bss_added(struct wpa_supplicant *wpa_s,
 209                                        const char *bss_obj_path)
 210 {
 211         wpas_dbus_signal_bss(wpa_s, bss_obj_path, "BSSAdded", TRUE);
 212 }
 213
 214
 215 /**
 216  * wpas_dbus_signal_bss_removed - Send a BSS removed signal
 217  * @wpa_s: %wpa_supplicant network interface data
 218  * @bss_obj_path: BSS object path
 219  *
 220  * Notify listeners about removing BSS
 221  */
 222 static void wpas_dbus_signal_bss_removed(struct wpa_supplicant *wpa_s,
 223                                          const char *bss_obj_path)
 224 {
 225         wpas_dbus_signal_bss(wpa_s, bss_obj_path, "BSSRemoved", FALSE);
 226 }
 227
 228
 229 /**
 230  * wpas_dbus_signal_blob - Send a blob related event signal
 231  * @wpa_s: %wpa_supplicant network interface data
 232  * @name: blob name
 233  * @sig_name: signal name - BlobAdded or BlobRemoved
 234  *
 235  * Notify listeners about event related with blob
 236  */
 237 static void wpas_dbus_signal_blob(struct wpa_supplicant *wpa_s,
 238                                   const char *name, const char *sig_name)
 239 {
 240         struct wpas_dbus_priv *iface;
 241         DBusMessage *msg;
 242
 243         iface = wpa_s->global->dbus;
 244
 245         /* Do nothing if the control interface is not turned on */
 246         if (iface == NULL)
 247                 return;
 248
 249         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 250                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 251                                       sig_name);
 252         if (msg == NULL)
 253                 return;
 254
 255         if (dbus_message_append_args(msg, DBUS_TYPE_STRING, &name,
 256                                      DBUS_TYPE_INVALID))
 257                 dbus_connection_send(iface->con, msg, NULL);
 258         else
 259                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 260         dbus_message_unref(msg);
 261 }
 262
 263
 264 /**
 265  * wpas_dbus_signal_blob_added - Send a blob added signal
 266  * @wpa_s: %wpa_supplicant network interface data
 267  * @name: blob name
 268  *
 269  * Notify listeners about adding a new blob
 270  */
 271 void wpas_dbus_signal_blob_added(struct wpa_supplicant *wpa_s,
 272                                  const char *name)
 273 {
 274         wpas_dbus_signal_blob(wpa_s, name, "BlobAdded");
 275 }
 276
 277
 278 /**
 279  * wpas_dbus_signal_blob_removed - Send a blob removed signal
 280  * @wpa_s: %wpa_supplicant network interface data
 281  * @name: blob name
 282  *
 283  * Notify listeners about removing blob
 284  */
 285 void wpas_dbus_signal_blob_removed(struct wpa_supplicant *wpa_s,
 286                                    const char *name)
 287 {
 288         wpas_dbus_signal_blob(wpa_s, name, "BlobRemoved");
 289 }
 290
 291
 292 /**
 293  * wpas_dbus_signal_network - Send a network related event signal
 294  * @wpa_s: %wpa_supplicant network interface data
 295  * @id: new network id
 296  * @sig_name: signal name - NetworkAdded, NetworkRemoved or NetworkSelected
 297  * @properties: determines if add second argument with object properties
 298  *
 299  * Notify listeners about event related with configured network
 300  */
 301 static void wpas_dbus_signal_network(struct wpa_supplicant *wpa_s,
 302                                      int id, const char *sig_name,
 303                                      int properties)
 304 {
 305         struct wpas_dbus_priv *iface;
 306         DBusMessage *msg;
 307         DBusMessageIter iter, iter_dict;
 308         char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
 309
 310         iface = wpa_s->global->dbus;
 311
 312         /* Do nothing if the control interface is not turned on */
 313         if (iface == NULL)
 314                 return;
 315
 316         os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
 317                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
 318                     wpa_s->dbus_new_path, id);
 319
 320         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 321                                       WPAS_DBUS_NEW_IFACE_INTERFACE,
 322                                       sig_name);
 323         if (msg == NULL)
 324                 return;
 325
 326         dbus_message_iter_init_append(msg, &iter);
 327         path = net_obj_path;
 328         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
 329                                             &path))
 330                 goto err;
 331
 332         if (properties) {
 333                 if (!wpa_dbus_dict_open_write(&iter, &iter_dict))
 334                         goto err;
 335
 336                 wpa_dbus_get_object_properties(iface, net_obj_path,
 337                                                WPAS_DBUS_NEW_IFACE_NETWORK,
 338                                                &iter_dict);
 339
 340                 if (!wpa_dbus_dict_close_write(&iter, &iter_dict))
 341                         goto err;
 342         }
 343
 344         dbus_connection_send(iface->con, msg, NULL);
 345
 346         dbus_message_unref(msg);
 347         return;
 348
 349 err:
 350         wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 351         dbus_message_unref(msg);
 352 }
 353
 354
 355 /**
 356  * wpas_dbus_signal_network_added - Send a network added signal
 357  * @wpa_s: %wpa_supplicant network interface data
 358  * @id: new network id
 359  *
 360  * Notify listeners about adding new network
 361  */
 362 static void wpas_dbus_signal_network_added(struct wpa_supplicant *wpa_s,
 363                                            int id)
 364 {
 365         wpas_dbus_signal_network(wpa_s, id, "NetworkAdded", TRUE);
 366 }
 367
 368
 369 /**
 370  * wpas_dbus_signal_network_removed - Send a network removed signal
 371  * @wpa_s: %wpa_supplicant network interface data
 372  * @id: network id
 373  *
 374  * Notify listeners about removing a network
 375  */
 376 static void wpas_dbus_signal_network_removed(struct wpa_supplicant *wpa_s,
 377                                              int id)
 378 {
 379         wpas_dbus_signal_network(wpa_s, id, "NetworkRemoved", FALSE);
 380 }
 381
 382
 383 /**
 384  * wpas_dbus_signal_network_selected - Send a network selected signal
 385  * @wpa_s: %wpa_supplicant network interface data
 386  * @id: network id
 387  *
 388  * Notify listeners about selecting a network
 389  */
 390 void wpas_dbus_signal_network_selected(struct wpa_supplicant *wpa_s, int id)
 391 {
 392         wpas_dbus_signal_network(wpa_s, id, "NetworkSelected", FALSE);
 393 }
 394
 395
 396 /**
 397  * wpas_dbus_signal_network_enabled_changed - Signals Enabled property changes
 398  * @wpa_s: %wpa_supplicant network interface data
 399  * @ssid: configured network which Enabled property has changed
 400  *
 401  * Sends PropertyChanged signals containing new value of Enabled property
 402  * for specified network
 403  */
 404 void wpas_dbus_signal_network_enabled_changed(struct wpa_supplicant *wpa_s,
 405                                               struct wpa_ssid *ssid)
 406 {
 407
 408         char path[WPAS_DBUS_OBJECT_PATH_MAX];
 409         os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
 410                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%d",
 411                     wpa_s->dbus_new_path, ssid->id);
 412
 413         wpa_dbus_mark_property_changed(wpa_s->global->dbus, path,
 414                                        WPAS_DBUS_NEW_IFACE_NETWORK, "Enabled");
 415 }
 416
 417
 418 #ifdef CONFIG_WPS
 419
 420 /**
 421  * wpas_dbus_signal_wps_event_success - Signals Success WPS event
 422  * @wpa_s: %wpa_supplicant network interface data
 423  *
 424  * Sends Event dbus signal with name "success" and empty dict as arguments
 425  */
 426 void wpas_dbus_signal_wps_event_success(struct wpa_supplicant *wpa_s)
 427 {
 428
 429         DBusMessage *msg;
 430         DBusMessageIter iter, dict_iter;
 431         struct wpas_dbus_priv *iface;
 432         char *key = "success";
 433
 434         iface = wpa_s->global->dbus;
 435
 436         /* Do nothing if the control interface is not turned on */
 437         if (iface == NULL)
 438                 return;
 439
 440         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 441                                       WPAS_DBUS_NEW_IFACE_WPS, "Event");
 442         if (msg == NULL)
 443                 return;
 444
 445         dbus_message_iter_init_append(msg, &iter);
 446
 447         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
 448             !wpa_dbus_dict_open_write(&iter, &dict_iter) ||
 449             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 450                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 451         else
 452                 dbus_connection_send(iface->con, msg, NULL);
 453
 454         dbus_message_unref(msg);
 455 }
 456
 457
 458 /**
 459  * wpas_dbus_signal_wps_event_fail - Signals Fail WPS event
 460  * @wpa_s: %wpa_supplicant network interface data
 461  *
 462  * Sends Event dbus signal with name "fail" and dictionary containing
 463  * "msg field with fail message number (int32) as arguments
 464  */
 465 void wpas_dbus_signal_wps_event_fail(struct wpa_supplicant *wpa_s,
 466                                      struct wps_event_fail *fail)
 467 {
 468
 469         DBusMessage *msg;
 470         DBusMessageIter iter, dict_iter;
 471         struct wpas_dbus_priv *iface;
 472         char *key = "fail";
 473
 474         iface = wpa_s->global->dbus;
 475
 476         /* Do nothing if the control interface is not turned on */
 477         if (iface == NULL)
 478                 return;
 479
 480         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 481                                       WPAS_DBUS_NEW_IFACE_WPS, "Event");
 482         if (msg == NULL)
 483                 return;
 484
 485         dbus_message_iter_init_append(msg, &iter);
 486
 487         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
 488             !wpa_dbus_dict_open_write(&iter, &dict_iter) ||
 489             !wpa_dbus_dict_append_int32(&dict_iter, "msg", fail->msg) ||
 490             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 491                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 492         else
 493                 dbus_connection_send(iface->con, msg, NULL);
 494
 495         dbus_message_unref(msg);
 496 }
 497
 498
 499 /**
 500  * wpas_dbus_signal_wps_event_m2d - Signals M2D WPS event
 501  * @wpa_s: %wpa_supplicant network interface data
 502  *
 503  * Sends Event dbus signal with name "m2d" and dictionary containing
 504  * fields of wps_event_m2d structure.
 505  */
 506 void wpas_dbus_signal_wps_event_m2d(struct wpa_supplicant *wpa_s,
 507                                     struct wps_event_m2d *m2d)
 508 {
 509
 510         DBusMessage *msg;
 511         DBusMessageIter iter, dict_iter;
 512         struct wpas_dbus_priv *iface;
 513         char *key = "m2d";
 514
 515         iface = wpa_s->global->dbus;
 516
 517         /* Do nothing if the control interface is not turned on */
 518         if (iface == NULL)
 519                 return;
 520
 521         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 522                                       WPAS_DBUS_NEW_IFACE_WPS, "Event");
 523         if (msg == NULL)
 524                 return;
 525
 526         dbus_message_iter_init_append(msg, &iter);
 527
 528         if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
 529             !wpa_dbus_dict_open_write(&iter, &dict_iter) ||
 530             !wpa_dbus_dict_append_uint16(&dict_iter, "config_methods",
 531                                          m2d->config_methods) ||
 532             !wpa_dbus_dict_append_byte_array(&dict_iter, "manufacturer",
 533                                              (const char *) m2d->manufacturer,
 534                                              m2d->manufacturer_len) ||
 535             !wpa_dbus_dict_append_byte_array(&dict_iter, "model_name",
 536                                              (const char *) m2d->model_name,
 537                                              m2d->model_name_len) ||
 538             !wpa_dbus_dict_append_byte_array(&dict_iter, "model_number",
 539                                              (const char *) m2d->model_number,
 540                                              m2d->model_number_len) ||
 541             !wpa_dbus_dict_append_byte_array(&dict_iter, "serial_number",
 542                                              (const char *)
 543                                              m2d->serial_number,
 544                                              m2d->serial_number_len) ||
 545             !wpa_dbus_dict_append_byte_array(&dict_iter, "dev_name",
 546                                              (const char *) m2d->dev_name,
 547                                              m2d->dev_name_len) ||
 548             !wpa_dbus_dict_append_byte_array(&dict_iter, "primary_dev_type",
 549                                              (const char *)
 550                                              m2d->primary_dev_type, 8) ||
 551             !wpa_dbus_dict_append_uint16(&dict_iter, "config_error",
 552                                          m2d->config_error) ||
 553             !wpa_dbus_dict_append_uint16(&dict_iter, "dev_password_id",
 554                                          m2d->dev_password_id) ||
 555             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 556                 wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
 557         else
 558                 dbus_connection_send(iface->con, msg, NULL);
 559
 560         dbus_message_unref(msg);
 561 }
 562
 563
 564 /**
 565  * wpas_dbus_signal_wps_cred - Signals new credentials
 566  * @wpa_s: %wpa_supplicant network interface data
 567  *
 568  * Sends signal with credentials in directory argument
 569  */
 570 void wpas_dbus_signal_wps_cred(struct wpa_supplicant *wpa_s,
 571                                const struct wps_credential *cred)
 572 {
 573         DBusMessage *msg;
 574         DBusMessageIter iter, dict_iter;
 575         struct wpas_dbus_priv *iface;
 576         char *auth_type[6]; /* we have six possible authorization types */
 577         int at_num = 0;
 578         char *encr_type[4]; /* we have four possible encryption types */
 579         int et_num = 0;
 580
 581         iface = wpa_s->global->dbus;
 582
 583         /* Do nothing if the control interface is not turned on */
 584         if (iface == NULL)
 585                 return;
 586
 587         msg = dbus_message_new_signal(wpa_s->dbus_new_path,
 588                                       WPAS_DBUS_NEW_IFACE_WPS,
 589                                       "Credentials");
 590         if (msg == NULL)
 591                 return;
 592
 593         dbus_message_iter_init_append(msg, &iter);
 594         if (!wpa_dbus_dict_open_write(&iter, &dict_iter))
 595                 goto nomem;
 596
 597         if (cred->auth_type & WPS_AUTH_OPEN)
 598                 auth_type[at_num++] = "open";
 599         if (cred->auth_type & WPS_AUTH_WPAPSK)
 600                 auth_type[at_num++] = "wpa-psk";
 601         if (cred->auth_type & WPS_AUTH_SHARED)
 602                 auth_type[at_num++] = "shared";
 603         if (cred->auth_type & WPS_AUTH_WPA)
 604                 auth_type[at_num++] = "wpa-eap";
 605         if (cred->auth_type & WPS_AUTH_WPA2)
 606                 auth_type[at_num++] = "wpa2-eap";
 607         if (cred->auth_type & WPS_AUTH_WPA2PSK)
 608                 auth_type[at_num++] =
 609                 "wpa2-psk";
 610
 611         if (cred->encr_type & WPS_ENCR_NONE)
 612                 encr_type[et_num++] = "none";
 613         if (cred->encr_type & WPS_ENCR_WEP)
 614                 encr_type[et_num++] = "wep";
 615         if (cred->encr_type & WPS_ENCR_TKIP)
 616                 encr_type[et_num++] = "tkip";
 617         if (cred->encr_type & WPS_ENCR_AES)
 618                 encr_type[et_num++] = "aes";
 619
 620         if (wpa_s->current_ssid) {
 621                 if (!wpa_dbus_dict_append_byte_array(
 622                             &dict_iter, "BSSID",
 623                             (const char *) wpa_s->current_ssid->bssid,
 624                             ETH_ALEN))
 625                         goto nomem;
 626         }
 627
 628         if (!wpa_dbus_dict_append_byte_array(&dict_iter, "SSID",
 629                                              (const char *) cred->ssid,
 630                                              cred->ssid_len) ||
 631             !wpa_dbus_dict_append_string_array(&dict_iter, "AuthType",
 632                                                (const char **) auth_type,
 633                                                at_num) ||
 634             !wpa_dbus_dict_append_string_array(&dict_iter, "EncrType",
 635                                                (const char **) encr_type,
 636                                                et_num) ||
 637             !wpa_dbus_dict_append_byte_array(&dict_iter, "Key",
 638                                              (const char *) cred->key,
 639                                              cred->key_len) ||
 640             !wpa_dbus_dict_append_uint32(&dict_iter, "KeyIndex",
 641                                          cred->key_idx) ||
 642             !wpa_dbus_dict_close_write(&iter, &dict_iter))
 643                 goto nomem;
 644
 645         dbus_connection_send(iface->con, msg, NULL);
 646
 647 nomem:
 648         dbus_message_unref(msg);
 649 }
 650
 651 #endif /* CONFIG_WPS */
 652
 653
 654 /**
 655  * wpas_dbus_signal_prop_changed - Signals change of property
 656  * @wpa_s: %wpa_supplicant network interface data
 657  * @property: indicates which property has changed
 658  *
 659  * Sends ProertyChanged signals with path, interface and arguments
 660  * depending on which property has changed.
 661  */
 662 void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
 663                                    enum wpas_dbus_prop property)
 664 {
 665         WPADBusPropertyAccessor getter;
 666         char *prop;
 667
 668         switch (property) {
 669         case WPAS_DBUS_PROP_AP_SCAN:
 670                 getter = (WPADBusPropertyAccessor) wpas_dbus_getter_ap_scan;
 671                 prop = "ApScan";
 672                 break;
 673         case WPAS_DBUS_PROP_SCANNING:
 674                 getter = (WPADBusPropertyAccessor) wpas_dbus_getter_scanning;
 675                 prop = "Scanning";
 676                 break;
 677         case WPAS_DBUS_PROP_STATE:
 678                 getter = (WPADBusPropertyAccessor) wpas_dbus_getter_state;
 679                 prop = "State";
 680                 break;
 681         case WPAS_DBUS_PROP_CURRENT_BSS:
 682                 getter = (WPADBusPropertyAccessor)
 683                         wpas_dbus_getter_current_bss;
 684                 prop = "CurrentBSS";
 685                 break;
 686         case WPAS_DBUS_PROP_CURRENT_NETWORK:
 687                 getter = (WPADBusPropertyAccessor)
 688                         wpas_dbus_getter_current_network;
 689                 prop = "CurrentNetwork";
 690                 break;
 691         default:
 692                 wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
 693                            __func__, property);
 694                 return;
 695         }
 696
 697         wpa_dbus_mark_property_changed(wpa_s->global->dbus,
 698                                        wpa_s->dbus_new_path,
 699                                        WPAS_DBUS_NEW_IFACE_INTERFACE, prop);
 700 }
 701
 702
 703 /**
 704  * wpas_dbus_bss_signal_prop_changed - Signals change of BSS property
 705  * @wpa_s: %wpa_supplicant network interface data
 706  * @property: indicates which property has changed
 707  * @id: unique BSS identifier
 708  *
 709  * Sends PropertyChanged signals with path, interface, and arguments depending
 710  * on which property has changed.
 711  */
 712 void wpas_dbus_bss_signal_prop_changed(struct wpa_supplicant *wpa_s,
 713                                        enum wpas_dbus_bss_prop property,
 714                                        unsigned int id)
 715 {
 716         char path[WPAS_DBUS_OBJECT_PATH_MAX];
 717         char *prop;
 718
 719         switch (property) {
 720         case WPAS_DBUS_BSS_PROP_SIGNAL:
 721                 prop = "Signal";
 722                 break;
 723         case WPAS_DBUS_BSS_PROP_FREQ:
 724                 prop = "Frequency";
 725                 break;
 726         case WPAS_DBUS_BSS_PROP_MODE:
 727                 prop = "Mode";
 728                 break;
 729         case WPAS_DBUS_BSS_PROP_PRIVACY:
 730                 prop = "Privacy";
 731                 break;
 732         case WPAS_DBUS_BSS_PROP_RATES:
 733                 prop = "Rates";
 734                 break;
 735         case WPAS_DBUS_BSS_PROP_WPAIE:
 736                 prop = "WPAIE";
 737                 break;
 738         case WPAS_DBUS_BSS_PROP_RSNIE:
 739                 prop = "RSNIE";
 740                 break;
 741         case WPAS_DBUS_BSS_PROP_WPSIE:
 742                 prop = "WPSIE";
 743                 break;
 744         default:
 745                 wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
 746                            __func__, property);
 747                 return;
 748         }
 749
 750         os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
 751                     "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
 752                     wpa_s->dbus_new_path, id);
 753
 754         wpa_dbus_mark_property_changed(wpa_s->global->dbus, path,
 755                                        WPAS_DBUS_NEW_IFACE_BSS, prop);
 756 }
 757
 758
 759 /**
 760  * wpas_dbus_signal_debug_level_changed - Signals change of debug param
 761  * @global: wpa_global structure
 762  *
 763  * Sends ProertyChanged signals informing that debug level has changed.
 764  */
 765 void wpas_dbus_signal_debug_level_changed(struct wpa_global *global)
 766 {
 767         wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
 768                                        WPAS_DBUS_NEW_INTERFACE,
 769                                        "DebugLevel");
 770 }
 771
 772
 773 /**
 774  * wpas_dbus_signal_debug_timestamp_changed - Signals change of debug param
 775  * @global: wpa_global structure
 776  *
 777  * Sends ProertyChanged signals informing that debug timestamp has changed.
 778  */
 779 void wpas_dbus_signal_debug_timestamp_changed(struct wpa_global *global)
 780 {
 781         wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
 782                                        WPAS_DBUS_NEW_INTERFACE,
 783                                        "DebugTimestamp");
 784 }
 785
 786
 787 /**
 788  * wpas_dbus_signal_debug_show_keys_changed - Signals change of debug param
 789  * @global: wpa_global structure
 790  *
 791  * Sends ProertyChanged signals informing that debug show_keys has changed.
 792  */
 793 void wpas_dbus_signal_debug_show_keys_changed(struct wpa_global *global)
 794 {
 795         wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
 796                                        WPAS_DBUS_NEW_INTERFACE,
 797                                        "DebugShowKeys");
 798 }
 799
 800
 801 static void wpas_dbus_register(struct wpa_dbus_object_desc *obj_desc,
 802                                void *priv,
 803                                WPADBusArgumentFreeFunction priv_free,
 804                                const struct wpa_dbus_method_desc *methods,
 805                                const struct wpa_dbus_property_desc *properties,
 806                                const struct wpa_dbus_signal_desc *signals)
 807 {
 808         int n;
 809
 810         obj_desc->user_data = priv;
 811         obj_desc->user_data_free_func = priv_free;
 812         obj_desc->methods = methods;
 813         obj_desc->properties = properties;
 814         obj_desc->signals = signals;
 815
 816         for (n = 0; properties && properties->dbus_property; properties++)
 817                 n++;
 818
 819         obj_desc->prop_changed_flags = os_zalloc(n);
 820         if (!obj_desc->prop_changed_flags)
 821                 wpa_printf(MSG_DEBUG, "dbus: %s: can't register handlers",
 822                            __func__);
 823 }
 824
 825
 826 static const struct wpa_dbus_method_desc wpas_dbus_global_methods[] = {
 827         { "CreateInterface", WPAS_DBUS_NEW_INTERFACE,
 828           (WPADBusMethodHandler) &wpas_dbus_handler_create_interface,
 829           {
 830                   { "args", "a{sv}", ARG_IN },
 831                   { "path", "o", ARG_OUT },
 832                   END_ARGS
 833           }
 834         },
 835         { "RemoveInterface", WPAS_DBUS_NEW_INTERFACE,
 836           (WPADBusMethodHandler) &wpas_dbus_handler_remove_interface,
 837           {
 838                   { "path", "o", ARG_IN },
 839                   END_ARGS
 840           }
 841         },
 842         { "GetInterface", WPAS_DBUS_NEW_INTERFACE,
 843           (WPADBusMethodHandler) &wpas_dbus_handler_get_interface,
 844           {
 845                   { "ifname", "s", ARG_IN },
 846                   { "path", "o", ARG_OUT },
 847                   END_ARGS
 848           }
 849         },
 850         { NULL, NULL, NULL, { END_ARGS } }
 851 };
 852
 853 static const struct wpa_dbus_property_desc wpas_dbus_global_properties[] = {
 854         { "DebugLevel", WPAS_DBUS_NEW_INTERFACE, "s",
 855           (WPADBusPropertyAccessor) wpas_dbus_getter_debug_level,
 856           (WPADBusPropertyAccessor) wpas_dbus_setter_debug_level,
 857           RW
 858         },
 859         { "DebugTimestamp", WPAS_DBUS_NEW_INTERFACE, "b",
 860           (WPADBusPropertyAccessor) wpas_dbus_getter_debug_timestamp,
 861           (WPADBusPropertyAccessor) wpas_dbus_setter_debug_timestamp,
 862           RW
 863         },
 864         { "DebugShowKeys", WPAS_DBUS_NEW_INTERFACE, "b",
 865           (WPADBusPropertyAccessor) wpas_dbus_getter_debug_show_keys,
 866           (WPADBusPropertyAccessor) wpas_dbus_setter_debug_show_keys,
 867           RW
 868         },
 869         { "Interfaces", WPAS_DBUS_NEW_INTERFACE, "ao",
 870           (WPADBusPropertyAccessor) &wpas_dbus_getter_interfaces,
 871           NULL,
 872           R
 873         },
 874         { "EapMethods", WPAS_DBUS_NEW_INTERFACE, "as",
 875           (WPADBusPropertyAccessor) wpas_dbus_getter_eap_methods,
 876           NULL,
 877           R
 878         },
 879         { NULL, NULL, NULL, NULL, NULL, 0 }
 880 };
 881
 882 static const struct wpa_dbus_signal_desc wpas_dbus_global_signals[] = {
 883         { "InterfaceAdded", WPAS_DBUS_NEW_INTERFACE,
 884           {
 885                   { "path", "o", ARG_OUT },
 886                   { "properties", "a{sv}", ARG_OUT },
 887                   END_ARGS
 888           }
 889         },
 890         { "InterfaceRemoved", WPAS_DBUS_NEW_INTERFACE,
 891           {
 892                   { "path", "o", ARG_OUT },
 893                   END_ARGS
 894           }
 895         },
 896         { "PropertiesChanged", WPAS_DBUS_NEW_INTERFACE,
 897           {
 898                   { "properties", "a{sv}", ARG_OUT },
 899                   END_ARGS
 900           }
 901         },
 902         { NULL, NULL, { END_ARGS } }
 903 };
 904
 905
 906 /**
 907  * wpas_dbus_ctrl_iface_init - Initialize dbus control interface
 908  * @global: Pointer to global data from wpa_supplicant_init()
 909  * Returns: 0 on success or -1 on failure
 910  *
 911  * Initialize the dbus control interface for wpa_supplicantand and start
 912  * receiving commands from external programs over the bus.
 913  */
 914 int wpas_dbus_ctrl_iface_init(struct wpas_dbus_priv *priv)
 915 {
 916         struct wpa_dbus_object_desc *obj_desc;
 917         int ret;
 918
 919         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
 920         if (!obj_desc) {
 921                 wpa_printf(MSG_ERROR, "Not enough memory "
 922                            "to create object description");
 923                 return -1;
 924         }
 925
 926         wpas_dbus_register(obj_desc, priv->global, NULL,
 927                            wpas_dbus_global_methods,
 928                            wpas_dbus_global_properties,
 929                            wpas_dbus_global_signals);
 930
 931         wpa_printf(MSG_DEBUG, "dbus: Register D-Bus object '%s'",
 932                    WPAS_DBUS_NEW_PATH);
 933         ret = wpa_dbus_ctrl_iface_init(priv, WPAS_DBUS_NEW_PATH,
 934                                        WPAS_DBUS_NEW_SERVICE,
 935                                        obj_desc);
 936         if (ret < 0)
 937                 free_dbus_object_desc(obj_desc);
 938         else
 939                 priv->dbus_new_initialized = 1;
 940
 941         return ret;
 942 }
 943
 944
 945 /**
 946  * wpas_dbus_ctrl_iface_deinit - Deinitialize dbus ctrl interface for
 947  * wpa_supplicant
 948  * @iface: Pointer to dbus private data from wpas_dbus_init()
 949  *
 950  * Deinitialize the dbus control interface that was initialized with
 951  * wpas_dbus_ctrl_iface_init().
 952  */
 953 void wpas_dbus_ctrl_iface_deinit(struct wpas_dbus_priv *iface)
 954 {
 955         if (!iface->dbus_new_initialized)
 956                 return;
 957         wpa_printf(MSG_DEBUG, "dbus: Unregister D-Bus object '%s'",
 958                    WPAS_DBUS_NEW_PATH);
 959         dbus_connection_unregister_object_path(iface->con,
 960                                                WPAS_DBUS_NEW_PATH);
 961 }
 962
 963
 964 static void wpa_dbus_free(void *ptr)
 965 {
 966         os_free(ptr);
 967 }
 968
 969
 970 static const struct wpa_dbus_property_desc wpas_dbus_network_properties[] = {
 971         { "Properties", WPAS_DBUS_NEW_IFACE_NETWORK, "a{sv}",
 972           (WPADBusPropertyAccessor) wpas_dbus_getter_network_properties,
 973           (WPADBusPropertyAccessor) wpas_dbus_setter_network_properties,
 974           RW
 975         },
 976         { "Enabled", WPAS_DBUS_NEW_IFACE_NETWORK, "b",
 977           (WPADBusPropertyAccessor) wpas_dbus_getter_enabled,
 978           (WPADBusPropertyAccessor) wpas_dbus_setter_enabled,
 979           RW
 980         },
 981         { NULL, NULL, NULL, NULL, NULL, 0 }
 982 };
 983
 984
 985 static const struct wpa_dbus_signal_desc wpas_dbus_network_signals[] = {
 986         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_NETWORK,
 987           {
 988                   { "properties", "a{sv}", ARG_OUT },
 989                   END_ARGS
 990           }
 991         },
 992         { NULL, NULL, { END_ARGS } }
 993 };
 994
 995
 996 /**
 997  * wpas_dbus_register_network - Register a configured network with dbus
 998  * @wpa_s: wpa_supplicant interface structure
 999  * @ssid: network configuration data
1000  * Returns: 0 on success, -1 on failure
1001  *
1002  * Registers network representing object with dbus
1003  */
1004 int wpas_dbus_register_network(struct wpa_supplicant *wpa_s,
1005                                struct wpa_ssid *ssid)
1006 {
1007         struct wpas_dbus_priv *ctrl_iface;
1008         struct wpa_dbus_object_desc *obj_desc;
1009         struct network_handler_args *arg;
1010         char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
1011
1012         /* Do nothing if the control interface is not turned on */
1013         if (wpa_s == NULL || wpa_s->global == NULL)
1014                 return 0;
1015         ctrl_iface = wpa_s->global->dbus;
1016         if (ctrl_iface == NULL)
1017                 return 0;
1018
1019         os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1020                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
1021                     wpa_s->dbus_new_path, ssid->id);
1022
1023         wpa_printf(MSG_DEBUG, "dbus: Register network object '%s'",
1024                    net_obj_path);
1025         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
1026         if (!obj_desc) {
1027                 wpa_printf(MSG_ERROR, "Not enough memory "
1028                            "to create object description");
1029                 goto err;
1030         }
1031
1032         /* allocate memory for handlers arguments */
1033         arg = os_zalloc(sizeof(struct network_handler_args));
1034         if (!arg) {
1035                 wpa_printf(MSG_ERROR, "Not enough memory "
1036                            "to create arguments for method");
1037                 goto err;
1038         }
1039
1040         arg->wpa_s = wpa_s;
1041         arg->ssid = ssid;
1042
1043         wpas_dbus_register(obj_desc, arg, wpa_dbus_free, NULL,
1044                            wpas_dbus_network_properties,
1045                            wpas_dbus_network_signals);
1046
1047         if (wpa_dbus_register_object_per_iface(ctrl_iface, net_obj_path,
1048                                                wpa_s->ifname, obj_desc))
1049                 goto err;
1050
1051         wpas_dbus_signal_network_added(wpa_s, ssid->id);
1052
1053         return 0;
1054
1055 err:
1056         free_dbus_object_desc(obj_desc);
1057         return -1;
1058 }
1059
1060
1061 /**
1062  * wpas_dbus_unregister_network - Unregister a configured network from dbus
1063  * @wpa_s: wpa_supplicant interface structure
1064  * @nid: network id
1065  * Returns: 0 on success, -1 on failure
1066  *
1067  * Unregisters network representing object from dbus
1068  */
1069 int wpas_dbus_unregister_network(struct wpa_supplicant *wpa_s, int nid)
1070 {
1071         struct wpas_dbus_priv *ctrl_iface;
1072         char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
1073         int ret;
1074
1075         /* Do nothing if the control interface is not turned on */
1076         if (wpa_s == NULL || wpa_s->global == NULL ||
1077             wpa_s->dbus_new_path == NULL)
1078                 return 0;
1079         ctrl_iface = wpa_s->global->dbus;
1080         if (ctrl_iface == NULL)
1081                 return 0;
1082
1083         os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1084                     "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
1085                     wpa_s->dbus_new_path, nid);
1086
1087         wpa_printf(MSG_DEBUG, "dbus: Unregister network object '%s'",
1088                    net_obj_path);
1089         ret = wpa_dbus_unregister_object_per_iface(ctrl_iface, net_obj_path);
1090
1091         if (!ret)
1092                 wpas_dbus_signal_network_removed(wpa_s, nid);
1093
1094         return ret;
1095 }
1096
1097
1098 static const struct wpa_dbus_property_desc wpas_dbus_bss_properties[] = {
1099         { "SSID", WPAS_DBUS_NEW_IFACE_BSS, "ay",
1100           (WPADBusPropertyAccessor) wpas_dbus_getter_bss_ssid,
1101           NULL,
1102           R
1103         },
1104         { "BSSID", WPAS_DBUS_NEW_IFACE_BSS, "ay",
1105           (WPADBusPropertyAccessor) wpas_dbus_getter_bss_bssid,
1106           NULL,
1107           R
1108         },
1109         { "Privacy", WPAS_DBUS_NEW_IFACE_BSS, "b",
1110           (WPADBusPropertyAccessor) wpas_dbus_getter_bss_privacy,
1111           NULL,
1112           R
1113         },
1114         { "Mode", WPAS_DBUS_NEW_IFACE_BSS, "s",
1115           (WPADBusPropertyAccessor) wpas_dbus_getter_bss_mode,
1116           NULL,
1117           R
1118         },
1119         { "Signal", WPAS_DBUS_NEW_IFACE_BSS, "n",
1120           (WPADBusPropertyAccessor) wpas_dbus_getter_bss_signal,
1121           NULL,
1122           R
1123         },
1124         { "Frequency", WPAS_DBUS_NEW_IFACE_BSS, "q",
1125           (WPADBusPropertyAccessor) wpas_dbus_getter_bss_frequency,
1126           NULL,
1127           R
1128         },
1129         { "Rates", WPAS_DBUS_NEW_IFACE_BSS, "au",
1130           (WPADBusPropertyAccessor) wpas_dbus_getter_bss_rates,
1131           NULL,
1132           R
1133         },
1134         { "WPAIE", WPAS_DBUS_NEW_IFACE_BSS, "ay",
1135           (WPADBusPropertyAccessor) wpas_dbus_getter_bss_wpaie,
1136           NULL,
1137           R
1138         },
1139         { "RSNIE", WPAS_DBUS_NEW_IFACE_BSS, "ay",
1140           (WPADBusPropertyAccessor) wpas_dbus_getter_bss_rsnie,
1141           NULL,
1142           R
1143         },
1144         { "WPSIE", WPAS_DBUS_NEW_IFACE_BSS, "ay",
1145           (WPADBusPropertyAccessor) wpas_dbus_getter_bss_wpsie,
1146           NULL,
1147           R
1148         },
1149         { NULL, NULL, NULL, NULL, NULL, 0 }
1150 };
1151
1152
1153 static const struct wpa_dbus_signal_desc wpas_dbus_bss_signals[] = {
1154         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_BSS,
1155           {
1156                   { "properties", "a{sv}", ARG_OUT },
1157                   END_ARGS
1158           }
1159         },
1160         { NULL, NULL, { END_ARGS } }
1161 };
1162
1163
1164 /**
1165  * wpas_dbus_unregister_bss - Unregister a scanned BSS from dbus
1166  * @wpa_s: wpa_supplicant interface structure
1167  * @bssid: scanned network bssid
1168  * @id: unique BSS identifier
1169  * Returns: 0 on success, -1 on failure
1170  *
1171  * Unregisters BSS representing object from dbus
1172  */
1173 int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
1174                              u8 bssid[ETH_ALEN], unsigned int id)
1175 {
1176         struct wpas_dbus_priv *ctrl_iface;
1177         char bss_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
1178
1179         /* Do nothing if the control interface is not turned on */
1180         if (wpa_s == NULL || wpa_s->global == NULL)
1181                 return 0;
1182         ctrl_iface = wpa_s->global->dbus;
1183         if (ctrl_iface == NULL)
1184                 return 0;
1185
1186         os_snprintf(bss_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1187                     "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
1188                     wpa_s->dbus_new_path, id);
1189
1190         wpa_printf(MSG_DEBUG, "dbus: Unregister BSS object '%s'",
1191                    bss_obj_path);
1192         if (wpa_dbus_unregister_object_per_iface(ctrl_iface, bss_obj_path)) {
1193                 wpa_printf(MSG_ERROR, "dbus: Cannot unregister BSS object %s",
1194                            bss_obj_path);
1195                 return -1;
1196         }
1197
1198         wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
1199
1200         return 0;
1201 }
1202
1203
1204 /**
1205  * wpas_dbus_register_bss - Register a scanned BSS with dbus
1206  * @wpa_s: wpa_supplicant interface structure
1207  * @bssid: scanned network bssid
1208  * @id: unique BSS identifier
1209  * Returns: 0 on success, -1 on failure
1210  *
1211  * Registers BSS representing object with dbus
1212  */
1213 int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
1214                            u8 bssid[ETH_ALEN], unsigned int id)
1215 {
1216         struct wpas_dbus_priv *ctrl_iface;
1217         struct wpa_dbus_object_desc *obj_desc;
1218         char bss_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
1219         struct bss_handler_args *arg;
1220
1221         /* Do nothing if the control interface is not turned on */
1222         if (wpa_s == NULL || wpa_s->global == NULL)
1223                 return 0;
1224         ctrl_iface = wpa_s->global->dbus;
1225         if (ctrl_iface == NULL)
1226                 return 0;
1227
1228         os_snprintf(bss_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1229                     "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
1230                     wpa_s->dbus_new_path, id);
1231
1232         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
1233         if (!obj_desc) {
1234                 wpa_printf(MSG_ERROR, "Not enough memory "
1235                            "to create object description");
1236                 goto err;
1237         }
1238
1239         arg = os_zalloc(sizeof(struct bss_handler_args));
1240         if (!arg) {
1241                 wpa_printf(MSG_ERROR, "Not enough memory "
1242                            "to create arguments for handler");
1243                 goto err;
1244         }
1245         arg->wpa_s = wpa_s;
1246         arg->id = id;
1247
1248         wpas_dbus_register(obj_desc, arg, wpa_dbus_free, NULL,
1249                            wpas_dbus_bss_properties,
1250                            wpas_dbus_bss_signals);
1251
1252         wpa_printf(MSG_DEBUG, "dbus: Register BSS object '%s'",
1253                    bss_obj_path);
1254         if (wpa_dbus_register_object_per_iface(ctrl_iface, bss_obj_path,
1255                                                wpa_s->ifname, obj_desc)) {
1256                 wpa_printf(MSG_ERROR,
1257                            "Cannot register BSSID dbus object %s.",
1258                            bss_obj_path);
1259                 goto err;
1260         }
1261
1262         wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
1263
1264         return 0;
1265
1266 err:
1267         free_dbus_object_desc(obj_desc);
1268         return -1;
1269 }
1270
1271
1272 static const struct wpa_dbus_method_desc wpas_dbus_interface_methods[] = {
1273         { "Scan", WPAS_DBUS_NEW_IFACE_INTERFACE,
1274           (WPADBusMethodHandler) &wpas_dbus_handler_scan,
1275           {
1276                   { "args", "a{sv}", ARG_IN },
1277                   END_ARGS
1278           }
1279         },
1280         { "Disconnect", WPAS_DBUS_NEW_IFACE_INTERFACE,
1281           (WPADBusMethodHandler) &wpas_dbus_handler_disconnect,
1282           {
1283                   END_ARGS
1284           }
1285         },
1286         { "AddNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE,
1287           (WPADBusMethodHandler) &wpas_dbus_handler_add_network,
1288           {
1289                   { "args", "a{sv}", ARG_IN },
1290                   { "path", "o", ARG_OUT },
1291                   END_ARGS
1292           }
1293         },
1294         { "RemoveNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE,
1295           (WPADBusMethodHandler) &wpas_dbus_handler_remove_network,
1296           {
1297                   { "path", "o", ARG_IN },
1298                   END_ARGS
1299           }
1300         },
1301         { "SelectNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE,
1302           (WPADBusMethodHandler) &wpas_dbus_handler_select_network,
1303           {
1304                   { "path", "o", ARG_IN },
1305                   END_ARGS
1306           }
1307         },
1308         { "AddBlob", WPAS_DBUS_NEW_IFACE_INTERFACE,
1309           (WPADBusMethodHandler) &wpas_dbus_handler_add_blob,
1310           {
1311                   { "name", "s", ARG_IN },
1312                   { "data", "ay", ARG_IN },
1313                   END_ARGS
1314           }
1315         },
1316         { "GetBlob", WPAS_DBUS_NEW_IFACE_INTERFACE,
1317           (WPADBusMethodHandler) &wpas_dbus_handler_get_blob,
1318           {
1319                   { "name", "s", ARG_IN },
1320                   { "data", "ay", ARG_OUT },
1321                   END_ARGS
1322           }
1323         },
1324         { "RemoveBlob", WPAS_DBUS_NEW_IFACE_INTERFACE,
1325           (WPADBusMethodHandler) &wpas_dbus_handler_remove_blob,
1326           {
1327                   { "name", "s", ARG_IN },
1328                   END_ARGS
1329           }
1330         },
1331 #ifdef CONFIG_WPS
1332         { "Start", WPAS_DBUS_NEW_IFACE_WPS,
1333           (WPADBusMethodHandler) &wpas_dbus_handler_wps_start,
1334           {
1335                   { "args", "a{sv}", ARG_IN },
1336                   { "output", "a{sv}", ARG_OUT },
1337                   END_ARGS
1338           }
1339         },
1340 #endif /* CONFIG_WPS */
1341         { NULL, NULL, NULL, { END_ARGS } }
1342 };
1343
1344 static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
1345         { "Capabilities", WPAS_DBUS_NEW_IFACE_INTERFACE, "a{sv}",
1346           (WPADBusPropertyAccessor) wpas_dbus_getter_capabilities,
1347           NULL, R
1348         },
1349         { "State", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
1350           (WPADBusPropertyAccessor) wpas_dbus_getter_state,
1351           NULL, R
1352         },
1353         { "Scanning", WPAS_DBUS_NEW_IFACE_INTERFACE, "b",
1354           (WPADBusPropertyAccessor) wpas_dbus_getter_scanning,
1355           NULL, R
1356         },
1357         { "ApScan", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
1358           (WPADBusPropertyAccessor) wpas_dbus_getter_ap_scan,
1359           (WPADBusPropertyAccessor) wpas_dbus_setter_ap_scan,
1360           RW
1361         },
1362         { "Ifname", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
1363           (WPADBusPropertyAccessor) wpas_dbus_getter_ifname,
1364           NULL, R
1365         },
1366         { "Driver", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
1367           (WPADBusPropertyAccessor) wpas_dbus_getter_driver,
1368           NULL, R
1369         },
1370         { "BridgeIfname", WPAS_DBUS_NEW_IFACE_INTERFACE, "s",
1371           (WPADBusPropertyAccessor) wpas_dbus_getter_bridge_ifname,
1372           NULL, R
1373         },
1374         { "CurrentBSS", WPAS_DBUS_NEW_IFACE_INTERFACE, "o",
1375           (WPADBusPropertyAccessor) wpas_dbus_getter_current_bss,
1376           NULL, R
1377         },
1378         { "CurrentNetwork", WPAS_DBUS_NEW_IFACE_INTERFACE, "o",
1379           (WPADBusPropertyAccessor) wpas_dbus_getter_current_network,
1380           NULL, R
1381         },
1382         { "Blobs", WPAS_DBUS_NEW_IFACE_INTERFACE, "a{say}",
1383           (WPADBusPropertyAccessor) wpas_dbus_getter_blobs,
1384           NULL, R
1385         },
1386         { "BSSs", WPAS_DBUS_NEW_IFACE_INTERFACE, "ao",
1387           (WPADBusPropertyAccessor) wpas_dbus_getter_bsss,
1388           NULL, R
1389         },
1390         { "Networks", WPAS_DBUS_NEW_IFACE_INTERFACE, "ao",
1391           (WPADBusPropertyAccessor) wpas_dbus_getter_networks,
1392           NULL, R
1393         },
1394 #ifdef CONFIG_WPS
1395         { "ProcessCredentials", WPAS_DBUS_NEW_IFACE_WPS, "b",
1396           (WPADBusPropertyAccessor) wpas_dbus_getter_process_credentials,
1397           (WPADBusPropertyAccessor) wpas_dbus_setter_process_credentials,
1398           RW
1399         },
1400 #endif /* CONFIG_WPS */
1401         { NULL, NULL, NULL, NULL, NULL, 0 }
1402 };
1403
1404 static const struct wpa_dbus_signal_desc wpas_dbus_interface_signals[] = {
1405         { "ScanDone", WPAS_DBUS_NEW_IFACE_INTERFACE,
1406           {
1407                   { "success", "b", ARG_OUT },
1408                   END_ARGS
1409           }
1410         },
1411         { "BSSAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
1412           {
1413                   { "path", "o", ARG_OUT },
1414                   { "properties", "a{sv}", ARG_OUT },
1415                   END_ARGS
1416           }
1417         },
1418         { "BSSRemoved", WPAS_DBUS_NEW_IFACE_INTERFACE,
1419           {
1420                   { "path", "o", ARG_OUT },
1421                   END_ARGS
1422           }
1423         },
1424         { "BlobAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
1425           {
1426                   { "name", "s", ARG_OUT },
1427                   END_ARGS
1428           }
1429         },
1430         { "BlobRemoved", WPAS_DBUS_NEW_IFACE_INTERFACE,
1431           {
1432                   { "name", "s", ARG_OUT },
1433                   END_ARGS
1434           }
1435         },
1436         { "NetworkAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
1437           {
1438                   { "path", "o", ARG_OUT },
1439                   { "properties", "a{sv}", ARG_OUT },
1440                   END_ARGS
1441           }
1442         },
1443         { "NetworkRemoved", WPAS_DBUS_NEW_IFACE_INTERFACE,
1444           {
1445                   { "path", "o", ARG_OUT },
1446                   END_ARGS
1447           }
1448         },
1449         { "NetworkSelected", WPAS_DBUS_NEW_IFACE_INTERFACE,
1450           {
1451                   { "path", "o", ARG_OUT },
1452                   END_ARGS
1453           }
1454         },
1455         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_INTERFACE,
1456           {
1457                   { "properties", "a{sv}", ARG_OUT },
1458                   END_ARGS
1459           }
1460         },
1461 #ifdef CONFIG_WPS
1462         { "Event", WPAS_DBUS_NEW_IFACE_WPS,
1463           {
1464                   { "name", "s", ARG_OUT },
1465                   { "args", "a{sv}", ARG_OUT },
1466                   END_ARGS
1467           }
1468         },
1469         { "Credentials", WPAS_DBUS_NEW_IFACE_WPS,
1470           {
1471                   { "credentials", "a{sv}", ARG_OUT },
1472                   END_ARGS
1473           }
1474         },
1475         { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_WPS,
1476           {
1477                   { "properties", "a{sv}", ARG_OUT },
1478                   END_ARGS
1479           }
1480         },
1481 #endif /* CONFIG_WPS */
1482         { NULL, NULL, { END_ARGS } }
1483 };
1484
1485
1486 int wpas_dbus_register_interface(struct wpa_supplicant *wpa_s)
1487 {
1488
1489         struct wpa_dbus_object_desc *obj_desc = NULL;
1490         struct wpas_dbus_priv *ctrl_iface = wpa_s->global->dbus;
1491         int next;
1492
1493         /* Do nothing if the control interface is not turned on */
1494         if (ctrl_iface == NULL)
1495                 return 0;
1496
1497         /* Create and set the interface's object path */
1498         wpa_s->dbus_new_path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
1499         if (wpa_s->dbus_new_path == NULL)
1500                 return -1;
1501         next = ctrl_iface->next_objid++;
1502         os_snprintf(wpa_s->dbus_new_path, WPAS_DBUS_OBJECT_PATH_MAX,
1503                     WPAS_DBUS_NEW_PATH_INTERFACES "/%u",
1504                     next);
1505
1506         obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
1507         if (!obj_desc) {
1508                 wpa_printf(MSG_ERROR, "Not enough memory "
1509                            "to create object description");
1510                 goto err;
1511         }
1512
1513         wpas_dbus_register(obj_desc, wpa_s, NULL, wpas_dbus_interface_methods,
1514                            wpas_dbus_interface_properties,
1515                            wpas_dbus_interface_signals);
1516
1517         wpa_printf(MSG_DEBUG, "dbus: Register interface object '%s'",
1518                    wpa_s->dbus_new_path);
1519         if (wpa_dbus_register_object_per_iface(ctrl_iface,
1520                                                wpa_s->dbus_new_path,
1521                                                wpa_s->ifname, obj_desc))
1522                 goto err;
1523
1524         wpas_dbus_signal_interface_added(wpa_s);
1525
1526         return 0;
1527
1528 err:
1529         os_free(wpa_s->dbus_new_path);
1530         wpa_s->dbus_new_path = NULL;
1531         free_dbus_object_desc(obj_desc);
1532         return -1;
1533 }
1534
1535
1536 int wpas_dbus_unregister_interface(struct wpa_supplicant *wpa_s)
1537 {
1538         struct wpas_dbus_priv *ctrl_iface;
1539
1540         /* Do nothing if the control interface is not turned on */
1541         if (wpa_s == NULL || wpa_s->global == NULL)
1542                 return 0;
1543         ctrl_iface = wpa_s->global->dbus;
1544         if (ctrl_iface == NULL)
1545                 return 0;
1546
1547         wpa_printf(MSG_DEBUG, "dbus: Unregister interface object '%s'",
1548                    wpa_s->dbus_new_path);
1549         if (wpa_dbus_unregister_object_per_iface(ctrl_iface,
1550                                                  wpa_s->dbus_new_path))
1551                 return -1;
1552
1553         wpas_dbus_signal_interface_removed(wpa_s);
1554
1555         os_free(wpa_s->dbus_new_path);
1556         wpa_s->dbus_new_path = NULL;
1557
1558         return 0;
1559 }