diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.cpp b/xplat/Flipper/FlipperConnectionManagerImpl.cpp index 12bcabac0..d87698ab4 100644 --- a/xplat/Flipper/FlipperConnectionManagerImpl.cpp +++ b/xplat/Flipper/FlipperConnectionManagerImpl.cpp @@ -34,12 +34,11 @@ static constexpr int maxPayloadSize = 0xFFFFFF; // Not a public-facing version number. // Used for compatibility checking with desktop flipper. // To be bumped for every core platform interface change. -static constexpr int sdkVersion = 2; +static constexpr int sdkVersion = 3; namespace facebook { namespace flipper { - class ConnectionEvents : public rsocket::RSocketConnectionEvents { private: FlipperConnectionManagerImpl* websocket_; @@ -189,10 +188,13 @@ void FlipperConnectionManagerImpl::connectSecurely() { if (deviceId.compare("unknown")) { loadingDeviceId->complete(); } - parameters.payload = rsocket::Payload( - folly::toJson(folly::dynamic::object("os", deviceData_.os)( - "device", deviceData_.device)("device_id", deviceId)( - "app", deviceData_.app)("sdk_version", sdkVersion))); + + parameters.payload = rsocket::Payload(folly::toJson(folly::dynamic::object( + "csr", contextStore_->getCertificateSigningRequest().c_str())( + "csr_path", contextStore_->getCertificateDirectoryPath().c_str())( + "os", deviceData_.os)("device", deviceData_.device)( + "device_id", deviceId)("app", deviceData_.app)( + "sdk_version", sdkVersion))); address.setFromHostPort(deviceData_.host, securePort); std::shared_ptr sslContext = diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.h b/xplat/Flipper/FlipperConnectionManagerImpl.h index e3ad92a49..9f1345532 100644 --- a/xplat/Flipper/FlipperConnectionManagerImpl.h +++ b/xplat/Flipper/FlipperConnectionManagerImpl.h @@ -6,13 +6,13 @@ */ #pragma once -#include "FlipperInitConfig.h" -#include "FlipperConnectionManager.h" -#include "FlipperState.h" #include #include #include #include +#include "FlipperConnectionManager.h" +#include "FlipperInitConfig.h" +#include "FlipperState.h" namespace facebook { namespace flipper { @@ -27,7 +27,10 @@ class FlipperConnectionManagerImpl : public FlipperConnectionManager { friend ConnectionEvents; public: - FlipperConnectionManagerImpl(FlipperInitConfig config, std::shared_ptr state, std::shared_ptr contextStore); + FlipperConnectionManagerImpl( + FlipperInitConfig config, + std::shared_ptr state, + std::shared_ptr contextStore); ~FlipperConnectionManagerImpl();