[PATCH libxcb] Fallback to TCP if no protocol is specified and the UNIX connection fails
Signed-off-by: Julien Cristau
---
src/xcb_util.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/xcb_util.c b/src/xcb_util.c
index fde4f85..6d9efe0 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -234,6 +234,11 @@ static int _xcb_open(const char *host, char *protocol,
const int display)
fd = _xcb_open_unix(protocol, file);
free(file);
+if (fd < 0 && !protocol && *host == '\0') {
+ unsigned short port = X_TCP_PORT + display;
+ fd = _xcb_open_tcp(host, protocol, port);
+}
+
return fd;
#endif /* !_WIN32 */
return -1; /* if control reaches here then something has gone wrong */
--
1.7.9
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH libxcb] Fallback to TCP if no protocol is specified and the UNIX connection fails
Can we delay the libX11 change until this is in a tagged libxcb (and have
libX11 require that version to avoid regression)? All the changes currently on
xcb/libxcb master look 1.8.1 worthy, so perhaps we can push this one into the
mix and get a 1.8.1 this week.
--Jeremy
On Feb 19, 2012, at 04:43, Julien Cristau wrote:
> Signed-off-by: Julien Cristau
> ---
> src/xcb_util.c |5 +
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/src/xcb_util.c b/src/xcb_util.c
> index fde4f85..6d9efe0 100644
> --- a/src/xcb_util.c
> +++ b/src/xcb_util.c
> @@ -234,6 +234,11 @@ static int _xcb_open(const char *host, char *protocol,
> const int display)
> fd = _xcb_open_unix(protocol, file);
> free(file);
>
> +if (fd < 0 && !protocol && *host == '\0') {
> + unsigned short port = X_TCP_PORT + display;
> + fd = _xcb_open_tcp(host, protocol, port);
> +}
> +
> return fd;
> #endif /* !_WIN32 */
> return -1; /* if control reaches here then something has gone wrong */
> --
> 1.7.9
>
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH libxcb] Fallback to TCP if no protocol is specified and the UNIX connection fails
I've pushed this patch; thanks!
I'll let you and Jeremy sort out the libX11 side.
Jamey
On Sun, Feb 19, 2012 at 01:43:54PM +0100, Julien Cristau wrote:
> Signed-off-by: Julien Cristau
> ---
> src/xcb_util.c |5 +
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/src/xcb_util.c b/src/xcb_util.c
> index fde4f85..6d9efe0 100644
> --- a/src/xcb_util.c
> +++ b/src/xcb_util.c
> @@ -234,6 +234,11 @@ static int _xcb_open(const char *host, char *protocol,
> const int display)
> fd = _xcb_open_unix(protocol, file);
> free(file);
>
> +if (fd < 0 && !protocol && *host == '\0') {
> + unsigned short port = X_TCP_PORT + display;
> + fd = _xcb_open_tcp(host, protocol, port);
> +}
> +
> return fd;
> #endif /* !_WIN32 */
> return -1; /* if control reaches here then something has gone wrong */
> --
> 1.7.9
>
> ___
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
signature.asc
Description: Digital signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH libxcb] Fallback to TCP if no protocol is specified and the UNIX connection fails
On Sun, Feb 19, 2012 at 14:36:42 -0800, Jeremy Huddleston wrote: > Can we delay the libX11 change until this is in a tagged libxcb (and > have libX11 require that version to avoid regression)? All the > changes currently on xcb/libxcb master look 1.8.1 worthy, so perhaps > we can push this one into the mix and get a 1.8.1 this week. > Sounds good to me, if the xcb folks are ok with it. Cheers, Julien ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH libxcb] Fallback to TCP if no protocol is specified and the UNIX connection fails
On Sun, Feb 19, 2012 at 14:36:42 -0800, Jeremy Huddleston wrote: > Can we delay the libX11 change until this is in a tagged libxcb (and > have libX11 require that version to avoid regression)? All the > changes currently on xcb/libxcb master look 1.8.1 worthy, so perhaps > we can push this one into the mix and get a 1.8.1 this week. > It's been a week, can I have that libxcb 1.8.1 now? :) Cheers, Julien signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH libxcb] Fallback to TCP if no protocol is specified and the UNIX connection fails
Ping +1 etc On Feb 27, 2012, at 2:01 PM, Julien Cristau wrote: > On Sun, Feb 19, 2012 at 14:36:42 -0800, Jeremy Huddleston wrote: > >> Can we delay the libX11 change until this is in a tagged libxcb (and >> have libX11 require that version to avoid regression)? All the >> changes currently on xcb/libxcb master look 1.8.1 worthy, so perhaps >> we can push this one into the mix and get a 1.8.1 this week. >> > It's been a week, can I have that libxcb 1.8.1 now? :) > > Cheers, > Julien ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [Xcb] [PATCH libxcb] Fallback to TCP if no protocol is specified and the UNIX connection fails
On Mon, Feb 20, 2012 at 10:02:58AM +0100, Julien Cristau wrote: > On Sun, Feb 19, 2012 at 14:36:42 -0800, Jeremy Huddleston wrote: > > > Can we delay the libX11 change until this is in a tagged libxcb (and > > have libX11 require that version to avoid regression)? All the > > changes currently on xcb/libxcb master look 1.8.1 worthy, so perhaps > > we can push this one into the mix and get a 1.8.1 this week. > > > Sounds good to me, if the xcb folks are ok with it. Seems entirely sensible. - Josh Triplett ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
