~morphis/aethercast/audio-streaming

« back to all changes in this revision

Viewing changes to src/w11tng/peerstub.cpp

Committer: Simon Fels
Date: 2016-05-26 10:05:07 UTC
mfrom: (140.2.8 trunk)
Revision ID: simon.fels@canonical.com-20160526100507-u3lr0hbmwv6a9ppc

Merge branch 'cleanup-things'

files added:
src/ac

src/ac/android

src/ac/audio

src/ac/common

src/ac/controller.cpp

src/ac/dbus

src/ac/forwardingcontroller.cpp

src/ac/mir

src/ac/mir/sourcemediamanager.h

src/ac/network

src/ac/report

src/ac/report/logging

src/ac/report/lttng

src/ac/report/null

src/ac/streaming

src/ac/ubuntu

src/ac/video

tests/ac

tests/ac/acceptance_tests

tests/ac/acceptance_tests/CMakeLists.txt

tests/ac/android

tests/ac/audio

tests/ac/common

tests/ac/dbus

tests/ac/dbus/CMakeLists.txt

tests/ac/dbus/controllerskeleton_tests.cpp

tests/ac/forwardingcontroller_tests.cpp

tests/ac/integration_tests

tests/ac/mir

tests/ac/report

tests/ac/streaming

tests/ac/video

files removed:
src/mcs

src/mcs/android

src/mcs/audio

src/mcs/common

src/mcs/forwardingmiracastcontroller.cpp

src/mcs/mir

src/mcs/mir/sourcemediamanager.h

src/mcs/miracastcontroller.cpp

src/mcs/network

src/mcs/report

src/mcs/report/logging

src/mcs/report/lttng

src/mcs/report/null

src/mcs/streaming

src/mcs/ubuntu

src/mcs/video

tests/mcs

tests/mcs/acceptance_tests

tests/mcs/acceptance_tests/CMakeLists.txt

tests/mcs/android

tests/mcs/audio

tests/mcs/common

tests/mcs/forwardingmiracastcontroller_tests.cpp

tests/mcs/integration_tests

tests/mcs/mir

tests/mcs/miracastcontrollerskeleton_tests.cpp

tests/mcs/report

tests/mcs/streaming

tests/mcs/video

files renamed:
src/mcs/android/aacencoder.cpp => src/ac/android/aacencoder.cpp

src/mcs/android/aacencoder.h => src/ac/android/aacencoder.h

src/mcs/android/baseencoder.cpp => src/ac/android/baseencoder.cpp

src/mcs/android/baseencoder.h => src/ac/android/baseencoder.h

src/mcs/android/encoderfactory.cpp => src/ac/android/encoderfactory.cpp

src/mcs/android/encoderfactory.h => src/ac/android/encoderfactory.h

src/mcs/android/h264encoder.cpp => src/ac/android/h264encoder.cpp

src/mcs/android/h264encoder.h => src/ac/android/h264encoder.h

src/mcs/android/mediasourcebuffer.cpp => src/ac/android/mediasourcebuffer.cpp

src/mcs/android/mediasourcebuffer.h => src/ac/android/mediasourcebuffer.h

src/mcs/audio/forwarder.cpp => src/ac/audio/forwarder.cpp

src/mcs/audio/forwarder.h => src/ac/audio/forwarder.h

src/mcs/audio/pulseaudiosource.cpp => src/ac/audio/pulseaudiosource.cpp

src/mcs/audio/pulseaudiosource.h => src/ac/audio/pulseaudiosource.h

src/mcs/audio/source.cpp => src/ac/audio/source.cpp

src/mcs/audio/source.h => src/ac/audio/source.h

src/mcs/basesourcemediamanager.cpp => src/ac/basesourcemediamanager.cpp

src/mcs/basesourcemediamanager.h => src/ac/basesourcemediamanager.h

src/mcs/common/executable.h => src/ac/common/executable.h

src/mcs/common/executor.h => src/ac/common/executor.h

src/mcs/common/executorfactory.h => src/ac/common/executorfactory.h

src/mcs/common/executorpool.cpp => src/ac/common/executorpool.cpp

