mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
ui/vnc: Require audiodev= to enable audio
If there is no audiodev do not send the audio ack in response to VNC_ENCODING_AUDIO, so that clients aren't told audio exists, and immediately drop the client if they try to send any audio control messages when audio is not advertised. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
0c1a5299ab
commit
9e58d7a756
4 changed files with 21 additions and 6 deletions
11
ui/vnc.c
11
ui/vnc.c
|
@ -2195,7 +2195,10 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
|
|||
send_ext_key_event_ack(vs);
|
||||
break;
|
||||
case VNC_ENCODING_AUDIO:
|
||||
send_ext_audio_ack(vs);
|
||||
if (vs->vd->audio_state) {
|
||||
vs->features |= VNC_FEATURE_AUDIO_MASK;
|
||||
send_ext_audio_ack(vs);
|
||||
}
|
||||
break;
|
||||
case VNC_ENCODING_WMVi:
|
||||
vs->features |= VNC_FEATURE_WMVI_MASK;
|
||||
|
@ -2502,6 +2505,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)
|
|||
read_u32(data, 4), read_u32(data, 8));
|
||||
break;
|
||||
case VNC_MSG_CLIENT_QEMU_AUDIO:
|
||||
if (!vnc_has_feature(vs, VNC_FEATURE_AUDIO)) {
|
||||
error_report("Audio message %d with audio disabled", read_u8(data, 2));
|
||||
vnc_client_error(vs);
|
||||
break;
|
||||
}
|
||||
|
||||
if (len == 2)
|
||||
return 4;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue