You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
75 lines
2.4 KiB
75 lines
2.4 KiB
2 years ago
|
From 5399d3d5ce420891adfd4beedb023515a28ceab1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frediano Ziglio <freddy77@gmail.com>
|
||
|
|
Date: Fri, 16 Sep 2022 20:14:28 +0100
|
||
|
|
Subject: [PATCH 4/8] Factor out a function to create watches
|
||
|
|
|
||
|
|
---
|
||
|
|
tools/usbredirect.c | 37 ++++++++++++++++++++-----------------
|
||
|
|
1 file changed, 20 insertions(+), 17 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tools/usbredirect.c b/tools/usbredirect.c
|
||
|
|
index 89a42a6..6a8b68b 100644
|
||
|
|
--- a/tools/usbredirect.c
|
||
|
|
+++ b/tools/usbredirect.c
|
||
|
|
@@ -414,6 +414,24 @@ end:
|
||
|
|
return G_SOURCE_REMOVE;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void
|
||
|
|
+create_watch(redirect *self)
|
||
|
|
+{
|
||
|
|
+ GSocket *socket = g_socket_connection_get_socket(self->connection);
|
||
|
|
+ int socket_fd = g_socket_get_fd(socket);
|
||
|
|
+ GIOChannel *io_channel =
|
||
|
|
+#ifdef G_OS_UNIX
|
||
|
|
+ g_io_channel_unix_new(socket_fd);
|
||
|
|
+#else
|
||
|
|
+ g_io_channel_win32_new_socket(socket_fd);
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
+ self->watch_server_id = g_io_add_watch(io_channel,
|
||
|
|
+ G_IO_IN | G_IO_OUT | G_IO_HUP | G_IO_ERR,
|
||
|
|
+ connection_handle_io_cb,
|
||
|
|
+ self);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
#ifdef G_OS_UNIX
|
||
|
|
static gboolean
|
||
|
|
signal_handler(gpointer user_data)
|
||
|
|
@@ -436,12 +454,7 @@ connection_incoming_cb(GSocketService *service,
|
||
|
|
/* Add a GSource watch to handle polling for us and handle IO in the callback */
|
||
|
|
GSocket *connection_socket = g_socket_connection_get_socket(self->connection);
|
||
|
|
g_socket_set_keepalive(connection_socket, self->keepalive);
|
||
|
|
- int socket_fd = g_socket_get_fd(connection_socket);
|
||
|
|
- GIOChannel *io_channel = g_io_channel_unix_new(socket_fd);
|
||
|
|
- self->watch_server_id = g_io_add_watch(io_channel,
|
||
|
|
- G_IO_IN | G_IO_OUT | G_IO_HUP | G_IO_ERR,
|
||
|
|
- connection_handle_io_cb,
|
||
|
|
- self);
|
||
|
|
+ create_watch(self);
|
||
|
|
return G_SOURCE_REMOVE;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -551,17 +564,7 @@ main(int argc, char *argv[])
|
||
|
|
|
||
|
|
GSocket *connection_socket = g_socket_connection_get_socket(self->connection);
|
||
|
|
g_socket_set_keepalive(connection_socket, self->keepalive);
|
||
|
|
- int socket_fd = g_socket_get_fd(connection_socket);
|
||
|
|
- GIOChannel *io_channel =
|
||
|
|
-#ifdef G_OS_UNIX
|
||
|
|
- g_io_channel_unix_new(socket_fd);
|
||
|
|
-#else
|
||
|
|
- g_io_channel_win32_new_socket(socket_fd);
|
||
|
|
-#endif
|
||
|
|
- self->watch_server_id = g_io_add_watch(io_channel,
|
||
|
|
- G_IO_IN | G_IO_OUT | G_IO_HUP | G_IO_ERR,
|
||
|
|
- connection_handle_io_cb,
|
||
|
|
- self);
|
||
|
|
+ create_watch(self);
|
||
|
|
} else {
|
||
|
|
GSocketService *socket_service;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.39.0
|
||
|
|
|