diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-10-12 21:06:36 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 19:46:36 +0100 |
| commit | b5bfd3a49503387f1477a58b7c3d76fcdf06fbe5 (patch) | |
| tree | 9e11241ad658d0f3cf7e7e6948c12c8e9c6b0f63 /nx-X11/lib/xtrans/Xtrans.c | |
| parent | a9b145d466f774d0a6948a493df2e9c7bff50d6f (diff) | |
| download | nx-libs-b5bfd3a49503387f1477a58b7c3d76fcdf06fbe5.tar.gz nx-libs-b5bfd3a49503387f1477a58b7c3d76fcdf06fbe5.tar.bz2 nx-libs-b5bfd3a49503387f1477a58b7c3d76fcdf06fbe5.zip | |
remove DECnet support
just as Xorg upstream did
Diffstat (limited to 'nx-X11/lib/xtrans/Xtrans.c')
| -rw-r--r-- | nx-X11/lib/xtrans/Xtrans.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/nx-X11/lib/xtrans/Xtrans.c b/nx-X11/lib/xtrans/Xtrans.c index d665305bb..e53012e2f 100644 --- a/nx-X11/lib/xtrans/Xtrans.c +++ b/nx-X11/lib/xtrans/Xtrans.c @@ -93,9 +93,6 @@ Xtransport_table Xtransports[] = { #endif /* IPv6 */ { &TRANS(SocketINETFuncs), TRANS_SOCKET_INET_INDEX }, #endif /* TCPCONN */ -#if defined(DNETCONN) - { &TRANS(DNETFuncs), TRANS_DNET_INDEX }, -#endif /* DNETCONN */ #if defined(UNIXCONN) #if !defined(LOCALCONN) { &TRANS(SocketLocalFuncs), TRANS_SOCKET_LOCAL_INDEX }, @@ -206,7 +203,6 @@ TRANS(ParseAddress) (char *address, char **protocol, char **host, char **port) * * If the protocol part is missing, then assume TCP. * If the protocol part and host part are missing, then assume local. - * If a "::" is found then assume DNET. */ char *mybuf, *tmpptr; @@ -289,22 +285,6 @@ TRANS(ParseAddress) (char *address, char **protocol, char **host, char **port) return 0; } - /* Check for DECnet */ - - if ((mybuf != _host) && (*(mybuf - 1) == ':') -#if defined(IPv6) && defined(AF_INET6) - /* An IPv6 address can end in :: so three : in a row is assumed to be - an IPv6 host and not a DECnet node with a : in it's name, unless - DECnet is specifically requested */ - && ( ((mybuf - 1) == _host) || (*(mybuf - 2) != ':') || - ((_protocol != NULL) && (strcmp(_protocol, "dnet") == 0)) ) -#endif - ) - { - _protocol = "dnet"; - *(mybuf - 1) = '\0'; - } - *mybuf ++= '\0'; _host_len = strlen(_host); @@ -420,7 +400,7 @@ TRANS(Open) (int type, char *address) PRMSG (2,"Open(%d,%s)\n", type, address, 0); -#if defined(WIN32) && (defined(TCPCONN) || defined(DNETCONN)) +#if defined(WIN32) && defined(TCPCONN) if (TRANS(WSAStartup)()) { PRMSG (1,"Open: WSAStartup failed\n", 0, 0, 0); |