mirror of https://github.com/proxmox/mirror_qemu
qemu-sockets: add error propagation to inet_parse
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>master
parent
4f085c8229
commit
2f002c43eb
|
@ -480,7 +480,7 @@ err:
|
||||||
}
|
}
|
||||||
|
|
||||||
/* compatibility wrapper */
|
/* compatibility wrapper */
|
||||||
static int inet_parse(QemuOpts *opts, const char *str)
|
static void inet_parse(QemuOpts *opts, const char *str, Error **errp)
|
||||||
{
|
{
|
||||||
const char *optstr, *h;
|
const char *optstr, *h;
|
||||||
char addr[64];
|
char addr[64];
|
||||||
|
@ -492,32 +492,28 @@ static int inet_parse(QemuOpts *opts, const char *str)
|
||||||
/* no host given */
|
/* no host given */
|
||||||
addr[0] = '\0';
|
addr[0] = '\0';
|
||||||
if (1 != sscanf(str,":%32[^,]%n",port,&pos)) {
|
if (1 != sscanf(str,":%32[^,]%n",port,&pos)) {
|
||||||
fprintf(stderr, "%s: portonly parse error (%s)\n",
|
error_setg(errp, "error parsing port in address '%s'", str);
|
||||||
__FUNCTION__, str);
|
return;
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
} else if (str[0] == '[') {
|
} else if (str[0] == '[') {
|
||||||
/* IPv6 addr */
|
/* IPv6 addr */
|
||||||
if (2 != sscanf(str,"[%64[^]]]:%32[^,]%n",addr,port,&pos)) {
|
if (2 != sscanf(str,"[%64[^]]]:%32[^,]%n",addr,port,&pos)) {
|
||||||
fprintf(stderr, "%s: ipv6 parse error (%s)\n",
|
error_setg(errp, "error parsing IPv6 address '%s'", str);
|
||||||
__FUNCTION__, str);
|
return;
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
qemu_opt_set(opts, "ipv6", "on");
|
qemu_opt_set(opts, "ipv6", "on");
|
||||||
} else if (qemu_isdigit(str[0])) {
|
} else if (qemu_isdigit(str[0])) {
|
||||||
/* IPv4 addr */
|
/* IPv4 addr */
|
||||||
if (2 != sscanf(str,"%64[0-9.]:%32[^,]%n",addr,port,&pos)) {
|
if (2 != sscanf(str,"%64[0-9.]:%32[^,]%n",addr,port,&pos)) {
|
||||||
fprintf(stderr, "%s: ipv4 parse error (%s)\n",
|
error_setg(errp, "error parsing IPv4 address '%s'", str);
|
||||||
__FUNCTION__, str);
|
return;
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
qemu_opt_set(opts, "ipv4", "on");
|
qemu_opt_set(opts, "ipv4", "on");
|
||||||
} else {
|
} else {
|
||||||
/* hostname */
|
/* hostname */
|
||||||
if (2 != sscanf(str,"%64[^:]:%32[^,]%n",addr,port,&pos)) {
|
if (2 != sscanf(str,"%64[^:]:%32[^,]%n",addr,port,&pos)) {
|
||||||
fprintf(stderr, "%s: hostname parse error (%s)\n",
|
error_setg(errp, "error parsing address '%s'", str);
|
||||||
__FUNCTION__, str);
|
return;
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
qemu_opt_set(opts, "host", addr);
|
qemu_opt_set(opts, "host", addr);
|
||||||
|
@ -532,7 +528,6 @@ static int inet_parse(QemuOpts *opts, const char *str)
|
||||||
qemu_opt_set(opts, "ipv4", "on");
|
qemu_opt_set(opts, "ipv4", "on");
|
||||||
if (strstr(optstr, ",ipv6"))
|
if (strstr(optstr, ",ipv6"))
|
||||||
qemu_opt_set(opts, "ipv6", "on");
|
qemu_opt_set(opts, "ipv6", "on");
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int inet_listen(const char *str, char *ostr, int olen,
|
int inet_listen(const char *str, char *ostr, int olen,
|
||||||
|
@ -541,9 +536,11 @@ int inet_listen(const char *str, char *ostr, int olen,
|
||||||
QemuOpts *opts;
|
QemuOpts *opts;
|
||||||
char *optstr;
|
char *optstr;
|
||||||
int sock = -1;
|
int sock = -1;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
|
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
|
||||||
if (inet_parse(opts, str) == 0) {
|
inet_parse(opts, str, &local_err);
|
||||||
|
if (local_err == NULL) {
|
||||||
sock = inet_listen_opts(opts, port_offset, errp);
|
sock = inet_listen_opts(opts, port_offset, errp);
|
||||||
if (sock != -1 && ostr) {
|
if (sock != -1 && ostr) {
|
||||||
optstr = strchr(str, ',');
|
optstr = strchr(str, ',');
|
||||||
|
@ -560,7 +557,7 @@ int inet_listen(const char *str, char *ostr, int olen,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
error_set(errp, QERR_SOCKET_CREATE_FAILED);
|
error_propagate(errp, local_err);
|
||||||
}
|
}
|
||||||
qemu_opts_del(opts);
|
qemu_opts_del(opts);
|
||||||
return sock;
|
return sock;
|
||||||
|
@ -578,12 +575,14 @@ int inet_connect(const char *str, Error **errp)
|
||||||
{
|
{
|
||||||
QemuOpts *opts;
|
QemuOpts *opts;
|
||||||
int sock = -1;
|
int sock = -1;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
|
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
|
||||||
if (inet_parse(opts, str) == 0) {
|
inet_parse(opts, str, &local_err);
|
||||||
|
if (local_err == NULL) {
|
||||||
sock = inet_connect_opts(opts, errp, NULL, NULL);
|
sock = inet_connect_opts(opts, errp, NULL, NULL);
|
||||||
} else {
|
} else {
|
||||||
error_set(errp, QERR_SOCKET_CREATE_FAILED);
|
error_propagate(errp, local_err);
|
||||||
}
|
}
|
||||||
qemu_opts_del(opts);
|
qemu_opts_del(opts);
|
||||||
return sock;
|
return sock;
|
||||||
|
@ -608,14 +607,16 @@ int inet_nonblocking_connect(const char *str,
|
||||||
{
|
{
|
||||||
QemuOpts *opts;
|
QemuOpts *opts;
|
||||||
int sock = -1;
|
int sock = -1;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
g_assert(callback != NULL);
|
g_assert(callback != NULL);
|
||||||
|
|
||||||
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
|
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
|
||||||
if (inet_parse(opts, str) == 0) {
|
inet_parse(opts, str, &local_err);
|
||||||
|
if (local_err == NULL) {
|
||||||
sock = inet_connect_opts(opts, errp, callback, opaque);
|
sock = inet_connect_opts(opts, errp, callback, opaque);
|
||||||
} else {
|
} else {
|
||||||
error_set(errp, QERR_SOCKET_CREATE_FAILED);
|
error_propagate(errp, local_err);
|
||||||
}
|
}
|
||||||
qemu_opts_del(opts);
|
qemu_opts_del(opts);
|
||||||
return sock;
|
return sock;
|
||||||
|
|
Loading…
Reference in New Issue