separate queen's service of introduction-to-the-network from queen's service of provi...

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index f0b3927b981c8dfc02f970180905b932c595a969..994fa6d9374aea5a221ea8c146aafcc2702069c5 100644 (file)
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -96,6 +96,7 @@ class Client(node.Node, Referenceable):
                              nodeid=self.nodeid,
                              node=self,
                              pburl=self.my_pburl)
+        d.addCallback(lambda x: queen.callRemote("get_global_vdrive"))
         d.addCallback(self._got_vdrive_root)
 
     def _got_vdrive_root(self, root):

diff --git a/src/allmydata/interfaces.py b/src/allmydata/interfaces.py
index c1c5a37258c9b2f45d1ea425632e4766263f2bbd..5da76b9c4a31e8d39d3b5e304de5670cc722acf1 100644 (file)
--- a/src/allmydata/interfaces.py
+++ b/src/allmydata/interfaces.py
@@ -19,7 +19,11 @@ RIMutableFileNode_ = Any()
 
 class RIQueenRoster(RemoteInterface):
     def hello(nodeid=Nodeid, node=RIClient_, pburl=PBURL):
+        return None
+
+    def get_global_vdrive():
         return RIMutableDirectoryNode_ # the virtual drive root
+       
 
 class RIClient(RemoteInterface):
     def get_service(name=str):

diff --git a/src/allmydata/queen.py b/src/allmydata/queen.py
index aff8ee76f73b9508265334de8c93afba15cbbe99..2cec7c8437944868de49fb1c4cbbf8050285de17 100644 (file)
--- a/src/allmydata/queen.py
+++ b/src/allmydata/queen.py
@@ -39,6 +39,8 @@ class Roster(service.MultiService, Referenceable):
         eventually(self._announce_new_peer,
                    nodeid, pburl, list(self.connections.values()))
         node.notifyOnDisconnect(self._lost_node, nodeid)
+
+    def remote_get_global_vdrive(self):
         return self.gvd_root
 
     def _educate_the_new_peer(self, nodeid, node, new_peers):