src/mcs/common/executorpool.h => src/ac/common/executorpool.h

src/mcs/common/threadedexecutor.cpp => src/ac/common/threadedexecutor.cpp

src/mcs/common/threadedexecutor.h => src/ac/common/threadedexecutor.h

src/mcs/common/threadedexecutorfactory.cpp => src/ac/common/threadedexecutorfactory.cpp

src/mcs/common/threadedexecutorfactory.h => src/ac/common/threadedexecutorfactory.h

src/mcs/config.h.in => src/ac/config.h.in

src/mcs/miracastcontroller.h => src/ac/controller.h

src/mcs/miracastcontrollerskeleton.cpp => src/ac/dbus/controllerskeleton.cpp

src/mcs/miracastcontrollerskeleton.h => src/ac/dbus/controllerskeleton.h

src/mcs/dbuserrors.cpp => src/ac/dbus/errors.cpp

src/mcs/dbuserrors.h => src/ac/dbus/errors.h

src/mcs/dbushelpers.cpp => src/ac/dbus/helpers.cpp

src/mcs/dbushelpers.h => src/ac/dbus/helpers.h

src/mcs/networkdeviceskeleton.cpp => src/ac/dbus/networkdeviceskeleton.cpp

src/mcs/networkdeviceskeleton.h => src/ac/dbus/networkdeviceskeleton.h

src/mcs/forwardingmiracastcontroller.h => src/ac/forwardingcontroller.h

src/mcs/forwardingnetworkdevice.cpp => src/ac/forwardingnetworkdevice.cpp

src/mcs/forwardingnetworkdevice.h => src/ac/forwardingnetworkdevice.h

src/mcs/glib_wrapper.h => src/ac/glib_wrapper.h

src/mcs/gobject_deleter.h => src/ac/gobject_deleter.h

src/mcs/ip_v4_address.h => src/ac/ip_v4_address.h

src/mcs/keep_alive.h => src/ac/keep_alive.h

src/mcs/logger.cpp => src/ac/logger.cpp

src/mcs/logger.h => src/ac/logger.h

src/mcs/mac_address.h => src/ac/mac_address.h

src/mcs/main.cpp => src/ac/main.cpp

src/mcs/mediamanagerfactory.cpp => src/ac/mediamanagerfactory.cpp

src/mcs/mediamanagerfactory.h => src/ac/mediamanagerfactory.h

src/mcs/mir/screencast.cpp => src/ac/mir/screencast.cpp

src/mcs/mir/screencast.h => src/ac/mir/screencast.h

src/mcs/mir/sourcemediamanager.cpp => src/ac/mir/sourcemediamanager.cpp

src/mcs/mir/streamrenderer.cpp => src/ac/mir/streamrenderer.cpp

src/mcs/mir/streamrenderer.h => src/ac/mir/streamrenderer.h

src/mcs/network/stream.cpp => src/ac/network/stream.cpp

src/mcs/network/stream.h => src/ac/network/stream.h

src/mcs/network/types.h => src/ac/network/types.h

src/mcs/network/udpstream.cpp => src/ac/network/udpstream.cpp

src/mcs/network/udpstream.h => src/ac/network/udpstream.h

src/mcs/networkdevice.cpp => src/ac/networkdevice.cpp

src/mcs/networkdevice.h => src/ac/networkdevice.h

src/mcs/networkmanager.cpp => src/ac/networkmanager.cpp

src/mcs/networkmanager.h => src/ac/networkmanager.h

src/mcs/networkmanagerfactory.cpp => src/ac/networkmanagerfactory.cpp

src/mcs/networkmanagerfactory.h => src/ac/networkmanagerfactory.h

src/mcs/networkutils.cpp => src/ac/networkutils.cpp

src/mcs/networkutils.h => src/ac/networkutils.h

src/mcs/non_copyable.h => src/ac/non_copyable.h

src/mcs/report/logging/encoderreport.cpp => src/ac/report/logging/encoderreport.cpp

src/mcs/report/logging/encoderreport.h => src/ac/report/logging/encoderreport.h

