TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 07:36:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite dbus code using sdbus-c++

Browse Source
This commit is contained in:
Vibhav Pant
2023-08-15 20:52:51 +05:30
parent 295f9d6b2e
commit f9fb3d259e
30 changed files with 1656 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/linux/bluetooth_classic_socket.cc
+21 -30
View File
@@ -7,17 +7,18 @@
#include "internal/platform/byte_array.h"
#include "internal/platform/exception.h"
#include "internal/platform/implementation/linux/bluetooth_classic_device.h"
#include "internal/platform/implementation/linux/bluetooth_classic_socket.h"
#include "internal/platform/implementation/linux/bluez.h"
#include "internal/platform/logging.h"
namespace nearby {
namespace linux {
ExceptionOr<ByteArray> BluetoothInputStream::Read(std::int64_t size) {
if (!fd_.has_value())
return Exception::kIo;
char *data = new char[size];
ssize_t ret = read(fd_, data, size);
ssize_t ret = read(fd_->get(), data, size);
if (ret == 0) {
delete[] data;
return ExceptionOr(ByteArray());
@@ -30,17 +31,23 @@ ExceptionOr<ByteArray> BluetoothInputStream::Read(std::int64_t size) {
}
ExceptionOr<std::size_t> BluetoothInputStream::Skip(std::size_t offset) {
auto off = lseek(fd_, offset, SEEK_CUR);
if (!fd_.has_value())
return Exception::kIo;
auto off = lseek(fd_->get(), offset, SEEK_CUR);
if (off != offset) {
auto end = lseek(fd_, 0, SEEK_END);
auto end = lseek(fd_->get(), 0, SEEK_END);
return off == end ? ExceptionOr((std::size_t)off) : Exception::kIo;
}
return ExceptionOr((std::size_t)(off));
}
ExceptionOr<ByteArray> BluetoothInputStream::ReadExactly(std::size_t size) {
if (!fd_.has_value())
return Exception::kIo;
char *data = new char[size];
ssize_t ret = read(fd_, data, size);
ssize_t ret = read(fd_->get(), data, size);
if (ret < 0) {
delete[] data;
return Exception::kIo;
@@ -50,9 +57,12 @@ ExceptionOr<ByteArray> BluetoothInputStream::ReadExactly(std::size_t size) {
}
Exception BluetoothOutputStream::Write(const ByteArray &data) {
if (!fd_.has_value())
return Exception{Exception::kIo};
ssize_t written = 0;
while (written < data.size()) {
ssize_t ret = write(fd_, data.data(), data.size());
ssize_t ret = write(fd_->get(), data.data(), data.size());
if (ret < 1) {
return Exception{Exception::kIo};
}
@@ -66,32 +76,13 @@ Exception BluetoothOutputStream::Flush() {
}
Exception BluetoothOutputStream::Close() {
return close(fd_) < 0 ? Exception{Exception::kIo}
: Exception{Exception::kSuccess};
return close(fd_->get()) < 0 ? Exception{Exception::kIo}
: Exception{Exception::kSuccess};
}
Exception BluetoothSocket::Close() {
__attribute__((cleanup(sd_bus_unrefp))) sd_bus *system_bus = NULL;
__attribute__((cleanup(sd_bus_error_free))) sd_bus_error err =
SD_BUS_ERROR_NULL;
if (auto ret = sd_bus_default_system(&system_bus); ret < 0) {
sd_bus_error_set_errno(&err, ret);
NEARBY_LOGS(ERROR) << __func__
<< "Error connecting to system bus: " << err.name << ": "
<< err.message;
return Exception{Exception::kFailed};
}
if (sd_bus_call_method(system_bus, BLUEZ_SERVICE, device_object_path_.c_str(),
BLUEZ_DEVICE_INTERFACE, "DisconnectProfile", &err,
nullptr, "s", connected_profile_uuid_.c_str()) < 0) {
NEARBY_LOGS(ERROR) << __func__ << "Error disconnecting from profile "
<< connected_profile_uuid_ << " on device "
<< device_object_path_ << ": " << err.name << ": "
<< err.message;
return Exception{Exception::kFailed};
}
input_stream_.fd_.reset();
output_stream_.fd_.reset();
return Exception{Exception::kSuccess};
}