Skip to content

N
nx-libs
Commit 603fe255 authored by Adam Jackson's avatar Adam Jackson Committed by Mike Gabriel
Browse files
Options

remove CLTS code

Remove CLTS code Never been used, as far as I can tell. Reviewed-by: 's avatarKeith Packard <keithp@keithp.com> Signed-off-by: 's avatarAdam Jackson <ajax@redhat.com> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent 247e1f72
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 491 deletions
nx-X11/lib/xtrans/Xtrans.c
View file @ 603fe255
......@@ -433,16 +433,6 @@ TRANS(Open) (int type, char *address)
ciptr = thistrans->OpenCOTSServer(thistrans, protocol, host, port);
#endif /* TRANS_SERVER */
break;
case XTRANS_OPEN_CLTS_CLIENT:
#ifdef TRANS_CLIENT
ciptr = thistrans->OpenCLTSClient(thistrans, protocol, host, port);
#endif /* TRANS_CLIENT */
break;
case XTRANS_OPEN_CLTS_SERVER:
#ifdef TRANS_SERVER
ciptr = thistrans->OpenCLTSServer(thistrans, protocol, host, port);
#endif /* TRANS_SERVER */
break;
default:
prmsg (1,"Open: Unknown Open type %d\n", type);
}
......@@ -522,9 +512,6 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port)
case XTRANS_OPEN_COTS_SERVER:
ciptr = thistrans->ReopenCOTSServer(thistrans, fd, port);
break;
case XTRANS_OPEN_CLTS_SERVER:
ciptr = thistrans->ReopenCLTSServer(thistrans, fd, port);
break;
default:
prmsg (1,"Reopen: Bad Open type %d\n", type);
}
......@@ -577,32 +564,6 @@ TRANS(OpenCOTSServer) (char *address)
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
XtransConnInfo
TRANS(OpenCLTSClient) (char *address)
{
prmsg (2,"OpenCLTSClient(%s)\n", address);
return TRANS(Open) (XTRANS_OPEN_CLTS_CLIENT, address);
}
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
XtransConnInfo
TRANS(OpenCLTSServer) (char *address)
{
prmsg (2,"OpenCLTSServer(%s)\n", address);
return TRANS(Open) (XTRANS_OPEN_CLTS_SERVER, address);
}
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
XtransConnInfo
......@@ -613,15 +574,6 @@ TRANS(ReopenCOTSServer) (int trans_id, int fd, char *port)
return TRANS(Reopen) (XTRANS_OPEN_COTS_SERVER, trans_id, fd, port);
}
XtransConnInfo
TRANS(ReopenCLTSServer) (int trans_id, int fd, char *port)
{
prmsg (2,"ReopenCLTSServer(%d, %d, %s)\n", trans_id, fd, port);
return TRANS(Reopen) (XTRANS_OPEN_CLTS_SERVER, trans_id, fd, port);
}
int
TRANS(GetReopenInfo) (XtransConnInfo ciptr,
int *trans_id, int *fd, char **port)
......@@ -1120,103 +1072,6 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
return 0;
}
int
TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret,
XtransConnInfo **ciptrs_ret)
{
char buffer[256]; /* ??? What size ?? */
XtransConnInfo ciptr, temp_ciptrs[NUMTRANS];
int status, i, j;
prmsg (2,"MakeAllCLTSServerListeners(%s,%p)\n",
port ? port : "NULL", ciptrs_ret);
*count_ret = 0;
for (i = 0; i < NUMTRANS; i++)
{
Xtransport *trans = Xtransports[i].transport;
if (trans->flags&TRANS_ALIAS || trans->flags&TRANS_NOLISTEN)
continue;
sprintf(buffer,"%s/:%s", trans->TransName, port ? port : "");
prmsg (5,"MakeAllCLTSServerListeners: opening %s\n",
buffer);
if ((ciptr = TRANS(OpenCLTSServer (buffer))) == NULL)
{
prmsg (1,
"MakeAllCLTSServerListeners: failed to open listener for %s\n",
trans->TransName);
continue;
}
if ((status = TRANS(CreateListener (ciptr, port, 0))) < 0)
{
if (status == TRANS_ADDR_IN_USE)
{
/*
* We failed to bind to the specified address because the
* address is in use. It must be that a server is already
* running at this address, and this function should fail.
*/
prmsg (1,
"MakeAllCLTSServerListeners: server already running\n");
for (j = 0; j < *count_ret; j++)
TRANS(Close) (temp_ciptrs[j]);
*count_ret = 0;
*ciptrs_ret = NULL;
*partial = 0;
return -1;
}
else
{
prmsg (1,
"MakeAllCLTSServerListeners: failed to create listener for %s\n",
trans->TransName);
continue;
}
}
prmsg (5,
"MakeAllCLTSServerListeners: opened listener for %s, %d\n",
trans->TransName, ciptr->fd);
temp_ciptrs[*count_ret] = ciptr;
(*count_ret)++;
}
*partial = (*count_ret < complete_network_count());
prmsg (5,
"MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n",
*partial, *count_ret, complete_network_count());
if (*count_ret > 0)
{
if ((*ciptrs_ret = (XtransConnInfo *) malloc (
*count_ret * sizeof (XtransConnInfo))) == NULL)
{
return -1;
}
for (i = 0; i < *count_ret; i++)
{
(*ciptrs_ret)[i] = temp_ciptrs[i];
}
}
else
*ciptrs_ret = NULL;
return 0;
}
#endif /* TRANS_SERVER */
......
nx-X11/lib/xtrans/Xtrans.h
View file @ 603fe255
......@@ -277,22 +277,6 @@ XtransConnInfo TRANS(OpenCOTSServer)(
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
XtransConnInfo TRANS(OpenCLTSClient)(
char * /* address */
);
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
XtransConnInfo TRANS(OpenCLTSServer)(
char * /* address */
);
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
XtransConnInfo TRANS(ReopenCOTSServer)(
......@@ -301,12 +285,6 @@ XtransConnInfo TRANS(ReopenCOTSServer)(
char * /* port */
);
XtransConnInfo TRANS(ReopenCLTSServer)(
int, /* trans_id */
int, /* fd */
char * /* port */
);
int TRANS(GetReopenInfo)(
XtransConnInfo, /* ciptr */
int *, /* trans_id */
......@@ -427,13 +405,6 @@ int TRANS(MakeAllCOTSServerListeners)(
XtransConnInfo ** /* ciptrs_ret */
);
int TRANS(MakeAllCLTSServerListeners)(
char *, /* port */
int *, /* partial */
int *, /* count_ret */
XtransConnInfo ** /* ciptrs_ret */
);
#endif /* TRANS_SERVER */
......
nx-X11/lib/xtrans/Xtransint.h
View file @ 603fe255
......@@ -135,9 +135,6 @@ struct _XtransConnInfo {
#define XTRANS_OPEN_COTS_CLIENT 1
#define XTRANS_OPEN_COTS_SERVER 2
#define XTRANS_OPEN_CLTS_CLIENT 3
#define XTRANS_OPEN_CLTS_SERVER 4
typedef struct _Xtransport {
char *TransName;
......@@ -165,29 +162,6 @@ typedef struct _Xtransport {
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
XtransConnInfo (*OpenCLTSClient)(
struct _Xtransport *, /* transport */
char *, /* protocol */
char *, /* host */
char * /* port */
);
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
XtransConnInfo (*OpenCLTSServer)(
struct _Xtransport *, /* transport */
char *, /* protocol */
char *, /* host */
char * /* port */
);
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
XtransConnInfo (*ReopenCOTSServer)(
......@@ -196,12 +170,6 @@ typedef struct _Xtransport {
char * /* port */
);
XtransConnInfo (*ReopenCLTSServer)(
struct _Xtransport *, /* transport */
int, /* fd */
char * /* port */
);
#endif /* TRANS_REOPEN */
......
nx-X11/lib/xtrans/Xtranslcl.c
View file @ 603fe255
......@@ -2041,11 +2041,7 @@ TRANS(LocalOpenClient)(int type, char *protocol, char *host, char *port)
case XTRANS_OPEN_COTS_CLIENT:
ciptr->fd=transptr->devcotsopenclient(ciptr,port);
break;
case XTRANS_OPEN_CLTS_CLIENT:
ciptr->fd=transptr->devcltsopenclient(ciptr,port);
break;
case XTRANS_OPEN_COTS_SERVER:
case XTRANS_OPEN_CLTS_SERVER:
prmsg(1,
"LocalOpenClient: Should not be opening a server with this function\n");
break;
......@@ -2109,16 +2105,12 @@ TRANS(LocalOpenServer)(int type, char *protocol, char *host, char *port)
switch( type )
{
case XTRANS_OPEN_COTS_CLIENT:
case XTRANS_OPEN_CLTS_CLIENT:
prmsg(1,
"LocalOpenServer: Should not be opening a client with this function\n");
break;
case XTRANS_OPEN_COTS_SERVER:
ciptr->fd=LOCALtrans2devtab[i].devcotsopenserver(ciptr,port);
break;
case XTRANS_OPEN_CLTS_SERVER:
ciptr->fd=LOCALtrans2devtab[i].devcltsopenserver(ciptr,port);
break;
default:
prmsg(1,"LocalOpenServer: Unknown Open type %d\n",
type );
......@@ -2163,10 +2155,7 @@ TRANS(LocalReopenServer)(int type, int index, int fd, char *port)
case XTRANS_OPEN_COTS_SERVER:
stat = LOCALtrans2devtab[index].devcotsreopenserver(ciptr,fd,port);
break;
case XTRANS_OPEN_CLTS_SERVER:
stat = LOCALtrans2devtab[index].devcltsreopenserver(ciptr,fd,port);
break;
default:
default:
prmsg(1,"LocalReopenServer: Unknown Open type %d\n",
type );
}
......@@ -2248,37 +2237,6 @@ TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, char *protocol,
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
static XtransConnInfo
TRANS(LocalOpenCLTSClient)(Xtransport *thistrans, char *protocol,
char *host, char *port)
{
prmsg(2,"LocalOpenCLTSClient(%s,%s,%s)\n",protocol,host,port);
return TRANS(LocalOpenClient)(XTRANS_OPEN_CLTS_CLIENT, protocol, host, port);
}
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
static XtransConnInfo
TRANS(LocalOpenCLTSServer)(Xtransport *thistrans, char *protocol,
char *host, char *port)
{
prmsg(2,"LocalOpenCLTSServer(%s,%s,%s)\n",protocol,host,port);
return TRANS(LocalOpenServer)(XTRANS_OPEN_CLTS_SERVER, protocol, host, port);
}
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
static XtransConnInfo
......@@ -2305,30 +2263,6 @@ TRANS(LocalReopenCOTSServer)(Xtransport *thistrans, int fd, char *port)
index, fd, port);
}
static XtransConnInfo
TRANS(LocalReopenCLTSServer)(Xtransport *thistrans, int fd, char *port)
{
int index;
prmsg(2,"LocalReopenCLTSServer(%d,%s)\n", fd, port);
for(index=1;index<NUMTRANSPORTS;index++)
{
if( strcmp(thistrans->TransName,
LOCALtrans2devtab[index].transname) == 0 )
break;
}
if (index >= NUMTRANSPORTS)
{
return (NULL);
}
return TRANS(LocalReopenServer)(XTRANS_OPEN_CLTS_SERVER,
index, fd, port);
}
#endif /* TRANS_REOPEN */
......@@ -2539,15 +2473,8 @@ Xtransport TRANS(LocalFuncs) = {
local_aliases,
TRANS(LocalOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
TRANS(LocalOpenCLTSClient),
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(LocalOpenCLTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer),
TRANS(LocalReopenCLTSServer),
#endif
TRANS(LocalSetOption),
#ifdef TRANS_SERVER
......@@ -2581,15 +2508,8 @@ Xtransport TRANS(PTSFuncs) = {
NULL,
TRANS(LocalOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
TRANS(LocalOpenCLTSClient),
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(LocalOpenCLTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer),
TRANS(LocalReopenCLTSServer),
#endif
TRANS(LocalSetOption),
#ifdef TRANS_SERVER
......@@ -2623,15 +2543,8 @@ Xtransport TRANS(NAMEDFuncs) = {
NULL,
TRANS(LocalOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
TRANS(LocalOpenCLTSClient),
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(LocalOpenCLTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer),
TRANS(LocalReopenCLTSServer),
#endif
TRANS(LocalSetOption),
#ifdef TRANS_SERVER
......@@ -2665,15 +2578,8 @@ Xtransport TRANS(ISCFuncs) = {
NULL,
TRANS(LocalOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
TRANS(LocalOpenCLTSClient),
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(LocalOpenCLTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer),
TRANS(LocalReopenCLTSServer),
#endif
TRANS(LocalSetOption),
#ifdef TRANS_SERVER
......@@ -2705,15 +2611,8 @@ Xtransport TRANS(SCOFuncs) = {
NULL,
TRANS(LocalOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
TRANS(LocalOpenCLTSClient),
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(LocalOpenCLTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(LocalReopenCOTSServer),
TRANS(LocalReopenCLTSServer),
#endif
TRANS(LocalSetOption),
#ifdef TRANS_SERVER
......
nx-X11/lib/xtrans/Xtranssock.c
View file @ 603fe255
......@@ -1079,120 +1079,6 @@ TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, char *protocol,
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
static XtransConnInfo
TRANS(SocketOpenCLTSClient) (Xtransport *thistrans, char *protocol,
char *host, char *port)
{
XtransConnInfo ciptr;
int i = -1;
prmsg (2,"SocketOpenCLTSClient(%s,%s,%s)\n", protocol, host, port);
SocketInitOnce();
while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
#if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT)
if ((!strcmp(protocol, "local") || !strcmp(protocol, "nx")) &&
(!strcasecmp(host, "nx") || !strncasecmp(host, "nx,", 3)))
{
ciptr = TRANS(SocketCreateConnInfo) ();
if (ciptr == NULL)
{
prmsg (1, "SocketOpenCLTSClient: Unable to create the NX connection info for %s.\n",
thistrans->TransName);
return NULL;
}
ciptr->index = i;
return ciptr;
}
#endif /* #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) */
if ((ciptr = TRANS(SocketOpen) (
i, Sockettrans2devtab[i].devcotsname)) != NULL)
break;
}
if (i < 0) {
if (i == -1)
prmsg (1,"SocketOpenCLTSClient: Unable to open socket for %s\n",
thistrans->TransName);
else
prmsg (1,"SocketOpenCLTSClient: Unable to determine socket type for %s\n",
thistrans->TransName);
return NULL;
}
#if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT)
ciptr->priv = NULL;
#endif /* #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) */
/* Save the index for later use */
ciptr->index = i;
return ciptr;
}
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
static XtransConnInfo
TRANS(SocketOpenCLTSServer) (Xtransport *thistrans, char *protocol,
char *host, char *port)
{
XtransConnInfo ciptr;
int i = -1;
prmsg (2,"SocketOpenCLTSServer(%s,%s,%s)\n", protocol, host, port);
SocketInitOnce();
while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
if ((ciptr = TRANS(SocketOpen) (
i, Sockettrans2devtab[i].devcotsname)) != NULL)
break;
}
if (i < 0) {
if (i == -1)
prmsg (1,"SocketOpenCLTSServer: Unable to open socket for %s\n",
thistrans->TransName);
else
prmsg (1,"SocketOpenCLTSServer: Unable to determine socket type for %s\n",
thistrans->TransName);
return NULL;
}
#ifdef IPV6_V6ONLY
if (Sockettrans2devtab[i].family == AF_INET6)
{
int one = 1;
setsockopt(ciptr->fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(int));
}
#endif
/* Save the index for later use */
ciptr->index = i;
return ciptr;
}
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
static XtransConnInfo
......@@ -1229,40 +1115,6 @@ TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, char *port)
return ciptr;
}
static XtransConnInfo
TRANS(SocketReopenCLTSServer) (Xtransport *thistrans, int fd, char *port)
{
XtransConnInfo ciptr;
int i = -1;
prmsg (2,
"SocketReopenCLTSServer(%d, %s)\n", fd, port);
SocketInitOnce();
while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
if ((ciptr = TRANS(SocketReopen) (
i, Sockettrans2devtab[i].devcotsname, fd, port)) != NULL)
break;
}
if (i < 0) {
if (i == -1)
prmsg (1,"SocketReopenCLTSServer: Unable to open socket for %s\n",
thistrans->TransName);
else
prmsg (1,"SocketReopenCLTSServer: Unable to determine socket type for %s\n",
thistrans->TransName);
return NULL;
}
/* Save the index for later use */
ciptr->index = i;
return ciptr;
}
#endif /* TRANS_REOPEN */
......@@ -2998,15 +2850,8 @@ Xtransport TRANS(SocketTCPFuncs) = {
tcp_nolisten,
TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
TRANS(SocketOpenCLTSClient),
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(SocketOpenCLTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer),
TRANS(SocketReopenCLTSServer),
#endif
TRANS(SocketSetOption),
#ifdef TRANS_SERVER
......@@ -3038,15 +2883,8 @@ Xtransport TRANS(SocketINETFuncs) = {
NULL,
TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
TRANS(SocketOpenCLTSClient),
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(SocketOpenCLTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer),
TRANS(SocketReopenCLTSServer),
#endif
TRANS(SocketSetOption),
#ifdef TRANS_SERVER
......@@ -3079,15 +2917,8 @@ Xtransport TRANS(SocketINET6Funcs) = {
NULL,
TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
TRANS(SocketOpenCLTSClient),
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(SocketOpenCLTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer),
TRANS(SocketReopenCLTSServer),
#endif
TRANS(SocketSetOption),
#ifdef TRANS_SERVER
......@@ -3127,15 +2958,8 @@ Xtransport TRANS(SocketLocalFuncs) = {
NULL,
TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
TRANS(SocketOpenCLTSClient),
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(SocketOpenCLTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer),
TRANS(SocketReopenCLTSServer),
#endif
TRANS(SocketSetOption),
#ifdef TRANS_SERVER
......@@ -3181,15 +3005,8 @@ Xtransport TRANS(SocketUNIXFuncs) = {
#endif
TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_CLIENT
TRANS(SocketOpenCLTSClient),
#endif /* TRANS_CLIENT */
#ifdef TRANS_SERVER
TRANS(SocketOpenCLTSServer),
#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer),
TRANS(SocketReopenCLTSServer),
#endif
TRANS(SocketSetOption),
#ifdef TRANS_SERVER
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment