diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README.extcap | 2 | ||||
| -rwxr-xr-x | doc/extcap_example.py | 32 |
2 files changed, 12 insertions, 22 deletions
diff --git a/doc/README.extcap b/doc/README.extcap index f1e27ce01c..3ce07aa161 100644 --- a/doc/README.extcap +++ b/doc/README.extcap @@ -356,7 +356,7 @@ Control packet: The common sync pipe indication. This protocol uses the value 'T'. Message Length: - Payload length + 2 bytes for argument number and command. + Payload length + 2 bytes for control number and command. Control Number: Unique number to identify the control. This number also gives the order of diff --git a/doc/extcap_example.py b/doc/extcap_example.py index e984b374aa..9c14ddeae7 100755 --- a/doc/extcap_example.py +++ b/doc/extcap_example.py @@ -340,28 +340,22 @@ def extcap_capture(interface, fifo, control_in, control_out, in_delay, in_verify message = in_message verify = in_verify counter = 1 - - if not os.path.exists(fifo): - print ( "Fifo does not exist, exiting!", file=sys.stderr ) - sys.exit(1) - fn_out = None - if control_out != None: - fn_out = open(control_out, 'wb', 0) - control_write(fn_out, CTRL_ARG_LOGGER, CTRL_CMD_SET, "Log started at " + time.strftime("%c") + "\n") + with open(fifo, 'wb', 0 ) as fh: + fh.write (pcap_fake_header()) - if control_in != None: - # Start reading thread - thread = Thread(target = control_read_thread, args = (control_in, fn_out)) - thread.start() + if control_out != None: + fn_out = open(control_out, 'wb', 0) + control_write(fn_out, CTRL_ARG_LOGGER, CTRL_CMD_SET, "Log started at " + time.strftime("%c") + "\n") + if control_in != None: + # Start reading thread + thread = Thread(target = control_read_thread, args = (control_in, fn_out)) + thread.start() - if fn_out != None: - control_write_defaults(fn_out) - - with open(fifo, 'wb', 0 ) as fh: - fh.write (pcap_fake_header()) + if fn_out != None: + control_write_defaults(fn_out) while True: if fn_out != None: @@ -383,10 +377,6 @@ def extcap_capture(interface, fifo, control_in, control_out, in_delay, in_verify fn_out.close() def extcap_close_fifo(fifo): - if not os.path.exists(fifo): - print ( "Fifo does not exist!", file=sys.stderr ) - return - # This is apparently needed to workaround an issue on Windows/macOS # where the message cannot be read. (really?) fh = open(fifo, 'wb', 0 ) |