diff options
Diffstat (limited to 'chromium/third_party/openscreen/src/osp')
9 files changed, 36 insertions, 19 deletions
diff --git a/chromium/third_party/openscreen/src/osp/demo/osp_demo.cc b/chromium/third_party/openscreen/src/osp/demo/osp_demo.cc index c14c7f297c0..c81ce9272a7 100644 --- a/chromium/third_party/openscreen/src/osp/demo/osp_demo.cc +++ b/chromium/third_party/openscreen/src/osp/demo/osp_demo.cc @@ -415,7 +415,7 @@ void RunControllerPollLoop(Controller* controller) { request_delegate.connection->Terminate( TerminationReason::kControllerTerminateCalled); } - }; + } watch = Controller::ReceiverWatch(); } @@ -644,7 +644,8 @@ int main(int argc, char** argv) { // TODO(jophba): Mac on Mojave hangs on this command forever. openscreen::SetLogFifoOrDie(log_filename); - PlatformClientPosix::Create(Clock::duration{50}, Clock::duration{50}); + PlatformClientPosix::Create(std::chrono::milliseconds(50), + std::chrono::milliseconds(50)); if (is_receiver_demo) { OSP_LOG_INFO << "Running publisher demo..."; diff --git a/chromium/third_party/openscreen/src/osp/impl/discovery/mdns/mdns_demo.cc b/chromium/third_party/openscreen/src/osp/impl/discovery/mdns/mdns_demo.cc index a6c0e508165..8037a16cebf 100644 --- a/chromium/third_party/openscreen/src/osp/impl/discovery/mdns/mdns_demo.cc +++ b/chromium/third_party/openscreen/src/osp/impl/discovery/mdns/mdns_demo.cc @@ -58,7 +58,7 @@ struct Service { class DemoSocketClient : public UdpSocket::Client { public: - DemoSocketClient(MdnsResponderAdapterImpl* mdns) : mdns_(mdns) {} + explicit DemoSocketClient(MdnsResponderAdapterImpl* mdns) : mdns_(mdns) {} void OnError(UdpSocket* socket, Error error) override { // TODO(crbug.com/openscreen/66): Change to OSP_LOG_FATAL. @@ -361,7 +361,8 @@ int main(int argc, char** argv) { openscreen::osp::ServiceMap services; openscreen::osp::g_services = &services; - PlatformClientPosix::Create(Clock::duration{50}, Clock::duration{50}); + PlatformClientPosix::Create(std::chrono::milliseconds(50), + std::chrono::milliseconds(50)); openscreen::osp::BrowseDemo( PlatformClientPosix::GetInstance()->GetTaskRunner(), labels[0], labels[1], diff --git a/chromium/third_party/openscreen/src/osp/impl/discovery/mdns/mdns_responder_platform.cc b/chromium/third_party/openscreen/src/osp/impl/discovery/mdns/mdns_responder_platform.cc index 02fa9ba6ac2..0d31b2b82cf 100644 --- a/chromium/third_party/openscreen/src/osp/impl/discovery/mdns/mdns_responder_platform.cc +++ b/chromium/third_party/openscreen/src/osp/impl/discovery/mdns/mdns_responder_platform.cc @@ -18,11 +18,15 @@ #include "third_party/mDNSResponder/src/mDNSCore/mDNSEmbeddedAPI.h" #include "util/osp_logging.h" +namespace { + using std::chrono::duration_cast; using std::chrono::hours; using std::chrono::milliseconds; using std::chrono::seconds; +} // namespace + extern "C" { const char ProgramName[] = "openscreen"; @@ -73,7 +77,13 @@ void mDNSPlatformLock(const mDNS* m) { void mDNSPlatformUnlock(const mDNS* m) {} void mDNSPlatformStrCopy(void* dst, const void* src) { - std::strcpy(static_cast<char*>(dst), static_cast<const char*>(src)); + const char* source = static_cast<const char*>(src); + const size_t source_len = strlen(source); + + // Unfortunately, the caller is responsible for making sure that dst + // if of sufficient length to store the src string. Otherwise we may + // cause an access violation. + std::strncpy(static_cast<char*>(dst), source, source_len); } mDNSu32 mDNSPlatformStrLen(const void* src) { diff --git a/chromium/third_party/openscreen/src/osp/impl/mdns_responder_service_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/mdns_responder_service_unittest.cc index 5a9891acf5b..0961d0d1fff 100644 --- a/chromium/third_party/openscreen/src/osp/impl/mdns_responder_service_unittest.cc +++ b/chromium/third_party/openscreen/src/osp/impl/mdns_responder_service_unittest.cc @@ -7,6 +7,7 @@ #include <cstdint> #include <iostream> #include <memory> +#include <utility> #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -130,7 +131,8 @@ class WrapperMdnsResponderAdapterFactory final : public MdnsResponderAdapterFactory, public FakeMdnsResponderAdapter::LifetimeObserver { public: - WrapperMdnsResponderAdapterFactory(FakeMdnsResponderAdapterFactory* ptr) + explicit WrapperMdnsResponderAdapterFactory( + FakeMdnsResponderAdapterFactory* ptr) : other_(ptr) {} std::unique_ptr<MdnsResponderAdapter> Create() override { diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.h b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.h index eed24f94536..a69919fcf90 100644 --- a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.h +++ b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.h @@ -7,6 +7,7 @@ #include <algorithm> #include <memory> +#include <string> #include "osp/msgs/osp_messages.h" #include "osp/public/message_demuxer.h" @@ -34,7 +35,7 @@ MessageDemuxer* GetClientDemuxer(); class PresentationID { public: - PresentationID(const std::string presentation_id); + explicit PresentationID(const std::string presentation_id); operator bool() { return id_; } operator std::string() { return id_.value(); } diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller_unittest.cc index bad4c66616a..343ea4d888a 100644 --- a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller_unittest.cc +++ b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller_unittest.cc @@ -21,7 +21,6 @@ namespace openscreen { namespace osp { -using std::chrono::seconds; using ::testing::_; using ::testing::Invoke; using ::testing::NiceMock; @@ -77,8 +76,8 @@ class MockRequestDelegate final : public RequestDelegate { class ControllerTest : public ::testing::Test { public: ControllerTest() { - fake_clock_ = - std::make_unique<FakeClock>(Clock::time_point(seconds(11111))); + fake_clock_ = std::make_unique<FakeClock>( + Clock::time_point(std::chrono::seconds(11111))); task_runner_ = std::make_unique<FakeTaskRunner>(fake_clock_.get()); quic_bridge_ = std::make_unique<FakeQuicBridge>(task_runner_.get(), FakeClock::now); diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester_unittest.cc index 4b601b38b6f..029ed6c6cbf 100644 --- a/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester_unittest.cc +++ b/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester_unittest.cc @@ -4,7 +4,10 @@ #include "osp/impl/presentation/url_availability_requester.h" +#include <chrono> #include <memory> +#include <utility> +#include <vector> #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -17,9 +20,6 @@ #include "platform/test/fake_task_runner.h" #include "util/osp_logging.h" -using std::chrono::milliseconds; -using std::chrono::seconds; - namespace openscreen { namespace osp { @@ -46,8 +46,8 @@ class MockReceiverObserver : public ReceiverObserver { class UrlAvailabilityRequesterTest : public Test { public: UrlAvailabilityRequesterTest() { - fake_clock_ = - std::make_unique<FakeClock>(Clock::time_point(milliseconds(1298424))); + fake_clock_ = std::make_unique<FakeClock>( + Clock::time_point(std::chrono::milliseconds(1298424))); task_runner_ = std::make_unique<FakeTaskRunner>(fake_clock_.get()); quic_bridge_ = std::make_unique<FakeQuicBridge>(task_runner_.get(), FakeClock::now); @@ -546,7 +546,7 @@ TEST_F(UrlAvailabilityRequesterTest, RefreshWatches) { EXPECT_CALL(mock_observer1, OnReceiverUnavailable(_, service_id_)).Times(0); quic_bridge_->RunTasksUntilIdle(); - fake_clock_->Advance(seconds(60)); + fake_clock_->Advance(std::chrono::seconds(60)); ExpectStreamMessage(&mock_callback_, &request); listener_.RefreshWatches(); @@ -667,7 +667,7 @@ TEST_F(UrlAvailabilityRequesterTest, RemoveObserverInSteps) { quic_bridge_->RunTasksUntilIdle(); EXPECT_EQ((std::vector<std::string>{url2_}), request.urls); - fake_clock_->Advance(seconds(60)); + fake_clock_->Advance(std::chrono::seconds(60)); listener_.RefreshWatches(); EXPECT_CALL(mock_callback_, OnStreamMessage(_, _, _, _, _, _)).Times(0); diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.h b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.h index e3588f6a2f0..99b8959707a 100644 --- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.h +++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.h @@ -7,6 +7,7 @@ #include <map> #include <memory> +#include <vector> #include "osp/impl/quic/quic_connection_factory.h" #include "platform/api/udp_socket.h" @@ -22,7 +23,7 @@ class QuicTaskRunner; class QuicConnectionFactoryImpl final : public QuicConnectionFactory { public: - QuicConnectionFactoryImpl(TaskRunner* task_runner); + explicit QuicConnectionFactoryImpl(TaskRunner* task_runner); ~QuicConnectionFactoryImpl() override; // UdpSocket::Client overrides. diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.h b/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.h index 2aac1145359..834d2889c3e 100644 --- a/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.h +++ b/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.h @@ -5,6 +5,7 @@ #ifndef OSP_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_FACTORY_H_ #define OSP_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_FACTORY_H_ +#include <memory> #include <vector> #include "gmock/gmock.h" @@ -17,7 +18,8 @@ namespace osp { class FakeQuicConnectionFactoryBridge { public: - FakeQuicConnectionFactoryBridge(const IPEndpoint& controller_endpoint); + explicit FakeQuicConnectionFactoryBridge( + const IPEndpoint& controller_endpoint); bool server_idle() const { return server_idle_; } bool client_idle() const { return client_idle_; } |