if dclient is not None:
lt('client')
dclient.queue_outbound(packet)
- elif daddr == c.server or daddr not in c.network:
+ elif daddr == c.vaddr or daddr not in c.vnetwork:
lt('inbound')
queue_inbound(packet)
elif daddr == relay:
#---------- client ----------
class Client():
- def __init__(self, ip, cs, pw):
+ def __init__(self, ip, cc):
# instance data members
self._ip = ip
- self._cs = cs
- self.pw = pw
+ self.cc = cc
self._rq = collections.deque() # requests
# self._pq = PacketQueue(...)
# plus from config:
# .max_queue_time
# .target_requests_outstanding
- if ip not in c.network:
+ if ip not in c.vnetwork:
raise ValueError('client %s not in network' % ip)
- for k in ('max_batch_down','max_queue_time','http_timeout',
- 'target_requests_outstanding'):
- req = cfg.getint(cs, k)
- limit = cfg.getint('limits',k)
- self.__dict__[k] = min(req, limit)
-
self._pq = PacketQueue(str(ip), self.max_queue_time)
if ip in clients:
#---------- config and setup ----------
-def process_cfg():
- process_cfg_common_always()
- process_cfg_server()
- process_cfg_network()
+def process_cfg(putative_servers, putative_clients):
+ global c
+ c = ConfigResults()
+ c.server = cfg.get('SERVER','server')
+
+ cfg_process_common(c, c.server)
+ cfg_process_saddrs(c, c.server)
+ cfg_process_vnetwork(c, c.server)
+ cfg_process_vaddr(c, c.server)
+
+ for (ci,cs) in putative_clients.items():
+ cc = ConfigResults()
+ sections = cfg_process_client_common(cc,c.server,cs,ci):
+ if not sections: continue
+ cfg_process_client_limited(cc,c.server,sections, 'max_batch_down')
+ cfg_process_client_limited(cc,c.server,sections, 'max_queue_time')
+ Client(ci)
try:
- c.relay = cfg.get('virtual','relay')
+ c.relay = cfg.get(c.server, 'relay')
except NoOptionError:
- for search in c.network.hosts():
- if search == c.server: continue
+ for search in c.vnetwork.hosts():
+ if search == c.vaddr: continue
c.relay = search
break
- process_cfg_saddrs()
- process_cfg_clients(Client)
-
- process_cfg_ipif('server',
- (('local','server'),
- ('peer', 'relay'),
- ('rnets','network')))
+ cfg_process_ipif(c,
+ [c.server, 'DEFAULT'],
+ (('local','vaddr'),
+ ('peer', 'vrelay'),
+ ('rnets','vnetwork')))
common_startup(process_cfg)
start_ipif(c.ipif_command, (lambda p,s,d: route(p,"[ipif]",s,d)))