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

Fixed option sourceport with UDP6-DATAGRAM

Browse source
This commit is contained in:
Gerhard Rieger 2023-11-06 21:22:49 +01:00
parent f61a95585b
commit c00262b42d
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -204,6 +204,8 @@ Corrections:
Thanks to Hiroshi Sakurai for reporting the problem and suggesting this Thanks to Hiroshi Sakurai for reporting the problem and suggesting this
solution. solution.
Fixed option sourceport with UDP6-DATAGRAM.
Coding: Coding:
Introduced groups_t instead of uint32_t, for more flexibility. Introduced groups_t instead of uint32_t, for more flexibility.

14
xio-udp.c
View file

@ -465,10 +465,10 @@ static int xioopen_udp_datagram(
if (retropt_ushort(opts, OPT_SOURCEPORT, &sfd->para.socket.ip.sourceport) if (retropt_ushort(opts, OPT_SOURCEPORT, &sfd->para.socket.ip.sourceport)
>= 0) { >= 0) {
sfd->para.socket.ip.dosourceport = true; sfd->para.socket.ip.dosourceport = true;
sfd->para.socket.ip.sourceport = ntohs(sfd->peersa.ip4.sin_port);
} }
retropt_socket_pf(opts, &pf); retropt_socket_pf(opts, &pf);
result = result =
_xioopen_udp_sendto(hostname, argv[2], opts, xioflags, xxfd, _xioopen_udp_sendto(hostname, argv[2], opts, xioflags, xxfd,
addrdesc->groups, pf, socktype, ipproto); addrdesc->groups, pf, socktype, ipproto);
@ -477,6 +477,18 @@ static int xioopen_udp_datagram(
return result; return result;
} }
if (sfd->para.socket.ip.dosourceport) {
switch (sfd->peersa.soa.sa_family) {
case PF_INET:
default:
sfd->para.socket.ip.sourceport = ntohs(sfd->peersa.ip4.sin_port);
break;
case PF_INET6:
sfd->para.socket.ip.sourceport = ntohs(sfd->peersa.ip6.sin6_port);
break;
}
}
sfd->dtype = XIOREAD_RECV|XIOWRITE_SENDTO; sfd->dtype = XIOREAD_RECV|XIOWRITE_SENDTO;
sfd->para.socket.la.soa.sa_family = sfd->peersa.soa.sa_family; sfd->para.socket.la.soa.sa_family = sfd->peersa.soa.sa_family;