From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drKF5-0006hb-Vy for qemu-devel@nongnu.org; Mon, 11 Sep 2017 04:39:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drKF1-0001fC-PS for qemu-devel@nongnu.org; Mon, 11 Sep 2017 04:38:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35316) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drKF1-0001eU-IO for qemu-devel@nongnu.org; Mon, 11 Sep 2017 04:38:51 -0400 Date: Mon, 11 Sep 2017 09:38:46 +0100 From: "Daniel P. Berrange" Message-ID: <20170911083846.GD21444@redhat.com> Reply-To: "Daniel P. Berrange" References: <20170724184217.21381-1-brandon.carpenter@cypherpath.com> <20170908173801.15205-6-brandon.carpenter@cypherpath.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170908173801.15205-6-brandon.carpenter@cypherpath.com> Subject: Re: [Qemu-devel] [PATCH v2 5/6] io: Ignore websocket PING and PONG frames List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Brandon Carpenter Cc: qemu-devel@nongnu.org On Fri, Sep 08, 2017 at 10:38:00AM -0700, Brandon Carpenter wrote: > Keep pings and gratuitous pongs generated by web browsers from killing > websocket connections. > > Signed-off-by: Brandon Carpenter > --- > io/channel-websock.c | 21 +++++++++++++++++---- > 1 file changed, 17 insertions(+), 4 deletions(-) > > diff --git a/io/channel-websock.c b/io/channel-websock.c > index 3183aeff77..50387050d5 100644 > --- a/io/channel-websock.c > +++ b/io/channel-websock.c > @@ -86,6 +86,7 @@ > #define QIO_CHANNEL_WEBSOCK_HEADER_FIELD_OPCODE 0x0f > #define QIO_CHANNEL_WEBSOCK_HEADER_FIELD_HAS_MASK 0x80 > #define QIO_CHANNEL_WEBSOCK_HEADER_FIELD_PAYLOAD_LEN 0x7f > +#define QIO_CHANNEL_WEBSOCK_CONTROL_OPCODE_MASK 0x8 > > typedef struct QIOChannelWebsockHeader QIOChannelWebsockHeader; > > @@ -565,8 +566,11 @@ static int qio_channel_websock_decode_header(QIOChannelWebsock *ioc, > return -1; > } > } else { > - if (opcode != QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME) { > - error_setg(errp, "only binary websocket frames are supported"); > + if (opcode != QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME && > + opcode != QIO_CHANNEL_WEBSOCK_OPCODE_PING && > + opcode != QIO_CHANNEL_WEBSOCK_OPCODE_PONG) { Why would we need to ignore PONG ? A client should only send a PONG in response to a PING that we send, and we never send PINGs. So if we received a PONG that would be a serious error by the client, which should cause us to close the connection IMHO> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|