diff options
Diffstat (limited to 'adb/transport.cpp')
| -rw-r--r-- | adb/transport.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/adb/transport.cpp b/adb/transport.cpp index 447a8fedf..6dccb7f68 100644 --- a/adb/transport.cpp +++ b/adb/transport.cpp @@ -82,6 +82,8 @@ const char* const kFeatureFixedPushSymlinkTimestamp = "fixed_push_symlink_timest const char* const kFeatureAbbExec = "abb_exec"; const char* const kFeatureRemountShell = "remount_shell"; const char* const kFeatureTrackApp = "track_app"; +const char* const kFeatureSendRecv2 = "sendrecv_v2"; +const char* const kFeatureSendRecv2Brotli = "sendrecv_v2_brotli"; namespace { @@ -498,12 +500,14 @@ bool FdConnection::DoTlsHandshake(RSA* key, std::string* auth_key) { auto x509 = GenerateX509Certificate(evp_pkey.get()); auto x509_str = X509ToPEMString(x509.get()); auto evp_str = Key::ToPEMString(evp_pkey.get()); + + int osh = cast_handle_to_int(adb_get_os_handle(fd_)); #if ADB_HOST tls_ = TlsConnection::Create(TlsConnection::Role::Client, #else tls_ = TlsConnection::Create(TlsConnection::Role::Server, #endif - x509_str, evp_str, fd_); + x509_str, evp_str, osh); CHECK(tls_); #if ADB_HOST // TLS 1.3 gives the client no message if the server rejected the @@ -1177,6 +1181,8 @@ const FeatureSet& supported_features() { kFeatureAbbExec, kFeatureRemountShell, kFeatureTrackApp, + kFeatureSendRecv2, + kFeatureSendRecv2Brotli, // Increment ADB_SERVER_VERSION when adding a feature that adbd needs // to know about. Otherwise, the client can be stuck running an old // version of the server even after upgrading their copy of adb. |