chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip
[hippotat.git]
/
server
diff --git
a/server
b/server
index 0d75e0b8b1f78cac850c70bf405b8cc50be07c6a..7c66edd2892fd52ea6825fbb9d4b7b594a0e2fab 100755
(executable)
--- a/
server
+++ b/
server
@@
-12,8
+12,6
@@
from twisted.web.server import NOT_DONE_YET
import syslog
import syslog
-import traceback
-
clients = { }
#---------- "router" ----------
clients = { }
#---------- "router" ----------
@@
-61,7
+59,7
@@
class Client():
limit = cfg.getint('limits',k)
self.__dict__[k] = min(req, limit)
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)
if ip in clients:
raise ValueError('multiple client cfg sections for %s' % ip)
@@
-73,7
+71,8
@@
class Client():
log_debug(dflag, ('client %s: ' % self._ip)+msg, **kwargs)
def process_arriving_data(self, d):
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:
for packet in slip.decode(d):
(saddr, daddr) = packet_addrs(packet)
if saddr != self._ip:
@@
-81,11
+80,11
@@
class Client():
route(packet, self._ip, saddr, daddr)
def _req_cancel(self, request):
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):
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._req_cancel(request)
def queue_outbound(self, packet):
@@
-100,7
+99,7
@@
class Client():
self._check_outbound()
def _check_outbound(self):
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
while True:
try: request = self._rq[0]
except IndexError: request = None
@@
-138,10
+137,13
@@
class Client():
def process_request(request, desca):
# find client, update config, etc.
def process_request(request, desca):
# find client, update config, etc.
- metadata = request.args[
'm'
]
+ metadata = request.args[
b'm'][0
]
metadata = metadata.split(b'\r\n')
(ci_s, pw, tro) = metadata[0:3]
desca['m[0,2]'] = [ci_s, tro]
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]
ci = ipaddr(ci_s)
desca['ci'] = ci
cl = clients[ci]
@@
-152,20
+154,27
@@
def process_request(request, desca):
raise ValueError('tro must be %d' % cl.target_requests_outstanding)
try:
raise ValueError('tro must be %d' % cl.target_requests_outstanding)
try:
- d = request.args[
'd'
]
+ d = request.args[
b'd'][0
]
desca['d'] = d
desca['d'] = d
- except KeyError: d = ''
+ desca['dlen'] = len(d)
+ except KeyError:
+ d = b''
+ desca['dlen'] = None
+
+ log_http(desca, 'processing', idof=id(request), d=d)
+
+ d = mime_translate(d)
cl.process_arriving_data(d)
cl.new_request(request)
cl.process_arriving_data(d)
cl.new_request(request)
-def log_http(desca, msg):
+def log_http(desca, msg
, **kwargs
):
try:
try:
-
d
= desca['d']
+
kwargs['d']
= desca['d']
del desca['d']
except KeyError:
del desca['d']
except KeyError:
- d = None
- log_debug(DBG.HTTP, msg + repr(desca),
d=d
)
+ pass
+ log_debug(DBG.HTTP, msg + repr(desca),
**kwargs
)
class IphttpResource(twisted.web.resource.Resource):
isLeaf = True
class IphttpResource(twisted.web.resource.Resource):
isLeaf = True
@@
-177,11
+186,11
@@
class IphttpResource(twisted.web.resource.Resource):
try: process_request(request, desca)
except Exception as e:
emsg = traceback.format_exc()
try: process_request(request, desca)
except Exception as e:
emsg = traceback.format_exc()
- log_http(desca, 'EXCEPTION ' + emsg)
+ log_http(desca, '
RETURNING
EXCEPTION ' + emsg)
request.setHeader('Content-Type','text/plain; charset="utf-8"')
request.setResponseCode(400)
request.setHeader('Content-Type','text/plain; charset="utf-8"')
request.setResponseCode(400)
- return
emsg
.encode('utf-8')
- log_
http(desca, '... [%s]' %
id(request))
+ return
(emsg + ' # ' + repr(desca) + '\r\n')
.encode('utf-8')
+ log_
debug(DBG.HTTP_CTRL, '...', idof=
id(request))
return NOT_DONE_YET
def render_GET(self, request):
return NOT_DONE_YET
def render_GET(self, request):
@@
-221,6
+230,6
@@
def process_cfg():
common_startup()
process_cfg()
common_startup()
process_cfg()
-start_ipif(c.ipif_command,
route
)
+start_ipif(c.ipif_command,
(lambda p,s,d: route(p,"[ipif]",s,d))
)
start_http()
common_run()
start_http()
common_run()