← Back to branch summary

~phablet-team/aethercast/fix-for-microsoft-dongle

« back to all changes in this revision

Viewing changes to tests/w11tng/p2pdeviceskeleton.cpp

  • Committer: Tarmac
  • Author(s): Simon Fels
  • Date: 2016-03-04 14:14:09 UTC
  • mfrom: (119.4.12 ac-networking-fixes)
  • Revision ID: tarmac-20160304141409-xe8khdgb43nha1fn
Multiple changes for Networking support:

* Add a DisconnectAll dbus method to allow the UI to easily disconnect
  any connected device. Just for the purpose of a demo.
* Return proper errors when scanning fails.
* Enable miracast mode for the WiFi driver if available.
* Set GO intent by default to 7. Should be higher if we're a sink.
* Print frequencies consider for GO negotiation
* Several minor fixes
* Enable unit tests again.

Approved by PS Jenkins bot, Thomas Voß.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/w11tng/p2pdeviceskeleton.cpp
16
16
 */
17
17
 
18
18
#include <memory>
 
19
#include <iostream>
19
20
 
20
 
#include <mcs/keep_alive.h>
21
 
#include <mcs/logger.h>
 
21
#include "mcs/keep_alive.h"
 
22
#include "mcs/logger.h"
22
23
 
23
24
#include "p2pdeviceskeleton.h"
24
25
 
94
95
    wpa_supplicant_interface_p2_pdevice_emit_device_lost(skeleton_.get(), path.c_str());
95
96
}
96
97
 
97
 
void P2PDeviceSkeleton::EmitGroupOwnerNegotiationSuccess(const std::string &path) {
 
98
void P2PDeviceSkeleton::EmitGroupOwnerNegotiationSuccess(const std::string &path, const P2PDeviceStub::Status status,
 
99
                                                         const P2PDeviceStub::Frequency freq, const P2PDeviceStub::FrequencyList &freqs,
 
100
                                                         const P2PDeviceStub::WpsMethod wps_method) {
98
101
    auto builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
99
102
    g_variant_builder_add(builder, "{sv}", "peer_object", g_variant_new_string(path.c_str()));
 
103
    g_variant_builder_add(builder, "{sv}", "status", g_variant_new_int32(static_cast<gint32>(status)));
 
104
    g_variant_builder_add(builder, "{sv}", "frequency", g_variant_new_int32(freq));
 
105
 
 
106
    auto freq_builder = g_variant_builder_new(G_VARIANT_TYPE("ai"));
 
107
    for (auto freq : freqs)
 
108
        g_variant_builder_add(freq_builder, "i", freq);
 
109
 
 
110
    g_variant_builder_add(builder, "{sv}", "frequency_list", g_variant_builder_end(freq_builder));
 
111
    g_variant_builder_add(builder, "{sv}", "wps_method", g_variant_new_string(P2PDeviceStub::WpsMethodToString(wps_method).c_str()));
 
112
 
100
113
    auto value = g_variant_builder_end(builder);
 
114
 
101
115
    wpa_supplicant_interface_p2_pdevice_emit_gonegotiation_success(skeleton_.get(), value);
102
116
}
103
117