merged with upstream/master

libretroshare/src/gxs/rsgxsnetservice.cc

@@ -343,7 +343,6 @@ int RsGxsNetService::tick()
         mLastCleanRejectedMessages = now ;
         cleanRejectedMessages() ;
     }
-    
     return 1;
 }
 

libretroshare/src/retroshare/rsplugin.h

@@ -49,6 +49,7 @@ class RsMsgs ;
 class RsGxsForums;
 class RsGxsChannels;
 class RsNotify;
+class RsServiceControl;
 class p3LinkMgr ;
 class MainPage ;
 class QIcon ;
@@ -75,6 +76,12 @@ class RsGcxs;
 class PgpAuxUtils;
 class p3Config;
 
+namespace resource_api
+{
+    class ResourceRouter;
+    class StateTokenServer;
+}
+
 // Plugin API version. Not used yet, but will be in the future the
 // main value that decides for compatibility.
 //
@@ -108,6 +115,8 @@ public:
     RsUtil::inited_ptr<RsDisc>   mDisc;
     RsUtil::inited_ptr<RsDht>    mDht;
     RsUtil::inited_ptr<RsNotify> mNotify;
+    RsUtil::inited_ptr<RsServiceControl> mServiceControl;
+    RsUtil::inited_ptr<RsPluginHandler> mPluginHandler;
 
     // gxs
     std::string     mGxsDir;
@@ -147,6 +156,12 @@ class RsPlugin
         virtual p3Config   *p3_config() 		const	{ return NULL ; }
 		virtual uint16_t        rs_service_id() 	   const	{ return 0    ; }
 
+
+        // creates a new resource api handler object. ownership is transferred to the caller.
+        // the caller should supply a statetokenserver, and keep it valid until destruction
+        // the plugin should return a entry point name. this is to make the entry point name independent from file names
+        virtual resource_api::ResourceRouter* new_resource_api_handler(const RsPlugInInterfaces& ifaces, resource_api::StateTokenServer* sts, std::string &entrypoint) const { return 0;}
+
 		// Shutdown
 		virtual void stop() {}
 

libretroshare/src/rsserver/rsinit.cc

@@ -1523,6 +1523,8 @@ int RsServer::StartupRetroShare()
 	interfaces.mDisc   = rsDisc;
 	interfaces.mDht    = rsDht;
 	interfaces.mNotify = mNotify;
+    interfaces.mServiceControl = serviceCtrl;
+    interfaces.mPluginHandler  = mPluginsManager;
     // gxs
     interfaces.mGxsDir          = currGxsDir;
     interfaces.mIdentity        = mGxsIdService;