mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sockets: add ability to disable DNS resolution for InetSocketAddress

Browse Source 
Add a 'numeric' flag to the InetSocketAddress struct to allow the
caller to indicate that DNS should be skipped for the host/port
fields. This is useful if the caller knows the address is already
numeric and wants to guarantee no (potentially blocking) DNS
lookups are attempted.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-07-19 12:58:52 +01:00
parent 598cf1c805
commit 6979a813f3
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qapi-schema.json
View File

@ -3983,6 +3983,10 @@
# #
# @port: port part of the address, or lowest port if @to is present # @port: port part of the address, or lowest port if @to is present
# #
# @numeric: #optional true if the host/port are guaranteed to be numeric,
# false if name resolution should be attempted. Defaults to false.
# (Since 2.9)
#
# @to: highest port to try # @to: highest port to try
# #
# @ipv4: whether to accept IPv4 addresses, default try both IPv4 and IPv6 # @ipv4: whether to accept IPv4 addresses, default try both IPv4 and IPv6
@ -3997,6 +4001,7 @@
'data': { 'data': {
'host': 'str', 'host': 'str',
'port': 'str', 'port': 'str',
'*numeric': 'bool',
'*to': 'uint16', '*to': 'uint16',
'*ipv4': 'bool', '*ipv4': 'bool',
'*ipv6': 'bool' } } '*ipv6': 'bool' } }

7
util/qemu-sockets.c
View File

@ -38,6 +38,10 @@
# define AI_V4MAPPED 0 # define AI_V4MAPPED 0
#endif #endif
#ifndef AI_NUMERICSERV
# define AI_NUMERICSERV 0
#endif
static int inet_getport(struct addrinfo *e) static int inet_getport(struct addrinfo *e)
{ {
@ -141,6 +145,9 @@ static int inet_listen_saddr(InetSocketAddress *saddr,
memset(&ai,0, sizeof(ai)); memset(&ai,0, sizeof(ai));
ai.ai_flags = AI_PASSIVE; ai.ai_flags = AI_PASSIVE;
if (saddr->has_numeric && saddr->numeric) {
ai.ai_flags |= AI_NUMERICHOST | AI_NUMERICSERV;
}
ai.ai_family = inet_ai_family_from_address(saddr, &err); ai.ai_family = inet_ai_family_from_address(saddr, &err);
ai.ai_socktype = SOCK_STREAM; ai.ai_socktype = SOCK_STREAM;