chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes
[hippotat.git]
/
server
diff --git
a/server
b/server
index b9aa6f26beacdd612905926996d7c4ae05cfc70d..ab92be07b0691bfb80051fed5e71ad585d42638f 100755
(executable)
--- a/
server
+++ b/
server
@@
-61,7
+61,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)
@@
-74,6
+74,7
@@
class Client():
def process_arriving_data(self, d):
self._log(DBG.FLOW, 'req data', d=d)
def process_arriving_data(self, d):
self._log(DBG.FLOW, 'req data', 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
+82,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
+101,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
@@
-157,7
+158,7
@@
def process_request(request, desca):
try:
d = request.args[b'd']
desca['d'] = d
try:
d = request.args[b'd']
desca['d'] = d
- except KeyError: d = ''
+ except KeyError: d =
b
''
cl.process_arriving_data(d)
cl.new_request(request)
cl.process_arriving_data(d)
cl.new_request(request)