diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-02-16 20:51:59 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-05-06 00:40:49 +0100 |
| commit | b6aaaf3bc4e74988fa491e5dd52522ec4431a275 (patch) | |
| tree | 952c69a6ea008b0c7c741dbc73e3394c3ab888c3 /netfs/fuse | |
| parent | Actually use precompiled headers (diff) | |
| download | netfs-b6aaaf3bc4e74988fa491e5dd52522ec4431a275.tar.bz2 netfs-b6aaaf3bc4e74988fa491e5dd52522ec4431a275.tar.xz netfs-b6aaaf3bc4e74988fa491e5dd52522ec4431a275.zip | |
Program defined config files and sandbox
Diffstat (limited to 'netfs/fuse')
| -rw-r--r-- | netfs/fuse/fuseApp.cpp | 8 | ||||
| -rw-r--r-- | netfs/fuse/fuseApp.h | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/netfs/fuse/fuseApp.cpp b/netfs/fuse/fuseApp.cpp index 2f3b288..d579271 100644 --- a/netfs/fuse/fuseApp.cpp +++ b/netfs/fuse/fuseApp.cpp @@ -34,11 +34,17 @@ NetFS::FuseApp::~FuseApp() } } +NetFS::Client::ConfigurationPtr +NetFS::FuseApp::ReadConfiguration(const std::string & path) const +{ + return Slicer::Deserialize<Slicer::XmlFileDeserializer, NetFS::Client::Configuration>(path); +} + void * NetFS::FuseApp::init(struct fuse_conn_info *) { ic = Ice::initialize(_argc, _argv); - fc = Slicer::Deserialize<Slicer::XmlFileDeserializer, NetFS::Client::Configuration>(configPath); + fc = ReadConfiguration(configPath); return NULL; } diff --git a/netfs/fuse/fuseApp.h b/netfs/fuse/fuseApp.h index 4786591..e514b55 100644 --- a/netfs/fuse/fuseApp.h +++ b/netfs/fuse/fuseApp.h @@ -80,6 +80,9 @@ namespace NetFS { virtual struct fuse_context * fuse_get_context() = 0; + protected: + virtual NetFS::Client::ConfigurationPtr ReadConfiguration(const std::string &) const; + private: void setProxy(OpenFilePtr, uint64_t & fh); OpenFilePtr getFileProxy(uint64_t localID) const; |