import syslog
+import traceback
+
clients = { }
#---------- "router" ----------
-def route(packet, saddr, daddr):
+def route(packet, iface, saddr, daddr):
def lt(dest):
log_debug(DBG.ROUTE, 'route: %s -> %s: %s' % (saddr,daddr,dest), d=packet)
try: dclient = clients[daddr]
queue_inbound(packet)
elif daddr == relay:
lt('discard relay')
- log_discard(packet, saddr, daddr, 'relay')
+ log_discard(packet, iface, saddr, daddr, 'relay')
else:
lt('discard no-client')
- log_discard(packet, saddr, daddr, 'no-client')
+ log_discard(packet, iface, saddr, daddr, 'no-client')
#---------- client ----------
limit = cfg.getint('limits',k)
self.__dict__[k] = min(req, limit)
- self._pq = PacketQueue(ip, self.max_queue_time)
+ self._pq = PacketQueue(str(ip), self.max_queue_time)
if ip in clients:
raise ValueError('multiple client cfg sections for %s' % ip)
log_debug(dflag, ('client %s: ' % self._ip)+msg, **kwargs)
def process_arriving_data(self, d):
- self._log(DBG.FLOW, 'req data', d=d)
+ self._log(DBG.FLOW, "req data (enc'd)", d=d)
+ if not len(d): return
for packet in slip.decode(d):
(saddr, daddr) = packet_addrs(packet)
if saddr != self._ip:
raise ValueError('wrong source address %s' % saddr)
- route(packet, saddr, daddr)
+ route(packet, self._ip, saddr, daddr)
def _req_cancel(self, request):
- self._log(DBG.HTTPCTRL, 'cancel', idof=request)
+ self._log(DBG.HTTP_CTRL, 'cancel', idof=request)
request.finish()
def _req_error(self, err, request):
- self._log(DBG.HTTPCTRL, 'error %s' % err, idof=request)
+ self._log(DBG.HTTP_CTRL, 'error %s' % err, idof=request)
self._req_cancel(request)
def queue_outbound(self, packet):
self._check_outbound()
def _check_outbound(self):
- log_debug(DBG.HTTPCTRL, 'CHKO')
+ log_debug(DBG.HTTP_CTRL, 'CHKO')
while True:
try: request = self._rq[0]
except IndexError: request = None
def process_request(request, desca):
# find client, update config, etc.
- metadata = request.args['m']
- metadata = metadata.split(b'\n')
- (ci_s, pw, tro) = metadata.split(b'\n')[0:3]
- desca['m'] = [ci_s, tro]
+ metadata = request.args[b'mX'][0]
+ metadata = metadata.split(b'\r\n')
+ (ci_s, pw, tro) = metadata[0:3]
+ desca['m[0,2]'] = [ci_s, tro]
+ ci_s = ci_s.decode('utf-8')
+ tro = int(tro)
+ desca['tro']= tro
ci = ipaddr(ci_s)
desca['ci'] = ci
cl = clients[ci]
raise ValueError('tro must be %d' % cl.target_requests_outstanding)
try:
- d = request.args['d']
+ d = request.args[b'd'][0]
desca['d'] = d
- except KeyError: d = ''
+ except KeyError: d = b''
cl.process_arriving_data(d)
cl.new_request(request)
class IphttpResource(twisted.web.resource.Resource):
isLeaf = True
def render_POST(self, request):
+ log_debug(DBG.HTTP_FULL,
+ 'req recv: ' + repr(request) + ' ' + repr(request.args),
+ idof=id(request))
desca = {'d': None}
try: process_request(request, desca)
except Exception as e:
- emsg = str(e).encode('utf-8')
+ emsg = traceback.format_exc()
log_http(desca, 'EXCEPTION ' + emsg)
request.setHeader('Content-Type','text/plain; charset="utf-8"')
request.setResponseCode(400)
- return emsg
+ return (emsg + ' # ' + repr(desca) + '\r\n').encode('utf-8')
log_http(desca, '... [%s]' % id(request))
return NOT_DONE_YET