fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util/qemu-sockets: Refactor inet_parse() to use QemuOpts

Browse source 
Currently, the inet address parser cannot handle multiple options where
one is prefixed with the name of the other. For example, with the
'keep-alive-idle' option added, the current parser cannot parse
'127.0.0.1:5000,keep-alive-idle=60,keep-alive' correctly. Instead, it
fails with "error parsing 'keep-alive' flag '-idle=60,keep-alive'".

To resolve these issues, this patch rewrites the inet address parsing
using the QemuOpts parser, which the inet_parse_flag() function tries to
mimic. This new parser supports all previously supported options and on
top of that the 'numeric' flag is now also supported. The only
difference is, the new parser produces an error if an unknown option is
passed, instead of silently ignoring it.

Signed-off-by: Juraj Marcin <jmarcin@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Juraj Marcin 2025-05-21 15:52:34 +02:00 • committed by Daniel P. Berrangé
parent 00064705ed
commit 316e8ee8d6
2 changed files with 276 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

170
util/qemu-sockets.c
View file

@ -30,6 +30,7 @@
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include "qemu/cutils.h"
#include "qemu/option.h"
#include "trace.h"
#ifndef AI_ADDRCONFIG
@ -600,115 +601,104 @@ err:
return -1;
}
/* compatibility wrapper */
static int inet_parse_flag(const char *flagname, const char *optstr, bool *val,
Error **errp)
{
char *end;
size_t len;
end = strstr(optstr, ",");
if (end) {
if (end[1] == ',') { /* Reject 'ipv6=on,,foo' */
error_setg(errp, "error parsing '%s' flag '%s'", flagname, optstr);
return -1;
}
len = end - optstr;
} else {
len = strlen(optstr);
}
if (len == 0 || (len == 3 && strncmp(optstr, "=on", len) == 0)) {
*val = true;
} else if (len == 4 && strncmp(optstr, "=off", len) == 0) {
*val = false;
} else {
error_setg(errp, "error parsing '%s' flag '%s'", flagname, optstr);
return -1;
}
return 0;
}
static QemuOptsList inet_opts = {
.name = "InetSocketAddress",
.head = QTAILQ_HEAD_INITIALIZER(inet_opts.head),
.implied_opt_name = "addr",
.desc = {
{
.name = "addr",
.type = QEMU_OPT_STRING,
},
{
.name = "numeric",
.type = QEMU_OPT_BOOL,
},
{
.name = "to",
.type = QEMU_OPT_NUMBER,
},
{
.name = "ipv4",
.type = QEMU_OPT_BOOL,
},
{
.name = "ipv6",
.type = QEMU_OPT_BOOL,
},
{
.name = "keep-alive",
.type = QEMU_OPT_BOOL,
},
#ifdef HAVE_IPPROTO_MPTCP
{
.name = "mptcp",
.type = QEMU_OPT_BOOL,
},
#endif
{ /* end of list */ }
},
};
int inet_parse(InetSocketAddress *addr, const char *str, Error **errp)
{
const char *optstr, *h;
char host[65];
char port[33];
int to;
int pos;
char *begin;
QemuOpts *opts = qemu_opts_parse(&inet_opts, str, true, errp);
if (!opts) {
return -1;
}
memset(addr, 0, sizeof(*addr));
/* parse address */
if (str[0] == ':') {
/* no host given */
host[0] = '\0';
if (sscanf(str, ":%32[^,]%n", port, &pos) != 1) {
error_setg(errp, "error parsing port in address '%s'", str);
return -1;
}
} else if (str[0] == '[') {
/* IPv6 addr */
if (sscanf(str, "[%64[^]]]:%32[^,]%n", host, port, &pos) != 2) {
error_setg(errp, "error parsing IPv6 address '%s'", str);
return -1;
}
} else {
/* hostname or IPv4 addr */
if (sscanf(str, "%64[^:]:%32[^,]%n", host, port, &pos) != 2) {
error_setg(errp, "error parsing address '%s'", str);
return -1;
}
const char *addr_str = qemu_opt_get(opts, "addr");
if (!addr_str) {
error_setg(errp, "error parsing address ''");
return -1;
}
if (str[0] == '[') {
/* IPv6 addr */
const char *ip_end = strstr(addr_str, "]:");
if (!ip_end || ip_end - addr_str < 2 || strlen(ip_end) < 3) {
error_setg(errp, "error parsing IPv6 address '%s'", addr_str);
return -1;
}
addr->host = g_strndup(addr_str + 1, ip_end - addr_str - 1);
addr->port = g_strdup(ip_end + 2);
} else {
/* no host, hostname or IPv4 addr */
const char *port = strchr(addr_str, ':');
if (!port || strlen(port) < 2) {
error_setg(errp, "error parsing address '%s'", addr_str);
return -1;
}
addr->host = g_strndup(addr_str, port - addr_str);
addr->port = g_strdup(port + 1);
}
addr->host = g_strdup(host);
addr->port = g_strdup(port);
/* parse options */
optstr = str + pos;
h = strstr(optstr, ",to=");
if (h) {
h += 4;
if (sscanf(h, "%d%n", &to, &pos) != 1 ||
(h[pos] != '\0' && h[pos] != ',')) {
error_setg(errp, "error parsing to= argument");
return -1;
}
if (qemu_opt_find(opts, "numeric")) {
addr->has_numeric = true,
addr->numeric = qemu_opt_get_bool(opts, "numeric", false);
}
if (qemu_opt_find(opts, "to")) {
addr->has_to = true;
addr->to = to;
addr->to = qemu_opt_get_number(opts, "to", 0);
}
begin = strstr(optstr, ",ipv4");
if (begin) {
if (inet_parse_flag("ipv4", begin + 5, &addr->ipv4, errp) < 0) {
return -1;
}
if (qemu_opt_find(opts, "ipv4")) {
addr->has_ipv4 = true;
addr->ipv4 = qemu_opt_get_bool(opts, "ipv4", false);
}
begin = strstr(optstr, ",ipv6");
if (begin) {
if (inet_parse_flag("ipv6", begin + 5, &addr->ipv6, errp) < 0) {
return -1;
}
if (qemu_opt_find(opts, "ipv6")) {
addr->has_ipv6 = true;
addr->ipv6 = qemu_opt_get_bool(opts, "ipv6", false);
}
begin = strstr(optstr, ",keep-alive");
if (begin) {
if (inet_parse_flag("keep-alive", begin + strlen(",keep-alive"),
&addr->keep_alive, errp) < 0)
{
return -1;
}
if (qemu_opt_find(opts, "keep-alive")) {
addr->has_keep_alive = true;
addr->keep_alive = qemu_opt_get_bool(opts, "keep-alive", false);
}
#ifdef HAVE_IPPROTO_MPTCP
begin = strstr(optstr, ",mptcp");
if (begin) {
if (inet_parse_flag("mptcp", begin + strlen(",mptcp"),
&addr->mptcp, errp) < 0)
{
return -1;
}
if (qemu_opt_find(opts, "mptcp")) {
addr->has_mptcp = true;
addr->mptcp = qemu_opt_get_bool(opts, "mptcp", 0);
}
#endif
return 0;