Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Client Websockets #3545

Merged
merged 9 commits into from
Feb 3, 2019
Merged

Client Websockets #3545

merged 9 commits into from
Feb 3, 2019

Conversation

basicer
Copy link
Member

@basicer basicer commented Jan 31, 2019

Related Ticket(s)

Short roundup of the initial problem

  • Client can't connect over websockets

What will change with this Pull Request?

  • When selecting a websocket port (80, 443, 8080, 4748) . connect using webosckets instead of raw TCP.
  • Servatrice can read the client IP out of an HTTP header to support reverse proxies in front of it.

@basicer basicer changed the title Websocket Client Websockets Jan 31, 2019
@basicer basicer force-pushed the websocket branch 3 times, most recently from eaaead6 to 35ad149 Compare January 31, 2019 18:43
@ZeldaZach
Copy link
Member

screenshot 2019-02-01 15 18 23

Could be a problem

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
Copy link
Contributor

@ctrlaltca ctrlaltca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great addition!
By now the cmake script is considering Qt5::WebSockets an optional (not-mandatory) component, so we should add proper #ifdef QT_WEBSOCKETS_LIB guards everywhere this Qt framework is used.
Since Qt5::WebSockets is available since Qt 5.3 and we already require 5.5, you can also consider adding it to the required components in the main CMakeLists. This could eventually needs some fixes in the CI build scripts to add the required libraries.

cockatrice/src/remoteclient.cpp Show resolved Hide resolved
servatrice/src/serversocketinterface.cpp Outdated Show resolved Hide resolved
cockatrice/src/remoteclient.h Outdated Show resolved Hide resolved
- Remove QWEBSOCEKT_LIB guards
- Only TCP on port 4747
- Fix peerName lookup
@ctrlaltca ctrlaltca merged commit 9a8c81c into Cockatrice:master Feb 3, 2019
tooomm added a commit to Cockatrice/cockatrice.github.io that referenced this pull request Feb 4, 2019
tooomm added a commit to Cockatrice/cockatrice.github.io that referenced this pull request Feb 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants