From 0cbc89221f82fa99db511eeef580a1476dfd4087 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 12 Oct 2016 21:33:00 +0200 Subject: Remove unused TLI ("STREAMSCONN") code --- nx-X11/programs/Xserver/os/access.c | 24 +++++++++--------- nx-X11/programs/Xserver/os/connection.c | 4 +-- nx-X11/programs/Xserver/os/utils.c | 4 +-- nx-X11/programs/Xserver/os/xdmauth.c | 2 +- nx-X11/programs/Xserver/os/xdmcp.c | 43 --------------------------------- 5 files changed, 17 insertions(+), 60 deletions(-) (limited to 'nx-X11/programs/Xserver/os') diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index 54d1b72bf..8d5dc15f3 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -84,9 +84,9 @@ SOFTWARE. #include #include -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(ISC) || defined(__SCO__) +#if defined(TCPCONN) || defined(ISC) || defined(__SCO__) #include -#endif /* TCPCONN || STREAMSCONN || ISC || __SCO__ */ +#endif /* TCPCONN || ISC || __SCO__ */ #ifdef HAS_GETPEERUCRED # include @@ -525,7 +525,7 @@ DefineSelf (int fd) void DefineSelf (int fd) { -#if !defined(TCPCONN) && !defined(STREAMSCONN) && !defined(UNIXCONN) && !defined(MNX_TCPCONN) +#if !defined(TCPCONN) && !defined(UNIXCONN) && !defined(MNX_TCPCONN) return; #else register int n; @@ -668,7 +668,7 @@ DefineLocalHost: selfhosts = host; } } -#endif /* !TCPCONN && !STREAMSCONN && !UNIXCONN && !MNX_TCPCONN */ +#endif /* !TCPCONN && !UNIXCONN && !MNX_TCPCONN */ } #else @@ -1110,13 +1110,13 @@ ResetHosts (char *display) FILE *fd; char *ptr; int i, hostlen; -#if ((defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)) && \ +#if ((defined(TCPCONN) || defined(MNX_TCPCONN)) && \ (!defined(IPv6) || !defined(AF_INET6))) union { struct sockaddr sa; -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN) +#if defined(TCPCONN) || defined(MNX_TCPCONN) struct sockaddr_in in; -#endif /* TCPCONN || STREAMSCONN */ +#endif /* TCPCONN */ } saddr; #endif int family = 0; @@ -1166,7 +1166,7 @@ ResetHosts (char *display) NewHost(family, "", 0, FALSE); LocalHostRequested = TRUE; /* Fix for XFree86 bug #156 */ } -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN) +#if defined(TCPCONN) || defined(MNX_TCPCONN) else if (!strncmp("inet:", lhostname, 5)) { family = FamilyInternet; @@ -1211,7 +1211,7 @@ ResetHosts (char *display) } else #endif /* SECURE_RPC */ -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN) +#if defined(TCPCONN) || defined(MNX_TCPCONN) { #if defined(IPv6) && defined(AF_INET6) if ( (family == FamilyInternet) || (family == FamilyInternet6) || @@ -1261,7 +1261,7 @@ ResetHosts (char *display) } #endif /* IPv6 */ } -#endif /* TCPCONN || STREAMSCONN */ +#endif /* TCPCONN */ family = FamilyWild; } fclose (fd); @@ -1642,7 +1642,7 @@ CheckAddr ( switch (family) { -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN) +#if defined(TCPCONN) || defined(MNX_TCPCONN) case FamilyInternet: if (length == sizeof (struct in_addr)) len = length; @@ -1735,7 +1735,7 @@ ConvertAddr ( case AF_UNIX: #endif return FamilyLocal; -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN) +#if defined(TCPCONN) || defined(MNX_TCPCONN) case AF_INET: #ifdef WIN32 if (16777343 == *(long*)&((struct sockaddr_in *) saddr)->sin_addr) diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index a7b6be6b0..ca885cde4 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -112,7 +112,7 @@ SOFTWARE. extern __const__ int _nfiles; #endif -#if defined(TCPCONN) || defined(STREAMSCONN) +#if defined(TCPCONN) # include # include # if !defined(hpux) @@ -601,7 +601,7 @@ AuthAudit (ClientPtr client, Bool letin, #endif strcpy(out, "local host"); break; -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN) +#if defined(TCPCONN) || defined(MNX_TCPCONN) case AF_INET: sprintf(out, "IP %s", inet_ntoa(((struct sockaddr_in *) saddr)->sin_addr)); diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 8c69b1346..9584dadd3 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -131,7 +131,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #include /* for malloc() */ -#if defined(TCPCONN) || defined(STREAMSCONN) +#if defined(TCPCONN) # ifndef WIN32 # include # endif @@ -1285,7 +1285,7 @@ int set_font_authorizations(char **authorizations, int *authlen, void * client) { #define AUTHORIZATION_NAME "hp-hostname-1" -#if defined(TCPCONN) || defined(STREAMSCONN) +#if defined(TCPCONN) static char *result = NULL; static char *p = NULL; diff --git a/nx-X11/programs/Xserver/os/xdmauth.c b/nx-X11/programs/Xserver/os/xdmauth.c index 48e1da6df..4a59b48f2 100644 --- a/nx-X11/programs/Xserver/os/xdmauth.c +++ b/nx-X11/programs/Xserver/os/xdmauth.c @@ -284,7 +284,7 @@ XdmAuthorizationValidate (unsigned char *plain, int length, if (_XSERVTransGetPeerAddr(((OsCommPtr)xclient->osPrivate)->trans_conn, &family, &addr_len, &addr) == 0 && _XSERVTransConvertAddress(&family, &addr_len, &addr) == 0) { -#if defined(TCPCONN) || defined(STREAMSCONN) +#if defined(TCPCONN) if (family == FamilyInternet && memcmp((char *)addr, client->client, 4) != 0) { free (client); diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c index f61321f23..5daf1cbbf 100644 --- a/nx-X11/programs/Xserver/os/xdmcp.c +++ b/nx-X11/programs/Xserver/os/xdmcp.c @@ -54,11 +54,6 @@ #include #endif -#ifdef STREAMSCONN -#include -#include -#include -#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 -- cgit v1.2.3