src/mcs/report/logging/loggingreportfactory.cpp => src/ac/report/logging/loggingreportfactory.cpp

src/mcs/report/logging/loggingreportfactory.h => src/ac/report/logging/loggingreportfactory.h

src/mcs/report/logging/packetizerreport.cpp => src/ac/report/logging/packetizerreport.cpp

src/mcs/report/logging/packetizerreport.h => src/ac/report/logging/packetizerreport.h

src/mcs/report/logging/rendererreport.cpp => src/ac/report/logging/rendererreport.cpp

src/mcs/report/logging/rendererreport.h => src/ac/report/logging/rendererreport.h

src/mcs/report/logging/senderreport.cpp => src/ac/report/logging/senderreport.cpp

src/mcs/report/logging/senderreport.h => src/ac/report/logging/senderreport.h

src/mcs/report/lttng/encoderreport.cpp => src/ac/report/lttng/encoderreport.cpp

src/mcs/report/lttng/encoderreport.h => src/ac/report/lttng/encoderreport.h

src/mcs/report/lttng/encoderreport_tp.h => src/ac/report/lttng/encoderreport_tp.h

src/mcs/report/lttng/lttngreportfactory.cpp => src/ac/report/lttng/lttngreportfactory.cpp

src/mcs/report/lttng/lttngreportfactory.h => src/ac/report/lttng/lttngreportfactory.h

src/mcs/report/lttng/packetizerreport.cpp => src/ac/report/lttng/packetizerreport.cpp

src/mcs/report/lttng/packetizerreport.h => src/ac/report/lttng/packetizerreport.h

src/mcs/report/lttng/packetizerreport_tp.h => src/ac/report/lttng/packetizerreport_tp.h

src/mcs/report/lttng/rendererreport.cpp => src/ac/report/lttng/rendererreport.cpp

src/mcs/report/lttng/rendererreport.h => src/ac/report/lttng/rendererreport.h

src/mcs/report/lttng/rendererreport_tp.h => src/ac/report/lttng/rendererreport_tp.h

src/mcs/report/lttng/senderreport.cpp => src/ac/report/lttng/senderreport.cpp

src/mcs/report/lttng/senderreport.h => src/ac/report/lttng/senderreport.h

src/mcs/report/lttng/senderreport_tp.h => src/ac/report/lttng/senderreport_tp.h

src/mcs/report/lttng/tracepointprovider.cpp => src/ac/report/lttng/tracepointprovider.cpp

src/mcs/report/lttng/tracepointprovider.h => src/ac/report/lttng/tracepointprovider.h

src/mcs/report/lttng/tracepoints.c => src/ac/report/lttng/tracepoints.c

src/mcs/report/lttng/utils.h => src/ac/report/lttng/utils.h

src/mcs/report/null/encoderreport.cpp => src/ac/report/null/encoderreport.cpp

src/mcs/report/null/encoderreport.h => src/ac/report/null/encoderreport.h

src/mcs/report/null/nullreportfactory.cpp => src/ac/report/null/nullreportfactory.cpp

src/mcs/report/null/nullreportfactory.h => src/ac/report/null/nullreportfactory.h

src/mcs/report/null/packetizerreport.cpp => src/ac/report/null/packetizerreport.cpp

src/mcs/report/null/packetizerreport.h => src/ac/report/null/packetizerreport.h

src/mcs/report/null/rendererreport.cpp => src/ac/report/null/rendererreport.cpp

src/mcs/report/null/rendererreport.h => src/ac/report/null/rendererreport.h

src/mcs/report/null/senderreport.cpp => src/ac/report/null/senderreport.cpp

src/mcs/report/null/senderreport.h => src/ac/report/null/senderreport.h

src/mcs/report/reportfactory.cpp => src/ac/report/reportfactory.cpp

src/mcs/report/reportfactory.h => src/ac/report/reportfactory.h

src/mcs/scoped_gobject.h => src/ac/scoped_gobject.h

src/mcs/miracastservice.cpp => src/ac/service.cpp

src/mcs/miracastservice.h => src/ac/service.h

