| Message ID | 20250408112508.1638722-2-jmarcin@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | util/qemu-sockets: Introduce inet socket options controlling TCP keep-alive | expand |
On Tue, Apr 08, 2025 at 01:25:00PM +0200, Juraj Marcin wrote: > From: Juraj Marcin <jmarcin@redhat.com> > > Commit aec21d3175 (qapi: Add InetSocketAddress member keep-alive) > introduces the keep-alive flag, but this flag is not copied together > with other options in qio_dns_resolver_lookup_sync_inet(). > > This patch fixes this issue and also prevents future ones by copying the > entire structure first and only then overriding a few attributes that > need to be different. > > Fixes: aec21d31756c (qapi: Add InetSocketAddress member keep-alive) > Signed-off-by: Juraj Marcin <jmarcin@redhat.com> > --- > io/dns-resolver.c | 21 +++++---------------- > 1 file changed, 5 insertions(+), 16 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
diff --git a/io/dns-resolver.c b/io/dns-resolver.c index 53b0e8407a..3712438f82 100644 --- a/io/dns-resolver.c +++ b/io/dns-resolver.c @@ -111,22 +111,11 @@ static int qio_dns_resolver_lookup_sync_inet(QIODNSResolver *resolver, uaddr, INET6_ADDRSTRLEN, uport, 32, NI_NUMERICHOST | NI_NUMERICSERV); - newaddr->u.inet = (InetSocketAddress){ - .host = g_strdup(uaddr), - .port = g_strdup(uport), - .has_numeric = true, - .numeric = true, - .has_to = iaddr->has_to, - .to = iaddr->to, - .has_ipv4 = iaddr->has_ipv4, - .ipv4 = iaddr->ipv4, - .has_ipv6 = iaddr->has_ipv6, - .ipv6 = iaddr->ipv6, -#ifdef HAVE_IPPROTO_MPTCP - .has_mptcp = iaddr->has_mptcp, - .mptcp = iaddr->mptcp, -#endif - }; + newaddr->u.inet = *iaddr; + newaddr->u.inet.host = g_strdup(uaddr), + newaddr->u.inet.port = g_strdup(uport), + newaddr->u.inet.has_numeric = true, + newaddr->u.inet.numeric = true, (*addrs)[i] = newaddr; }