fixes

[hippotat] / client

#!/usr/bin/python3

from hippotat import *

client_cs = None

def set_client(ci,cs,pw):
  global client_cs
  global password
  assert(client_cs is None)
  client_cs = cs
  c.client = ci
  c.max_outstanding = cfg.getint(cs, 'max_requests_outstanding')
  c.target_outstanding = cfg.getint(cs, 'target_requests_outstanding')
  password = pw

def process_cfg():
  global url
  global max_requests_outstanding

  process_cfg_common_always()
  process_cfg_server()

  try:
    c.url = cfg.get('server','url')
  except NoOptionError:
    process_cfg_saddrs()
    sa = c.saddrs[0].url()

  process_cfg_clients(set_client)

  c.routes = cfg.get('virtual','routes')
  c.max_queue_time = cfg.getint(client_cs, 'max_queue_time')
  c.max_batch_up   = cfg.getint(client_cs, 'max_batch_up')

  process_cfg_ipif(client_cs,
                   (('local', 'client'),
                    ('peer',  'server'),
                    ('rnets', 'routes')))

outstanding = 0

def start_client():
  global queue
  global agent
  queue = PacketQueue(c.max_queue_time)
  agent = twisted.web.client.Agent(reactor, connectTimeout = c.http_timeout)

def outbound(packet, saddr, daddr):
  #print('OUT ', saddr, daddr, repr(packet))
  queue.append(packet)
  check_outbound()

def req_ok(resp):
  

def req_err(err):
  print(err, >>sys.stderr)

def req_fin(*args):  
  outstanding--

def check_outbound():
  while True:
    if                         outstanding >= c.max_outstanding   : break
    if not queue.nonempty() && outstanding >= c.target_outstanding: break

    d = b''
    queue.process((lambda: len(d)),
                  (lambda s: d += s),
                  c.max_batch_up)
    assert(len(d))
    
    crlf = b'\r\n'
    mime = (b'--b'                                      + crlf +
            b'Content-Disposition: form-data; name="m"' + crlf +
            password                                    + crlf +
            c.client                                    + crlf +
            c.target_outstanding                        + crlf +
            b'--b'                                      + crlf +
            b'Content-Disposition: form-data; name="d"' + crlf +
            mime_translate(d)                           + crlf +
            b'--b--'                                    + crlf)

    hh = { 'User-Agent': ['hippotat'],
           'Content-Type': ['multipart/form-data; boundary="b"'] }
    req = agent.request(b'POST',
                        c.url,
                        twisted.web.client.Headers(hh))
    req.addTimeout(c.http_timeout, 
    req.addCallbacks(req_ok, req_err)
    req.addBoth(req_fin)
    outstanding++

common_startup()
process_cfg()
start_client()
start_ipif(c.ipif_command, outbound)
common_run()