src/mcs/shared_gobject.h => src/ac/shared_gobject.h

src/mcs/miracastsourceclient.cpp => src/ac/sourceclient.cpp

src/mcs/miracastsourceclient.h => src/ac/sourceclient.h

src/mcs/miracastsourcemanager.cpp => src/ac/sourcemanager.cpp

src/mcs/miracastsourcemanager.h => src/ac/sourcemanager.h

src/mcs/streaming/mediasender.cpp => src/ac/streaming/mediasender.cpp

src/mcs/streaming/mediasender.h => src/ac/streaming/mediasender.h

src/mcs/streaming/mpegtspacketizer.cpp => src/ac/streaming/mpegtspacketizer.cpp

src/mcs/streaming/mpegtspacketizer.h => src/ac/streaming/mpegtspacketizer.h

src/mcs/streaming/packetizer.h => src/ac/streaming/packetizer.h

src/mcs/streaming/rtcpreceiver.cpp => src/ac/streaming/rtcpreceiver.cpp

src/mcs/streaming/rtcpreceiver.h => src/ac/streaming/rtcpreceiver.h

src/mcs/streaming/rtpsender.cpp => src/ac/streaming/rtpsender.cpp

src/mcs/streaming/rtpsender.h => src/ac/streaming/rtpsender.h

src/mcs/streaming/transportsender.cpp => src/ac/streaming/transportsender.cpp

src/mcs/streaming/transportsender.h => src/ac/streaming/transportsender.h

src/mcs/systemcontroller.cpp => src/ac/systemcontroller.cpp

src/mcs/systemcontroller.h => src/ac/systemcontroller.h

src/mcs/types.cpp => src/ac/types.cpp

src/mcs/types.h => src/ac/types.h

src/mcs/ubuntu/systemcontroller.cpp => src/ac/ubuntu/systemcontroller.cpp

src/mcs/ubuntu/systemcontroller.h => src/ac/ubuntu/systemcontroller.h

src/mcs/ubuntu/unity.cpp => src/ac/ubuntu/unity.cpp

src/mcs/ubuntu/unity.h => src/ac/ubuntu/unity.h

src/mcs/ubuntu/unitydisplaylock.cpp => src/ac/ubuntu/unitydisplaylock.cpp

src/mcs/ubuntu/unitydisplaylock.h => src/ac/ubuntu/unitydisplaylock.h

src/mcs/unixsignalhandler.cpp => src/ac/unixsignalhandler.cpp

src/mcs/unixsignalhandler.h => src/ac/unixsignalhandler.h

src/mcs/utils.cpp => src/ac/utils.cpp

src/mcs/utils.h => src/ac/utils.h

src/mcs/video/baseencoder.cpp => src/ac/video/baseencoder.cpp

src/mcs/video/baseencoder.h => src/ac/video/baseencoder.h

src/mcs/video/buffer.cpp => src/ac/video/buffer.cpp

src/mcs/video/buffer.h => src/ac/video/buffer.h

src/mcs/video/bufferproducer.h => src/ac/video/bufferproducer.h

src/mcs/video/bufferqueue.cpp => src/ac/video/bufferqueue.cpp

src/mcs/video/bufferqueue.h => src/ac/video/bufferqueue.h

src/mcs/video/displayoutput.cpp => src/ac/video/displayoutput.cpp

src/mcs/video/displayoutput.h => src/ac/video/displayoutput.h

src/mcs/video/encoderfactory.cpp => src/ac/video/encoderfactory.cpp

src/mcs/video/encoderfactory.h => src/ac/video/encoderfactory.h

src/mcs/video/encoderreport.h => src/ac/video/encoderreport.h

src/mcs/video/h264analyzer.cpp => src/ac/video/h264analyzer.cpp

src/mcs/video/h264analyzer.h => src/ac/video/h264analyzer.h

src/mcs/video/nullencoder.cpp => src/ac/video/nullencoder.cpp

src/mcs/video/nullencoder.h => src/ac/video/nullencoder.h

src/mcs/video/packetizerreport.h => src/ac/video/packetizerreport.h

