From: Adam Jackson <ajax@redhat.com>
Date: Wed, 2 Dec 2009 19:31:56 +0000 (-0500)
Subject: setsockopt(SO_KEEPALIVE) on TCP display connections.
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cf2a87def76f4646fe05e282b45605d572f2513;hp=e82c34c2f7ac3fbb23ab14cbee8df2dd9178f5a4;p=free-sw%2Fxcb%2Flibxcb

setsockopt(SO_KEEPALIVE) on TCP display connections.

This matches xtrans behaviour in SocketINETConnect, and makes it so apps
don't hang forever if their display dies.

Signed-off-by: Adam Jackson <ajax@redhat.com>
---

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 55aadb7..c3cbfa6 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -260,6 +260,7 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
         if(fd >= 0) {
             int on = 1;
             setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
+	    setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
 
             if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
                 break;