pvl-verkko: comparison pvl/socket.py

equal deleted inserted replaced

-:58aebcd35e1a
+:4f9bcf1e53e0
 # XXX: absolute import plz
 socket = __import__('socket')
 import select
+import errno
 import urlparse
 import logging; log = logging.getLogger('pvl.socket')
-URL = {
+# order matters!
-'tcp':  (0,                 socket.SOCK_STREAM  ), # AF_UNSPEC
+URL = (
-'udp':  (0,                 socket.SOCK_DGRAM   ), # AF_UNSPEC
+# scheme    family              socktype
-'unix': (socket.AF_UNIX,    None                ), # socktype is given
+( 'unix',   (socket.AF_UNIX,    None                )   ), # socktype is given
-}
+( 'tcp',    (0,                 socket.SOCK_STREAM  )   ), # AF_UNSPEC
+( 'udp',    (0,                 socket.SOCK_DGRAM   )   ), # AF_UNSPEC
+)
+URL_SCHEMES = dict(URL)
 def parse (str, port=None, scheme='tcp', unix=socket.SOCK_DGRAM) :
 """
 Parse given string into (AF_*, SOCK_*, host, port).
 For AF_UNIX, the path is in host, and port is empty, and the socktype is the given unix=... value.
 """
-family, socktype = URL[scheme]
+family, socktype = URL_SCHEMES[scheme]
 url = urlparse.urlparse(str)
 # TODO: UNIX?
 if url.scheme and url.netloc :
 # proper url
-family, socktype = URL[url.scheme]
+family, socktype = URL_SCHEMES[url.scheme]
 return family, socktype, url.hostname, url.port or port
 elif url.scheme and url.path :
 # host:port
 family, socktype, host, port = parse(str, *args, **kwargs)
 if family == socket.AF_UNIX :
 raise ValueError("XXX: AF_UNIX is not yet supported", str)
 else : # AF_UNSPEC
 return connect_inet(host, port, family=family, socktype=socktype)
 def connect_inet (host=None, port=None, family=socket.AF_UNSPEC, socktype=socket.SOCK_STREAM) :
 """
 return sock
 else :
 raise Exception("Unable to connect: %s:%s: %s" % (host, port, error))
-def reverse (self, sockaddr, numeric_host=False, numeric_port=True) :
+def reverse (sockaddr, numeric_host=False, numeric_port=True) :
 """
 Resolve given sockaddr, returning (host, port).
 """
 flags = 0
 if numeric_port :
 flags |= socket.NI_NUMERICSERV
 return socket.getnameinfo(sockaddr, flags)
+def socket_str (sock) :
+peer = sock.getpeername()
+# lookup scheme
+for scheme, (family, socktype) in URL :
+if family and family != sock.family :
+continue
+elif socktype and socktype != sock.type :
+continue
+else :
+break
+else :
+scheme = None
+host, port = reverse(peer)
+if scheme :
+return "{scheme}://{host}:{port}".format(scheme=scheme, host=host, port=port)
+else :
+return "{host}:{port}".format(host=host, port=port)
 def nonblocking (call, *args, **kwargs) :
 """
 Call the given function, which read/writes on a nonblocking file, and return None if it would have blocked.
 """
 Raises EOFError on EOF.
 """
 buf = nonblocking(self.sock.recv, block)
+log.debug("%s: %s", self, buf)
 # eof?
-if not buf :
+if buf :
+return buf
+else :
 raise EOFError()
-# ok
-return buf
 def peek (self) :
 """
 Peek at data in buffer.
 """
 # split out one line
 line, self._buf = self._buf.split('\n', 1)
 # in case we had \r\n
 line = line.rstrip('\r')
+log.debug("%s: %s", self, line)
 return line
 def readlines (self) :
 """
 return
 else :
 yield line
 __iter__ = readlines
+def __str__ (self) :
+return socket_str(self.sock)
 class WriteStream (object) :
 """
 Writable stream, supporting non-blocking/buffered writes.
 def writeline (self, line, eol=EOL) :
 """
 Write out line.
 """
-self.write(str(line) + eol)
+log.debug("%s: %s", self, line)
+self.write(str(line))
+self.write(eol)
 def __call__ (self, *lines) :
 for line in lines :
 self.writeline(line)
 # TODO: flush
+def __str__ (self) :
+return socket_str(self.sock)

changeset 118	4f9bcf1e53e0
parent 116	89b7385d19ba
child 120	d342506c3ef3