src/mcs/video/rendererreport.h => src/ac/video/rendererreport.h

src/mcs/video/senderreport.h => src/ac/video/senderreport.h

src/mcs/video/utils.cpp => src/ac/video/utils.cpp

src/mcs/video/utils.h => src/ac/video/utils.h

src/mcs/video/utils_from_android.cpp => src/ac/video/utils_from_android.cpp

src/mcs/video/videoformat.cpp => src/ac/video/videoformat.cpp

src/mcs/video/videoformat.h => src/ac/video/videoformat.h

tests/mcs/CMakeLists.txt => tests/ac/CMakeLists.txt

tests/mcs/acceptance_tests/did_exit_cleanly.cpp => tests/ac/acceptance_tests/did_exit_cleanly.cpp

tests/mcs/acceptance_tests/did_exit_cleanly.h => tests/ac/acceptance_tests/did_exit_cleanly.h

tests/mcs/acceptance_tests/miracast_service_tests.cpp => tests/ac/acceptance_tests/service_tests.cpp

tests/mcs/android/CMakeLists.txt => tests/ac/android/CMakeLists.txt

tests/mcs/android/encoderfactory_tests.cpp => tests/ac/android/encoderfactory_tests.cpp

tests/mcs/android/h264encoder_tests.cpp => tests/ac/android/h264encoder_tests.cpp

tests/mcs/android/mediasourcebuffer_tests.cpp => tests/ac/android/mediasourcebuffer_tests.cpp

tests/mcs/android/mockencoderreport.cpp => tests/ac/android/mockencoderreport.cpp

tests/mcs/android/mockencoderreport.h => tests/ac/android/mockencoderreport.h

tests/mcs/android/mockmedia.cpp => tests/ac/android/mockmedia.cpp

tests/mcs/android/mockmedia.h => tests/ac/android/mockmedia.h

tests/mcs/audio/CMakeLists.txt => tests/ac/audio/CMakeLists.txt

tests/mcs/audio/forwarder_tests.cpp => tests/ac/audio/forwarder_tests.cpp

tests/mcs/audio/mockpulse.cpp => tests/ac/audio/mockpulse.cpp

tests/mcs/audio/mockpulse.h => tests/ac/audio/mockpulse.h

tests/mcs/audio/pulseaudiosource_tests.cpp => tests/ac/audio/pulseaudiosource_tests.cpp

tests/mcs/common/CMakeLists.txt => tests/ac/common/CMakeLists.txt

tests/mcs/common/executorpool_tests.cpp => tests/ac/common/executorpool_tests.cpp

tests/mcs/common/threadedexecutor_tests.cpp => tests/ac/common/threadedexecutor_tests.cpp

tests/mcs/common/threadedexecutorfactory_tests.cpp => tests/ac/common/threadedexecutorfactory_tests.cpp

tests/mcs/networkdeviceskeleton_tests.cpp => tests/ac/dbus/networkdeviceskeleton_tests.cpp

tests/mcs/forwardingnetworkdevice_tests.cpp => tests/ac/forwardingnetworkdevice_tests.cpp

tests/mcs/integration_tests/CMakeLists.txt => tests/ac/integration_tests/CMakeLists.txt

tests/mcs/integration_tests/config.h.in => tests/ac/integration_tests/config.h.in

tests/mcs/integration_tests/stream-performance-reference.xml => tests/ac/integration_tests/stream-performance-reference.xml

tests/mcs/integration_tests/test_hybris_media_api.cpp => tests/ac/integration_tests/test_hybris_media_api.cpp

tests/mcs/integration_tests/test_stream_performance.cpp => tests/ac/integration_tests/test_stream_performance.cpp

tests/mcs/mediamanagerfactory_tests.cpp => tests/ac/mediamanagerfactory_tests.cpp

tests/mcs/mir/CMakeLists.txt => tests/ac/mir/CMakeLists.txt

tests/mcs/mir/mockmir.cpp => tests/ac/mir/mockmir.cpp

tests/mcs/mir/mockmir.h => tests/ac/mir/mockmir.h

