def __init__(me, name):
"""Make a new resolving-host object for the host NAME."""
me.name = name
- me.addr = []
+ me.addr = { 'INET': [] }
me.failure = None
- def addaddr(me, addr):
- """Add the address ADDR."""
- me.addr.append(addr)
+ def addaddr(me, af, addr):
+ """
+ Add the address ADDR with address family AF.
+
+ The address family must currently be `INET'.
+ """
+ me.addr[af].append(addr)
def failed(me, msg):
"""
def get(me, flags):
"""Return a list of addresses according to the FLAGS string."""
if me.failure is not None: raise ResolverFailure(me.name, me.failure)
- aa = me.addr
- all = False
+ aa = []
+ a4 = me.addr['INET']
+ all, any = False, False
for ch in flags:
if ch == '*': all = True
+ elif ch == '4': aa += a4; any = True
else: raise ValueError("unknown address-resolution flag `%s'" % ch)
+ if not any: aa = a4
if not aa: raise ResolverFailure(me.name, 'no matching addresses found')
if not all: aa = [aa[0]]
return aa
host.failed('(unknown failure)')
else:
if cname is not None: host.name = cname
- for a in addr: host.addaddr(a)
+ for a in addr: host.addaddr('INET', a)
host._resolv = None
me._noutstand -= 1
## Match a $FLAGS[HOST] name resolution reference; group 1 are the flags;
## group 2 is the HOST.
-RX_RESOLVE = RX.compile(r'(?x) \$ ([*]*) \[ ([^]]+) \]')
+RX_RESOLVE = RX.compile(r'(?x) \$ ([4*]*) \[ ([^]]+) \]')
class ConfigSyntaxError (ExpectedError):
def __init__(me, fname, lno, msg):
expansion and processes them correctly.
* It recognizes `$FLAGS[HOST]' name-resolver requests and handles them
- correctly. FLAGS may be empty, or `*' (all addresses, space-separated,
- rather than just the first).
+ correctly. FLAGS consists of characters `4' (IPv4 addresses), and `*'
+ (all addresses, space-separated, rather than just the first).
* Its parsing behaviour is well-defined.