WIP: Generalize ArgusProbe for Serial and OpenTestbed inputs #31
Conversation
JelenaKovacc
changed the title
JelenaKovacc
changed the title
malishav
changed the title
ArgusProbe_Beamlogic.py
Outdated
| with self.dataLock: | ||
| pleaseConnect = self.pleaseConnect | ||
|
|
||
| if pleaseConnect: |
There was a problem hiding this comment.
pleaseConnect always set to True, why complicate the code. Please remove the if condition and unnecessary pleaseConnect vars.
| time.sleep(1) | ||
|
|
||
| except Exception as err: | ||
| logCrash(self.name, err) |
There was a problem hiding this comment.
Should you not destroy the thread in this case as well? i.e. call self.close().
ArgusProbe_Beamlogic.py
Outdated
|
|
||
| #======================== public ========================================== | ||
|
|
||
| def connectSerialPort(self): |
There was a problem hiding this comment.
I don't see this method used anywhere in the code. Please remove.
ArgusProbe_Beamlogic.py
Outdated
| print "WARNING: Could not read from serial at \"{0}\".".format( | ||
| self.serialport) | ||
| print "Is device connected?" | ||
| self.goOn = False |
There was a problem hiding this comment.
I suppose both #335 and #336 lines should be within the close() method. Just invoke the method here instead of doing it manually for each case.
ArgusProbe_Beamlogic.py
Outdated
| with self.dataLock: | ||
| self.pleaseConnect = True | ||
|
|
||
| def disconnectSerialPort(self): |
There was a problem hiding this comment.
Please merge disconnectSerialPort and close methods, leaving only close in use throughout the code.
ArgusProbe_Beamlogic.py
Outdated
| self.send_to_parser([ord(c) for c in self.rxBuffer]) | ||
|
|
||
| if self.rxBuffer[0] == 'P': #packet from sniffer SERFRAME_MOTE2PC_SNIFFED_PACKET 'P' | ||
| self.rxBuffer = self.rxBuffer[1:] |
There was a problem hiding this comment.
please add a short comment that you are discarding the type byte.
ArgusProbe_Beamlogic.py
Outdated
| valid_frame = True | ||
|
|
||
| except openhdlc.HdlcException as err: | ||
| #log.warning('{}: invalid serial frame: {} {}'.format(self.name, format_string_buf(temp_buf), err)) |
ArgusProbe_Beamlogic.py
Outdated
|
|
||
| except openhdlc.HdlcException as err: | ||
| #log.warning('{}: invalid serial frame: {} {}'.format(self.name, format_string_buf(temp_buf), err)) | ||
| print 'HDLC Exception' |
There was a problem hiding this comment.
this is too generic of a print, add some context like in the commented warning log just above
Argus is limited to using only BeamLogic device as sniffer. To use nodes over serial or nodes in the testbed as sniffers, we need to extend the ArgusProbe script. In that way, we are not limited by the number of BeamLogic sniffers in the network.