from sys import stdin, stdout, exit, argv
import re as RX
import os as OS
+import socket as S
from cStringIO import StringIO
###--------------------------------------------------------------------------
def __init__(me, name):
"""Make a new resolving-host object for the host NAME."""
me.name = name
- me.addr = []
+ me.addr = { 'INET': [], 'INET6': [] }
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 may be `INET' or `INET6'.
+ """
+ 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']
+ a6 = me.addr['INET6']
+ all, any = False, False
for ch in flags:
if ch == '*': all = True
+ elif ch == '4': aa += a4; any = True
+ elif ch == '6': aa += a6; any = True
else: raise ValueError("unknown address-resolution flag `%s'" % ch)
+ if not any: aa = a4 + a6
if not aa: raise ResolverFailure(me.name, 'no matching addresses found')
if not all: aa = [aa[0]]
return aa
-class BulkResolver (object):
+class BaseBulkResolver (object):
"""
Resolve a number of DNS names in parallel.
def __init__(me):
"""Initialize the resolver."""
me._namemap = {}
- me._noutstand = 0
def prepare(me, name):
"""Prime the resolver to resolve the given host NAME."""
if name not in me._namemap:
me._namemap[name] = host = ResolvingHost(name)
- host._resolv = M.SelResolveByName(
- name,
- lambda cname, alias, addr: me._resolved(host, cname, addr),
- lambda: me._resolved(host, None, []))
- me._noutstand += 1
-
- def run(me):
- """Run the background DNS resolver until it's finished."""
- while me._noutstand: M.select()
+ try:
+ ailist = S.getaddrinfo(name, None, S.AF_UNSPEC, S.SOCK_DGRAM, 0,
+ S.AI_NUMERICHOST | S.AI_NUMERICSERV)
+ except S.gaierror:
+ me._prepare(host, name)
+ else:
+ for af, skty, proto, cname, sa in ailist:
+ if af == S.AF_INET: host.addaddr('INET', sa[0])
+ elif af == S.AF_INET6: host.addaddr('INET6', sa[0])
def lookup(me, name, flags):
"""Fetch the address corresponding to the host NAME."""
return me._namemap[name].get(flags)
+class BresBulkResolver (BaseBulkResolver):
+ """
+ A BulkResolver using mLib's `bres' background resolver.
+
+ This is always available (and might use ADNS), but only does IPv4.
+ """
+
+ def __init__(me):
+ super(BresBulkResolver, me).__init__()
+ """Initialize the resolver."""
+ me._noutstand = 0
+
+ def _prepare(me, host, name):
+ """Arrange to resolve a NAME, reporting the results to HOST."""
+ host._resolv = M.SelResolveByName(
+ name,
+ lambda cname, alias, addr: me._resolved(host, cname, addr),
+ lambda: me._resolved(host, None, []))
+ me._noutstand += 1
+
+ def run(me):
+ """Run the background DNS resolver until it's finished."""
+ while me._noutstand: M.select()
+
def _resolved(me, host, cname, addr):
"""Callback function: remember that ADDRs are the addresses for HOST."""
if not addr:
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
+## Select a bulk resolver. Currently, there's only one choice.
+BulkResolver = BresBulkResolver
+
###--------------------------------------------------------------------------
### The configuration parser.
## 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) \$ ([46*]*) \[ ([^]]+) \]')
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), `6'
+ (IPv6 addresses), and `*' (all, space-separated, rather than just the
+ first).
* Its parsing behaviour is well-defined.