revpi/revpipyload
1
0
Fork 0
mirror of https://github.com/naruxde/revpipyload.git synced 2025-11-08 23:23:52 +01:00
Code Issues Packages Releases Wiki Activity

ACL Regex angepasst

Browse Source 
Controlbyte für Schreiben
This commit is contained in:
Sven Sager
2017-08-14 13:30:16 +02:00
parent f0eecb8930
commit 239cd9eee7
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
revpipyload/revpipyload.py
View File

@@ -58,7 +58,7 @@ procimg = "/dev/piControl0"
pyloadverion = "0.5.0" pyloadverion = "0.5.0"
rapcatalog = None rapcatalog = None
re_ipacl = "(([\\d\\*]{1,3}\\.){3}[\\d\\*]{1,3},[0-1] ?)+" re_ipacl = "(([\\d\\*]{1,3}\\.){3}[\\d\\*]{1,3},[0-1] ?)*"
def _ipmatch(ipaddress, dict_acl): def _ipmatch(ipaddress, dict_acl):
@@ -649,24 +649,26 @@ class RevPiSlaveDev(Thread):
elif cmd == b'SD' and self._acl == 1: elif cmd == b'SD' and self._acl == 1:
# Ausgänge empfangen, wenn acl es erlaubt # Ausgänge empfangen, wenn acl es erlaubt
# bCMiiii00000000b = 16 # bCMiiiic0000000b = 16
position = int.from_bytes(netcmd[3:5], byteorder="little") position = int.from_bytes(netcmd[3:5], byteorder="little")
length = int.from_bytes(netcmd[5:7], byteorder="little") length = int.from_bytes(netcmd[5:7], byteorder="little")
control = netcmd[7:8]
try: if control == b'\x1d' and length > 0:
block = self._devcon.recv(length) try:
except: block = self._devcon.recv(length)
proginit.logger.error("error while recv data to write") except:
break proginit.logger.error("error while recv data to write")
fh_proc.seek(position) break
fh_proc.seek(position)
# Länge der Daten prüfen # Länge der Daten prüfen
if len(block) == length: if len(block) == length:
fh_proc.write(block) fh_proc.write(block)
else: else:
proginit.logger.error("got wrong length to write") proginit.logger.error("got wrong length to write")
break break
# Record seperator character # Record seperator character
self._devcon.send(b'\x1e') self._devcon.send(b'\x1e')
@@ -783,9 +785,7 @@ class RevPiSlaveDev(Thread):
fh_proc.seek(pos) fh_proc.seek(pos)
fh_proc.write(self.ey_dict[pos]) fh_proc.write(self.ey_dict[pos])
proginit.logger.error( proginit.logger.error("dirty shutdown of connection")
"dirty shutdown of connection"
)
fh_proc.close() fh_proc.close()
self._devcon.close() self._devcon.close()