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
Contributor

@mkrautz mkrautz 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.

Copy link
Contributor

@hacst hacst left a comment

Choose a reason for hiding this comment

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

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
Copy link
Contributor

Choose a reason for hiding this comment

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

"in" this interval?

@mkrautz mkrautz force-pushed the serverhandler-timeout-settings branch from fe4f665 to 536076c Compare January 14, 2018 14:22
@mkrautz
Copy link
Contributor Author

mkrautz commented Jan 14, 2018

I changed the wording of the comment.

… duration.

This commit implements (hidden, for now) settings for setting the
ping interval and connection timeout duration.
@mkrautz mkrautz force-pushed the serverhandler-timeout-settings branch from 536076c to 97d776a Compare January 14, 2018 22:20
@mkrautz
Copy link
Contributor Author

mkrautz 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
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.

3 participants