Adding special processing in SyncLog and ContentStore when forwardingHint is a prefix to userName
Change-Id: I1c9eedcc60a1170be46886dc964b90118b764d24
diff --git a/src/content-server.cc b/src/content-server.cc
index fa0ea4c..c84c6b6 100644
--- a/src/content-server.cc
+++ b/src/content-server.cc
@@ -38,7 +38,7 @@
ContentServer::ContentServer(CcnxWrapperPtr ccnx, ActionLogPtr actionLog,
const boost::filesystem::path &rootDir,
- const Ccnx::Name &deviceName, const std::string &sharedFolderName,
+ const Ccnx::Name &userName, const std::string &sharedFolderName,
const std::string &appName,
int freshness)
: m_ccnx(ccnx)
@@ -46,7 +46,7 @@
, m_dbFolder(rootDir / ".chronoshare")
, m_freshness(freshness)
, m_scheduler (new Scheduler())
- , m_deviceName (deviceName)
+ , m_userName (userName)
, m_sharedFolderName (sharedFolderName)
, m_appName (appName)
{
@@ -60,9 +60,9 @@
m_scheduler->shutdown ();
ScopedLock lock (m_mutex);
- for (PrefixIt it = m_prefixes.begin(); it != m_prefixes.end(); ++it)
+ for (PrefixIt forwardingHint = m_prefixes.begin(); forwardingHint != m_prefixes.end(); ++forwardingHint)
{
- m_ccnx->clearInterestFilter (*it);
+ m_ccnx->clearInterestFilter (*forwardingHint);
}
m_prefixes.clear ();
@@ -75,6 +75,7 @@
// Format for actions: /<forwarding-hint>/<device_name>/<appname>/action/<shared-folder>/<action-seq>
_LOG_DEBUG (">> content server: register " << forwardingHint);
+
m_ccnx->setInterestFilter (forwardingHint, bind(&ContentServer::filterAndServe, this, forwardingHint, _1));
ScopedLock lock (m_mutex);
@@ -91,13 +92,13 @@
m_prefixes.erase (forwardingHint);
}
-void
-ContentServer::filterAndServe (Name forwardingHint, const Name &interest)
-{
- // Format for files: /<forwarding-hint>/<device_name>/<appname>/file/<hash>/<segment>
- // Format for actions: /<forwarding-hint>/<device_name>/<appname>/action/<shared-folder>/<action-seq>
- Name name = interest.getPartialName (forwardingHint.size());
+void
+ContentServer::filterAndServeImpl (const Name &forwardingHint, const Name &name, const Name &interest)
+{
+ // interest for files: /<forwarding-hint>/<device_name>/<appname>/file/<hash>/<segment>
+ // interest for actions: /<forwarding-hint>/<device_name>/<appname>/action/<shared-folder>/<action-seq>
+
// name for files: /<device_name>/<appname>/file/<hash>/<segment>
// name for actions: /<device_name>/<appname>/action/<shared-folder>/<action-seq>
@@ -106,39 +107,50 @@
string type = name.getCompFromBackAsString (2);
if (type == "file")
{
- serve_File (forwardingHint, interest);
+ serve_File (forwardingHint, name, interest);
}
else if (type == "action")
{
- serve_Action (forwardingHint, interest);
+ serve_Action (forwardingHint, name, interest);
}
}
}
void
-ContentServer::serve_Action (Name forwardingHint, Name interest)
+ContentServer::filterAndServe (Name forwardingHint, const Name &interest)
+{
+ if (forwardingHint.size () > 0 &&
+ m_userName.size () >= forwardingHint.size () &&
+ m_userName.getPartialName (0, forwardingHint.size ()) == forwardingHint)
+ {
+ filterAndServeImpl (Name ("/"), interest, interest); // try without forwarding hints
+ }
+
+ filterAndServeImpl (forwardingHint, interest.getPartialName (forwardingHint.size()), interest); // always try with hint... :( have to
+}
+
+void
+ContentServer::serve_Action (const Name &forwardingHint, const Name &name, const Name &interest)
{
_LOG_DEBUG (">> content server serving ACTION, hint: " << forwardingHint << ", interest: " << interest);
- m_scheduler->scheduleOneTimeTask (m_scheduler, 0, bind (&ContentServer::serve_Action_Execute, this, forwardingHint, interest), boost::lexical_cast<string>(interest));
+ m_scheduler->scheduleOneTimeTask (m_scheduler, 0, bind (&ContentServer::serve_Action_Execute, this, forwardingHint, name, interest), boost::lexical_cast<string>(name));
// need to unlock ccnx mutex... or at least don't lock it
}
void
-ContentServer::serve_File (Name forwardingHint, Name interest)
+ContentServer::serve_File (const Name &forwardingHint, const Name &name, const Name &interest)
{
_LOG_DEBUG (">> content server serving FILE, hint: " << forwardingHint << ", interest: " << interest);
- m_scheduler->scheduleOneTimeTask (m_scheduler, 0, bind (&ContentServer::serve_File_Execute, this, forwardingHint, interest), boost::lexical_cast<string>(interest));
+ m_scheduler->scheduleOneTimeTask (m_scheduler, 0, bind (&ContentServer::serve_File_Execute, this, forwardingHint, name, interest), boost::lexical_cast<string>(name));
// need to unlock ccnx mutex... or at least don't lock it
}
void
-ContentServer::serve_File_Execute (Name forwardingHint, Name interest)
+ContentServer::serve_File_Execute (const Name &forwardingHint, const Name &name, const Name &interest)
{
// forwardingHint: /<forwarding-hint>
// interest: /<forwarding-hint>/<device_name>/<appname>/file/<hash>/<segment>
-
- Name name = interest.getPartialName (forwardingHint.size());
// name: /<device_name>/<appname>/file/<hash>/<segment>
int64_t segment = name.getCompFromBackAsInt (0);
@@ -204,12 +216,10 @@
}
void
-ContentServer::serve_Action_Execute (Name forwardingHint, Name interest)
+ContentServer::serve_Action_Execute (const Name &forwardingHint, const Name &name, const Name &interest)
{
// forwardingHint: /<forwarding-hint>
// interest: /<forwarding-hint>/<device_name>/<appname>/action/<shared-folder>/<action-seq>
-
- Name name = interest.getPartialName (forwardingHint.size());
// name for actions: /<device_name>/<appname>/action/<shared-folder>/<action-seq>
int64_t seqno = name.getCompFromBackAsInt (0);
diff --git a/src/content-server.h b/src/content-server.h
index 13ca2dc..55037b7 100644
--- a/src/content-server.h
+++ b/src/content-server.h
@@ -35,7 +35,7 @@
{
public:
ContentServer(Ccnx::CcnxWrapperPtr ccnx, ActionLogPtr actionLog, const boost::filesystem::path &rootDir,
- const Ccnx::Name &deviceName, const std::string &sharedFolderName, const std::string &appName,
+ const Ccnx::Name &userName, const std::string &sharedFolderName, const std::string &appName,
int freshness = -1);
~ContentServer();
@@ -51,16 +51,19 @@
filterAndServe (Ccnx::Name forwardingHint, const Ccnx::Name &interest);
void
- serve_Action (Ccnx::Name forwardingHint, Ccnx::Name interest);
+ filterAndServeImpl (const Ccnx::Name &forwardingHint, const Ccnx::Name &name, const Ccnx::Name &interest);
void
- serve_File (Ccnx::Name forwardingHint, Ccnx::Name interest);
+ serve_Action (const Ccnx::Name &forwardingHint, const Ccnx::Name &name, const Ccnx::Name &interest);
void
- serve_Action_Execute(Ccnx::Name forwardingHint, Ccnx::Name interest);
+ serve_File (const Ccnx::Name &forwardingHint, const Ccnx::Name &name, const Ccnx::Name &interest);
void
- serve_File_Execute(Ccnx::Name forwardingHint, Ccnx::Name interest);
+ serve_Action_Execute(const Ccnx::Name &forwardingHint, const Ccnx::Name &name, const Ccnx::Name &interest);
+
+ void
+ serve_File_Execute(const Ccnx::Name &forwardingHint, const Ccnx::Name &name, const Ccnx::Name &interest);
void
flushStaleDbCache();
@@ -82,7 +85,7 @@
DbCache m_dbCache;
Mutex m_dbCacheMutex;
- Ccnx::Name m_deviceName;
+ Ccnx::Name m_userName;
std::string m_sharedFolderName;
std::string m_appName;
};
diff --git a/src/sync-core.cc b/src/sync-core.cc
index e6a4b01..17cb16d 100644
--- a/src/sync-core.cc
+++ b/src/sync-core.cc
@@ -74,12 +74,6 @@
}
void
-SyncCore::updateLocalPrefix (const Name &localPrefix)
-{
- m_log->UpdateLocalLocator (localPrefix);
-}
-
-void
SyncCore::updateLocalState(sqlite3_int64 seqno)
{
m_log->UpdateLocalSeqNo (seqno);
diff --git a/src/sync-core.h b/src/sync-core.h
index c2b427b..7cf4368 100644
--- a/src/sync-core.h
+++ b/src/sync-core.h
@@ -51,9 +51,6 @@
~SyncCore();
void
- updateLocalPrefix (const Ccnx::Name &localPrefix);
-
- void
localStateChanged ();
/**
diff --git a/src/sync-log.cc b/src/sync-log.cc
index 74506c6..5bd5703 100644
--- a/src/sync-log.cc
+++ b/src/sync-log.cc
@@ -367,12 +367,19 @@
}
void
-SyncLog::UpdateLocalLocator (const Ccnx::Name &locator)
+SyncLog::UpdateLocalLocator (const Ccnx::Name &forwardingHint)
{
- return UpdateLocator (m_localName, locator);
+ if (m_localName.size () >= forwardingHint.size () &&
+ m_localName.getPartialName (0, forwardingHint.size ()) == forwardingHint)
+ {
+ return UpdateLocator (m_localName, Name ("/")); // "directly" accesible
+ }
+ else
+ {
+ return UpdateLocator (m_localName, forwardingHint);
+ }
}
-
SyncStateMsgPtr
SyncLog::FindStateDifferences (const std::string &oldHash, const std::string &newHash, bool includeOldSeq)
{