|
1 | 1 |
|
2 |
| -#include "net.h" |
| 2 | +#include "netbase.h" |
3 | 3 | #include "masternodeconfig.h"
|
4 | 4 | #include "util.h"
|
5 |
| -#include "ui_interface.h" |
6 | 5 | #include "chainparams.h"
|
7 | 6 |
|
8 | 7 | #include <boost/filesystem.hpp>
|
@@ -56,16 +55,26 @@ bool CMasternodeConfig::read(std::string& strErr) {
|
56 | 55 | }
|
57 | 56 | }
|
58 | 57 |
|
| 58 | + int port = 0; |
| 59 | + std::string hostname = ""; |
| 60 | + SplitHostPort(ip, port, hostname); |
| 61 | + if(port == 0 || hostname == "") { |
| 62 | + strErr = _("Failed to parse host:port string") + "\n"+ |
| 63 | + strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\""; |
| 64 | + streamConfig.close(); |
| 65 | + return false; |
| 66 | + } |
59 | 67 | int mainnetDefaultPort = Params(CBaseChainParams::MAIN).GetDefaultPort();
|
60 | 68 | if(Params().NetworkIDString() == CBaseChainParams::MAIN) {
|
61 |
| - if(CService(ip).GetPort() != mainnetDefaultPort) { |
| 69 | + if(port != mainnetDefaultPort) { |
62 | 70 | strErr = _("Invalid port detected in masternode.conf") + "\n" +
|
| 71 | + strprintf(_("Port: %d"), port) + "\n" + |
63 | 72 | strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" +
|
64 | 73 | strprintf(_("(must be %d for mainnet)"), mainnetDefaultPort);
|
65 | 74 | streamConfig.close();
|
66 | 75 | return false;
|
67 | 76 | }
|
68 |
| - } else if(CService(ip).GetPort() == mainnetDefaultPort) { |
| 77 | + } else if(port == mainnetDefaultPort) { |
69 | 78 | strErr = _("Invalid port detected in masternode.conf") + "\n" +
|
70 | 79 | strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" +
|
71 | 80 | strprintf(_("(%d could be used only on mainnet)"), mainnetDefaultPort);
|
|
0 commit comments