#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
+#include <netinet/in.h>
#ifdef DNETCONN
#include <netdnet/dnetdb.h>
#include <netdnet/dn.h>
#include "xcbext.h"
#include "xcbint.h"
-int XCBPopcount(CARD32 mask)
+static const int error_connection = 1;
+
+int xcb_popcount(uint32_t mask)
{
unsigned long y;
y = (mask >> 1) & 033333333333;
return ((y + (y >> 3)) & 030707070707) % 077;
}
-int XCBParseDisplay(const char *name, char **host, int *displayp, int *screenp)
+int xcb_parse_display(const char *name, char **host, int *displayp, int *screenp)
{
int len, display, screen;
char *colon, *dot, *end;
return 1;
}
-static int _xcb_open_tcp(const char *host, const unsigned short port);
+static int _xcb_open_tcp(char *host, const unsigned short port);
static int _xcb_open_unix(const char *file);
#ifdef DNETCONN
static int _xcb_open_decnet(const char *host, const unsigned short port);
#endif
-static int _xcb_open(const char *host, const int display)
+static int _xcb_open(char *host, const int display)
{
int fd;
if(*host)
{
#ifdef DNETCONN
- if (strchr(host, ':'))
+ /* DECnet displays have two colons, so xcb_parse_display will have left
+ one at the end. However, an IPv6 address can end with *two* colons,
+ so only treat this as a DECnet display if host ends with exactly one
+ colon. */
+ char *colon = strchr(host, ':');
+ if(colon && *(colon+1) == '\0')
{
- /* DECnet displays have two colons, so the parser will have left
- one at the end */
- char *dnethost = strdup(host);
-
- dnethost[strlen(dnethost)-1] = '\0';
- fd = _xcb_open_decnet(dnethost, display);
- free(dnethost);
+ *colon = '\0';
+ fd = _xcb_open_decnet(host, display);
}
else
#endif
}
#endif
-static int _xcb_open_tcp(const char *host, const unsigned short port)
-{
- int fd;
- struct sockaddr_in addr;
- struct hostent *hostaddr = gethostbyname(host);
- if(!hostaddr)
- return -1;
- addr.sin_family = AF_INET;
- addr.sin_port = htons(port);
- memcpy(&addr.sin_addr, hostaddr->h_addr_list[0], sizeof(addr.sin_addr));
+static int _xcb_open_tcp(char *host, const unsigned short port)
+{
+ int fd = -1;
+ struct addrinfo hints = { AI_ADDRCONFIG | AI_NUMERICSERV, AF_UNSPEC,
+ SOCK_STREAM };
+ char service[6]; /* "65535" with the trailing '\0' */
+ struct addrinfo *results, *addr;
+ char *bracket;
+
+ /* Allow IPv6 addresses enclosed in brackets. */
+ if(host[0] == '[' && (bracket = strrchr(host, ']')) && bracket[1] == '\0')
+ {
+ *bracket = '\0';
+ ++host;
+ hints.ai_flags |= AI_NUMERICHOST;
+ hints.ai_family = AF_INET6;
+ }
- fd = socket(PF_INET, SOCK_STREAM, 0);
- if(fd == -1)
- return -1;
- if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
+ snprintf(service, sizeof(service), "%hu", port);
+ if(getaddrinfo(host, service, &hints, &results))
+ /* FIXME: use gai_strerror, and fill in error connection */
return -1;
+
+ for(addr = results; addr; addr = addr->ai_next)
+ {
+ fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+ if(fd >= 0 && connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
+ break;
+ fd = -1;
+ }
+ freeaddrinfo(results);
return fd;
}
return fd;
}
-XCBConnection *XCBConnect(const char *displayname, int *screenp)
+xcb_connection_t *xcb_connect(const char *displayname, int *screenp)
{
int fd, display = 0;
char *host;
- XCBConnection *c;
- XCBAuthInfo auth;
+ xcb_connection_t *c;
+ xcb_auth_info_t auth;
- if(!XCBParseDisplay(displayname, &host, &display, screenp))
- return 0;
+ if(!xcb_parse_display(displayname, &host, &display, screenp))
+ return (xcb_connection_t *) &error_connection;
fd = _xcb_open(host, display);
free(host);
if(fd == -1)
- return 0;
+ return (xcb_connection_t *) &error_connection;
_xcb_get_auth_info(fd, &auth);
- c = XCBConnectToFD(fd, &auth);
+ c = xcb_connect_to_fd(fd, &auth);
free(auth.name);
free(auth.data);
return c;
}
-XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthInfo *auth, int *screenp)
+xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname, xcb_auth_info_t *auth, int *screenp)
{
int fd, display = 0;
char *host;
- if(!XCBParseDisplay(displayname, &host, &display, screenp))
- return 0;
+ if(!xcb_parse_display(displayname, &host, &display, screenp))
+ return (xcb_connection_t *) &error_connection;
fd = _xcb_open(host, display);
free(host);
if(fd == -1)
- return 0;
-
- return XCBConnectToFD(fd, auth);
-}
-
-int XCBSync(XCBConnection *c, XCBGenericError **e)
-{
- XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e);
- free(reply);
- return reply != 0;
-}
-
-
-
-
-/* backwards compatible interfaces: remove before 1.0 release */
-XCBConnection *XCBConnectBasic()
-{
- XCBConnection *c = XCBConnect(0, 0);
- if(c)
- return c;
- perror("XCBConnect");
- abort();
-}
-
-int XCBOpen(const char *host, const int display)
-{
- return _xcb_open(host, display);
-}
-
-int XCBOpenTCP(const char *host, const unsigned short port)
-{
- return _xcb_open_tcp(host, port);
-}
-
-int XCBOpenUnix(const char *file)
-{
- return _xcb_open_unix(file);
-}
-
-int XCBGetAuthInfo(int fd, XCBAuthInfo *info)
-{
- return _xcb_get_auth_info(fd, info);
-}
-
-char *XCBConnSetupReqAuthorizationProtocolName(XCBSetupReq *R)
-{
- return XCBSetupReqAuthorizationProtocolName(R);
-}
-
-int XCBConnSetupReqAuthorizationProtocolNameLength(XCBSetupReq *R)
-{
- return XCBSetupReqAuthorizationProtocolNameLength(R);
-}
-
-XCBGenericIter XCBConnSetupReqAuthorizationProtocolNameEnd(XCBSetupReq *R)
-{
- return XCBSetupReqAuthorizationProtocolNameEnd(R);
-}
-
-char *XCBConnSetupReqAuthorizationProtocolData(XCBSetupReq *R)
-{
- return XCBSetupReqAuthorizationProtocolData(R);
-}
-
-int XCBConnSetupReqAuthorizationProtocolDataLength(XCBSetupReq *R)
-{
- return XCBSetupReqAuthorizationProtocolDataLength(R);
-}
-
-XCBGenericIter XCBConnSetupReqAuthorizationProtocolDataEnd(XCBSetupReq *R)
-{
- return XCBSetupReqAuthorizationProtocolDataEnd(R);
-}
-
-void XCBConnSetupReqNext(XCBSetupReqIter *i)
-{
- XCBSetupReqNext(i);
-}
+ return (xcb_connection_t *) &error_connection;
-XCBGenericIter XCBConnSetupReqEnd(XCBSetupReqIter i)
-{
- return XCBSetupReqEnd(i);
-}
-
-char *XCBConnSetupFailedRepReason(XCBSetupFailed *R)
-{
- return XCBSetupFailedReason(R);
-}
-
-int XCBConnSetupFailedRepReasonLength(XCBSetupFailed *R)
-{
- return XCBSetupFailedReasonLength(R);
-}
-
-XCBGenericIter XCBConnSetupFailedRepReasonEnd(XCBSetupFailed *R)
-{
- return XCBSetupFailedReasonEnd(R);
-}
-
-void XCBConnSetupFailedRepNext(XCBSetupFailedIter *i)
-{
- XCBSetupFailedNext(i);
-}
-
-XCBGenericIter XCBConnSetupFailedRepEnd(XCBSetupFailedIter i)
-{
- return XCBSetupFailedEnd(i);
-}
-
-char *XCBConnSetupAuthenticateRepReason(XCBSetupAuthenticate *R)
-{
- return XCBSetupAuthenticateReason(R);
-}
-
-int XCBConnSetupAuthenticateRepReasonLength(XCBSetupAuthenticate *R)
-{
- return XCBSetupAuthenticateReasonLength(R);
-}
-
-XCBGenericIter XCBConnSetupAuthenticateRepReasonEnd(XCBSetupAuthenticate *R)
-{
- return XCBSetupAuthenticateReasonEnd(R);
-}
-
-void XCBConnSetupAuthenticateRepNext(XCBSetupAuthenticateIter *i)
-{
- XCBSetupAuthenticateNext(i);
-}
-
-XCBGenericIter XCBConnSetupAuthenticateRepEnd(XCBSetupAuthenticateIter i)
-{
- return XCBSetupAuthenticateEnd(i);
-}
-
-char *XCBConnSetupSuccessRepVendor(XCBSetup *R)
-{
- return XCBSetupVendor(R);
-}
-
-int XCBConnSetupSuccessRepVendorLength(XCBSetup *R)
-{
- return XCBSetupVendorLength(R);
-}
-
-XCBGenericIter XCBConnSetupSuccessRepVendorEnd(XCBSetup *R)
-{
- return XCBSetupVendorEnd(R);
-}
-
-XCBFORMAT *XCBConnSetupSuccessRepPixmapFormats(XCBSetup *R)
-{
- return XCBSetupPixmapFormats(R);
-}
-
-int XCBConnSetupSuccessRepPixmapFormatsLength(XCBSetup *R)
-{
- return XCBSetupPixmapFormatsLength(R);
-}
-
-XCBFORMATIter XCBConnSetupSuccessRepPixmapFormatsIter(XCBSetup *R)
-{
- return XCBSetupPixmapFormatsIter(R);
-}
-
-int XCBConnSetupSuccessRepRootsLength(XCBSetup *R)
-{
- return XCBSetupRootsLength(R);
-}
-
-XCBSCREENIter XCBConnSetupSuccessRepRootsIter(XCBSetup *R)
-{
- return XCBSetupRootsIter(R);
-}
-
-void XCBConnSetupSuccessRepNext(XCBSetupIter *i)
-{
- XCBSetupNext(i);
-}
-
-XCBGenericIter XCBConnSetupSuccessRepEnd(XCBSetupIter i)
-{
- return XCBSetupEnd(i);
+ return xcb_connect_to_fd(fd, auth);
}