Almost reverting changes in naming convention: moving "user" name to
front, but still keeping application name. As part of an additional
change, shared folder name in actions is moved just after "action"
keyword
Making AddRemoteAction call exception-free
Change-Id: Ifd0a0c6256940eaf6df8081722ae9d7ed40b12e5
diff --git a/src/content-server.h b/src/content-server.h
index 7d9b3ed..13ca2dc 100644
--- a/src/content-server.h
+++ b/src/content-server.h
@@ -47,20 +47,20 @@
void deregisterPrefix(const Ccnx::Name &prefix);
private:
- // void
- // serve (Ccnx::Name forwardingHint, const Ccnx::Name &interest);
+ void
+ filterAndServe (Ccnx::Name forwardingHint, const Ccnx::Name &interest);
void
- serve_Action (Ccnx::Name forwardingHint, Ccnx::Name locatorPrefix, Ccnx::Name interest);
+ serve_Action (Ccnx::Name forwardingHint, Ccnx::Name interest);
void
- serve_File (Ccnx::Name forwardingHint, Ccnx::Name locatorPrefix, Ccnx::Name interest);
+ serve_File (Ccnx::Name forwardingHint, Ccnx::Name interest);
void
- serve_Action_Execute(Ccnx::Name forwardingHint, Ccnx::Name locatorPrefix, Ccnx::Name interest);
+ serve_Action_Execute(Ccnx::Name forwardingHint, Ccnx::Name interest);
void
- serve_File_Execute(Ccnx::Name forwardingHint, Ccnx::Name locatorPrefix, Ccnx::Name interest);
+ serve_File_Execute(Ccnx::Name forwardingHint, Ccnx::Name interest);
void
flushStaleDbCache();