import mLib as M
import tripe as T
import dbus as D
+import re as RX
for i in ['mainloop', 'mainloop.glib']:
__import__('dbus.%s' % i)
try: from gi.repository import GLib as G
def __init__(me, **kw):
me.__dict__.update(kw)
-def toposort(cmp, things):
- """
- Generate the THINGS in an order consistent with a given partial order.
-
- The function CMP(X, Y) should return true if X must precede Y, and false if
- it doesn't care. If X and Y are equal then it should return false.
-
- The THINGS may be any finite iterable; it is converted to a list
- internally.
- """
-
- ## Make sure we can index the THINGS, and prepare an ordering table.
- ## What's going on? The THINGS might not have a helpful equality
- ## predicate, so it's easier to work with indices. The ordering table will
- ## remember which THINGS (by index) are considered greater than other
- ## things.
- things = list(things)
- n = len(things)
- order = [{} for i in xrange(n)]
- rorder = [{} for i in xrange(n)]
- for i in xrange(n):
- for j in xrange(n):
- if i != j and cmp(things[i], things[j]):
- order[j][i] = True
- rorder[i][j] = True
-
- ## Now we can do the sort.
- out = []
- while True:
- done = True
- for i in xrange(n):
- if order[i] is not None:
- done = False
- if len(order[i]) == 0:
- for j in rorder[i]:
- del order[j][i]
- yield things[i]
- order[i] = None
- if done:
- break
+###--------------------------------------------------------------------------
+### Address manipulation.
+
+class InetAddress (object):
+ def __init__(me, addrstr, maskstr = None):
+ me.addr = me._addrstr_to_int(addrstr)
+ if maskstr is None:
+ me.mask = -1
+ elif maskstr.isdigit():
+ me.mask = (1 << 32) - (1 << 32 - int(maskstr))
+ else:
+ me.mask = me._addrstr_to_int(maskstr)
+ if me.addr&~me.mask:
+ raise ValueError('network contains bits set beyond mask')
+ def _addrstr_to_int(me, addrstr):
+ return unpack('>L', S.inet_aton(addrstr))[0]
+ def _int_to_addrstr(me, n):
+ return S.inet_ntoa(pack('>L', n))
+ def sockaddr(me, port = 0):
+ if me.mask != -1: raise ValueError('not a simple address')
+ return me._int_to_addrstr(me.addr), port
+ def __str__(me):
+ addrstr = me._int_to_addrstr(me.addr)
+ if me.mask == -1:
+ return addrstr
+ else:
+ inv = me.mask ^ ((1 << 32) - 1)
+ if (inv&(inv + 1)) == 0:
+ return '%s/%d' % (addrstr, 32 - inv.bit_length())
+ else:
+ return '%s/%s' % (addrstr, me._int_to_addrstr(me.mask))
+ def withinp(me, net):
+ if (me.mask&net.mask) != net.mask: return False
+ if (me.addr ^ net.addr)&net.mask: return False
+ return True
+ def eq(me, other):
+ if me.mask != other.mask: return False
+ if me.addr != other.addr: return False
+ return True
+ @classmethod
+ def from_sockaddr(cls, sa):
+ addr, port = (lambda a, p: (a, p))(*sa)
+ return cls(addr), port
+
+def parse_address(addrstr, maskstr = None):
+ return InetAddress(addrstr, maskstr)
+
+def parse_net(netstr):
+ try: sl = netstr.index('/')
+ except ValueError: raise ValueError('missing mask')
+ return parse_address(netstr[:sl], netstr[sl + 1:])
+
+def straddr(a): return a is None and '#<none>' or str(a)
###--------------------------------------------------------------------------
### Parse the configuration file.
## this service are largely going to be satellite notes, I don't think
## scalability's going to be a problem.
+TESTADDR = InetAddress('1.2.3.4')
+
+CONFSYNTAX = [
+ ('COMMENT', RX.compile(r'^\s*($|[;#])')),
+ ('GRPHDR', RX.compile(r'^\s*\[(.*)\]\s*$')),
+ ('ASSGN', RX.compile(r'\s*([\w.-]+)\s*[:=]\s*(|\S|\S.*\S)\s*$'))]
+
+class ConfigError (Exception):
+ def __init__(me, file, lno, msg):
+ me.file = file
+ me.lno = lno
+ me.msg = msg
+ def __str__(me):
+ return '%s:%d: %s' % (me.file, me.lno, me.msg)
+
class Config (object):
"""
Represents a configuration file.
The most interesting thing is probably the `groups' slot, which stores a
list of pairs (NAME, PATTERNS); the NAME is a string, and the PATTERNS a
- list of (TAG, PEER, ADDR, MASK) triples. The implication is that there
- should be precisely one peer with a name matching NAME-*, and that it
- should be NAME-TAG, where (TAG, PEER, ADDR, MASK) is the first triple such
- that the host's primary IP address (if PEER is None -- or the IP address it
- would use for communicating with PEER) is within the network defined by
- ADDR/MASK.
+ list of (TAG, PEER, NETS) triples. The implication is that there should be
+ precisely one peer from the set, and that it should be named TAG, where
+ (TAG, PEER, NETS) is the first triple such that the host's primary IP
+ address (if PEER is None -- or the IP address it would use for
+ communicating with PEER) is within one of the networks defined by NETS.
"""
def __init__(me, file):
Internal function to update the configuration from the underlying file.
"""
- ## Read the configuration. We have no need of the fancy substitutions,
- ## so turn them all off.
- cp = RawConfigParser()
- cp.read(me._file)
if T._debug: print '# reread config'
- ## Save the test address. Make sure it's vaguely sensible. The default
- ## is probably good for most cases, in fact, since that address isn't
- ## actually in use. Note that we never send packets to the test address;
- ## we just use it to discover routing information.
- if cp.has_option('DEFAULT', 'test-addr'):
- testaddr = cp.get('DEFAULT', 'test-addr')
- S.inet_aton(testaddr)
- else:
- testaddr = '1.2.3.4'
-
- ## Scan the configuration file and build the groups structure.
- groups = []
- for sec in cp.sections():
- pats = []
- for tag in cp.options(sec):
- spec = cp.get(sec, tag).split()
-
- ## Parse the entry into peer and network.
- if len(spec) == 1:
- peer = None
- net = spec[0]
- else:
- peer, net = spec
-
- ## Syntax of a net is ADDRESS/MASK, where ADDRESS is a dotted-quad,
- ## and MASK is either a dotted-quad or a single integer N indicating
- ## a mask with N leading ones followed by trailing zeroes.
- slash = net.index('/')
- addr, = unpack('>L', S.inet_aton(net[:slash]))
- if net.find('.', slash + 1) >= 0:
- mask, = unpack('>L', S.inet_aton(net[:slash]))
+ ## Initial state.
+ testaddr = None
+ groups = {}
+ grpname = None
+ grplist = []
+
+ ## Open the file and start reading.
+ with open(me._file) as f:
+ lno = 0
+ for line in f:
+ lno += 1
+ for tag, rx in CONFSYNTAX:
+ m = rx.match(line)
+ if m: break
else:
- n = int(net[slash + 1:], 10)
- mask = (1 << 32) - (1 << 32 - n)
- pats.append((tag, peer, addr & mask, mask))
-
- ## Annoyingly, RawConfigParser doesn't preserve the order of options.
- ## In order to make things vaguely sane, we topologically sort the
- ## patterns so that more specific patterns are checked first.
- pats = list(toposort(lambda (t, p, a, m), (tt, pp, aa, mm): \
- (p and not pp) or \
- (p == pp and m == (m | mm) and aa == (a & mm)),
- pats))
- groups.append((sec, pats))
+ raise ConfigError(me._file, lno, 'failed to parse line: %r' % line)
+
+ if tag == 'COMMENT':
+ ## A comment. Ignore it and hope it goes away.
+
+ continue
+
+ elif tag == 'GRPHDR':
+ ## A group header. Flush the old group and start a new one.
+ newname = m.group(1)
+
+ if grpname is not None: groups[grpname] = grplist
+ if newname in groups:
+ raise ConfigError(me._file, lno,
+ "duplicate group name `%s'" % newname)
+ grpname = newname
+ grplist = []
+
+ elif tag == 'ASSGN':
+ ## An assignment. Deal with it.
+ name, value = m.group(1), m.group(2)
+
+ if grpname is None:
+ ## We're outside of any group, so this is a global configuration
+ ## tweak.
+
+ if name == 'test-addr':
+ for astr in value.split():
+ try:
+ a = parse_address(astr)
+ except Exception, e:
+ raise ConfigError(me._file, lno,
+ "invalid IP address `%s': %s" %
+ (astr, e))
+ if testaddr is not None:
+ raise ConfigError(me._file, lno, 'duplicate test-address')
+ testaddr = a
+ else:
+ raise ConfigError(me._file, lno,
+ "unknown global option `%s'" % name)
+
+ else:
+ ## Parse a pattern and add it to the group.
+ spec = value.split()
+ i = 0
+
+ ## Check for an explicit target address.
+ if i >= len(spec) or spec[i].find('/') >= 0:
+ peer = None
+ else:
+ try:
+ peer = parse_address(spec[i])
+ except Exception, e:
+ raise ConfigError(me._file, lno,
+ "invalid IP address `%s': %s" %
+ (spec[i], e))
+ i += 1
+
+ ## Parse the list of local networks.
+ nets = []
+ while i < len(spec):
+ try:
+ net = parse_net(spec[i])
+ except Exception, e:
+ raise ConfigError(me._file, lno,
+ "invalid IP network `%s': %s" %
+ (spec[i], e))
+ else:
+ nets.append(net)
+ i += 1
+ if not nets:
+ raise ConfigError(me._file, lno, 'no networks defined')
+
+ ## Add this entry to the list.
+ grplist.append((name, peer, nets))
+
+ ## Fill in the default test address if necessary.
+ if testaddr is None: testaddr = TESTADDR
## Done.
+ if grpname is not None: groups[grpname] = grplist
me.testaddr = testaddr
me.groups = groups
### This will be a configuration file.
CF = None
-def straddr(a): return a is None and '#<none>' or S.inet_ntoa(pack('>L', a))
-def strmask(m):
- for i in xrange(33):
- if m == 0xffffffff ^ ((1 << (32 - i)) - 1): return i
- return straddr(m)
-
def cmd_showconfig():
T.svcinfo('test-addr=%s' % CF.testaddr)
def cmd_showgroups():
- for sec, pats in CF.groups:
- T.svcinfo(sec)
+ for g in sorted(CF.groups.iterkeys()):
+ T.svcinfo(g)
def cmd_showgroup(g):
- for s, p in CF.groups:
- if s == g:
- pats = p
- break
- else:
- raise T.TripeJobError, 'unknown-group', g
- for t, p, a, m in pats:
+ try: pats = CF.groups[g]
+ except KeyError: raise T.TripeJobError('unknown-group', g)
+ for t, p, nn in pats:
T.svcinfo('peer', t,
- 'target', p or '(default)',
- 'net', '%s/%s' % (straddr(a), strmask(m)))
+ 'target', p and str(p) or '(default)',
+ 'net', ' '.join(map(str, nn)))
###--------------------------------------------------------------------------
### Responding to a network up/down event.
sk = S.socket(S.AF_INET, S.SOCK_DGRAM)
try:
try:
- sk.connect((peer, 1))
- addr, _ = sk.getsockname()
- addr, = unpack('>L', S.inet_aton(addr))
- return addr
+ sk.connect(peer.sockaddr(1))
+ addr = sk.getsockname()
+ return InetAddress.from_sockaddr(addr)[0]
except S.error:
return None
finally:
sk.close()
_kick = T.Queue()
+_delay = None
+
+def cancel_delay():
+ global _delay
+ if _delay is not None:
+ if T._debug: print '# cancel delayed kick'
+ G.source_remove(_delay)
+ _delay = None
+
+def netupdown(upness, reason):
+ """
+ Add or kill peers according to whether the network is up or down.
+
+ UPNESS is true if the network is up, or false if it's down.
+ """
+
+ _kick.put((upness, reason))
+
+def delay_netupdown(upness, reason):
+ global _delay
+ cancel_delay()
+ def _func():
+ global _delay
+ if T._debug: print '# delayed %s: %s' % (upness, reason)
+ _delay = None
+ netupdown(upness, reason)
+ return False
+ if T._debug: print '# delaying %s: %s' % (upness, reason)
+ _delay = G.timeout_add(2000, _func)
+
def kickpeers():
while True:
upness, reason = _kick.get()
if T._debug: print '# kickpeers %s: %s' % (upness, reason)
select = []
+ cancel_delay()
## Make sure the configuration file is up-to-date. Don't worry if we
## can't do anything useful.
## Now decide what to do.
changes = []
- for g, pp in CF.groups:
+ for g, pp in CF.groups.iteritems():
if T._debug: print '# check group %s' % g
## Find out which peer in the group ought to be active.
- ip = None
- map = {}
+ statemap = {}
want = None
- for t, p, a, m in pp:
- if p is None or not upness:
- ipq = addr
- else:
- ipq = localaddr(p)
+ matchp = False
+ for t, p, nn in pp:
+ if p is None or not upness: ip = addr
+ else: ip = localaddr(p)
if T._debug:
- info = 'peer=%s; target=%s; net=%s/%s; local=%s' % (
- t, p or '(default)', straddr(a), strmask(m), straddr(ipq))
- if upness and ip is None and \
- ipq is not None and (ipq & m) == a:
+ info = 'peer = %s; target = %s; nets = %s; local = %s' % (
+ t, p or '(default)', ', '.join(map(str, nn)), straddr(ip))
+ if upness and not matchp and \
+ ip is not None and any(ip.withinp(n) for n in nn):
if T._debug: print '# %s: SELECTED' % info
- map[t] = 'up'
+ statemap[t] = 'up'
select.append('%s=%s' % (g, t))
- if t == 'down' or t.startswith('down/'):
- want = None
- else:
- want = t
- ip = ipq
+ if t == 'down' or t.startswith('down/'): want = None
+ else: want = t
+ matchp = True
else:
- map[t] = 'down'
+ statemap[t] = 'down'
if T._debug: print '# %s: skipped' % info
## Shut down the wrong ones.
found = False
- if T._debug: print '# peer-map = %r' % map
+ if T._debug: print '# peer-map = %r' % statemap
for p in peers:
- what = map.get(p, 'leave')
+ what = statemap.get(p, 'leave')
if what == 'up':
found = True
if T._debug: print '# peer %s: already up' % p
if want is not None and not found:
def _(want = want):
try:
- SM.svcsubmit('connect', 'active', want)
+ list(SM.svcsubmit('connect', 'active', want))
except T.TripeError, exc:
SM.warn('conntrack', 'connect-failed', want, *exc.args)
if T._debug: print '# peer %s: bring up' % want
SM.notify('conntrack', upness and 'up' or 'down', *select + reason)
for c in changes: c()
-def netupdown(upness, reason):
- """
- Add or kill peers according to whether the network is up or down.
-
- UPNESS is true if the network is up, or false if it's down.
- """
-
- _kick.put((upness, reason))
-
###--------------------------------------------------------------------------
### NetworkManager monitor.
+DBPROPS_IFACE = 'org.freedesktop.DBus.Properties'
+
NM_NAME = 'org.freedesktop.NetworkManager'
NM_PATH = '/org/freedesktop/NetworkManager'
NM_IFACE = NM_NAME
def attach(me, bus):
try:
nm = bus.get_object(NM_NAME, NM_PATH)
- state = nm.Get(NM_IFACE, 'State')
+ state = nm.Get(NM_IFACE, 'State', dbus_interface = DBPROPS_IFACE)
if state in NM_CONNSTATES:
netupdown(True, ['nm', 'initially-connected'])
else:
netupdown(False, ['nm', 'initially-disconnected'])
- except D.DBusException:
- pass
+ except D.DBusException, e:
+ if T._debug: print '# exception attaching to network-manager: %s' % e
bus.add_signal_receiver(me._nm_state, 'StateChanged',
NM_IFACE, NM_NAME, NM_PATH)
bus.add_signal_receiver(me._nm_connchange, 'PropertiesChanged',
def _nm_state(me, state):
if state in NM_CONNSTATES:
- netupdown(True, ['nm', 'connected'])
+ delay_netupdown(True, ['nm', 'connected'])
else:
- netupdown(False, ['nm', 'disconnected'])
+ delay_netupdown(False, ['nm', 'disconnected'])
def _nm_connchange(me, props):
- if props.get('Default', False):
- netupdown(True, ['nm', 'default-connection-change'])
+ if props.get('Default', False) or props.get('Default6', False):
+ delay_netupdown(True, ['nm', 'default-connection-change'])
##--------------------------------------------------------------------------
### Connman monitor.
props = cm.GetProperties(dbus_interface = CM_IFACE)
state = props['State']
netupdown(state == 'online', ['connman', 'initially-%s' % state])
- except D.DBusException:
- pass
+ except D.DBusException, e:
+ if T._debug: print '# exception attaching to connman: %s' % e
bus.add_signal_receiver(me._cm_state, 'PropertyChanged',
CM_IFACE, CM_NAME, CM_PATH)
def _cm_state(me, prop, value):
if prop != 'State': return
- netupdown(value == 'online', ['connman', value])
+ delay_netupdown(value == 'online', ['connman', value])
###--------------------------------------------------------------------------
### Maemo monitor.
except D.DBusException:
me._iap = None
netupdown(False, ['icd', 'initially-disconnected'])
- except D.DBusException:
+ except D.DBusException, e:
+ if T._debug: print '# exception attaching to icd: %s' % e
me._iap = None
bus.add_signal_receiver(me._icd_state, 'status_changed', ICD_IFACE,
ICD_NAME, ICD_PATH)
def _icd_state(me, iap, ty, state, hunoz):
if state == 'CONNECTED':
me._iap = iap
- netupdown(True, ['icd', 'connected', iap])
+ delay_netupdown(True, ['icd', 'connected', iap])
elif state == 'IDLE' and iap == me._iap:
me._iap = None
- netupdown(False, ['icd', 'idle'])
+ delay_netupdown(False, ['icd', 'idle'])
###--------------------------------------------------------------------------
### D-Bus connection tracking.
DBM.addmon(NetworkManagerMonitor())
DBM.addmon(ConnManMonitor())
DBM.addmon(MaemoICdMonitor())
- G.timeout_add_seconds(30, lambda: (netupdown(True, ['interval-timer'])
- or True))
+ G.timeout_add_seconds(30, lambda: (_delay is not None or
+ netupdown(True, ['interval-timer']) or
+ True))
def parse_options():
"""
~mdw / tripe / blobdiff