import sys
import os
-import twisted
import twisted.internet
import twisted.internet.endpoints
-from twisted.internet import reactor
from twisted.web.server import NOT_DONE_YET
from twisted.logger import LogLevel
import syslog
-from hippotit import *
+from hippotat import *
clients = { }
max_batch_down = 65536
max_queue_time = 10
max_request_time = 54
+target_requests_outstanding = 3
[virtual]
mtu = 1500
max_batch_down = 262144
max_queue_time = 121
max_request_time = 121
+target_requests_outstanding = 10
'''
#---------- error handling ----------
# 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''
- def connectionMade(self): pass
- def outReceived(self, data):
- #print('RECV ', repr(data))
- self._buffer += data
- packets = slip.decode(self._buffer)
- self._buffer = packets.pop()
- for packet in packets:
- if not len(packet): continue
- (saddr, daddr) = packet_addrs(packet)
- route(packet, saddr, daddr)
- def processEnded(self, status):
- status.raiseException()
-
-def start_ipif():
- global ipif
- ipif = IpifProcessProtocol()
- reactor.spawnProcess(ipif,
- '/bin/sh',['sh','-xc', ipif_command],
- childFDs={0:'w', 1:'r', 2:2})
-
-def queue_inbound(packet):
- ipif.transport.write(slip.delimiter)
- ipif.transport.write(slip.encode(packet))
- ipif.transport.write(slip.delimiter)
-
#---------- client ----------
class Client():
self._cs = cs
self.pw = cfg.get(cs, 'password')
self._rq = collections.deque() # requests
- self._pq = collections.deque() # packets
+ # self._pq = PacketQueue(...)
# plus from config:
# .max_batch_down
# .max_queue_time
# .max_request_time
- for k in ('max_batch_down','max_queue_time','max_request_time'):
+ # .target_requests_outstanding
+ for k in ('max_batch_down','max_queue_time','max_request_time',
+ 'target_requests_outstanding'):
req = cfg.getint(cs, k)
limit = cfg.getint('limits',k)
self.__dict__[k] = min(req, limit)
+ self._pq = PacketQueue(self.max_queue_time)
def process_arriving_data(self, d):
for packet in slip.decode(d):
self._req_cancel(request)
def queue_outbound(self, packet):
- self._pq.append((time.monotonic(), packet))
+ self._pq.append(packet)
def http_request(self, request):
request.setHeader('Content-Type','application/octet-stream')
self._rq.popleft()
continue
- # now request is an unfinished request, or None
- try: (queuetime, packet) = self._pq[0]
- except IndexError:
+ if not self._pq.nonempty():
# no packets, oh well
- break
-
- age = time.monotonic() - queuetime
- if age > self.max_queue_time:
- self._pq.popleft()
continue
if request is None:
# request, and also some non-expired packets
while True:
- try: (dummy, packet) = self._pq[0]
- except IndexError: break
+ packet = self.pq.popleft()
+ if packet is None: break
encoded = slip.encode(packet)
request.finish()
# round again, looking for more to do
+ while len(self._rq) > self.target_requests_outstanding:
+ request = self._rq.popleft()
+ request.finish()
+
class IphttpResource(twisted.web.resource.Resource):
isLeaf = True
def render_POST(self, request):
# update config
for r, w in (('mbd', 'max_batch_down'),
('mqt', 'max_queue_time'),
- ('mrt', 'max_request_time')):
+ ('mrt', 'max_request_time'),
+ ('tro', 'target_requests_outstanding')):
try: v = request.args[r]
except KeyError: continue
v = int(v)
c.new_request(request)
def render_GET(self, request):
- return b'<html><body>hippotit</body></html>'
+ return b'<html><body>hippotat</body></html>'
def start_http():
resource = IphttpResource()
cfg.read(opts.configfile)
process_cfg()
- start_ipif()
+ start_ipif(ipif_command, route)
start_http()
startup()