From d0f63ef62c76c932a2003eaa42c0b250065ae06f Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Wed, 31 Jul 2019 10:43:37 -0700 Subject: Update to internal 7-31-19 Signed-off-by: Ed Tanous --- ...dd-a-hooking-function-to-deliver-rfbFrame.patch | 54 ---------------------- .../libvncserver/libvncserver_%.bbappend | 4 +- ...d-flow-control-to-prevent-buffer-over-run.patch | 30 ++++++------ 3 files changed, 17 insertions(+), 71 deletions(-) delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver/0001-rfbserver-add-a-hooking-function-to-deliver-rfbFrame.patch (limited to 'meta-openbmc-mods/meta-common/recipes-graphics') diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver/0001-rfbserver-add-a-hooking-function-to-deliver-rfbFrame.patch b/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver/0001-rfbserver-add-a-hooking-function-to-deliver-rfbFrame.patch deleted file mode 100644 index 6dd1c93f0..000000000 --- a/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver/0001-rfbserver-add-a-hooking-function-to-deliver-rfbFrame.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6d7c437f4d111ed183627c11e9bfc77ad2abc752 Mon Sep 17 00:00:00 2001 -From: Jae Hyun Yoo -Date: Thu, 9 May 2019 15:33:55 -0700 -Subject: [PATCH] rfbserver: add a hooking function to deliver - rfbFramebufferUpdateRequest messages. - -This commit adds a hooking function to deliver -rfbFramebufferUpdateRequest messages from clients to the frame -producer for a case the producer needs to handle the messages for -flow control or etc. ---- - libvncserver/rfbserver.c | 2 ++ - rfb/rfb.h | 5 +++++ - 2 files changed, 7 insertions(+) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 42209cf29a0d..3a546f2ed330 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -2381,6 +2381,8 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) - return; - } - -+ if (cl->clientFURHook) -+ cl->clientFURHook(cl, &msg.fur); - - tmpRegion = - sraRgnCreateRect(msg.fur.x, -diff --git a/rfb/rfb.h b/rfb/rfb.h -index 2a5600e25375..1a2294428288 100644 ---- a/rfb/rfb.h -+++ b/rfb/rfb.h -@@ -412,6 +412,8 @@ typedef struct sraRegion* sraRegionPtr; - */ - - typedef void (*ClientGoneHookPtr)(struct _rfbClientRec* cl); -+typedef void (*ClientFURHookPtr)(struct _rfbClientRec* cl, -+ rfbFramebufferUpdateRequestMsg* furMsg); - - typedef struct _rfbFileTransferData { - int fd; -@@ -457,6 +459,9 @@ typedef struct _rfbClientRec { - void* clientData; - ClientGoneHookPtr clientGoneHook; - -+ /** clientFURHook is called when a client requests a frame buffer update. */ -+ ClientFURHookPtr clientFURHook; -+ - SOCKET sock; - char *host; - --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend b/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend index e367e97b9..0d9012235 100644 --- a/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend @@ -2,6 +2,4 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" # Use the latest to support obmc-ikvm properly #SRC_URI = "git://github.com/LibVNC/libvncserver" -SRCREV = "f12b14f275f019673b3ace8fa4d46c8a79beb388" - -SRC_URI += "file://0001-rfbserver-add-a-hooking-function-to-deliver-rfbFrame.patch" +SRCREV = "091b9eb739a95c8c969e2e6865c255b0d170f95f" diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Add-flow-control-to-prevent-buffer-over-run.patch b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Add-flow-control-to-prevent-buffer-over-run.patch index 1340e845b..70f2da4a0 100644 --- a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Add-flow-control-to-prevent-buffer-over-run.patch +++ b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Add-flow-control-to-prevent-buffer-over-run.patch @@ -1,4 +1,4 @@ -From 336d0e9163a027b2b35ed240c2995f06684637b8 Mon Sep 17 00:00:00 2001 +From 88337ce8246a453cd3c6e60e96aead43549a5e1d Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo Date: Thu, 9 May 2019 16:26:53 -0700 Subject: [PATCH] Add flow control to prevent buffer over run @@ -31,12 +31,12 @@ resolves https://github.com/openbmc/bmcweb/issues/80 Change-Id: I6b09a711137d15a38fce59adada9bf3d00afde86 Signed-off-by: Jae Hyun Yoo --- - ikvm_server.cpp | 19 +++++++++++++++++++ - ikvm_server.hpp | 10 ++++++++++ - 2 files changed, 29 insertions(+) + ikvm_server.cpp | 20 ++++++++++++++++++++ + ikvm_server.hpp | 11 +++++++++++ + 2 files changed, 31 insertions(+) diff --git a/ikvm_server.cpp b/ikvm_server.cpp -index 35310da292be..363eab7e000d 100644 +index 35310da292be..dfafe3a82e64 100644 --- a/ikvm_server.cpp +++ b/ikvm_server.cpp @@ -119,6 +119,12 @@ void Server::sendFrame() @@ -52,13 +52,14 @@ index 35310da292be..363eab7e000d 100644 if (cl->enableLastRectEncoding) { fu->nRects = 0xFFFF; -@@ -149,6 +155,18 @@ void Server::sendFrame() +@@ -149,6 +155,19 @@ void Server::sendFrame() rfbReleaseClientIterator(it); } -+void Server::clientFUR(rfbClientPtr cl, rfbFramebufferUpdateRequestMsg* furMsg) ++void Server::clientFramebufferUpdateRequest( ++ rfbClientPtr cl, rfbFramebufferUpdateRequestMsg *furMsg) +{ -+ ClientData* cd = (ClientData*)cl->clientData; ++ ClientData *cd = (ClientData *)cl->clientData; + + if (!cd) + return; @@ -71,16 +72,16 @@ index 35310da292be..363eab7e000d 100644 void Server::clientGone(rfbClientPtr cl) { Server* server = (Server*)cl->screen->screenData; -@@ -170,6 +188,7 @@ enum rfbNewClientAction Server::newClient(rfbClientPtr cl) +@@ -170,6 +189,7 @@ enum rfbNewClientAction Server::newClient(rfbClientPtr cl) cl->clientData = new ClientData(server->video.getFrameRate(), &server->input); cl->clientGoneHook = clientGone; -+ cl->clientFURHook = clientFUR; ++ cl->clientFramebufferUpdateRequestHook = clientFramebufferUpdateRequest; if (!server->numClients++) { server->pendingResize = false; diff --git a/ikvm_server.hpp b/ikvm_server.hpp -index b8062017b8ca..e51e57a19722 100644 +index b8062017b8ca..ebe4ad2b287e 100644 --- a/ikvm_server.hpp +++ b/ikvm_server.hpp @@ -32,6 +32,7 @@ class Server @@ -99,7 +100,7 @@ index b8062017b8ca..e51e57a19722 100644 }; /* -@@ -85,6 +87,14 @@ class Server +@@ -85,6 +87,15 @@ class Server private: /* @@ -108,8 +109,9 @@ index b8062017b8ca..e51e57a19722 100644 + * @param[in] cl - Handle to the client object + * @param[in] furMsg - Pointer of the FUR message + */ -+ static void clientFUR(rfbClientPtr cl, -+ rfbFramebufferUpdateRequestMsg* furMsg); ++ static void ++ clientFramebufferUpdateRequest(rfbClientPtr cl, ++ rfbFramebufferUpdateRequestMsg *furMsg); + /* * @brief Handler for a client disconnecting * -- cgit v1.2.3