tests/mcs/mir/screencast_tests.cpp => tests/ac/mir/screencast_tests.cpp

tests/mcs/mir/sourcemediamanager_tests.cpp => tests/ac/mir/sourcemediamanager_tests.cpp

tests/mcs/mir/streamrenderer_tests.cpp => tests/ac/mir/streamrenderer_tests.cpp

tests/mcs/mock_network_device.h => tests/ac/mock_network_device.h

tests/mcs/networkdevice_tests.cpp => tests/ac/networkdevice_tests.cpp

tests/mcs/networkmanagerfactory_tests.cpp => tests/ac/networkmanagerfactory_tests.cpp

tests/mcs/networkutils_tests.cpp => tests/ac/networkutils_tests.cpp

tests/mcs/report/CMakeLists.txt => tests/ac/report/CMakeLists.txt

tests/mcs/report/reportfactory_tests.cpp => tests/ac/report/reportfactory_tests.cpp

tests/mcs/streaming/CMakeLists.txt => tests/ac/streaming/CMakeLists.txt

tests/mcs/streaming/mediasender_tests.cpp => tests/ac/streaming/mediasender_tests.cpp

tests/mcs/streaming/mpegtspacketizer_tests.cpp => tests/ac/streaming/mpegtspacketizer_tests.cpp

tests/mcs/streaming/rtpsender_tests.cpp => tests/ac/streaming/rtpsender_tests.cpp

tests/mcs/video/CMakeLists.txt => tests/ac/video/CMakeLists.txt

tests/mcs/video/buffer_tests.cpp => tests/ac/video/buffer_tests.cpp

tests/mcs/video/h264analyzer_tests.cpp => tests/ac/video/h264analyzer_tests.cpp

tests/mcs/video/videoformat_tests.cpp => tests/ac/video/videoformat_tests.cpp

files modified:
debian/changelog

src/CMakeLists.txt

src/client/application.cpp

src/client/application.h

src/client/main.cpp

src/w11tng/dhcpclient.cpp

src/w11tng/dhcpclient.h

src/w11tng/dhcpleaseparser.cpp

src/w11tng/dhcpleaseparser.h

src/w11tng/dhcpserver.cpp

src/w11tng/dhcpserver.h

src/w11tng/filemonitor.cpp

src/w11tng/filemonitor.h

src/w11tng/hostname1stub.cpp

src/w11tng/hostname1stub.h

src/w11tng/interfaceselector.cpp

src/w11tng/interfaceselector.h

src/w11tng/interfacestub.cpp

src/w11tng/interfacestub.h

src/w11tng/managerstub.cpp

src/w11tng/managerstub.h

src/w11tng/networkdevice.cpp

src/w11tng/networkdevice.h

src/w11tng/networkmanager.cpp

src/w11tng/networkmanager.h

src/w11tng/p2pdevicestub.cpp

src/w11tng/p2pdevicestub.h

src/w11tng/peerstub.cpp

src/w11tng/peerstub.h

src/w11tng/processexecutor.cpp

src/w11tng/processexecutor.h

src/w11tng/rfkillmanager.cpp

src/w11tng/rfkillmanager.h

src/w11tng/wififirmwareloader.cpp

src/w11tng/wififirmwareloader.h

tests/CMakeLists.txt

tests/common/benchmark.cpp

tests/common/benchmark.h

tests/common/dbusfixture.cpp

tests/common/dbusfixture.h

tests/common/dbusnameowner.cpp

tests/common/dbusnameowner.h

tests/common/glibhelpers.cpp

tests/common/glibhelpers.h

tests/common/statistics.cpp

tests/common/statistics.h

tests/common/virtualnetwork.cpp

tests/common/virtualnetwork.h

tests/scoped_gobject_tests.cpp

tests/utilities_tests.cpp

tests/w11tng/baseskeleton.cpp

tests/w11tng/baseskeleton.h

tests/w11tng/dhcp_tests.cpp

tests/w11tng/dhcpleaseparser_tests.cpp

tests/w11tng/interfaceselector_tests.cpp

tests/w11tng/interfacestub_tests.cpp

