callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test connection to all given addresses when printing

Browse Source 
Go to the next address given by CUPS if we fail to connect to
previous address (#603637).
This commit is contained in:
Marek Kasik
2010-06-03 10:13:17 +02:00
parent 9fbfbda8cc
commit f8ac123192
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/printbackends/cups/gtkcupsutils.c
View File

@ -1502,6 +1502,7 @@ gtk_cups_connection_test_new (const char *server)
result->socket = -1; result->socket = -1;
result->current_addr = NULL; result->current_addr = NULL;
result->last_wrong_addr = NULL;
result->at_init = GTK_CUPS_CONNECTION_NOT_AVAILABLE; result->at_init = GTK_CUPS_CONNECTION_NOT_AVAILABLE;
result->at_init = gtk_cups_connection_test_get_state (result); result->at_init = gtk_cups_connection_test_get_state (result);
@ -1540,7 +1541,14 @@ gtk_cups_connection_test_get_state (GtkCupsConnectionTest *test)
{ {
if (test->socket == -1) if (test->socket == -1)
{ {
iter = test->addrlist; if (test->last_wrong_addr != NULL && test->last_wrong_addr->next != NULL)
iter = test->last_wrong_addr->next;
else
{
test->last_wrong_addr = NULL;
iter = test->addrlist;
}
while (iter) while (iter)
{ {
test->socket = socket (iter->addr.addr.sa_family, test->socket = socket (iter->addr.addr.sa_family,
@ -1584,7 +1592,12 @@ gtk_cups_connection_test_get_state (GtkCupsConnectionTest *test)
if (error_code == EALREADY || error_code == EINPROGRESS) if (error_code == EALREADY || error_code == EINPROGRESS)
result = GTK_CUPS_CONNECTION_IN_PROGRESS; result = GTK_CUPS_CONNECTION_IN_PROGRESS;
else else
result = GTK_CUPS_CONNECTION_NOT_AVAILABLE; {
close (test->socket);
test->socket = -1;
test->last_wrong_addr = test->current_addr;
result = GTK_CUPS_CONNECTION_NOT_AVAILABLE;
}
} }
} }
@ -1605,6 +1618,7 @@ gtk_cups_connection_test_free (GtkCupsConnectionTest *test)
#ifdef HAVE_CUPS_API_1_2 #ifdef HAVE_CUPS_API_1_2
test->current_addr = NULL; test->current_addr = NULL;
test->last_wrong_addr = NULL;
httpAddrFreeList (test->addrlist); httpAddrFreeList (test->addrlist);
if (test->socket != -1) if (test->socket != -1)
{ {

1
modules/printbackends/cups/gtkcupsutils.h
View File

@ -111,6 +111,7 @@ struct _GtkCupsConnectionTest
GtkCupsConnectionState at_init; GtkCupsConnectionState at_init;
http_addrlist_t *addrlist; http_addrlist_t *addrlist;
http_addrlist_t *current_addr; http_addrlist_t *current_addr;
http_addrlist_t *last_wrong_addr;
gint socket; gint socket;
#endif #endif
}; };