-
Notifications
You must be signed in to change notification settings - Fork 61
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
Allow DNSServerLookupMechanism to specify ports for the servers #82
Open
Ch4t4r
wants to merge
7
commits into
MiniDNS:master
Choose a base branch
from
Ch4t4r:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6203687
Allow DNSServerLookupMechanisms to specify a port the server runs on
Ch4t4r 9b53571
Renamed getDnsServerAddresses() to getDnsServerAddressesWithPorts() t…
Ch4t4r 3f946dc
blacklistedDnsServers does contain strings, not IPPortPairs
Ch4t4r ae8f304
Removed auto-generated (and wrong) copyright notice
Ch4t4r bf8ffea
Let getDnsServerAddresses() keep its original name
Ch4t4r af70e1e
Merge branch 'master' of https://github.com/MiniDNS/minidns
Ch4t4r 23bd1fb
Merge branch 'master' of https://github.com/Ch4t4r/minidns
Ch4t4r File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
46 changes: 46 additions & 0 deletions
46
minidns-client/src/main/java/org/minidns/dnsserverlookup/IPPortPair.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* | ||
* Copyright 2015-2018 the original author or authors | ||
* | ||
* This software is licensed under the Apache License, Version 2.0, | ||
* the GNU Lesser General Public License version 2 or later ("LGPL") | ||
* and the WTFPL. | ||
* You may choose either license to govern your use of this software only | ||
* upon the condition that you accept all of the terms of either | ||
* the Apache License 2.0, the LGPL 2.1+ or the WTFPL. | ||
*/ | ||
package org.minidns.dnsserverlookup; | ||
|
||
import java.io.Serializable; | ||
|
||
/** | ||
* Copyright Daniel Wolf 2018 | ||
* All rights reserved. | ||
* Code may NOT be used without proper permission, neither in binary nor in source form. | ||
* All redistributions of this software in source code must retain this copyright header | ||
* All redistributions of this software in binary form must visibly inform users about usage of this software | ||
* <p> | ||
* [email protected] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Was this added by accident? If so, please remove it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah it was. I'm removing it. |
||
*/ | ||
public class IPPortPair implements Serializable { | ||
private static final long serialVersionUID = 7354713072355023750L; | ||
public static final int DEFAULT_PORT = 53; | ||
private int port; | ||
private String ip; | ||
|
||
public IPPortPair(String ip) { | ||
this(ip, DEFAULT_PORT); | ||
} | ||
|
||
public IPPortPair(String ip, int port) { | ||
this.port = port; | ||
this.ip = ip; | ||
} | ||
|
||
public int getPort() { | ||
return port; | ||
} | ||
|
||
public String getIp() { | ||
return ip; | ||
} | ||
} |
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no need to rename the method, just changing the return type is fine.