import twisted
-import twisted.web.server import Site
-from twisted.web.resource import Resource
+#import twisted.web.server import Site
+#from twisted.web.resource import Resource
from twisted.web.server import NOT_DONE_YET
from twisted.internet import reactor
[server]
ipif = userv root ipif %(host),%(relay),%(mtu),slip %(network)
+addrs = 127.0.0.1 ::1
+port = 80
[limits]
max_batch_down = 262144
max_request_time = 121
'''
+#---------- "router" ----------
+
+def route(packet. daddr):
+ try: client = clients[daddr]
+ except KeyError: dclient = None
+ if dclient is not None:
+ dclient.queue_outbound(packet)
+ else if daddr = host or daddr not in network:
+ queue_inbound(packet)
+ else if daddr = relay:
+ log_discard(packet, saddr, daddr, 'relay')
+ else:
+ log_discard(packet, saddr, daddr, 'no client')
+
+def log_discard(packet, saddr, daddr, why):
+ syslog.syslog(syslog.LOG_DEBUG,
+ 'discarded packet %s -> %s (%s)' % (saddr, daddr, why))
+
+#---------- ipif (slip subprocess) ----------
+
class IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol):
def __init__(self):
self._buffer = b''
for packet in packets:
(saddr, daddr) = packet_addrs(packet)
route(packet, daddr)
+ def processEnded(self, status):
+ status.raiseException()
def start_ipif():
- reactor.spawnProcess(IpifProcessProtocol(),
+ global ipif
+ ipif = IpifProcessProtocol()
+ reactor.spawnProcess(ipif,
'/bin/sh',['-c', ipif_command],
childFDs={0:'w', 1:'r', 2:2})
-def log_discard(packet, saddr, daddr, why):
- syslog.syslog(syslog.LOG_DEBUG,
- 'discarded packet %s -> %s (%s)' % (saddr, daddr, why))
+def queue_inbound(packet):
+ ipif.transport.write(slip_delimiter)
+ ipif.transport.write(slip_encode(packet))
+ ipif.transport.write(slip_delimiter)
-def route(packet. daddr):
- try: client = clients[daddr]
- except KeyError: dclient = None
- if dclient is not None:
- dclient.queue_outbound(packet)
- else if daddr = host or daddr not in network:
- queue_inbound(packet)
- else if daddr = relay:
- log_discard(packet, saddr, daddr, 'relay')
- else:
- log_discard(packet, saddr, daddr, 'no client')
+#---------- client ----------
class Client():
def __init__(self, ip, cs):
request.finish()
# round again, looking for more to do
+class IphttpResource(twisted.web.resource.Resource):
+ def render_POST(self, request):
+ # find client, update config, etc.
+ ci = ipaddress(request.args['i'])
+ c = clients[ci]
+ pw = request.args['pw']
+ if pw != c.pw: raise ValueError('bad password')
+
+ # update config
+ for r, w in (('mbd', 'max_batch_down'),
+ ('mqt', 'max_queue_time'),
+ ('mrt', 'max_request_time')):
+ try: v = request.args[r]
+ except KeyError: continue
+ v = int(v)
+ c.__dict__[w] = v
+
+ try: d = request.args['d']
+ except KeyError: d = ''
+
+ c.process_arriving_data(d)
+ c.new_request(request)
+
+def start_http():
+ resource = IphttpResource()
+ sitefactory = twisted.web.server.Site(resource)
+ for addrspec in cfg.get('server','addresses').split():
+ try:
+ addr = ipaddress.IPv4Address(addrspec)
+ endpointfactory = twisted.internet.endpoints.TCP4ServerEndpoint
+ except AddressValueError:
+ addr = ipaddress.IPv6Address(addrspec)
+ endpointfactory = twisted.internet.endpoints.TCP6ServerEndpoint
+ ep = endpointfactory(reactor, cfg.getint('server','port'), addr)
+ ep.listen(sitefactory)
+
+#---------- config and setup ----------
+
def process_cfg():
global network
global host
ipif_command = cfg.get('server','ipif', vars=iic_vars)
-class FormPage(Resource):
- def render_POST(self, request):
- # find client, update config, etc.
- ci = ipaddress(request.args['i'])
- c = clients[ci]
- pw = request.args['pw']
- if pw != c.pw: raise ValueError('bad password')
-
- # update config
- for r, w in (('mbd', 'max_batch_down'),
- ('mqt', 'max_queue_time'),
- ('mrt', 'max_request_time')):
- try: v = request.args[r]
- except KeyError: continue
- v = int(v)
- c.__dict__[w] = v
-
- try: d = request.args['d']
- except KeyError: d = ''
-
- c.process_arriving_data(d)
- c.new_request(request)
-
def startup():
op = OptionParser()
op.add_option('-c', '--config', dest='configfile',