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

ServerHandler, Settings: add ping interval and connection timeout duration settings. #3304

Merged
merged 2 commits into from Jan 15, 2018

Conversation

@mkrautz
Copy link
Member

commented Jan 13, 2018

This PR contains two commits:

  1. Settings: implement settings for ping interval and connection timeout duration., which adds the necessary plumbing to the Settings class.
  2. ServerHandler: use ping interval and connection timeout duration from Settings instead of magic numbers., which hooks up ServerHandler to use the new values from the Settings class.

@mkrautz mkrautz force-pushed the mkrautz:serverhandler-timeout-settings branch from 1bfdeeb to fe4f665 Jan 13, 2018

@mkrautz mkrautz requested review from Kissaki, hacst and davidebeatrici Jan 13, 2018

@hacst
hacst approved these changes Jan 14, 2018
Copy link
Member

left a comment

LGTM. Minor typo in comment. Zero or negative values in these settings might lead to bad behavior but I don't think we historically guard against bad config.

@@ -331,6 +331,18 @@ struct Settings {
ProxyType ptProxyType;
QString qsProxyHost, qsProxyUsername, qsProxyPassword;
unsigned short usProxyPort;

/// The ping interval in milliseconds. The Mumble client
/// will send TCP and UDP pings to the remote server at this

This comment has been minimized.

Copy link
@hacst

hacst Jan 14, 2018

Member

"in" this interval?

@mkrautz mkrautz force-pushed the mkrautz:serverhandler-timeout-settings branch from fe4f665 to 536076c Jan 14, 2018

@mkrautz

This comment has been minimized.

Copy link
Member Author

commented Jan 14, 2018

I changed the wording of the comment.

mkrautz added 2 commits Jan 14, 2018
Settings: implement settings for ping interval and connection timeout…
… duration.

This commit implements (hidden, for now) settings for setting the
ping interval and connection timeout duration.

@mkrautz mkrautz force-pushed the mkrautz:serverhandler-timeout-settings branch from 536076c to 97d776a Jan 14, 2018

@mkrautz

This comment has been minimized.

Copy link
Member Author

commented Jan 14, 2018

Rebased on top of the PR to use our own MXE mirror to speed up the MinGW builds. (#3305)

@mkrautz mkrautz merged commit a189969 into mumble-voip:master Jan 15, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.