AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

printing: Don't hang when getting info for Avahi printer

Browse Source 
Asynchronously create testing connection to address returned
by GaServiceResolver. Don't request info for such printer if
the connection fails.

https://bugzilla.gnome.org/show_bug.cgi?id=695714
This commit is contained in:
Marek Kasik 2013-03-13 14:57:55 +01:00
parent 7dd2539e1b
commit 7529b95fab
1 changed files with 77 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
modules/printbackends/cups/gtkprintbackendcups.c
View File

@ -149,6 +149,7 @@ struct _GtkPrintBackendCups
GaServiceBrowser *avahi_ipp_browser; GaServiceBrowser *avahi_ipp_browser;
GaServiceBrowser *avahi_ipps_browser; GaServiceBrowser *avahi_ipps_browser;
GaClient *avahi_client; GaClient *avahi_client;
GCancellable *avahi_cancellable;
#endif #endif
}; };
@ -2334,6 +2335,8 @@ avahi_data_free (GtkPrintBackendCups *cups_backend)
{ {
if (cups_backend) if (cups_backend)
{ {
g_cancellable_cancel (cups_backend->avahi_cancellable);
g_clear_object (&cups_backend->avahi_cancellable);
g_clear_pointer (&cups_backend->avahi_default_printer, g_free); g_clear_pointer (&cups_backend->avahi_default_printer, g_free);
g_list_free_full (cups_backend->avahi_resolvers, g_object_unref); g_list_free_full (cups_backend->avahi_resolvers, g_object_unref);
cups_backend->avahi_resolvers = NULL; cups_backend->avahi_resolvers = NULL;
@ -2517,6 +2520,52 @@ cups_request_avahi_printer_info (const gchar *printer_uri,
} }
} }
typedef struct
{
gchar *printer_uri;
gchar *host;
gint port;
gchar *name;
gchar *type;
gchar *domain;
GtkPrintBackendCups *backend;
} AvahiConnectionTestData;
static void
avahi_connection_test_cb (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
{
AvahiConnectionTestData *data = (AvahiConnectionTestData *) user_data;
GSocketConnection *connection;
connection = g_socket_client_connect_to_host_finish (G_SOCKET_CLIENT (source_object),
res,
&error);
g_object_unref (source_object);
if (connection != NULL)
{
g_io_stream_close (G_IO_STREAM (connection), NULL, NULL);
g_object_unref (connection);
cups_request_avahi_printer_info (data->printer_uri,
data->host,
data->port,
data->name,
data->type,
data->domain,
data->backend);
}
g_free (data->printer_uri);
g_free (data->host);
g_free (data->name);
g_free (data->type);
g_free (data->domain);
g_free (data);
}
static void static void
avahi_resolver_found_cb (GaServiceResolver *resolver, avahi_resolver_found_cb (GaServiceResolver *resolver,
int interface, int interface,
@ -2531,12 +2580,12 @@ avahi_resolver_found_cb (GaServiceResolver *resolver,
glong flags, glong flags,
gpointer *user_data) gpointer *user_data)
{ {
GtkPrintBackendCups *backend = GTK_PRINT_BACKEND_CUPS (user_data); AvahiConnectionTestData *data;
AvahiStringList *item; GtkPrintBackendCups *backend = GTK_PRINT_BACKEND_CUPS (user_data);
const gchar *protocol_string; AvahiStringList *item;
gchar host[AVAHI_ADDRESS_STR_MAX]; const gchar *protocol_string;
gchar *suffix = NULL; gchar host[AVAHI_ADDRESS_STR_MAX];
gchar *printer_uri; gchar *suffix = NULL;
avahi_address_snprint (host, sizeof (host), address); avahi_address_snprint (host, sizeof (host), address);
@ -2551,20 +2600,28 @@ avahi_resolver_found_cb (GaServiceResolver *resolver,
else else
protocol_string = "ipps"; protocol_string = "ipps";
data = g_new0 (AvahiConnectionTestData, 1);
if (protocol == GA_PROTOCOL_INET6) if (protocol == GA_PROTOCOL_INET6)
printer_uri = g_strdup_printf ("%s://[%s]:%u/%s", protocol_string, host, port, suffix); data->printer_uri = g_strdup_printf ("%s://[%s]:%u/%s", protocol_string, host, port, suffix);
else else
printer_uri = g_strdup_printf ("%s://%s:%u/%s", protocol_string, host, port, suffix); data->printer_uri = g_strdup_printf ("%s://%s:%u/%s", protocol_string, host, port, suffix);
cups_request_avahi_printer_info (printer_uri, data->host = g_strdup (host);
host, data->port = port;
port, data->name = g_strdup (name);
name, data->type = g_strdup (type);
type, data->domain = g_strdup (domain);
domain, data->backend = backend;
backend);
/* It can happen that the address is not reachable */
g_socket_client_connect_to_host_async (g_socket_client_new (),
host,
port,
backend->avahi_cancellable,
avahi_connection_test_cb,
data);
g_free (printer_uri);
g_free (suffix); g_free (suffix);
} }
} }
@ -2782,6 +2839,10 @@ avahi_request_printer_list (GtkPrintBackendCups *cups_backend)
g_clear_object (&cups_backend->avahi_client); g_clear_object (&cups_backend->avahi_client);
g_clear_error (&error); g_clear_error (&error);
} }
else
{
cups_backend->avahi_cancellable = g_cancellable_new ();
}
} }
} }
#endif #endif