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

Fixed the end-close option, it just did not work

Browse source
This commit is contained in:
Gerhard Rieger 2023-11-06 21:23:27 +01:00
parent e610b14470
commit d605ab57f5
18 changed files with 66 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -210,6 +210,8 @@ Corrections:
automatically spawning new connections, however the max-children option automatically spawning new connections, however the max-children option
was not applied. was not applied.
Fixed the end-close option, it just did not work.
Coding: Coding:
Introduced groups_t instead of uint32_t, for more flexibility. Introduced groups_t instead of uint32_t, for more flexibility.

3
xio-fdnum.c
View file

@ -111,7 +111,8 @@ static int xioopen_accept_fd(
int xioopen_fd(struct opt *opts, int rw, struct single *sfd, int numfd) { int xioopen_fd(struct opt *opts, int rw, struct single *sfd, int numfd) {
sfd->fd = numfd; sfd->fd = numfd;
sfd->howtoend = END_NONE; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_NONE;
#if WITH_TERMIOS #if WITH_TERMIOS
if (Isatty(sfd->fd)) { if (Isatty(sfd->fd)) {

3
xio-interface.c
View file

@ -74,7 +74,8 @@ int _xioopen_interface(const char *ifname,
ifidx = 0; /* desparate attempt to continue */ ifidx = 0; /* desparate attempt to continue */
} }
sfd->howtoend = END_INTERFACE; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_INTERFACE;
retropt_int(opts, OPT_SO_TYPE, &socktype); retropt_int(opts, OPT_SO_TYPE, &socktype);
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);

6
xio-ipapp.c
View file

@ -54,7 +54,8 @@ int xioopen_ipapp_connect(
} }
xioinit_ip(&pf, xioparms.default_ip); xioinit_ip(&pf, xioparms.default_ip);
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) if (applyopts_single(sfd, opts, PH_INIT) < 0)
return -1; return -1;
@ -367,7 +368,8 @@ int xioopen_ipapp_listen(
#endif #endif
} }
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1; if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1;
applyopts(sfd, -1, opts, PH_INIT); applyopts(sfd, -1, opts, PH_INIT);

6
xio-openssl.c
View file

@ -275,7 +275,8 @@ static int xioopen_openssl_connect(
} }
xioinit_ip(&pf, xioparms.default_ip); xioinit_ip(&pf, xioparms.default_ip);
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) if (applyopts_single(sfd, opts, PH_INIT) < 0)
return -1; return -1;
applyopts(sfd, -1, opts, PH_INIT); applyopts(sfd, -1, opts, PH_INIT);
@ -592,7 +593,8 @@ static int xioopen_openssl_listen(
portname = argv[1]; portname = argv[1];
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1; if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1;
applyopts(sfd, -1, opts, PH_INIT); applyopts(sfd, -1, opts, PH_INIT);

3
xio-posixmq.c
View file

@ -102,7 +102,8 @@ static int xioopen_posixmq(
_posixmq_unlink(sfd->para.posixmq.name, E_INFO); _posixmq_unlink(sfd->para.posixmq.name, E_INFO);
} }
retropt_bool(opts, OPT_UNLINK_CLOSE, &sfd->opt_unlink_close); retropt_bool(opts, OPT_UNLINK_CLOSE, &sfd->opt_unlink_close);
sfd->howtoend = END_CLOSE; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_CLOSE;
sfd->dtype = XIODATA_POSIXMQ | oneshot; sfd->dtype = XIODATA_POSIXMQ | oneshot;
oflag = O_CREAT; oflag = O_CREAT;

3
xio-proxy.c
View file

@ -113,7 +113,8 @@ static int xioopen_proxy_connect(
targetname = argv[2]; targetname = argv[2];
targetport = argv[3]; targetport = argv[3];
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) if (applyopts_single(sfd, opts, PH_INIT) < 0)
return -1; return -1;
applyopts(sfd, 1, opts, PH_INIT); applyopts(sfd, 1, opts, PH_INIT);

3
xio-pty.c
View file

@ -60,7 +60,8 @@ static int xioopen_pty(
return STAT_NORETRY; return STAT_NORETRY;
} }
sfd->howtoend = END_CLOSE; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_CLOSE;
if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1; if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1;
applyopts(sfd, -1, opts, PH_INIT); applyopts(sfd, -1, opts, PH_INIT);

6
xio-rawip.c
View file

