1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
Submitted upstream: https://github.com/canonical/lightdm/pull/312
diff --git a/src/vnc-server.c b/src/vnc-server.c
index d3500764..00a2fc02 100644
--- a/src/vnc-server.c
+++ b/src/vnc-server.c
@@ -126,18 +126,10 @@ vnc_server_start (VNCServer *server)
g_return_val_if_fail (server != NULL, FALSE);
- g_autoptr(GError) ipv4_error = NULL;
- priv->socket = open_tcp_socket (G_SOCKET_FAMILY_IPV4, priv->port, priv->listen_address, &ipv4_error);
- if (ipv4_error)
- g_warning ("Failed to create IPv4 VNC socket: %s", ipv4_error->message);
-
- if (priv->socket)
- {
- GSource *source = g_socket_create_source (priv->socket, G_IO_IN, NULL);
- g_source_set_callback (source, (GSourceFunc) read_cb, server, NULL);
- g_source_attach (source, NULL);
- }
-
+ // Bind to IPv6 first, as this implies binding to 0.0.0.0 in the
+ // Linux kernel default configuration, which would otherwise cause
+ // IPv6 clients to fail with "Error binding to address [::]:5900:
+ // Address already in use" (#266).
g_autoptr(GError) ipv6_error = NULL;
priv->socket6 = open_tcp_socket (G_SOCKET_FAMILY_IPV6, priv->port, priv->listen_address, &ipv6_error);
if (ipv6_error)
@@ -150,6 +142,18 @@ vnc_server_start (VNCServer *server)
g_source_attach (source, NULL);
}
+ g_autoptr(GError) ipv4_error = NULL;
+ priv->socket = open_tcp_socket (G_SOCKET_FAMILY_IPV4, priv->port, priv->listen_address, &ipv4_error);
+ if (ipv4_error)
+ g_warning ("Failed to create IPv4 VNC socket: %s", ipv4_error->message);
+
+ if (priv->socket)
+ {
+ GSource *source = g_socket_create_source (priv->socket, G_IO_IN, NULL);
+ g_source_set_callback (source, (GSourceFunc) read_cb, server, NULL);
+ g_source_attach (source, NULL);
+ }
+
if (!priv->socket && !priv->socket6)
return FALSE;
|
