SwallowOS/xorg_lib_libXdmcp
1
0
Fork 0
mirror of https://github.com/SwallowOS/xorg_lib_libXdmcp synced 2025-11-04 06:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused TLI ("STREAMSCONN") code from libXdmcp

Browse Source 
Has never been converted to build in modular builds, so has been unusable
since X11R7.0 release in 2005.  All known platforms with TLI/XTI support
that X11R7 & later releases run on also have (and mostly prefer) BSD
socket support for their networking API.

Mostly performed via "unifdef -USTREAMSCONN", followed by manual cleanup.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith
2012-12-26 23:39:58 -08:00
parent 60aa228de5
commit ca65a92405
3 changed files with 1 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Fill.c
View File

@@ -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;

17
Flush.c
View File

@@ -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;
}

2
include/X11/Xdmcp.h
View File

@@ -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;