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

Let the OS decide the default interface regardless of IPv4/IPv6. Closes #2156. #2611

Merged
merged 1 commit into from
Feb 25, 2015

Conversation

Chocobo1
Copy link
Member

See issue #2165.

@@ -1858,7 +1858,7 @@ void QBtSession::setListeningPort(int port) {
if (iface_name.isEmpty()) {
logger->addMessage(tr("qBittorrent is trying to listen on any interface port: %1", "e.g: qBittorrent is trying to listen on any interface port: TCP/6881").arg(QString::number(port)), Log::INFO);
if (listen_ipv6)
s->listen_on(ports, ec, "::", session::listen_no_system_port);
s->listen_on(ports, ec, 0, session::listen_no_system_port);
Copy link
Member

Choose a reason for hiding this comment

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

In the special case of "any interface" this should be used regardless of listen_ipv6.

@sledgehammer999
Copy link
Member

Rename the commit message to something like Let the OS decide the default interface regardless of IPv4/IPv6. Closes #2156.

Hint: git commit --amend lets you edit the message of the last commit

@Chocobo1
Copy link
Member Author

done.

@Chocobo1 Chocobo1 changed the title Let OS decide whether to bind to ipv6 or not, closes #2165 Let the OS decide the default interface regardless of IPv4/IPv6. Closes #2156. Feb 25, 2015
@sledgehammer999
Copy link
Member

@glassez I am willing to merge this. Are you ok with breaking your hacking?

@glassez
Copy link
Member

glassez commented Feb 25, 2015

Ok. These small changes should not give me trouble.

P.S. Please see my last PR as soon as possible - it should prevent some of further rebasing problems.

@sledgehammer999
Copy link
Member

@Chocobo1 sorry but can you rebase and fix the indentation? Normally I wouldn't knowingly break your commit, but the other one was too big and useful. Yours is tiny and you shouldn't have any problem rebasing.

@Chocobo1
Copy link
Member Author

No problem, it's good to see code being uniformly formatted.
Maybe include that uncrustify config in this repo is good idea, so that everyone can follow the style easily.

@sledgehammer999
Copy link
Member

Thank you.

sledgehammer999 added a commit that referenced this pull request Feb 25, 2015
Let the OS decide the default interface regardless of IPv4/IPv6. Closes #2156.
@sledgehammer999 sledgehammer999 merged commit 784c3da into qbittorrent:master Feb 25, 2015
@sledgehammer999
Copy link
Member

Damn. The issue number had a typo...

@Chocobo1 Chocobo1 deleted the my_dev branch February 25, 2015 16:06
@Chocobo1 Chocobo1 restored the my_dev branch February 25, 2015 16:06
@glassez
Copy link
Member

glassez commented Feb 25, 2015

Maybe include that uncrustify config in this repo is good idea, so that everyone can follow the style easily.

I like this idea. Even if we do not have such a config that satisfies our coding style, we could edit it as much as the other project files.

@sledgehammer999
Copy link
Member

Actually I have it lying in qbt's folder already(locally). Should I just push it? -as uncrustify.cfg-

@glassez
Copy link
Member

glassez commented Feb 25, 2015

Actually I have it lying in qbt's folder already(locally). Should I just push it? -as uncrustify.cfg-

I think, Yes. You only need to warn other developers that it may contain discrepancies and need to double-check its work (until we bring it to perfection).

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.

4 participants