bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

-T 0 now means 0.0s instead of no timeout

Browse source
This commit is contained in:
Gerhard Rieger 2024-06-21 12:45:06 +02:00
parent 335fca16c4
commit 42e20ed278
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
 
Features:
Total inactivity timeout option -T 0 now means 0.0 seconds; up to
version 1.8.0.0 it meant no total inactivity timeout.
Testing: Testing:
test.sh: lots of corrections and improvements test.sh: lots of corrections and improvements

6
doc/socat.yo
View file

@ -197,9 +197,11 @@ label(option_t)dit(bf(tt(-t))tt(<timeout>))
the timeout interval the read part gives EOF, socat terminates without the timeout interval the read part gives EOF, socat terminates without
awaiting the timeout. awaiting the timeout.
label(option_T)dit(bf(tt(-T))tt(<timeout>)) label(option_T)dit(bf(tt(-T))tt(<timeout>))
Total inactivity timeout: when socat is already in the transfer loop and Total inactivity timeout: when socat() is already in the transfer loop and
nothing has happened for <timeout> [link(timeval)(TYPE_TIMEVAL)] seconds nothing has happened for <timeout> [link(timeval)(TYPE_TIMEVAL)] seconds
(no data arrived, no interrupt occurred...) then it terminates. (no data arrived, no interrupt occurred...) then it terminates. Up to
version 1.8.0.0 "0" meant infinite"; since version 1.8.0.1 "0" means 0
and values <0 mean infinite.nl()
Useful with protocols like UDP that cannot transfer EOF. Useful with protocols like UDP that cannot transfer EOF.
label(option_u)dit(bf(tt(-u))) label(option_u)dit(bf(tt(-u)))
Uses unidirectional mode. The first address is only used for reading, and the Uses unidirectional mode. The first address is only used for reading, and the

16
socat.c
View file

@ -45,7 +45,7 @@ struct socat_opts {
false, /* verbhex */ false, /* verbhex */
{1,0}, /* pollintv */ {1,0}, /* pollintv */
{0,500000}, /* closwait */ {0,500000}, /* closwait */
{0,0}, /* total_timeout */ {0,1000000}, /* total_timeout (this invalid default means no timeout)*/
0, /* debug */ 0, /* debug */
0, /* strictopts */ 0, /* strictopts */
's', /* logopt */ 's', /* logopt */
@ -274,9 +274,14 @@ int main(int argc, const char *argv[]) {
} }
} }
rto = Strtod(a, (char **)&a, "-T"); rto = Strtod(a, (char **)&a, "-T");
if (rto < 0) {
socat_opts.total_timeout.tv_sec = 0; /* infinite */
socat_opts.total_timeout.tv_usec = 1000000; /* by invalid */
} else {
socat_opts.total_timeout.tv_sec = rto; socat_opts.total_timeout.tv_sec = rto;
socat_opts.total_timeout.tv_usec = socat_opts.total_timeout.tv_usec =
(rto-socat_opts.total_timeout.tv_sec) * 1000000; (rto-socat_opts.total_timeout.tv_sec) * 1000000;
}
break; break;
case 'u': if (arg1[0][2]) { socat_opt_hint(stderr, arg1[0][1], arg1[0][2]); Exit(1); } case 'u': if (arg1[0][2]) { socat_opt_hint(stderr, arg1[0][1], arg1[0][2]); Exit(1); }
socat_opts.lefttoright = true; break; socat_opts.lefttoright = true; break;
@ -992,8 +997,7 @@ int _socat(void) {
/* for ignoreeof */ /* for ignoreeof */
if (polling) { if (polling) {
if (!wasaction) { if (!wasaction) {
if (socat_opts.total_timeout.tv_sec != 0 || if (socat_opts.total_timeout.tv_usec <= 1000000) {
socat_opts.total_timeout.tv_usec != 0) {
if (total_timeout.tv_usec < socat_opts.pollintv.tv_usec) { if (total_timeout.tv_usec < socat_opts.pollintv.tv_usec) {
total_timeout.tv_usec += 1000000; total_timeout.tv_usec += 1000000;
total_timeout.tv_sec -= 1; total_timeout.tv_sec -= 1;
@ -1017,8 +1021,7 @@ int _socat(void) {
/* there is a ignoreeof poll timeout, use it */ /* there is a ignoreeof poll timeout, use it */
timeout = socat_opts.pollintv; timeout = socat_opts.pollintv;
to = &timeout; to = &timeout;
} else if (socat_opts.total_timeout.tv_sec != 0 || } else if (socat_opts.total_timeout.tv_usec < 1000000) {
socat_opts.total_timeout.tv_usec != 0) {
/* there might occur a total inactivity timeout */ /* there might occur a total inactivity timeout */
timeout = socat_opts.total_timeout; timeout = socat_opts.total_timeout;
to = &timeout; to = &timeout;
@ -1134,8 +1137,7 @@ int _socat(void) {
} else if (polling && wasaction) { } else if (polling && wasaction) {
wasaction = 0; wasaction = 0;
} else if (socat_opts.total_timeout.tv_sec != 0 || } else if (socat_opts.total_timeout.tv_usec < 1000000) {
socat_opts.total_timeout.tv_usec != 0) {
/* there was a total inactivity timeout */ /* there was a total inactivity timeout */
Notice("inactivity timeout triggered"); Notice("inactivity timeout triggered");
free(buff); free(buff);