-from foolscap.tokens import Violation
-
-class VersionedRemoteReference:
- """I wrap a RemoteReference, and add a .version attribute."""
-
- def __init__(self, original, version):
- self.rref = original
- self.version = version
-
- def callRemote(self, *args, **kwargs):
- return self.rref.callRemote(*args, **kwargs)
-
- def callRemoteOnly(self, *args, **kwargs):
- return self.rref.callRemoteOnly(*args, **kwargs)
-
- def notifyOnDisconnect(self, *args, **kwargs):
- return self.rref.notifyOnDisconnect(*args, **kwargs)
-
-
-def get_versioned_remote_reference(rref, default):
- """I return a Deferred that fires with a VersionedRemoteReference"""
+from twisted.internet import address
+from foolscap.api import Violation, RemoteException, DeadReferenceError, \
+ SturdyRef
+
+def add_version_to_remote_reference(rref, default):
+ """I try to add a .version attribute to the given RemoteReference. I call
+ the remote get_version() method to learn its version. I'll add the
+ default value if the remote side doesn't appear to have a get_version()
+ method."""
d = rref.callRemote("get_version")
- def _no_get_version(f):
- f.trap(Violation, AttributeError)
- return default
- d.addErrback(_no_get_version)
def _got_version(version):
- return VersionedRemoteReference(rref, version)
- d.addCallback(_got_version)
+ rref.version = version
+ return rref
+ def _no_get_version(f):
+ f.trap(Violation, RemoteException)
+ rref.version = default
+ return rref
+ d.addCallbacks(_got_version, _no_get_version)
return d
+def trap_and_discard(f, *errorTypes):
+ f.trap(*errorTypes)
+ pass
+
+def trap_deadref(f):
+ return trap_and_discard(f, DeadReferenceError)
+
+
+def hosts_for_furl(furl, ignore_localhost=True):
+ advertised = []
+ for hint in SturdyRef(furl).locationHints:
+ assert not isinstance(hint, str), hint
+ if hint[0] == "ipv4":
+ host = hint[1]
+ if ignore_localhost and host == "127.0.0.1":
+ continue
+ advertised.append(host)
+ return advertised
+
+def stringify_remote_address(rref):
+ remote = rref.getPeer()
+ if isinstance(remote, address.IPv4Address):
+ return "%s:%d" % (remote.host, remote.port)
+ # loopback is a non-IPv4Address
+ return str(remote)