nbd sockets vnc: Mark problematic address family tests TODO
Certain features make sense only with certain address families. For instance, passing file descriptors requires AF_UNIX. Testing SocketAddress's saddr->type == SOCKET_ADDRESS_KIND_UNIX is obvious, but problematic: it can't recognize AF_UNIX when type == SOCKET_ADDRESS_KIND_FD. Mark such tests of saddr->type TODO. We may want to check the address family with getsockname() there. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 1490895797-29094-2-git-send-email-armbru@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
9588c5897b
commit
ca0b64e5ed
|
@ -421,6 +421,7 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* TODO SOCKET_ADDRESS_KIND_FD where fd has AF_INET or AF_INET6 */
|
||||||
if (s->saddr->type != SOCKET_ADDRESS_KIND_INET) {
|
if (s->saddr->type != SOCKET_ADDRESS_KIND_INET) {
|
||||||
error_setg(errp, "TLS only supported over IP sockets");
|
error_setg(errp, "TLS only supported over IP sockets");
|
||||||
goto error;
|
goto error;
|
||||||
|
|
|
@ -124,6 +124,7 @@ void qmp_nbd_server_start(SocketAddress *addr,
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* TODO SOCKET_ADDRESS_KIND_FD where fd has AF_INET or AF_INET6 */
|
||||||
if (addr->type != SOCKET_ADDRESS_KIND_INET) {
|
if (addr->type != SOCKET_ADDRESS_KIND_INET) {
|
||||||
error_setg(errp, "TLS is only supported with IPv4/IPv6");
|
error_setg(errp, "TLS is only supported with IPv4/IPv6");
|
||||||
goto error;
|
goto error;
|
||||||
|
|
|
@ -47,7 +47,6 @@ typedef struct {
|
||||||
int max_size;
|
int max_size;
|
||||||
int do_telnetopt;
|
int do_telnetopt;
|
||||||
int do_nodelay;
|
int do_nodelay;
|
||||||
int is_unix;
|
|
||||||
int *read_msgfds;
|
int *read_msgfds;
|
||||||
size_t read_msgfds_num;
|
size_t read_msgfds_num;
|
||||||
int *write_msgfds;
|
int *write_msgfds;
|
||||||
|
@ -825,7 +824,6 @@ static void qmp_chardev_open_socket(Chardev *chr,
|
||||||
int64_t reconnect = sock->has_reconnect ? sock->reconnect : 0;
|
int64_t reconnect = sock->has_reconnect ? sock->reconnect : 0;
|
||||||
QIOChannelSocket *sioc = NULL;
|
QIOChannelSocket *sioc = NULL;
|
||||||
|
|
||||||
s->is_unix = addr->type == SOCKET_ADDRESS_KIND_UNIX;
|
|
||||||
s->is_listen = is_listen;
|
s->is_listen = is_listen;
|
||||||
s->is_telnet = is_telnet;
|
s->is_telnet = is_telnet;
|
||||||
s->do_nodelay = do_nodelay;
|
s->do_nodelay = do_nodelay;
|
||||||
|
@ -865,7 +863,8 @@ static void qmp_chardev_open_socket(Chardev *chr,
|
||||||
s->addr = QAPI_CLONE(SocketAddress, sock->addr);
|
s->addr = QAPI_CLONE(SocketAddress, sock->addr);
|
||||||
|
|
||||||
qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_RECONNECTABLE);
|
qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_RECONNECTABLE);
|
||||||
if (s->is_unix) {
|
/* TODO SOCKET_ADDRESS_FD where fd has AF_UNIX */
|
||||||
|
if (addr->type == SOCKET_ADDRESS_KIND_UNIX) {
|
||||||
qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_FD_PASS);
|
qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_FD_PASS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
1
ui/vnc.c
1
ui/vnc.c
|
@ -3642,6 +3642,7 @@ static int vnc_display_connect(VncDisplay *vd,
|
||||||
error_setg(errp, "Expected a single address in reverse mode");
|
error_setg(errp, "Expected a single address in reverse mode");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
/* TODO SOCKET_ADDRESS_KIND_FD when fd has AF_UNIX */
|
||||||
vd->is_unix = saddr[0]->type == SOCKET_ADDRESS_KIND_UNIX;
|
vd->is_unix = saddr[0]->type == SOCKET_ADDRESS_KIND_UNIX;
|
||||||
sioc = qio_channel_socket_new();
|
sioc = qio_channel_socket_new();
|
||||||
qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-reverse");
|
qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-reverse");
|
||||||
|
|
|
@ -1154,6 +1154,10 @@ int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* TODO SOCKET_ADDRESS_KIND_FD when fd is AF_INET or AF_INET6
|
||||||
|
* (although other address families can do SOCK_DGRAM, too)
|
||||||
|
*/
|
||||||
switch (remote->type) {
|
switch (remote->type) {
|
||||||
case SOCKET_ADDRESS_KIND_INET:
|
case SOCKET_ADDRESS_KIND_INET:
|
||||||
fd = inet_dgram_saddr(remote->u.inet.data,
|
fd = inet_dgram_saddr(remote->u.inet.data,
|
||||||
|
|
Loading…
Reference in New Issue