Add support for DECnet. Still needs configure-script options to enable.
This commit is contained in:
parent
771761ccaa
commit
bb8cf58015
|
@ -29,7 +29,10 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#include <netinet/in.h>
|
#ifdef DNETCONN
|
||||||
|
#include <netdnet/dnetdb.h>
|
||||||
|
#include <netdnet/dn.h>
|
||||||
|
#endif
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -92,17 +95,35 @@ 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_tcp(const char *host, const unsigned short port);
|
||||||
static int _xcb_open_unix(const char *file);
|
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(const char *host, const int display)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
if(*host)
|
if(*host)
|
||||||
|
{
|
||||||
|
#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 */
|
/* display specifies TCP */
|
||||||
unsigned short port = X_TCP_PORT + display;
|
unsigned short port = X_TCP_PORT + display;
|
||||||
fd = _xcb_open_tcp(host, port);
|
fd = _xcb_open_tcp(host, port);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* display specifies Unix socket */
|
/* display specifies Unix socket */
|
||||||
|
@ -115,6 +136,40 @@ static int _xcb_open(const char *host, const int display)
|
||||||
return fd;
|
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)
|
static int _xcb_open_tcp(const char *host, const unsigned short port)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
|
|
Loading…
Reference in New Issue