#!/usr/bin/python3
+import twisted
+
import twisted.web.server import Site
from twisted.web.resource import Resource
from twisted.web.server import NOT_DONE_YET
# [relay]
[server]
-ipif_program = userv root ipif %(host),%(relay),%(mtu),slip %(network)
+ipif = userv root ipif %(host),%(relay),%(mtu),slip %(network)
[limits]
max_batch_down = 262144
max_request_time = 121
'''
+class IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol):
+ def __init__(self):
+ self._buffer = b''
+ def connectionMade(self): pass
+ def outReceived(self, data):
+ buffer += data
+ packets = slip_decode(buffer)
+ buffer = packets.pop()
+ for packet in packets:
+ (saddr, daddr) = packet_addrs(packet)
+ route(packet, daddr)
+
+def start_ipif():
+ reactor.spawnProcess(IpifProcessProtocol(),
+ '/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 route(packet. daddr):
try: client = clients[daddr]
except KeyError: dclient = None
if dclient is not None:
dclient.queue_outbound(packet)
- else if daddr = server or daddr not in network:
+ else if daddr = host or daddr not in network:
queue_inbound(packet)
+ else if daddr = relay:
+ log_discard(packet, saddr, daddr, 'relay')
else:
- syslog.syslog(syslog.LOG_DEBUG, 'no client for %s' % daddr)
+ log_discard(packet, saddr, daddr, 'no client')
class Client():
def __init__(self, ip, cs):
def process_arriving_data(self, d):
for packet in slip_decode(d):
- (saddr, daddr) = ip_64_addrs(packet)
+ (saddr, daddr) = packet_addrs(packet)
if saddr != self._ip:
raise ValueError('wrong source address %s' % saddr)
route(packet, daddr)
global network
global host
global relay
+ global ipif_command
network = ipnetwork(cfg.get('virtual','network'))
if network.num_addresses < 3 + 2:
raise ValueError('multiple client cfg sections for %s' % ci)
clients[ci] = Client(ci, cs)
+ iic_vars = { }
+ for k in ('host','relay','mtu','network'):
+ iic_vars[k] = globals()[k]
+
+ ipif_command = cfg.get('server','ipif', vars=iic_vars)
+
class FormPage(Resource):
def render_POST(self, request):
# find client, update config, etc.
if len(args): op.error('no non-option arguments please')
cfg = ConfigParser()
-
+ cfg.read_string(defcfg)
+ cfg.read_file(opts['configfile'])
+ process_cfg()
+
+ start_ipif()
+ start_http()