X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_conn.c;h=c00eccfb761cfd7fd45ee5990dedcbfaeb86f8d9;hb=91568d7070e2c2400dfdbdff515f51da74ca3701;hp=2da3150e8f194255b0d0d1e578d3a7798164307a;hpb=b83f18a4cc2303dfda59807d56e16bbc5c18b09d;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_conn.c b/src/xcb_conn.c index 2da3150..c00eccf 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -32,12 +32,20 @@ #include #include #include -#include +#include #include #include "xcb.h" #include "xcbint.h" +typedef struct { + CARD8 status; + CARD8 pad0[5]; + CARD16 length; +} XCBSetupGeneric; + +static const int error_connection = 1; + static int set_fd_flags(const int fd) { long flags = fcntl(fd, F_GETFL, 0); @@ -54,7 +62,7 @@ static int set_fd_flags(const int fd) static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info) { static const char pad[3]; - XCBConnSetupReq out; + XCBSetupRequest out; struct iovec parts[6]; int count = 0; int endian = 0x01020304; @@ -71,21 +79,21 @@ static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info) out.protocol_minor_version = X_PROTOCOL_REVISION; out.authorization_protocol_name_len = 0; out.authorization_protocol_data_len = 0; - parts[count].iov_len = sizeof(XCBConnSetupReq); + parts[count].iov_len = sizeof(XCBSetupRequest); parts[count++].iov_base = &out; - parts[count].iov_len = XCB_PAD(sizeof(XCBConnSetupReq)); - parts[count++].iov_base = (caddr_t) pad; + parts[count].iov_len = XCB_PAD(sizeof(XCBSetupRequest)); + parts[count++].iov_base = (char *) pad; if(auth_info) { parts[count].iov_len = out.authorization_protocol_name_len = auth_info->namelen; parts[count++].iov_base = auth_info->name; parts[count].iov_len = XCB_PAD(out.authorization_protocol_name_len); - parts[count++].iov_base = (caddr_t) pad; + parts[count++].iov_base = (char *) pad; parts[count].iov_len = out.authorization_protocol_data_len = auth_info->datalen; parts[count++].iov_base = auth_info->data; parts[count].iov_len = XCB_PAD(out.authorization_protocol_data_len); - parts[count++].iov_base = (caddr_t) pad; + parts[count++].iov_base = (char *) pad; } assert(count <= sizeof(parts) / sizeof(*parts)); @@ -101,21 +109,21 @@ static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info) static int read_setup(XCBConnection *c) { /* Read the server response */ - c->setup = malloc(sizeof(XCBConnSetupGenericRep)); + c->setup = malloc(sizeof(XCBSetupGeneric)); if(!c->setup) return 0; - if(_xcb_in_read_block(c, c->setup, sizeof(XCBConnSetupGenericRep)) != sizeof(XCBConnSetupGenericRep)) + if(_xcb_in_read_block(c, c->setup, sizeof(XCBSetupGeneric)) != sizeof(XCBSetupGeneric)) return 0; { - void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(XCBConnSetupGenericRep)); + void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(XCBSetupGeneric)); if(!tmp) return 0; c->setup = tmp; } - if(_xcb_in_read_block(c, (char *) c->setup + sizeof(XCBConnSetupGenericRep), c->setup->length * 4) <= 0) + if(_xcb_in_read_block(c, (char *) c->setup + sizeof(XCBSetupGeneric), c->setup->length * 4) <= 0) return 0; /* 0 = failed, 2 = authenticate, 1 = success */ @@ -123,15 +131,15 @@ static int read_setup(XCBConnection *c) { case 0: /* failed */ { - XCBConnSetupFailedRep *setup = (XCBConnSetupFailedRep *) c->setup; - write(STDERR_FILENO, XCBConnSetupFailedRepReason(setup), XCBConnSetupFailedRepReasonLength(setup)); + XCBSetupFailed *setup = (XCBSetupFailed *) c->setup; + write(STDERR_FILENO, XCBSetupFailedReason(setup), XCBSetupFailedReasonLength(setup)); return 0; } case 2: /* authenticate */ { - XCBConnSetupAuthenticateRep *setup = (XCBConnSetupAuthenticateRep *) c->setup; - write(STDERR_FILENO, XCBConnSetupAuthenticateRepReason(setup), XCBConnSetupAuthenticateRepReasonLength(setup)); + XCBSetupAuthenticate *setup = (XCBSetupAuthenticate *) c->setup; + write(STDERR_FILENO, XCBSetupAuthenticateReason(setup), XCBSetupAuthenticateReasonLength(setup)); return 0; } } @@ -148,7 +156,10 @@ static int write_vec(XCBConnection *c, struct iovec **vector, int *count) if(n < 0 && errno == EAGAIN) return 1; if(n <= 0) + { + _xcb_conn_shutdown(c); return 0; + } for(; *count; --*count, ++*vector) { @@ -169,25 +180,35 @@ static int write_vec(XCBConnection *c, struct iovec **vector, int *count) /* Public interface */ -XCBConnSetupSuccessRep *XCBGetSetup(XCBConnection *c) +const XCBSetup *XCBGetSetup(XCBConnection *c) { + if(c->has_error) + return 0; /* doesn't need locking because it's never written to. */ return c->setup; } int XCBGetFileDescriptor(XCBConnection *c) { + if(c->has_error) + return -1; /* doesn't need locking because it's never written to. */ return c->fd; } +int XCBConnectionHasError(XCBConnection *c) +{ + /* doesn't need locking because it's read and written atomically. */ + return c->has_error; +} + XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info) { XCBConnection* c; c = calloc(1, sizeof(XCBConnection)); if(!c) - return 0; + return (XCBConnection *) &error_connection; c->fd = fd; @@ -203,7 +224,7 @@ XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info) )) { XCBDisconnect(c); - return 0; + return (XCBConnection *) &error_connection; } return c; @@ -211,7 +232,7 @@ XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info) void XCBDisconnect(XCBConnection *c) { - if(!c) + if(c->has_error) return; free(c->setup); @@ -229,6 +250,11 @@ void XCBDisconnect(XCBConnection *c) /* Private interface */ +void _xcb_conn_shutdown(XCBConnection *c) +{ + c->has_error = 1; +} + int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector, int *count) { int ret; @@ -253,7 +279,14 @@ int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector } pthread_mutex_unlock(&c->iolock); - ret = select(c->fd + 1, &rfds, &wfds, 0, 0) > 0; + do { + ret = select(c->fd + 1, &rfds, &wfds, 0, 0); + } while (ret == -1 && errno == EINTR); + if (ret < 0) + { + _xcb_conn_shutdown(c); + ret = 0; + } pthread_mutex_lock(&c->iolock); if(ret)