Deleted Added
sdiff udiff text old ( 214501 ) new ( 252190 )
full compact
1/*
2 * WPA Supplicant / dbus-based control interface
3 * Copyright (c) 2006, Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 2 as
7 * published by the Free Software Foundation.
8 *
9 * Alternatively, this software may be distributed under the terms of BSD
10 * license.
11 *
12 * See README and COPYING for more details.
13 */
14
15#include "includes.h"
16#include <dbus/dbus.h>
17
18#include "common.h"
19#include "eloop.h"
20#include "wps/wps.h"
21#include "../config.h"
22#include "../wpa_supplicant_i.h"
23#include "../bss.h"
24#include "dbus_old.h"
25#include "dbus_old_handlers.h"
26#include "dbus_common.h"
27#include "dbus_common_i.h"
28
29
30/**
31 * wpas_dbus_decompose_object_path - Decompose an interface object path into parts
32 * @path: The dbus object path
33 * @network: (out) the configured network this object path refers to, if any
34 * @bssid: (out) the scanned bssid this object path refers to, if any

--- 247 unchanged lines hidden (view full) ---

282#ifdef CONFIG_WPS
283 else if (!os_strcmp(method, "wpsPbc"))
284 reply = wpas_dbus_iface_wps_pbc(message, wpa_s);
285 else if (!os_strcmp(method, "wpsPin"))
286 reply = wpas_dbus_iface_wps_pin(message, wpa_s);
287 else if (!os_strcmp(method, "wpsReg"))
288 reply = wpas_dbus_iface_wps_reg(message, wpa_s);
289#endif /* CONFIG_WPS */
290 }
291
292 /* If the message was handled, send back the reply */
293 if (reply) {
294 if (!dbus_message_get_no_reply(message))
295 dbus_connection_send(connection, reply, NULL);
296 dbus_message_unref(reply);
297 }

--- 244 unchanged lines hidden (view full) ---

542}
543#else /* CONFIG_WPS */
544void wpa_supplicant_dbus_notify_wps_cred(struct wpa_supplicant *wpa_s,
545 const struct wps_credential *cred)
546{
547}
548#endif /* CONFIG_WPS */
549
550
551/**
552 * wpa_supplicant_dbus_ctrl_iface_init - Initialize dbus control interface
553 * @global: Pointer to global data from wpa_supplicant_init()
554 * Returns: 0 on success, -1 on failure
555 *
556 * Initialize the dbus control interface and start receiving commands from
557 * external programs over the bus.
558 */

--- 137 unchanged lines hidden ---