diff options
Diffstat (limited to 'libXdmcp')
| -rw-r--r-- | libXdmcp/Fill.c | 22 | ||||
| -rw-r--r-- | libXdmcp/Flush.c | 17 | ||||
| -rw-r--r-- | libXdmcp/include/X11/Xdmcp.h | 2 |
3 files changed, 1 insertions, 40 deletions
diff --git a/libXdmcp/Fill.c b/libXdmcp/Fill.c index 98c324f45..61cd974e9 100644 --- a/libXdmcp/Fill.c +++ b/libXdmcp/Fill.c @@ -36,24 +36,16 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> #include <stdlib.h> -#ifdef STREAMSCONN -#include <tiuser.h> -#else #ifdef WIN32 #include <X11/Xwinsock.h> #else #include <sys/socket.h> #endif -#endif int XdmcpFill (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen) { BYTE *newBuf; -#ifdef STREAMSCONN - struct t_unitdata dataunit; - int gotallflag, result; -#endif if (buffer->size < XDM_MAX_MSGLEN) { @@ -66,22 +58,8 @@ XdmcpFill (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen) } } buffer->pointer = 0; -#ifdef STREAMSCONN - dataunit.addr.buf = from; - dataunit.addr.maxlen = *fromlen; - dataunit.opt.maxlen = 0; /* don't care to know about options */ - dataunit.udata.buf = (char *)buffer->data; - dataunit.udata.maxlen = buffer->size; - result = t_rcvudata (fd, &dataunit, &gotallflag); - if (result < 0) { - return FALSE; - } - buffer->count = dataunit.udata.len; - *fromlen = dataunit.addr.len; -#else buffer->count = recvfrom (fd, (char*)buffer->data, buffer->size, 0, (struct sockaddr *)from, (void *)fromlen); -#endif if (buffer->count < 6) { buffer->count = 0; return FALSE; diff --git a/libXdmcp/Flush.c b/libXdmcp/Flush.c index cdcd1f096..1654846b9 100644 --- a/libXdmcp/Flush.c +++ b/libXdmcp/Flush.c @@ -35,36 +35,19 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xmd.h> #include <X11/Xdmcp.h> -#ifdef STREAMSCONN -#include <tiuser.h> -#else #ifdef WIN32 #include <X11/Xwinsock.h> #else #include <sys/socket.h> #endif -#endif int XdmcpFlush (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr to, int tolen) { int result; -#ifdef STREAMSCONN - struct t_unitdata dataunit; - - dataunit.addr.buf = to; - dataunit.addr.len = tolen; - dataunit.opt.len = 0; /* default options */ - dataunit.udata.buf = (char *)buffer->data; - dataunit.udata.len = buffer->pointer; - result = t_sndudata(fd, &dataunit); - if (result < 0) - return FALSE; -#else result = sendto (fd, (char *)buffer->data, buffer->pointer, 0, (struct sockaddr *)to, tolen); if (result != buffer->pointer) return FALSE; -#endif return TRUE; } diff --git a/libXdmcp/include/X11/Xdmcp.h b/libXdmcp/include/X11/Xdmcp.h index 99a5f9520..0b531de78 100644 --- a/libXdmcp/include/X11/Xdmcp.h +++ b/libXdmcp/include/X11/Xdmcp.h @@ -114,7 +114,7 @@ typedef struct _XdmAuthKey { /* implementation-independent network address structure. - Equiv to sockaddr* for sockets and netbuf* for STREAMS. */ + Equiv to sockaddr* for sockets. */ typedef char *XdmcpNetaddr; |