diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 19:50:24 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 19:50:24 +0100 |
commit | 107e72b038bc76953dc97d4ea655c9bde10e5865 (patch) | |
tree | a5c7cd9dc1857fd972683481fa39f6eba685b32e /nx-X11/programs/Xserver/os/xdmcp.c | |
parent | a9b145d466f774d0a6948a493df2e9c7bff50d6f (diff) | |
parent | 6a186b9217e0e3ca10f285f90e5afcdd22dc6c2e (diff) | |
download | nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.tar.gz nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.tar.bz2 nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.zip |
Merge branch 'uli42-pr/upgrade_xtrans' into 3.6.x
Attributes GH PR #268: https://github.com/ArcticaProject/nx-libs/pull/268
Diffstat (limited to 'nx-X11/programs/Xserver/os/xdmcp.c')
-rw-r--r-- | nx-X11/programs/Xserver/os/xdmcp.c | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c index d84fe2906..5daf1cbbf 100644 --- a/nx-X11/programs/Xserver/os/xdmcp.c +++ b/nx-X11/programs/Xserver/os/xdmcp.c @@ -54,11 +54,6 @@ #include <sys/ioctl.h> #endif -#ifdef STREAMSCONN -#include <tiuser.h> -#include <netconfig.h> -#include <netdir.h> -#endif #ifndef NX_TRANS_SOCKET @@ -1029,43 +1024,6 @@ XdmcpAddAuthorization ( static void get_xdmcp_sock(void) { -#ifdef STREAMSCONN - struct netconfig *nconf; - - if ((xdmcpSocket = t_open("/dev/udp", O_RDWR, 0)) < 0) { - XdmcpWarning("t_open() of /dev/udp failed"); - return; - } - - if( t_bind(xdmcpSocket,NULL,NULL) < 0 ) { - XdmcpWarning("UDP socket creation failed"); - t_error("t_bind(xdmcpSocket) failed" ); - t_close(xdmcpSocket); - return; - } - - /* - * This part of the code looks contrived. It will actually fit in nicely - * when the CLTS part of Xtrans is implemented. - */ - - if( (nconf=getnetconfigent("udp")) == NULL ) { - XdmcpWarning("UDP socket creation failed: getnetconfigent()"); - t_unbind(xdmcpSocket); - t_close(xdmcpSocket); - return; - } - - if( netdir_options(nconf, ND_SET_BROADCAST, xdmcpSocket, NULL) ) { - XdmcpWarning("UDP set broadcast option failed: netdir_options()"); - freenetconfigent(nconf); - t_unbind(xdmcpSocket); - t_close(xdmcpSocket); - return; - } - - freenetconfigent(nconf); -#else int soopts = 1; #if defined(IPv6) && defined(AF_INET6) @@ -1085,7 +1043,6 @@ get_xdmcp_sock(void) FatalError("Xserver: failed to bind to -from address: %s\n", xdm_from); } } -#endif /* STREAMSCONN */ } static void @@ -1572,7 +1529,7 @@ get_addr_by_name( #ifdef XTHREADS_NEEDS_BYNAMEPARAMS _Xgethostbynameparams hparams; #endif -#if defined(WIN32) && (defined(TCPCONN) || defined(DNETCONN)) +#if defined(WIN32) && defined(TCPCONN) _XSERVTransWSAStartup(); #endif if (!(hep = _XGethostbyname(namestr, hparams))) |