tests/w11tng/p2pdeviceskeleton.cpp

tests/w11tng/p2pdeviceskeleton.h

tests/w11tng/p2pdevicestub_tests.cpp

tests/w11tng/peerstub_tests.cpp

tools/mirscreencast_to_stream.cpp

tools/mpegts_muxer.cpp

tools/simplesource.cpp

tools/simplesource.h

Show diffs side-by-side

added added

removed removed

src/w11tng/peerstub.cpp

#include <sstream>

#include <mcs/keep_alive.h>

#include <mcs/logger.h>

#include <mcs/utils.h>

#include <ac/keep_alive.h>

#include <ac/logger.h>

#include <ac/utils.h>

#include "peerstub.h"

GError *error = nullptr;

connection_.reset(g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, &error));

if (!connection_) {

MCS_ERROR("Failed to connect to system bus: %s", error->message);

AC_ERROR("Failed to connect to system bus: %s", error->message);

g_error_free(error);

return sp;

}

nullptr,

[](GObject *source, GAsyncResult *res, gpointer user_data) {

auto inst = static_cast<mcs::SharedKeepAlive<PeerStub>*>(user_data)->ShouldDie();

auto inst = static_cast<ac::SharedKeepAlive<PeerStub>*>(user_data)->ShouldDie();

GError *error = nullptr;

inst->proxy_.reset(wpa_supplicant_peer_proxy_new_finish(res, &error));

if (!inst->proxy_) {

MCS_ERROR("Failed to connect with Peer proxy: %s", error->message);

AC_ERROR("Failed to connect with Peer proxy: %s", error->message);

g_error_free(error);

return;

}

if (auto sp = inst->delegate_.lock())

sp->OnPeerReady();

}, new mcs::SharedKeepAlive<PeerStub>{shared_from_this()});

}, new ac::SharedKeepAlive<PeerStub>{shared_from_this()});

return sp;

}

void PeerStub::OnPropertyChanged(GObject *source, GParamSpec *spec, gpointer user_data) {

auto inst = static_cast<mcs::WeakKeepAlive<PeerStub>*>(user_data)->GetInstance().lock();

auto inst = static_cast<ac::WeakKeepAlive<PeerStub>*>(user_data)->GetInstance().lock();

if (not inst)

return;

void PeerStub::ConnectSignals() {

g_signal_connect_data(proxy_.get(), "notify::device-name",

G_CALLBACK(&PeerStub::OnPropertyChanged), new mcs::WeakKeepAlive<PeerStub>(shared_from_this()),

[](gpointer data, GClosure *) { delete static_cast<mcs::WeakKeepAlive<PeerStub>*>(data); },

G_CALLBACK(&PeerStub::OnPropertyChanged), new ac::WeakKeepAlive<PeerStub>(shared_from_this()),

[](gpointer data, GClosure *) { delete static_cast<ac::WeakKeepAlive<PeerStub>*>(data); },

GConnectFlags(0));

g_signal_connect_data(proxy_.get(), "notify::device-address",

G_CALLBACK(&PeerStub::OnPropertyChanged), new mcs::WeakKeepAlive<PeerStub>(shared_from_this()),

[](gpointer data, GClosure *) { delete static_cast<mcs::WeakKeepAlive<PeerStub>*>(data); },

G_CALLBACK(&PeerStub::OnPropertyChanged), new ac::WeakKeepAlive<PeerStub>(shared_from_this()),

[](gpointer data, GClosure *) { delete static_cast<ac::WeakKeepAlive<PeerStub>*>(data); },

GConnectFlags(0));

}

std::stringstream ss;

for (int n = 0; n < 6; n++) {

ss << mcs::Utils::Sprintf("%02x", (uint16_t) (data[n] & 0xff));

ss << ac::Utils::Sprintf("%02x", (uint16_t) (data[n] & 0xff));

//ss << buf;

100

if (n < 5)

101

ss << ":";

154

delegate_.reset();

155

}

156

157

mcs::MacAddress PeerStub::Address() const {

157

ac::MacAddress PeerStub::Address() const {

158

return address_;

159

}

160

Older »