GUACAMOLE-623: Fix build against older libwebsockets. #192
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The pwsi member was previously used to ensure the lws structure was made available to invocations of the event callback early in the connection lifecycle such that the underlyin guac_client could always be retrieved. Since the migration to guac_kubernetes_lws_current_client, this is not necessary, and isn't supported in older versions of libwebsockets anyway.
For older versions of libwebsockets, simply requesting that OpenSSL ignore the verification result is insufficient, as libwebsockets manually checks and confirms the verification result, producing an error in all but specific cases.
…erlying WebSocket. Older versions of libwebsockets will not necessarily invoke close events under all circumstances, and will instead sometimes summarily destroy the WebSocket. Thankfully there is another event for that, and newer versions of libwebsockets continue to define that event. We can hook into both to handle disconnect.
necouchman
approved these changes
Sep 27, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The build is currently broken on CentOS 7 with EPEL, where libwebsockets is available but at version 1.7.5. Several differences are in play which needed to be addressed here:
lws_callback_http_dummy()function which must be invoked within the event callback to perform some sort of housekeeping tasks internal to libwebsockets is not defined. The event callback is instead expected to simply return 0.pwsimember of thelws_client_connect_infostructure does not exist. This can safely be removed - our original purpose for using it, exposing theguac_clientto the event callback, no longer exists as theguac_clientis exposed through a static variable instead.ignore_certis set, rather than just asking nicely.LWS_CALLBACK_CLOSEDevents under some circumstances, instead only firingLWS_CALLBACK_WSI_DESTROYfor the destruction of the WebSocket structure. Both need to be handled for the connection to close cleanly in all cases.