git.ucc.asn.au
/
uccvend-vendserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix stupid crypto bug
[uccvend-vendserver.git]
/
sql-edition
/
servers
/
VendingMachine.py
diff --git
a/sql-edition/servers/VendingMachine.py
b/sql-edition/servers/VendingMachine.py
index
52b66cf
..
d7e7a8f
100644
(file)
--- a/
sql-edition/servers/VendingMachine.py
+++ b/
sql-edition/servers/VendingMachine.py
@@
-1,7
+1,8
@@
# vim:ts=4
# vim:ts=4
-import re
, pg
+import re
from CRC import do_crc
from select import select
from CRC import do_crc
from select import select
+import socket, logging
asynchronous_responses = [ '400', '401', # door open/closed
'610', # switches changed
asynchronous_responses = [ '400', '401', # door open/closed
'610', # switches changed
@@
-12,6
+13,8
@@
DOOR = 1
SWITCH = 2
KEY = 3
SWITCH = 2
KEY = 3
+class VendingException(Exception): pass
+
class VendingMachine:
def __init__(self, rfh, wfh):
self.events = []
class VendingMachine:
def __init__(self, rfh, wfh):
self.events = []
@@
-27,7
+30,7
@@
class VendingMachine:
self.wfh.write('PING\n')
code = ''
while code != '000':
self.wfh.write('PING\n')
code = ''
while code != '000':
- (code, _) = self.get_response()
+ code = self.get_response()[0]
self.get_switches()
def await_prompt(self):
self.get_switches()
def await_prompt(self):
@@
-36,8
+39,12
@@
class VendingMachine:
prefix = ''
s = ''
while True:
prefix = ''
s = ''
while True:
- s = self.rfh.read(1)
- if s == '': raise Exception('nothing read!')
+ try:
+ s = self.rfh.read(1)
+ except socket.error:
+ raise VendingException('failed to read input from vending machine')
+ if s == '': raise VendingException('nothing read!')
+ if (s != '#' and s != '%') and state == 1: prefix += s
if s == '\n' or s == '\r':
state = 1
prefix = ''
if s == '\n' or s == '\r':
state = 1
prefix = ''
@@
-56,7
+63,8
@@
class VendingMachine:
s = ''
while s == '':
s = self.rfh.readline()
s = ''
while s == '':
s = self.rfh.readline()
- if s == '': return None
+ if s == '':
+ raise VendingException('Input socket has closed!')
s = s.strip('\r\n')
code = s[0:3]
text = s[4:]
s = s.strip('\r\n')
code = s[0:3]
text = s[4:]
@@
-89,7
+97,7
@@
class VendingMachine:
elif code[0] == '2':
self.events.append((KEY, int(code[1:3])))
else:
elif code[0] == '2':
self.events.append((KEY, int(code[1:3])))
else:
-
sys.stderr.write('WARNING:
Unhandled event! (%s %s)\n'%(code,text))
+
logging.warning('
Unhandled event! (%s %s)\n'%(code,text))
def authed_message(self, message):
if self.challenge == None:
def authed_message(self, message):
if self.challenge == None:
@@
-107,7
+115,7
@@
class VendingMachine:
def vend(self, item):
if not re.search('^[0-9][0-9]$', item):
return (False, 'Invalid item requested (%s)'%item)
def vend(self, item):
if not re.search('^[0-9][0-9]$', item):
return (False, 'Invalid item requested (%s)'%item)
- self.wfh.write(self.authed_message(('V%s
\n'%item)+'\n')
)
+ self.wfh.write(self.authed_message(('V%s
'%item))+'\n'
)
(code, string) = self.get_response()
return (code == '100', code, string)
(code, string) = self.get_response()
return (code == '100', code, string)
@@
-131,8
+139,7
@@
class VendingMachine:
msg += '%02x'%duration
self.wfh.write(msg+'\n')
(code, string) = self.get_response()
msg += '%02x'%duration
self.wfh.write(msg+'\n')
(code, string) = self.get_response()
- # FIXME: workaround a bug in rom W. should be just: return (code == '500', code, string)
- return (code == '500' or code == '501', code, string)
+ return (code == '501', code, string)
def display(self, string):
if len(string) > 10:
def display(self, string):
if len(string) > 10:
@@
-149,6
+156,7
@@
class VendingMachine:
(r, _, _) = select([self.rfh], [], [], timeout)
if r:
self.get_response(async = True)
(r, _, _) = select([self.rfh], [], [], timeout)
if r:
self.get_response(async = True)
+ timeout = 0
else:
break
if len(self.events) == 0: return None
else:
break
if len(self.events) == 0: return None
UCC
git Repository :: git.ucc.asn.au