Skip to content

feat(device): add packet I/O streams #861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
andyholmes wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(device): add packet I/O streams #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/libvalent/device/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ libvalent_device_public_headers = [
libvalent_device_private_headers = [
'valent-device-impl.h',
'valent-device-private.h',
'valent-packet-input-stream.h',
]

libvalent_device_enum_headers = [
Expand All @@ -46,6 +47,7 @@ libvalent_device_public_sources = [
'valent-device-plugin.c',
'valent-device-transfer.c',
'valent-packet.c',
'valent-packet-input-stream.c',
]


Expand Down
44 changes: 14 additions & 30 deletions src/libvalent/device/valent-channel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

#include "valent-certificate.h"
#include "valent-packet.h"
#include "valent-packet-input-stream.h"

#include "valent-channel.h"

Expand Down Expand Up @@ -55,7 +56,7 @@ typedef struct
JsonNode *peer_identity;

/* Packet Buffer */
GDataInputStream *input_buffer;
ValentPacketInputStream *input_buffer;
GQueue output_buffer;
unsigned int pending : 1;
} ValentChannelPrivate;
Expand Down Expand Up @@ -178,10 +179,13 @@ valent_channel_set_base_stream (ValentChannel *self,
{
GInputStream *input_stream;

// FIXME: associate the device paired state with the channel trust
input_stream = g_io_stream_get_input_stream (base_stream);
priv->input_buffer = g_object_new (G_TYPE_DATA_INPUT_STREAM,
priv->input_buffer = g_object_new (VALENT_TYPE_PACKET_INPUT_STREAM,
"base-stream", input_stream,
"buffer-size", VALENT_PACKET_DEFAULT_BUFFER_SIZE,
"close-base-stream", FALSE,
"trusted", TRUE,
NULL);
}
valent_object_unlock (VALENT_OBJECT (self));
Expand Down Expand Up @@ -670,34 +674,15 @@ valent_channel_close_finish (ValentChannel *channel,
}

static void
valent_channel_read_packet_cb (GObject *object,
GAsyncResult *result,
gpointer user_data)
valent_channel_read_packet_cb (ValentPacketInputStream *stream,
GAsyncResult *result,
gpointer user_data)
{
g_autoptr (GTask) task = G_TASK (g_steal_pointer (&user_data));
g_autofree char *line = NULL;
JsonNode *packet = NULL;
GError *error = NULL;

line = g_data_input_stream_read_line_finish_utf8 (G_DATA_INPUT_STREAM (object),
result,
NULL,
&error);
if (error != NULL)
{
g_task_return_error (task, g_steal_pointer (&error));
return;
}
else if (line == NULL)
{
g_task_return_new_error (task,
G_IO_ERROR,
G_IO_ERROR_CONNECTION_CLOSED,
"Channel is closed");
return;
}

packet = valent_packet_deserialize (line, &error);
packet = valent_packet_input_stream_read_packet_finish (stream, result, &error);
if (packet == NULL)
{
g_task_return_error (task, g_steal_pointer (&error));
Expand Down Expand Up @@ -741,11 +726,10 @@ valent_channel_read_packet (ValentChannel *channel,

if (!valent_channel_return_error_if_closed (channel, task))
{
g_data_input_stream_read_line_async (priv->input_buffer,
G_PRIORITY_DEFAULT,
cancellable,
valent_channel_read_packet_cb,
g_object_ref (task));
valent_packet_input_stream_read_packet_async (priv->input_buffer,
cancellable,
(GAsyncReadyCallback)valent_channel_read_packet_cb,
g_object_ref (task));
valent_object_unlock (VALENT_OBJECT (channel));
}

Expand Down
Loading
Loading