X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=06b5bcaf1b16d8f7b8502a187c931fd891fef193;hb=162c7593adf1577ca8aecfcd53fd5644b6182609;hp=b1e93276becab468883525d5b6c67f20971813a6;hpb=e7576738c33e73fb4f29c1426c2ec49257564129;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_util.c b/src/xcb_util.c
index b1e9327..06b5bca 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -26,10 +26,13 @@
 /* Utility functions implementable using only public APIs. */
 
 #include <assert.h>
-#include <sys/select.h>
+#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>
+#endif
 #include <netdb.h>
 #include <errno.h>
 #include <stdio.h>
@@ -39,6 +42,7 @@
 
 #include "xcb.h"
 #include "xcbext.h"
+#include "xcbint.h"
 
 int XCBPopcount(CARD32 mask)
 {
@@ -91,6 +95,9 @@ int XCBParseDisplay(const char *name, char **host, int *displayp, int *screenp)
 
 static int _xcb_open_tcp(const 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)
 {
@@ -98,9 +105,24 @@ static int _xcb_open(const char *host, const int display)
 
     if(*host)
     {
-        /* display specifies TCP */
-        unsigned short port = X_TCP_PORT + display;
-        fd = _xcb_open_tcp(host, port);
+#ifdef DNETCONN
+        if (strchr(host,  ':'))
+        {
+            /* 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);
+        }
+        else
+#endif
+        {
+            /* display specifies TCP */
+            unsigned short port = X_TCP_PORT + display;
+            fd = _xcb_open_tcp(host, port);
+        }
     }
     else
     {
@@ -114,6 +136,40 @@ static int _xcb_open(const char *host, const int display)
     return fd;
 }
 
+#ifdef DNETCONN
+static int _xcb_open_decnet(const char *host, const unsigned short port)
+{
+    int fd;
+    struct sockaddr_dn addr;
+    struct accessdata_dn accessdata;
+    struct nodeent *nodeaddr = getnodebyname(host);
+
+    if(!nodeaddr)
+        return -1;
+    addr.sdn_family = AF_DECnet;
+
+    addr.sdn_add.a_len = nodeaddr->n_length;
+    memcpy(addr.sdn_add.a_addr, nodeaddr->n_addr, addr.sdn_add.a_len);
+
+    sprintf((char *)addr.sdn_objname, "X$X%d", port);
+    addr.sdn_objnamel = strlen((char *)addr.sdn_objname);
+    addr.sdn_objnum = 0;
+
+    fd = socket(PF_DECnet, SOCK_STREAM, 0);
+    if(fd == -1)
+        return -1;
+
+    memset(&accessdata, 0, sizeof(accessdata));
+    sprintf((char*)accessdata.acc_acc, "%d", getuid());
+    accessdata.acc_accl = strlen((char *)accessdata.acc_acc);
+    setsockopt(fd, DNPROTO_NSP, SO_CONACCESS, &accessdata, sizeof(accessdata));
+
+    if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
+        return -1;
+    return fd;
+}
+#endif
+
 static int _xcb_open_tcp(const char *host, const unsigned short port)
 {
     int fd;
@@ -161,7 +217,7 @@ XCBConnection *XCBConnect(const char *displayname, int *screenp)
     if(fd == -1)
         return 0;
 
-    XCBGetAuthInfo(fd, &auth);
+    _xcb_get_auth_info(fd, &auth);
     c = XCBConnectToFD(fd, &auth);
     free(auth.name);
     free(auth.data);
@@ -217,3 +273,148 @@ 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);
+}
+
+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);
+}