diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-05-13 01:26:14 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-05-13 01:26:14 +0200 |
| commit | 5a3cb32e5942adbfb5af90808013c1dde3c03fcf (patch) | |
| tree | 91e93cba67ad9a600f18589b2ac25f2b80bc4064 /src/init.cpp | |
| parent | 139d2f7c294c2489151b0b5df9b5351aaeaffa97 (diff) | |
| download | bitcoin-5a3cb32e5942adbfb5af90808013c1dde3c03fcf.tar.xz | |
Take -port into account when resolving -bind's
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index fe07ed7275..d26d5d73e4 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -611,14 +611,14 @@ bool AppInit2(int argc, char* argv[]) std::string strError; if (mapArgs.count("-bind")) { BOOST_FOREACH(std::string strBind, mapMultiArgs["-bind"]) { - fBound |= Bind(CService(strBind, GetDefaultPort(), false)); + fBound |= Bind(CService(strBind, GetListenPort(), false)); } } else { struct in_addr inaddr_any; inaddr_any.s_addr = INADDR_ANY; - fBound |= Bind(CService(inaddr_any, GetDefaultPort())); + fBound |= Bind(CService(inaddr_any, GetListenPort())); #ifdef USE_IPV6 - fBound |= Bind(CService(in6addr_any, GetDefaultPort())); + fBound |= Bind(CService(in6addr_any, GetListenPort())); #endif } if (!fBound) @@ -628,7 +628,7 @@ bool AppInit2(int argc, char* argv[]) if (mapArgs.count("-externalip")) { BOOST_FOREACH(string strAddr, mapMultiArgs["-externalip"]) - AddLocal(CNetAddr(strAddr, fNameLookup), LOCAL_MANUAL); + AddLocal(CService(strAddr, GetListenPort(), fNameLookup), LOCAL_MANUAL); } if (mapArgs.count("-paytxfee")) |