projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.19
[fms.git]
/
src
/
freenet
/
freenetmasterthread.cpp
diff --git
a/src/freenet/freenetmasterthread.cpp
b/src/freenet/freenetmasterthread.cpp
index
b957c50
..
c23ee27
100644
(file)
--- a/
src/freenet/freenetmasterthread.cpp
+++ b/
src/freenet/freenetmasterthread.cpp
@@
-34,24
+34,24
@@
\r
FreenetMasterThread::FreenetMasterThread()
\r
{
\r
\r
FreenetMasterThread::FreenetMasterThread()
\r
{
\r
- std::string fcpport;
\r
\r
if(Option::Instance()->Get("FCPHost",m_fcphost)==false)
\r
{
\r
m_fcphost="localhost";
\r
Option::Instance()->Set("FCPHost",m_fcphost);
\r
}
\r
\r
if(Option::Instance()->Get("FCPHost",m_fcphost)==false)
\r
{
\r
m_fcphost="localhost";
\r
Option::Instance()->Set("FCPHost",m_fcphost);
\r
}
\r
- if(Option::Instance()->Get
("FCPPort",
fcpport)==false)
\r
+ if(Option::Instance()->Get
Int("FCPPort",m_
fcpport)==false)
\r
{
\r
{
\r
-
fcpport="9481"
;
\r
- Option::Instance()->Set("FCPPort",fcpport);
\r
+
m_fcpport=9481
;
\r
+ Option::Instance()->Set("FCPPort",
m_
fcpport);
\r
}
\r
}
\r
-
\r
- // convert fcp port to long, and make sure it's within the valid port range
\r
- if(StringFunctions::Convert(fcpport,m_fcpport)==false)
\r
+ else
\r
{
\r
{
\r
- m_fcpport=9481;
\r
- Option::Instance()->Set("FCPPort","9481");
\r
+ if(m_fcpport<1 || m_fcpport>65535)
\r
+ {
\r
+ m_fcpport=9481;
\r
+ Option::Instance()->Set("FCPPort",m_fcpport);
\r
+ }
\r
}
\r
\r
m_receivednodehello=false;
\r
}
\r
\r
m_receivednodehello=false;
\r