[phodav] spice: uncrustify
- From: Marc-Andre Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [phodav] spice: uncrustify
- Date: Wed, 5 Feb 2014 11:21:43 +0000 (UTC)
commit 81514de74ac5a60c97cc13c8fc0102cec86c2937
Author: Marc-André Lureau <marcandre lureau gmail com>
Date: Tue Feb 4 14:53:35 2014 +0100
spice: uncrustify
spice/spice-webdavd.c | 892 +++++++++++++++++++++++++------------------------
1 files changed, 458 insertions(+), 434 deletions(-)
---
diff --git a/spice/spice-webdavd.c b/spice/spice-webdavd.c
index 60f20ad..5a2f57e 100644
--- a/spice/spice-webdavd.c
+++ b/spice/spice-webdavd.c
@@ -34,164 +34,171 @@
#include <avahi-gobject/ga-entry-group.h>
#endif
-typedef struct _OutputQueue {
- guint refs;
- GOutputStream *output;
- gboolean flushing;
- guint idle_id;
- GQueue *queue;
+typedef struct _OutputQueue
+{
+ guint refs;
+ GOutputStream *output;
+ gboolean flushing;
+ guint idle_id;
+ GQueue *queue;
} OutputQueue;
-typedef struct _OutputQueueElem {
- OutputQueue *queue;
- const guint8 *buf;
- gsize size;
- GFunc cb;
- gpointer user_data;
+typedef struct _OutputQueueElem
+{
+ OutputQueue *queue;
+ const guint8 *buf;
+ gsize size;
+ GFunc cb;
+ gpointer user_data;
} OutputQueueElem;
static OutputQueue*
-output_queue_new(GOutputStream *output)
+output_queue_new (GOutputStream *output)
{
- OutputQueue *queue = g_new0(OutputQueue, 1);
+ OutputQueue *queue = g_new0 (OutputQueue, 1);
- queue->output = g_object_ref(output);
- queue->queue = g_queue_new();
- queue->refs = 1;
+ queue->output = g_object_ref (output);
+ queue->queue = g_queue_new ();
+ queue->refs = 1;
- return queue;
+ return queue;
}
static
-void output_queue_free(OutputQueue *queue)
+void
+output_queue_free (OutputQueue *queue)
{
- g_warn_if_fail(g_queue_get_length(queue->queue) == 0);
- g_warn_if_fail(!queue->flushing);
- g_warn_if_fail(!queue->idle_id);
+ g_warn_if_fail (g_queue_get_length (queue->queue) == 0);
+ g_warn_if_fail (!queue->flushing);
+ g_warn_if_fail (!queue->idle_id);
- g_queue_free_full(queue->queue, g_free);
- g_clear_object(&queue->output);
- g_free(queue);
+ g_queue_free_full (queue->queue, g_free);
+ g_clear_object (&queue->output);
+ g_free (queue);
}
static OutputQueue*
-output_queue_ref(OutputQueue *q)
+output_queue_ref (OutputQueue *q)
{
- q->refs++;
- return q;
+ q->refs++;
+ return q;
}
static void
-output_queue_unref(OutputQueue *q)
+output_queue_unref (OutputQueue *q)
{
- q->refs--;
- if (q->refs == 0)
- output_queue_free(q);
+ q->refs--;
+ if (q->refs == 0)
+ output_queue_free (q);
}
-static gboolean
-output_queue_idle(gpointer user_data);
+static gboolean output_queue_idle (gpointer user_data);
static void
-output_queue_flush_cb(GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
+output_queue_flush_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
{
- GError *error = NULL;
- OutputQueueElem *e = user_data;
- OutputQueue *q = e->queue;
+ GError *error = NULL;
+ OutputQueueElem *e = user_data;
+ OutputQueue *q = e->queue;
- g_debug("flushed");
- q->flushing = FALSE;
- g_output_stream_flush_finish(G_OUTPUT_STREAM(source_object),
- res, &error);
- if (error)
- g_warning("error: %s", error->message);
+ g_debug ("flushed");
+ q->flushing = FALSE;
+ g_output_stream_flush_finish (G_OUTPUT_STREAM (source_object),
+ res, &error);
+ if (error)
+ g_warning ("error: %s", error->message);
- g_clear_error(&error);
+ g_clear_error (&error);
- if (!q->idle_id)
- q->idle_id = g_idle_add(output_queue_idle, output_queue_ref(q));
+ if (!q->idle_id)
+ q->idle_id = g_idle_add (output_queue_idle, output_queue_ref (q));
- g_free(e);
- output_queue_unref(q);
+ g_free (e);
+ output_queue_unref (q);
}
static gboolean
-output_queue_idle(gpointer user_data)
+output_queue_idle (gpointer user_data)
{
- OutputQueue *q = user_data;
- OutputQueueElem *e = NULL;
- GError *error = NULL;
-
- if (q->flushing) {
- g_debug("already flushing");
- goto end;
+ OutputQueue *q = user_data;
+ OutputQueueElem *e = NULL;
+ GError *error = NULL;
+
+ if (q->flushing)
+ {
+ g_debug ("already flushing");
+ goto end;
}
- e = g_queue_pop_head(q->queue);
- if (!e) {
- g_debug("No more data to flush");
- goto end;
+ e = g_queue_pop_head (q->queue);
+ if (!e)
+ {
+ g_debug ("No more data to flush");
+ goto end;
}
- g_debug("flushing %" G_GSIZE_FORMAT, e->size);
- g_output_stream_write_all(q->output, e->buf, e->size, NULL, NULL, &error);
- if (error)
- goto end;
+ g_debug ("flushing %" G_GSIZE_FORMAT, e->size);
+ g_output_stream_write_all (q->output, e->buf, e->size, NULL, NULL, &error);
+ if (error)
+ goto end;
- if (e->cb)
- e->cb(q, e->user_data);
+ if (e->cb)
+ e->cb (q, e->user_data);
- q->flushing = TRUE;
- g_output_stream_flush_async(q->output, G_PRIORITY_DEFAULT, NULL, output_queue_flush_cb, e);
+ q->flushing = TRUE;
+ g_output_stream_flush_async (q->output, G_PRIORITY_DEFAULT, NULL, output_queue_flush_cb, e);
- q->idle_id = 0;
- return FALSE;
+ q->idle_id = 0;
+ return FALSE;
end:
- if (error) {
- g_warning("error: %s", error->message);
- g_clear_error(&error);
+ if (error)
+ {
+ g_warning ("error: %s", error->message);
+ g_clear_error (&error);
}
- q->idle_id = 0;
- g_free(e);
- output_queue_unref(q);
+ q->idle_id = 0;
+ g_free (e);
+ output_queue_unref (q);
- return FALSE;
+ return FALSE;
}
static void
-output_queue_push(OutputQueue *q, const guint8 *buf, gsize size,
- GFunc pushed_cb, gpointer user_data)
+output_queue_push (OutputQueue *q, const guint8 *buf, gsize size,
+ GFunc pushed_cb, gpointer user_data)
{
- OutputQueueElem *e = g_new(OutputQueueElem, 1);
+ OutputQueueElem *e = g_new (OutputQueueElem, 1);
- e->buf = buf;
- e->size = size;
- e->cb = pushed_cb;
- e->user_data = user_data;
- e->queue = q;
- g_queue_push_tail(q->queue, e);
+ e->buf = buf;
+ e->size = size;
+ e->cb = pushed_cb;
+ e->user_data = user_data;
+ e->queue = q;
+ g_queue_push_tail (q->queue, e);
- if (!q->idle_id && !q->flushing)
- q->idle_id = g_idle_add(output_queue_idle, output_queue_ref(q));
+ if (!q->idle_id && !q->flushing)
+ q->idle_id = g_idle_add (output_queue_idle, output_queue_ref (q));
}
-static struct _DemuxData {
- gint64 client;
- guint16 size;
- gchar buf[G_MAXUINT16];
+static struct _DemuxData
+{
+ gint64 client;
+ guint16 size;
+ gchar buf[G_MAXUINT16];
} demux;
-typedef struct _Client {
- gint64 id;
- guint8 buf[G_MAXUINT16];
- guint16 size;
- GSocketConnection *client_connection;
- OutputQueue *queue;
+typedef struct _Client
+{
+ gint64 id;
+ guint8 buf[G_MAXUINT16];
+ guint16 size;
+ GSocketConnection *client_connection;
+ OutputQueue *queue;
} Client;
static GMainLoop *loop;
@@ -200,297 +207,302 @@ static GOutputStream *mux_ostream;
static OutputQueue *mux_queue;
static GHashTable *clients;
-static void
-start_mux_read(GInputStream *istream);
+static void start_mux_read (GInputStream *istream);
static void
-quit(int sig)
+quit (int sig)
{
- g_main_loop_quit(loop);
+ g_main_loop_quit (loop);
}
static Client *
-add_client(GSocketConnection *client_connection)
+add_client (GSocketConnection *client_connection)
{
- GIOStream *iostream = G_IO_STREAM(client_connection);
- GOutputStream *ostream = g_io_stream_get_output_stream(iostream);
- GOutputStream *bostream;
- Client *client;
+ GIOStream *iostream = G_IO_STREAM (client_connection);
+ GOutputStream *ostream = g_io_stream_get_output_stream (iostream);
+ GOutputStream *bostream;
+ Client *client;
- bostream = g_buffered_output_stream_new(ostream);
- g_buffered_output_stream_set_auto_grow(G_BUFFERED_OUTPUT_STREAM(bostream), TRUE);
+ bostream = g_buffered_output_stream_new (ostream);
+ g_buffered_output_stream_set_auto_grow (G_BUFFERED_OUTPUT_STREAM (bostream), TRUE);
- client = g_new0(Client, 1);
- client->client_connection = g_object_ref(client_connection);
- client->id = GPOINTER_TO_INT(client_connection);
- client->queue = output_queue_new(bostream);
- g_object_unref(bostream);
+ client = g_new0 (Client, 1);
+ client->client_connection = g_object_ref (client_connection);
+ client->id = GPOINTER_TO_INT (client_connection);
+ client->queue = output_queue_new (bostream);
+ g_object_unref (bostream);
- g_hash_table_insert(clients, g_object_ref(client_connection), client);
+ g_hash_table_insert (clients, g_object_ref (client_connection), client);
- return client;
+ return client;
}
static void
-client_free(Client *c)
+client_free (Client *c)
{
- g_object_unref(c->client_connection);
- output_queue_unref(c->queue);
- g_free(c);
+ g_object_unref (c->client_connection);
+ output_queue_unref (c->queue);
+ g_free (c);
}
static void
-remove_client(Client *client)
+remove_client (Client *client)
{
- g_debug("remove client %p", client);
+ g_debug ("remove client %p", client);
- g_hash_table_remove(clients, client->client_connection);
+ g_hash_table_remove (clients, client->client_connection);
}
-typedef struct ReadData {
- void *buffer;
- gsize count;
- gssize size;
+typedef struct ReadData
+{
+ void *buffer;
+ gsize count;
+ gssize size;
} ReadData;
static void
-read_thread(GSimpleAsyncResult *simple,
- GObject *object,
- GCancellable *cancellable)
-{
- GError *error = NULL;
- GInputStream *stream = G_INPUT_STREAM(object);
- ReadData *data;
- gsize bread;
-
- data = g_simple_async_result_get_op_res_gpointer(simple);
-
- g_debug("my read %" G_GSIZE_FORMAT, data->count);
- g_input_stream_read_all(stream,
- data->buffer, data->count, &bread,
- cancellable, &error);
- if (bread != data->count)
- data->size = -1;
- else
- data->size = bread;
-
- if (error) {
- g_debug("error: %s", error->message);
- g_simple_async_result_set_from_error(simple, error);
+read_thread (GSimpleAsyncResult *simple,
+ GObject *object,
+ GCancellable *cancellable)
+{
+ GError *error = NULL;
+ GInputStream *stream = G_INPUT_STREAM (object);
+ ReadData *data;
+ gsize bread;
+
+ data = g_simple_async_result_get_op_res_gpointer (simple);
+
+ g_debug ("my read %" G_GSIZE_FORMAT, data->count);
+ g_input_stream_read_all (stream,
+ data->buffer, data->count, &bread,
+ cancellable, &error);
+ if (bread != data->count)
+ data->size = -1;
+ else
+ data->size = bread;
+
+ if (error)
+ {
+ g_debug ("error: %s", error->message);
+ g_simple_async_result_set_from_error (simple, error);
}
}
static void
-my_input_stream_read_async(GInputStream *stream,
- void *buffer,
- gsize count,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- GSimpleAsyncResult *simple;
- ReadData *data = g_new(ReadData, 1);
-
- data->buffer = buffer;
- data->count = count;
-
- simple = g_simple_async_result_new(G_OBJECT(stream),
- callback, user_data,
- my_input_stream_read_async);
-
- g_simple_async_result_set_op_res_gpointer(simple, data, g_free);
- g_simple_async_result_run_in_thread(simple, read_thread, io_priority, cancellable);
- g_object_unref(simple);
+my_input_stream_read_async (GInputStream *stream,
+ void *buffer,
+ gsize count,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple;
+ ReadData *data = g_new (ReadData, 1);
+
+ data->buffer = buffer;
+ data->count = count;
+
+ simple = g_simple_async_result_new (G_OBJECT (stream),
+ callback, user_data,
+ my_input_stream_read_async);
+
+ g_simple_async_result_set_op_res_gpointer (simple, data, g_free);
+ g_simple_async_result_run_in_thread (simple, read_thread, io_priority, cancellable);
+ g_object_unref (simple);
}
static gssize
-my_input_stream_read_finish(GInputStream *stream,
- GAsyncResult *result,
- GError **error)
+my_input_stream_read_finish (GInputStream *stream,
+ GAsyncResult *result,
+ GError **error)
{
- GSimpleAsyncResult *simple;
- ReadData *data;
+ GSimpleAsyncResult *simple;
+ ReadData *data;
- g_return_val_if_fail(g_simple_async_result_is_valid(result,
- G_OBJECT(stream),
+ g_return_val_if_fail (g_simple_async_result_is_valid (result,
+ G_OBJECT (stream),
my_input_stream_read_async),
- -1);
+ -1);
- simple = G_SIMPLE_ASYNC_RESULT(result);
+ simple = G_SIMPLE_ASYNC_RESULT (result);
- if (g_simple_async_result_propagate_error(simple, error))
- return -1;
+ if (g_simple_async_result_propagate_error (simple, error))
+ return -1;
- data = g_simple_async_result_get_op_res_gpointer(simple);
+ data = g_simple_async_result_get_op_res_gpointer (simple);
- return data->size;
+ return data->size;
}
static void
-mux_pushed_client_cb(OutputQueue *q, gpointer user_data)
+mux_pushed_client_cb (OutputQueue *q, gpointer user_data)
{
- start_mux_read(mux_istream);
+ start_mux_read (mux_istream);
}
static void
-mux_data_read_cb(GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
-{
- GError *error = NULL;
- gssize size;
-
- size = my_input_stream_read_finish(G_INPUT_STREAM(source_object), res, &error);
- g_return_if_fail(size == demux.size);
- if (error) {
- g_warning("error: %s", error->message);
- g_clear_error(&error);
- quit(0);
- return;
+mux_data_read_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GError *error = NULL;
+ gssize size;
+
+ size = my_input_stream_read_finish (G_INPUT_STREAM (source_object), res, &error);
+ g_return_if_fail (size == demux.size);
+ if (error)
+ {
+ g_warning ("error: %s", error->message);
+ g_clear_error (&error);
+ quit (0);
+ return;
}
- Client *c = g_hash_table_lookup(clients, GINT_TO_POINTER(demux.client));
+ Client *c = g_hash_table_lookup (clients, GINT_TO_POINTER (demux.client));
- if (c)
- output_queue_push(c->queue, (guint8 *)demux.buf, demux.size,
- (GFunc)mux_pushed_client_cb, c);
- else
- start_mux_read(mux_istream);
+ if (c)
+ output_queue_push (c->queue, (guint8 *) demux.buf, demux.size,
+ (GFunc) mux_pushed_client_cb, c);
+ else
+ start_mux_read (mux_istream);
}
static void
-mux_size_read_cb(GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
+mux_size_read_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
{
- GInputStream *istream = G_INPUT_STREAM(source_object);
- GError *error = NULL;
- gssize size;
+ GInputStream *istream = G_INPUT_STREAM (source_object);
+ GError *error = NULL;
+ gssize size;
- size = my_input_stream_read_finish(G_INPUT_STREAM(source_object), res, &error);
- if (error || size != sizeof(guint16))
- goto end;
+ size = my_input_stream_read_finish (G_INPUT_STREAM (source_object), res, &error);
+ if (error || size != sizeof (guint16))
+ goto end;
- my_input_stream_read_async(istream,
- &demux.buf, demux.size, G_PRIORITY_DEFAULT,
- NULL, mux_data_read_cb, NULL);
- return;
+ my_input_stream_read_async (istream,
+ &demux.buf, demux.size, G_PRIORITY_DEFAULT,
+ NULL, mux_data_read_cb, NULL);
+ return;
end:
- if (error) {
- g_warning("error: %s", error->message);
- g_clear_error(&error);
+ if (error)
+ {
+ g_warning ("error: %s", error->message);
+ g_clear_error (&error);
}
- quit(0);
+ quit (0);
}
static void
-mux_client_read_cb(GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
+mux_client_read_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
{
- GInputStream *istream = G_INPUT_STREAM(source_object);
- GError *error = NULL;
- gssize size;
+ GInputStream *istream = G_INPUT_STREAM (source_object);
+ GError *error = NULL;
+ gssize size;
- size = my_input_stream_read_finish(G_INPUT_STREAM(source_object), res, &error);
- if (error || size != sizeof(gint64))
- goto end;
+ size = my_input_stream_read_finish (G_INPUT_STREAM (source_object), res, &error);
+ if (error || size != sizeof (gint64))
+ goto end;
- my_input_stream_read_async(istream,
- &demux.size, sizeof(guint16), G_PRIORITY_DEFAULT,
- NULL, mux_size_read_cb, NULL);
- return;
+ my_input_stream_read_async (istream,
+ &demux.size, sizeof (guint16), G_PRIORITY_DEFAULT,
+ NULL, mux_size_read_cb, NULL);
+ return;
end:
- if (error) {
- g_warning("error: %s", error->message);
- g_clear_error(&error);
+ if (error)
+ {
+ g_warning ("error: %s", error->message);
+ g_clear_error (&error);
}
- quit(0);
+ quit (0);
}
static void
-start_mux_read(GInputStream *istream)
+start_mux_read (GInputStream *istream)
{
- my_input_stream_read_async(istream,
- &demux.client, sizeof(gint64), G_PRIORITY_DEFAULT,
- NULL, mux_client_read_cb, NULL);
+ my_input_stream_read_async (istream,
+ &demux.client, sizeof (gint64), G_PRIORITY_DEFAULT,
+ NULL, mux_client_read_cb, NULL);
}
-static void
-client_start_read(Client *client);
+static void client_start_read (Client *client);
static void
-mux_pushed_cb(OutputQueue *q, gpointer user_data)
+mux_pushed_cb (OutputQueue *q, gpointer user_data)
{
- Client *client = user_data;
+ Client *client = user_data;
- if (client->size == 0) {
- remove_client(client);
- return;
+ if (client->size == 0)
+ {
+ remove_client (client);
+ return;
}
- client_start_read(client);
+ client_start_read (client);
}
static void
-client_read_cb(GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
-{
- Client *client = user_data;
- GError *error = NULL;
- gssize size;
-
- size = g_input_stream_read_finish(G_INPUT_STREAM(source_object), res, &error);
- g_debug("end read %" G_GSIZE_FORMAT, size);
- if (error) {
- g_warning("error: %s", error->message);
- g_clear_error(&error);
- remove_client(client);
- return;
+client_read_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ Client *client = user_data;
+ GError *error = NULL;
+ gssize size;
+
+ size = g_input_stream_read_finish (G_INPUT_STREAM (source_object), res, &error);
+ g_debug ("end read %" G_GSIZE_FORMAT, size);
+ if (error)
+ {
+ g_warning ("error: %s", error->message);
+ g_clear_error (&error);
+ remove_client (client);
+ return;
}
- g_return_if_fail(size <= G_MAXUINT16);
- g_return_if_fail(size >= 0);
- client->size = size;
+ g_return_if_fail (size <= G_MAXUINT16);
+ g_return_if_fail (size >= 0);
+ client->size = size;
- output_queue_push(mux_queue, (guint8 *) &client->id, sizeof(gint64), NULL, NULL);
- output_queue_push(mux_queue, (guint8 *) &client->size, sizeof(guint16), NULL, NULL);
- output_queue_push(mux_queue, (guint8 *) client->buf, size, (GFunc)mux_pushed_cb, client);
+ output_queue_push (mux_queue, (guint8 *) &client->id, sizeof (gint64), NULL, NULL);
+ output_queue_push (mux_queue, (guint8 *) &client->size, sizeof (guint16), NULL, NULL);
+ output_queue_push (mux_queue, (guint8 *) client->buf, size, (GFunc) mux_pushed_cb, client);
- return;
+ return;
}
static void
-client_start_read(Client *client)
+client_start_read (Client *client)
{
- GIOStream *iostream = G_IO_STREAM(client->client_connection);
- GInputStream *istream = g_io_stream_get_input_stream(iostream);
+ GIOStream *iostream = G_IO_STREAM (client->client_connection);
+ GInputStream *istream = g_io_stream_get_input_stream (iostream);
- g_debug("start read");
- g_input_stream_read_async(istream,
- client->buf, G_MAXUINT16, G_PRIORITY_DEFAULT,
- NULL, client_read_cb, client);
+ g_debug ("start read");
+ g_input_stream_read_async (istream,
+ client->buf, G_MAXUINT16, G_PRIORITY_DEFAULT,
+ NULL, client_read_cb, client);
}
static gboolean
-incoming_callback(GSocketService *service,
- GSocketConnection *client_connection,
- GObject *source_object,
- gpointer user_data)
+incoming_callback (GSocketService *service,
+ GSocketConnection *client_connection,
+ GObject *source_object,
+ gpointer user_data)
{
- Client *client;
+ Client *client;
- g_debug("new client!");
- client = add_client(client_connection);
- client_start_read(client);
+ g_debug ("new client!");
+ client = add_client (client_connection);
+ client_start_read (client);
- return FALSE;
+ return FALSE;
}
static int port;
@@ -501,200 +513,212 @@ static GaEntryGroup *mdns_group;
static GaEntryGroupService *mdns_service;
static void
-mdns_register_service(void)
+mdns_register_service (void)
{
- GError *error = NULL;
- gchar *name = NULL;
-
- if (!mdns_group) {
- mdns_group = ga_entry_group_new();
-
- if (!ga_entry_group_attach(mdns_group, mdns_client, &error)) {
- g_warning("Could not attach MDNS group to client: %s", error->message);
- g_clear_error(&error);
- goto end;
+ GError *error = NULL;
+ gchar *name = NULL;
+
+ if (!mdns_group)
+ {
+ mdns_group = ga_entry_group_new ();
+
+ if (!ga_entry_group_attach (mdns_group, mdns_client, &error))
+ {
+ g_warning ("Could not attach MDNS group to client: %s", error->message);
+ g_clear_error (&error);
+ goto end;
}
}
- name = g_strdup_printf("Spice client folder");
- mdns_service = ga_entry_group_add_service(mdns_group,
- name, "_webdav._tcp",
- port, &error,
- NULL);
- if (!mdns_service) {
- g_warning("Could not create service: %s", error->message);
- g_clear_error(&error);
- goto end;
+ name = g_strdup_printf ("Spice client folder");
+ mdns_service = ga_entry_group_add_service (mdns_group,
+ name, "_webdav._tcp",
+ port, &error,
+ NULL);
+ if (!mdns_service)
+ {
+ g_warning ("Could not create service: %s", error->message);
+ g_clear_error (&error);
+ goto end;
}
- ga_entry_group_service_freeze(mdns_service);
- if (!ga_entry_group_service_set(mdns_service, "u", "", &error) ||
- !ga_entry_group_service_set(mdns_service, "p", "", &error) ||
- !ga_entry_group_service_set(mdns_service, "path", "/", &error) ||
- !ga_entry_group_service_thaw(mdns_service, &error)) {
- g_warning ("Could not update TXT: %s", error->message);
- g_clear_error(&error);
+ ga_entry_group_service_freeze (mdns_service);
+ if (!ga_entry_group_service_set (mdns_service, "u", "", &error) ||
+ !ga_entry_group_service_set (mdns_service, "p", "", &error) ||
+ !ga_entry_group_service_set (mdns_service, "path", "/", &error) ||
+ !ga_entry_group_service_thaw (mdns_service, &error))
+ {
+ g_warning ("Could not update TXT: %s", error->message);
+ g_clear_error (&error);
}
- if (!ga_entry_group_commit(mdns_group, &error)) {
- g_warning("Could not announce MDNS service: %s", error->message);
- g_clear_error(&error);
+ if (!ga_entry_group_commit (mdns_group, &error))
+ {
+ g_warning ("Could not announce MDNS service: %s", error->message);
+ g_clear_error (&error);
}
end:
- g_free(name);
+ g_free (name);
}
static void
-mdns_state_changed(GaClient *client, GaClientState state, gpointer user_data)
-{
- switch (state) {
- case GA_CLIENT_STATE_FAILURE:
- g_warning("MDNS client state failure");
- break;
-
- case GA_CLIENT_STATE_S_RUNNING:
- g_debug("MDNS client found server running");
- mdns_register_service();
- break;
-
- case GA_CLIENT_STATE_S_COLLISION:
- case GA_CLIENT_STATE_S_REGISTERING:
- g_message("MDNS collision");
- if (mdns_group) {
- ga_entry_group_reset (mdns_group, NULL);
- mdns_service = 0;
+mdns_state_changed (GaClient *client, GaClientState state, gpointer user_data)
+{
+ switch (state)
+ {
+ case GA_CLIENT_STATE_FAILURE:
+ g_warning ("MDNS client state failure");
+ break;
+
+ case GA_CLIENT_STATE_S_RUNNING:
+ g_debug ("MDNS client found server running");
+ mdns_register_service ();
+ break;
+
+ case GA_CLIENT_STATE_S_COLLISION:
+ case GA_CLIENT_STATE_S_REGISTERING:
+ g_message ("MDNS collision");
+ if (mdns_group)
+ {
+ ga_entry_group_reset (mdns_group, NULL);
+ mdns_service = 0;
}
- break;
+ break;
default:
- // Do nothing
- break;
+ // Do nothing
+ break;
}
}
#endif
static void
-open_mux_path(const char *path)
+open_mux_path (const char *path)
{
- g_return_if_fail(path);
- g_return_if_fail(!mux_istream);
- g_return_if_fail(!mux_ostream);
- g_return_if_fail(!mux_queue);
+ g_return_if_fail (path);
+ g_return_if_fail (!mux_istream);
+ g_return_if_fail (!mux_ostream);
+ g_return_if_fail (!mux_queue);
#ifdef G_OS_UNIX
- GError *error = NULL;
- GFile *file = g_file_new_for_path(path);
- GFileIOStream *fio = g_file_open_readwrite(file, NULL, &error);
- g_object_unref(file);
-
- if (error) {
- g_printerr("%s\n", error->message);
- exit(1);
+ GError *error = NULL;
+ GFile *file = g_file_new_for_path (path);
+ GFileIOStream *fio = g_file_open_readwrite (file, NULL, &error);
+ g_object_unref (file);
+
+ if (error)
+ {
+ g_printerr ("%s\n", error->message);
+ exit (1);
}
- mux_ostream = g_io_stream_get_output_stream(G_IO_STREAM(fio));
- mux_istream = g_io_stream_get_input_stream(G_IO_STREAM(fio));
+ mux_ostream = g_io_stream_get_output_stream (G_IO_STREAM (fio));
+ mux_istream = g_io_stream_get_input_stream (G_IO_STREAM (fio));
#else
- HANDLE h = CreateFile(path,
- GENERIC_WRITE | GENERIC_READ,
- 0,
- NULL,
- OPEN_EXISTING,
- FILE_FLAG_OVERLAPPED,
- NULL);
- g_assert(h != INVALID_HANDLE_VALUE);
-
- mux_ostream = G_OUTPUT_STREAM(g_win32_output_stream_new(h, TRUE));
- mux_istream = G_INPUT_STREAM(g_win32_input_stream_new(h, TRUE));
+ HANDLE h = CreateFile (path,
+ GENERIC_WRITE | GENERIC_READ,
+ 0,
+ NULL,
+ OPEN_EXISTING,
+ FILE_FLAG_OVERLAPPED,
+ NULL);
+ g_assert (h != INVALID_HANDLE_VALUE);
+
+ mux_ostream = G_OUTPUT_STREAM (g_win32_output_stream_new (h, TRUE));
+ mux_istream = G_INPUT_STREAM (g_win32_input_stream_new (h, TRUE));
#endif
- mux_queue = output_queue_new(G_OUTPUT_STREAM(mux_ostream));
+ mux_queue = output_queue_new (G_OUTPUT_STREAM (mux_ostream));
- start_mux_read(mux_istream);
+ start_mux_read (mux_istream);
}
static GOptionEntry entries[] = {
- { "port", 'p', 0,
- G_OPTION_ARG_INT, &port,
- "Port to listen on", NULL },
- { NULL }
+ { "port", 'p', 0,
+ G_OPTION_ARG_INT, &port,
+ "Port to listen on", NULL },
+ { NULL }
};
-int main(int argc, char *argv[])
+int
+main (int argc, char *argv[])
{
- GOptionContext *opts;
- GError *error = NULL;
-
- opts = g_option_context_new(NULL);
- g_option_context_add_main_entries(opts, entries, NULL);
- if (!g_option_context_parse(opts, &argc, &argv, &error)) {
- g_printerr("Could not parse arguments: %s\n",
- error->message);
- g_printerr("%s",
- g_option_context_get_help(opts, TRUE, NULL));
- exit(1);
+ GOptionContext *opts;
+ GError *error = NULL;
+
+ opts = g_option_context_new (NULL);
+ g_option_context_add_main_entries (opts, entries, NULL);
+ if (!g_option_context_parse (opts, &argc, &argv, &error))
+ {
+ g_printerr ("Could not parse arguments: %s\n",
+ error->message);
+ g_printerr ("%s",
+ g_option_context_get_help (opts, TRUE, NULL));
+ exit (1);
}
- if (port == 0) {
- g_printerr("please specify a valid port\n");
- exit(1);
+ if (port == 0)
+ {
+ g_printerr ("please specify a valid port\n");
+ exit (1);
}
- g_option_context_free(opts);
-
- signal(SIGINT, quit);
-
-
- GSocketService *service = g_socket_service_new();
- GInetAddress *iaddr = g_inet_address_new_loopback(G_SOCKET_FAMILY_IPV4);
- GSocketAddress *saddr = g_inet_socket_address_new(iaddr, port);
- g_object_unref(iaddr);
-
- g_socket_listener_add_address(G_SOCKET_LISTENER(service), saddr,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_TCP,
- NULL,
- NULL,
- &error);
- if (error) {
- g_printerr("%s\n", error->message);
- exit(1);
+ g_option_context_free (opts);
+
+ signal (SIGINT, quit);
+
+
+ GSocketService *service = g_socket_service_new ();
+ GInetAddress *iaddr = g_inet_address_new_loopback (G_SOCKET_FAMILY_IPV4);
+ GSocketAddress *saddr = g_inet_socket_address_new (iaddr, port);
+ g_object_unref (iaddr);
+
+ g_socket_listener_add_address (G_SOCKET_LISTENER (service), saddr,
+ G_SOCKET_TYPE_STREAM,
+ G_SOCKET_PROTOCOL_TCP,
+ NULL,
+ NULL,
+ &error);
+ if (error)
+ {
+ g_printerr ("%s\n", error->message);
+ exit (1);
}
- g_signal_connect(service,
- "incoming", G_CALLBACK(incoming_callback),
- NULL);
+ g_signal_connect (service,
+ "incoming", G_CALLBACK (incoming_callback),
+ NULL);
- clients = g_hash_table_new_full(g_direct_hash, g_direct_equal,
- g_object_unref, (GDestroyNotify)client_free);
+ clients = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+ g_object_unref, (GDestroyNotify) client_free);
#ifdef G_OS_UNIX
- open_mux_path("/dev/virtio-ports/org.spice-space.webdav.0");
+ open_mux_path ("/dev/virtio-ports/org.spice-space.webdav.0");
#else
- open_mux_path("\\\\.\\Global\\org.spice-space.webdav.0");
- //open_mux_path("\\\\.\\Global\\com.redhat.spice.0");
+ open_mux_path ("\\\\.\\Global\\org.spice-space.webdav.0");
#endif
- /* listen on port for incoming clients, multiplex there input into
- virtio path, demultiplex input from there to the respective
- clients */
+ /* listen on port for incoming clients, multiplex there input into
+ virtio path, demultiplex input from there to the respective
+ clients */
- g_socket_service_start(service);
+ g_socket_service_start (service);
#ifdef WITH_AVAHI
- mdns_client = ga_client_new(GA_CLIENT_FLAG_NO_FLAGS);
- g_signal_connect(mdns_client, "state-changed", G_CALLBACK(mdns_state_changed), NULL);
- if (!ga_client_start(mdns_client, &error)) {
- g_printerr("%s\n", error->message);
- exit(1);
+ mdns_client = ga_client_new (GA_CLIENT_FLAG_NO_FLAGS);
+ g_signal_connect (mdns_client, "state-changed", G_CALLBACK (mdns_state_changed), NULL);
+ if (!ga_client_start (mdns_client, &error))
+ {
+ g_printerr ("%s\n", error->message);
+ exit (1);
}
#endif
- loop = g_main_loop_new(NULL, TRUE);
- g_main_loop_run(loop);
- g_main_loop_unref(loop);
+ loop = g_main_loop_new (NULL, TRUE);
+ g_main_loop_run (loop);
+ g_main_loop_unref (loop);
- output_queue_unref(mux_queue);
- g_hash_table_unref(clients);
+ output_queue_unref (mux_queue);
+ g_hash_table_unref (clients);
- return 0;
+ return 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
