bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-07-13 15:13:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

IP-SENDTO with pf=ip4 failed with "trailing garbage"

Browse source
This commit is contained in:
Gerhard Rieger 2024-07-26 10:14:57 +02:00
parent 602a54420e
commit bd727963a0
4 changed files with 53 additions and 71 deletions

46
xio-udp.c
View file

@ -286,21 +286,8 @@ int xioopen_ipdgram_listen(
}
xioinit_ip(&pf, xioparms.default_ip);
if (pf == PF_UNSPEC) {
#if WITH_IP4 && WITH_IP6
switch (xioparms.default_ip) {
case '4': pf = PF_INET; break;
case '6': pf = PF_INET6; break;
default: break; /* includes \0 */
}
#elif WITH_IP6
pf = PF_INET6;
#else
pf = PF_INET;
#endif
}
retropt_socket_pf(opts, &pf);
retropt_int(opts, OPT_SO_PROTOTYPE, &ipproto);
if (applyopts_single(sfd, opts, PH_INIT) < 0)
@ -460,6 +447,7 @@ int xioopen_udp_datagram(
sfd->para.socket.ip.dosourceport = true;
}
xioinit_ip(&pf, xioparms.default_ip);
retropt_socket_pf(opts, &pf);
result =
@ -535,23 +523,11 @@ int xioopen_udp_recvfrom(
}
xioinit_ip(&pf, xioparms.default_ip);
retropt_socket_pf(opts, &pf);
sfd->howtoend = END_NONE;
if (sfd->howtoend == END_UNSPEC)
sfd->howtoend = END_NONE;
retropt_socket_pf(opts, &pf);
if (pf == PF_UNSPEC) {
#if WITH_IP4 && WITH_IP6
switch (xioparms.default_ip) {
case '4': pf = PF_INET; break;
case '6': pf = PF_INET6; break;
default: break; /* includes \0 */
}
#elif WITH_IP6
pf = PF_INET6;
#else
pf = PF_INET;
#endif
}
/* Set AI_PASSIVE, except when it is explicitely disabled */
ai_flags2[0] = xfd->stream.para.socket.ip.ai_flags[0];
@ -626,20 +602,8 @@ int xioopen_udp_recv(
return STAT_NORETRY;
}
xioinit_ip(&pf, xioparms.default_ip);
retropt_socket_pf(opts, &pf);
if (pf == PF_UNSPEC) {
#if WITH_IP4 && WITH_IP6
switch (xioparms.default_ip) {
case '4': pf = PF_INET; break;
case '6': pf = PF_INET6; break;
default: break; /* includes \0 */
}
#elif WITH_IP6
pf = PF_INET6;
#else
pf = PF_INET;
#endif
}
/* Set AI_PASSIVE, except when it is explicitely disabled */
ai_flags2[0] = xfd->stream.para.socket.ip.ai_flags[0];