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.29
[fms.git]
/
src
/
freenet
/
identityintroductionrequester.cpp
diff --git
a/src/freenet/identityintroductionrequester.cpp
b/src/freenet/identityintroductionrequester.cpp
index
20fb31f
..
b9532f3
100644
(file)
--- a/
src/freenet/identityintroductionrequester.cpp
+++ b/
src/freenet/identityintroductionrequester.cpp
@@
-14,12
+14,12
@@
#include <xmem.h>
\r
#endif
\r
\r
#include <xmem.h>
\r
#endif
\r
\r
-IdentityIntroductionRequester::IdentityIntroductionRequester()
\r
+IdentityIntroductionRequester::IdentityIntroductionRequester(
SQLite3DB::DB *db):IDatabase(db
)
\r
{
\r
Initialize();
\r
}
\r
\r
{
\r
Initialize();
\r
}
\r
\r
-IdentityIntroductionRequester::IdentityIntroductionRequester(
FCPv2::Connection *fcp):
IFCPConnected(fcp)
\r
+IdentityIntroductionRequester::IdentityIntroductionRequester(
SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),
IFCPConnected(fcp)
\r
{
\r
Initialize();
\r
}
\r
{
\r
Initialize();
\r
}
\r
@@
-178,7
+178,8
@@
const bool IdentityIntroductionRequester::HandleMessage(FCPv2::Message &message)
void IdentityIntroductionRequester::Initialize()
\r
{
\r
m_maxrequests=0;
\r
void IdentityIntroductionRequester::Initialize()
\r
{
\r
m_maxrequests=0;
\r
- Option::Instance()->GetInt("MaxIdentityIntroductionRequests",m_maxrequests);
\r
+ Option option(m_db);
\r
+ option.GetInt("MaxIdentityIntroductionRequests",m_maxrequests);
\r
if(m_maxrequests<1)
\r
{
\r
m_maxrequests=1;
\r
if(m_maxrequests<1)
\r
{
\r
m_maxrequests=1;
\r
@@
-188,7
+189,7
@@
void IdentityIntroductionRequester::Initialize()
{
\r
m_log->warning("Option MaxIdentityIntroductionRequests is currently set at more than 100. This value might be incorrectly configured.");
\r
}
\r
{
\r
m_log->warning("Option MaxIdentityIntroductionRequests is currently set at more than 100. This value might be incorrectly configured.");
\r
}
\r
-
Option::Instance()->
Get("MessageBase",m_messagebase);
\r
+
option.
Get("MessageBase",m_messagebase);
\r
m_tempdate=Poco::Timestamp();
\r
}
\r
\r
m_tempdate=Poco::Timestamp();
\r
}
\r
\r