@ -106,7 +106,8 @@ int _xioopen_rawip_sendto(const char *hostname, const char *protname,
/*return STAT_NORETRY;*/ /*return STAT_NORETRY;*/
} }
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
retropt_int(opts, OPT_PROTOCOL_FAMILY, pf); retropt_int(opts, OPT_PROTOCOL_FAMILY, pf);
if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1; if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1;
@ -228,7 +229,8 @@ static int xioopen_rawip_recvfrom(
protname); protname);
/*return STAT_NORETRY;*/ /*return STAT_NORETRY;*/
} }
sfd->howtoend = END_NONE; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_NONE;
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
if (pf == PF_UNSPEC) { if (pf == PF_UNSPEC) {

3
xio-readline.c
View file

@ -75,7 +75,8 @@ static int xioopen_readline(
Notice(msgbuf); Notice(msgbuf);
xfd->stream.fd = 0; /* stdin */ xfd->stream.fd = 0; /* stdin */
xfd->stream.howtoend = END_NONE; if (sfd->howtoend == END_UNSPEC)
xfd->stream.howtoend = END_NONE;
xfd->stream.dtype = XIODATA_READLINE; xfd->stream.dtype = XIODATA_READLINE;
#if WITH_TERMIOS #if WITH_TERMIOS

18
xio-socket.c
View file

@ -236,7 +236,8 @@ static int xioopen_socket_connect(
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
retropt_int(opts, OPT_SO_TYPE, &socktype); retropt_int(opts, OPT_SO_TYPE, &socktype);
/*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/ /*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) if (applyopts_single(sfd, opts, PH_INIT) < 0)
return -1; return -1;
@ -320,7 +321,8 @@ static int xioopen_socket_listen(
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
retropt_int(opts, OPT_SO_TYPE, &socktype); retropt_int(opts, OPT_SO_TYPE, &socktype);
/*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/ /*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
socket_init(0, &us); socket_init(0, &us);
ussize = 0; ussize = 0;
@ -415,7 +417,8 @@ int _xioopen_socket_sendto(const char *pfname, const char *type,
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
retropt_int(opts, OPT_SO_TYPE, &socktype); retropt_int(opts, OPT_SO_TYPE, &socktype);
/*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/ /*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
sfd->peersa.soa.sa_family = pf; sfd->peersa.soa.sa_family = pf;
themsize = 0; themsize = 0;
@ -516,7 +519,8 @@ int xioopen_socket_recvfrom(
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
retropt_int(opts, OPT_SO_TYPE, &socktype); retropt_int(opts, OPT_SO_TYPE, &socktype);
/*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/ /*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/
sfd->howtoend = END_NONE; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_NONE;
ussize = 0; ussize = 0;
if ((result = if ((result =
@ -600,7 +604,8 @@ int xioopen_socket_recv(
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
retropt_int(opts, OPT_SO_TYPE, &socktype); retropt_int(opts, OPT_SO_TYPE, &socktype);
/*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/ /*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/
sfd->howtoend = END_NONE; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_NONE;
ussize = 0; ussize = 0;
if ((result = if ((result =
@ -673,7 +678,8 @@ static int xioopen_socket_datagram(
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
/*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/ /*retropt_int(opts, OPT_IP_PROTOCOL, &proto);*/
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
sfd->peersa.soa.sa_family = pf; sfd->peersa.soa.sa_family = pf;
themsize = 0; themsize = 0;

3
xio-socks.c
View file

@ -76,7 +76,8 @@ static int xioopen_socks4_connect(
targetname = argv[2]; targetname = argv[2];
targetport = argv[3]; targetport = argv[3];
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1; if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1;
applyopts(sfd, 1, opts, PH_INIT); applyopts(sfd, 1, opts, PH_INIT);

3
xio-socks5.c
View file

@ -531,7 +531,8 @@ static int xioopen_socks5(
target_name = argv[3]; target_name = argv[3];
target_port = argv[4]; target_port = argv[4];
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1; if (applyopts_single(sfd, opts, PH_INIT) < 0) return -1;
applyopts(sfd, -1, opts, PH_INIT); applyopts(sfd, -1, opts, PH_INIT);

4
xio-stdio.c
View file

@ -41,7 +41,9 @@ int xioopen_stdio_bi(xiofile_t *sock) {
sock->dual.stream[0]->fd = 0 /*stdin*/; sock->dual.stream[0]->fd = 0 /*stdin*/;
sock->dual.stream[1]->tag = XIO_TAG_WRONLY; sock->dual.stream[1]->tag = XIO_TAG_WRONLY;
sock->dual.stream[1]->fd = 1 /*stdout*/; sock->dual.stream[1]->fd = 1 /*stdout*/;
sock->dual.stream[0]->howtoend = if (sock->dual.stream[0]->howtoend == END_UNSPEC)
sock->dual.stream[0]->howtoend = END_NONE;
if (sock->dual.stream[1]->howtoend == END_UNSPEC)
sock->dual.stream[1]->howtoend = END_NONE; sock->dual.stream[1]->howtoend = END_NONE;
#if WITH_TERMIOS #if WITH_TERMIOS

8
xio-udp.c
View file

@ -260,7 +260,8 @@ int _xioopen_ipdgram_listen(struct single *sfd,
xiosetsockaddrenv("SOCK", us, uslen, IPPROTO_UDP); xiosetsockaddrenv("SOCK", us, uslen, IPPROTO_UDP);
xiosetsockaddrenv("PEER", them, themlen, IPPROTO_UDP); xiosetsockaddrenv("PEER", them, themlen, IPPROTO_UDP);
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
applyopts_fchown(sfd->fd, opts); applyopts_fchown(sfd->fd, opts);
applyopts(sfd, -1, opts, PH_LATE); applyopts(sfd, -1, opts, PH_LATE);
@ -383,7 +384,8 @@ int _xioopen_udp_sendto(const char *hostname, const char *servname,
bool needbind = false; bool needbind = false;
int result; int result;
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
/* ...res_opts[] */ /* ...res_opts[] */
if (applyopts_single(sfd, opts, PH_INIT) < 0) if (applyopts_single(sfd, opts, PH_INIT) < 0)
@ -539,6 +541,8 @@ static int xioopen_udp_recvfrom(
xioinit_ip(&pf, xioparms.default_ip); xioinit_ip(&pf, xioparms.default_ip);
sfd->howtoend = END_NONE; sfd->howtoend = END_NONE;
if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_NONE;
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
if (pf == PF_UNSPEC) { if (pf == PF_UNSPEC) {
#if WITH_IP4 && WITH_IP6 #if WITH_IP4 && WITH_IP6

18
xio-unix.c
View file

@ -142,7 +142,8 @@ static int xioopen_unix_listen(
sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN; sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN;
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (!(ABSTRACT && addrdesc->arg1/*abstract*/)) { if (!(ABSTRACT && addrdesc->arg1/*abstract*/)) {
/* only for non abstract because abstract do not work in file system */ /* only for non abstract because abstract do not work in file system */
@ -239,7 +240,8 @@ static int xioopen_unix_connect(
sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN; sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN;
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) return STAT_NORETRY; if (applyopts_single(sfd, opts, PH_INIT) < 0) return STAT_NORETRY;
applyopts(sfd, -1, opts, PH_INIT); applyopts(sfd, -1, opts, PH_INIT);
applyopts_offset(sfd, opts); applyopts_offset(sfd, opts);
@ -409,7 +411,8 @@ static int xioopen_unix_sendto(
sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN; sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN;
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
applyopts_offset(sfd, opts); applyopts_offset(sfd, opts);
sfd->salen = xiosetunix(pf, &sfd->peersa.un, name, addrdesc->arg1/*abstract*/, sfd->para.socket.un.tight); sfd->salen = xiosetunix(pf, &sfd->peersa.un, name, addrdesc->arg1/*abstract*/, sfd->para.socket.un.tight);
@ -494,7 +497,8 @@ int xioopen_unix_recvfrom(
sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN; sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN;
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
sfd->howtoend = END_NONE; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_NONE;
if (applyopts_single(sfd, opts, PH_INIT) < 0) return STAT_NORETRY; if (applyopts_single(sfd, opts, PH_INIT) < 0) return STAT_NORETRY;
applyopts(sfd, -1, opts, PH_INIT); applyopts(sfd, -1, opts, PH_INIT);
applyopts_named(name, opts, PH_EARLY); /* umask! */ applyopts_named(name, opts, PH_EARLY); /* umask! */
@ -580,7 +584,8 @@ static int xioopen_unix_recv(
sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN; sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN;
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) return STAT_NORETRY; if (applyopts_single(sfd, opts, PH_INIT) < 0) return STAT_NORETRY;
applyopts(sfd, -1, opts, PH_INIT); applyopts(sfd, -1, opts, PH_INIT);
applyopts_named(name, opts, PH_EARLY); /* umask! */ applyopts_named(name, opts, PH_EARLY); /* umask! */
@ -687,7 +692,8 @@ _xioopen_unix_client(
sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN; sfd->para.socket.un.tight = UNIX_TIGHTSOCKLEN;
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) return STAT_NORETRY; if (applyopts_single(sfd, opts, PH_INIT) < 0) return STAT_NORETRY;
applyopts(sfd, -1, opts, PH_INIT); applyopts(sfd, -1, opts, PH_INIT);
applyopts_offset(sfd, opts); applyopts_offset(sfd, opts);

3
xio-vsock.c
View file

@ -43,7 +43,8 @@ static int vsock_addr_init(struct sockaddr_vm *sa, const char *cid_str,
/* Performs a few steps during opening an address of type VSOCK */ /* Performs a few steps during opening an address of type VSOCK */
static int vsock_init(struct opt *opts, struct single *sfd) { static int vsock_init(struct opt *opts, struct single *sfd) {
sfd->howtoend = END_SHUTDOWN; if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_SHUTDOWN;
if (applyopts_single(sfd, opts, PH_INIT) < 0) if (applyopts_single(sfd, opts, PH_INIT) < 0)
return STAT_NORETRY; return STAT_NORETRY;

1
xioshutdown.c
View file

@ -79,6 +79,7 @@ int xioshutdown(xiofile_t *sock, int how) {
#endif /* _WITH_SOCKET */ #endif /* _WITH_SOCKET */
default: ; default: ;
} }
/* XIOSHUT_UNSPEC passes on */
if (false) { if (false) {
; ;