summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-02-14 17:09:14 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2015-02-14 17:09:14 +0000
commitdd79923295120adb14b28497792b717c452c095e (patch)
tree6bba803eee8d1ab87694522d076da3d30e0c738b
parentPass include dirs to slice tools (diff)
downloadnetfs-dd79923295120adb14b28497792b717c452c095e.tar.bz2
netfs-dd79923295120adb14b28497792b717c452c095e.tar.xz
netfs-dd79923295120adb14b28497792b717c452c095e.zip
Allow specifying the identity of the service object
-rw-r--r--netfs/fuse/configuration.ice3
-rw-r--r--netfs/fuse/fuse.cpp5
2 files changed, 6 insertions, 2 deletions
diff --git a/netfs/fuse/configuration.ice b/netfs/fuse/configuration.ice
index 6f76b37..db37770 100644
--- a/netfs/fuse/configuration.ice
+++ b/netfs/fuse/configuration.ice
@@ -7,6 +7,9 @@ module NetFS {
["slicer:name:export"]
string ExportName;
+ ["slicer:name:service"]
+ string ServiceIdentity = "Service";
+
["slicer:name:endpoints"]
EndpointList Endpoints;
};
diff --git a/netfs/fuse/fuse.cpp b/netfs/fuse/fuse.cpp
index ca504ac..e31ee03 100644
--- a/netfs/fuse/fuse.cpp
+++ b/netfs/fuse/fuse.cpp
@@ -76,9 +76,10 @@ NetFS::FuseApp::connectToService()
}
const std::string & ep = e->second->Endpoints.front();
- service = NetFS::ServicePrx::checkedCast(ic->stringToProxy("Service:" + ep));
+ auto proxyAddr = e->second->ServiceIdentity + ":" + ep;
+ service = NetFS::ServicePrx::checkedCast(ic->stringToProxy(proxyAddr));
if (!service) {
- throw std::runtime_error("Invalid service proxy: " + ep);
+ throw std::runtime_error("Invalid service proxy: " + proxyAddr);
}
}
}