falso
/
cdesktopenv
mirror of https://git.code.sf.net/p/cdesktopenv/code
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: t_optmgmt: Incorrect options format 

From a diff file provided by Mariusz Zynel:

    Every time, every dt program gives that error on its
    start. t_optmgmt() is called once in _tt_tli_set_nodelay(), as the
    name says, to set TCP_NODELAY option for ToolTalk connections.
This commit is contained in:
Jon Trulson 2025-11-15 13:09:49 -07:00
parent 9f0f015c4d
commit 76b99355ce
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
cde/lib/tt/lib/mp/mp_rpc_fns.C
View File

@ -42,6 +42,36 @@
#include <tiuser.h>
#include <sys/socket.h>
int
tli_setopt(int fd, int level, int name, int value)
{
struct t_optmgmt req, resp;
struct {
struct opthdr opt;
int value;
} reqbuf;
reqbuf.opt.level = level;
reqbuf.opt.name = name;
reqbuf.opt.len = sizeof (int);
reqbuf.value = value;
req.flags = T_NEGOTIATE;
req.opt.len = sizeof (reqbuf);
req.opt.buf = (char *)&reqbuf;
resp.flags = 0;
resp.opt.buf = (char *)&reqbuf;
resp.opt.maxlen = sizeof (reqbuf);
if (t_optmgmt(fd, &req, &resp) < 0 || resp.flags != T_SUCCESS) {
t_error("t_optmgmt");
return (0);
}
return (1);
}
/*
* Sets the TCP_NODELAY option for a tli stream bound using tcp. This
@ -53,34 +83,9 @@ extern "C"
int
_tt_tli_set_nodelay(int fd)
{
struct t_optmgmt *options;
struct sochdr {
struct opthdr opthdr;
long value;
} sochdr;
options = (struct t_optmgmt *)t_alloc(fd, T_OPTMGMT, 0);
if (options == (struct t_optmgmt *)0) {
return (0);
}
sochdr.opthdr.level = IPPROTO_TCP;
sochdr.opthdr.name = TCP_NODELAY;
sochdr.opthdr.len = 4;
sochdr.value = 1;
options->opt.maxlen = sizeof(sochdr);
options->opt.len = sizeof(sochdr);
options->opt.buf = (char *) &sochdr;
options->flags = T_NEGOTIATE;
if (t_optmgmt(fd, options, options) == -1) {
t_error("t_optmgmt");
return(0);
}
options->opt.buf = 0;
(void) t_free((char *)options, T_OPTMGMT);
return(1);
return (tli_setopt(fd, IPPROTO_TCP, TCP_NODELAY, 1));
}
extern "C"
int
_tt_bind_endpoint(int fd,