From d5b0122f41af198bfb4a7ffc6f6f0458ba982331 Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Thu, 15 Feb 2018 16:02:12 -0700 Subject: [PATCH] Switch 'blocking' param. --- mar/formats/20150701/ftp_pasv_transfer.mar | 2 +- mar/formats/20150701/ftp_simple_blocking.mar | 2 +- mar/mar.gen.go | 8 ++++---- plugins/fte/send.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mar/formats/20150701/ftp_pasv_transfer.mar b/mar/formats/20150701/ftp_pasv_transfer.mar index 8b6942e..85b6839 100755 --- a/mar/formats/20150701/ftp_pasv_transfer.mar +++ b/mar/formats/20150701/ftp_pasv_transfer.mar @@ -3,4 +3,4 @@ connection(tcp, ftp_pasv_port): ftp_pasv_transfer end NULL 1 action do_ftp_pasv_transfer: - server fte.send_async("ID3.*", 512) + server fte.send("ID3.*", 512) diff --git a/mar/formats/20150701/ftp_simple_blocking.mar b/mar/formats/20150701/ftp_simple_blocking.mar index 953df13..b4066bc 100755 --- a/mar/formats/20150701/ftp_simple_blocking.mar +++ b/mar/formats/20150701/ftp_simple_blocking.mar @@ -40,7 +40,7 @@ action do_pasv_mode_ok: server tg.send("ftp_entering_passive") action do_ftp_get_file_request: - client fte.send_async("get ([a-zA-Z0-9]*).mp3\n", 128) + client fte.send("get ([a-zA-Z0-9]*).mp3\n", 128) action do_ftp_get_file_response_started: server io.puts("150 Opening data channel for file transfer\n") diff --git a/mar/mar.gen.go b/mar/mar.gen.go index 5c789fe..416b0f7 100644 --- a/mar/mar.gen.go +++ b/mar/mar.gen.go @@ -191,7 +191,7 @@ func formats20150701DummyMar() (*asset, error) { return a, nil } -var _formats20150701Ftp_pasv_transferMar = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x8d\xb1\xca\xc3\x30\x0c\x06\x77\x3f\xc5\x47\xa6\xe4\x27\x04\xfc\x97\x2e\x9d\xbb\x14\x42\xb7\xce\x46\xd8\x32\x74\x91\x8d\x24\x02\x7d\xfb\x42\x28\x74\x48\xd7\x3b\x8e\xcb\x4d\x84\xb3\x3f\x9b\x8c\x9e\xfb\x8c\xea\x3d\x75\xb2\x2d\xf5\xa6\x3e\x5d\x02\x00\x98\x93\xfa\xd7\xb8\x92\x58\x65\x45\x69\xe9\x08\xe3\x9e\x1c\x39\x4b\xc1\xfd\xb1\xae\x88\x21\xd0\x3e\xfc\xd9\x7f\x8e\xac\x1b\x2b\xaa\xf3\x62\x2c\x25\x91\xbd\x24\x8f\xc3\xed\x7a\x5a\xfe\x86\x19\xe7\xf8\x3f\x85\x77\x00\x00\x00\xff\xff\x7d\xb8\x55\xf2\xba\x00\x00\x00") +var _formats20150701Ftp_pasv_transferMar = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x8d\x31\x0b\xc2\x30\x14\x06\xf7\xfc\x8a\x8f\x4e\xad\x94\x42\x14\x17\x67\x17\xa1\xb8\x39\x87\x90\xbc\x80\xcb\x4b\x78\xf9\xe8\xef\x17\x8a\xe0\x50\xd7\x3b\x8e\x4b\x55\x55\x12\xdf\x55\x47\xa6\x36\xa3\xb0\x85\x16\xfb\x16\x5a\x35\x4e\x37\x07\x00\x9d\xd1\xf8\x33\xb4\xa8\xbd\x88\x21\xd7\x70\x84\x7e\x4f\x8e\x5c\x34\xe3\xf9\x5a\x57\x78\xe7\xe2\x3e\xfc\xdb\x7f\x8f\x62\x9b\x18\x0a\x65\xe9\xa2\x79\x1c\x1e\xf7\xcb\x72\x1a\x66\x5c\xfd\x79\x72\x9f\x00\x00\x00\xff\xff\x10\x55\xc9\x23\xb4\x00\x00\x00") func formats20150701Ftp_pasv_transferMarBytes() ([]byte, error) { return bindataRead( @@ -206,12 +206,12 @@ func formats20150701Ftp_pasv_transferMar() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "formats/20150701/ftp_pasv_transfer.mar", size: 186, mode: os.FileMode(493), modTime: time.Unix(1518734726, 0)} + info := bindataFileInfo{name: "formats/20150701/ftp_pasv_transfer.mar", size: 180, mode: os.FileMode(493), modTime: time.Unix(1518735569, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _formats20150701Ftp_simple_blockingMar = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x54\x4d\x8f\xd3\x30\x10\xbd\xf7\x57\x8c\x72\x4a\xd1\x36\x6a\x52\x81\x80\xdb\x0a\x01\x97\x5d\xa8\xe8\x96\x03\x2c\xb2\xbc\xc9\x24\x58\x4d\x6d\xaf\xed\x76\x55\x7e\x3d\x72\x3e\xdc\x38\x75\xaa\xbd\xcd\xc7\x7b\x6f\xc6\x93\x99\xe4\x82\x73\xcc\x0d\x13\x3c\x36\xb9\xbc\x81\x2c\xcd\xd2\xf9\xc7\x19\x00\x80\x36\x54\x19\x50\x48\x8b\x13\x14\x82\xb4\x46\xda\xa4\x5a\xfb\xa0\x51\x71\xba\x47\x9b\x75\x76\x0b\x70\x6e\x6f\x10\xb1\x1b\xc2\xac\xeb\x23\x6d\x44\x52\xad\x5f\x84\x2a\x2c\xd2\xd9\x2d\xcc\xb9\xbd\xd1\x09\x0e\x5d\x1f\xd9\x09\x1e\xc9\x5e\x14\xd8\x41\x3b\xc7\x01\x3b\xdf\x59\xe4\x89\xf1\xc2\xc3\xb6\x91\x11\xa1\x0d\x9e\x5d\xd7\xca\xd9\x1f\x33\xc4\x0e\x4a\x23\x49\x85\x86\x94\xac\x46\xa2\xf0\xf9\x80\xda\x58\x5e\x30\xde\xf2\x83\xa9\x51\x50\x4b\xc1\x35\x92\xe6\x6b\x61\x11\x10\x1c\x01\x82\xca\x23\x8c\xcd\x36\xbd\x1b\x45\xb9\x2e\x51\xf5\xb2\x7e\xf0\x2c\xe5\xc7\x2f\x22\xdd\x84\x82\xf1\x09\x11\x9b\xd2\xac\xe2\x44\x94\x25\x79\x3e\xb0\x66\x54\x7e\xa0\x65\xfa\x31\xe7\xb5\x15\x87\xee\x08\x2e\x76\x80\xbc\x80\x6f\xdb\xbb\x3b\x48\x67\x33\xda\x1c\x81\x5b\xf4\xee\x04\x50\x1d\x51\x01\x13\x89\x3c\x18\x1d\x47\x59\xb6\x84\xfb\x13\x7c\x79\x58\xc3\xa6\x49\x25\x8f\x3c\x9a\x0f\xc9\xfd\x3a\xb7\xfc\xbc\x66\xc8\xcd\x99\xbf\xdd\x7c\xfe\x01\xf7\xa7\x6d\x07\x9a\x22\x13\xb1\x0b\xd7\x5f\xf7\x57\x60\x77\x81\x29\xfb\xa5\x84\xba\x22\xd8\xdf\x82\xd7\x8d\xa9\x12\x8d\xbc\x88\x23\x29\xe4\xca\x41\xc2\xc4\xc9\x4e\xb2\xd5\x12\x6c\xd5\x41\x71\xa8\x45\x55\x61\x01\x8c\x5f\x4c\xc5\xdd\x41\x78\x2c\xeb\xdb\xcd\xcf\x49\x4a\x73\x6c\x5e\x13\xf9\x5f\xca\x39\xd6\x89\x4d\xc4\x91\xdb\x1c\x29\x94\x99\xd2\x18\x3d\xc3\x8d\xc0\x92\x91\x1b\x54\x8c\x57\xcd\xa3\xd9\x11\x7d\x8d\xd0\x09\x7a\xaf\x28\x0d\x36\x62\x84\xea\x13\xcf\xe3\xa8\x42\x03\xf1\x6f\xba\xf8\x77\xbb\xf8\xb5\x5c\x7c\xf8\xf3\x66\x9e\xec\xe5\xea\x91\x47\x37\x90\x66\xef\xaf\x69\xfb\x47\x18\x9e\x7b\xfa\x76\x09\xdf\x25\x72\xc6\x2b\x28\xa8\xa1\xfd\x30\x9a\x45\xb0\x3a\xd0\x1f\xd0\x78\xa0\x17\x17\xe6\x15\xb0\x53\xaa\x13\x2d\xe9\x0b\x1f\x8c\xb4\x87\xda\xde\xe7\xc3\x47\xbf\x06\x7e\xad\xf6\xf4\x5e\x65\xef\xe0\xa1\xff\x8f\x7c\x12\x7b\x59\xa3\xc1\x8b\x7d\xf2\x6e\x3e\xbc\x53\x36\x33\x49\x9b\xae\x9e\xc2\x57\x21\x8a\xa7\x53\x57\xf3\x7f\x00\x00\x00\xff\xff\x39\x65\x6d\x40\x1f\x07\x00\x00") +var _formats20150701Ftp_simple_blockingMar = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x54\x4d\x8f\xd3\x30\x10\xbd\xf7\x57\x8c\x7a\x6a\xd1\x36\x6a\x52\x81\x80\xdb\x0a\x01\x97\x5d\xa8\xe8\x96\x03\x2c\xb2\xbc\xf1\x24\x58\x4d\x6d\xaf\xed\x76\x55\x7e\x3d\x72\x3e\xdc\x38\x75\xaa\xbd\xcd\xc7\x7b\x6f\xc6\x93\x99\xe4\x52\x08\xcc\x2d\x97\x62\x66\x73\x75\x03\x59\x9a\xa5\xf3\x8f\x13\x00\x00\x63\xa9\xb6\xa0\x91\xb2\x13\x30\x49\x1a\x23\xad\x53\x8d\x7d\x30\xa8\x05\xdd\xa3\xcb\x7a\xbb\x01\x78\xb7\x33\x88\xdc\xf5\x61\xce\x0d\x91\x2e\xa2\xa8\x31\x2f\x52\x33\x87\xf4\x76\x03\xf3\x6e\x67\xb4\x82\x7d\x37\x44\xb6\x82\x47\xb2\x97\x0c\x5b\x68\xeb\x78\x60\xeb\x7b\x8b\x3c\x71\xc1\x02\x6c\x13\x19\x10\x9a\xe0\xd9\xf5\xad\x9c\xfd\x21\x43\xee\xa0\xb0\x8a\x94\x68\x49\xc1\x2b\x24\x1a\x9f\x0f\x68\xac\xe3\x45\xe3\x0d\x3f\x9a\x1a\x04\x8d\x92\xc2\x20\xa9\xbf\x16\xb2\x88\xe0\x00\x10\x55\x1e\x60\x5c\xb6\xee\xdd\x6a\x2a\x4c\x81\xba\x93\x0d\x83\x67\xa9\x30\x7e\x11\x69\x27\x14\x8d\x8f\x88\xb8\x94\xe1\xa5\x20\xb2\x28\xc8\xf3\x81\xd7\xa3\x0a\x03\x0d\x33\x8c\x79\xaf\xa9\xd8\x77\x07\x70\xb9\x03\x14\x0c\xbe\x6d\xef\xee\x20\x9d\x4c\x68\x7d\x04\x7e\xd1\xdb\x13\x40\x7d\x44\x0d\x5c\x26\xea\x60\xcd\x6c\x9a\x65\x4b\xb8\x3f\xc1\x97\x87\x35\x6c\xea\x54\xf2\x28\xa6\xf3\x3e\xb9\x5b\xe7\x86\x9f\x57\x1c\x85\x3d\xf3\xb7\x9b\xcf\x3f\xe0\xfe\xb4\x6d\x41\x63\x64\x22\x77\xf1\xfa\xeb\xee\x0a\xdc\x2e\x70\xed\xbe\x94\xd4\x57\x04\xbb\x5b\x08\xba\xb1\x65\x62\x50\xb0\xd9\x54\x49\xb5\xf2\x90\x38\x71\xb4\x93\x6c\xb5\x04\x57\xb5\x57\x1c\x2a\x59\x96\xc8\x80\x8b\x8b\xa9\xf8\x3b\x88\x8f\x65\x7d\xbb\xf9\x39\x4a\xa9\x8f\x2d\x68\x22\xff\x4b\x85\xc0\x2a\x71\x89\xd9\xd4\x6f\x8e\x92\xda\x8e\x69\x0c\x9e\xe1\x47\xe0\xc8\x28\x2c\x6a\x2e\xca\xfa\xd1\xfc\x88\xa1\x46\xec\x04\x83\x57\x14\x16\x5b\xb1\x12\x2d\xcc\x7e\xd3\xc5\xbf\xdb\xc5\xaf\xe5\xe2\xc3\x9f\x37\xf3\x64\xaf\x56\x8f\x62\x7a\x03\x69\xf6\xfe\x9a\x6a\x78\x7e\xf1\x89\xa7\x6f\x97\xf0\x5d\xa1\xe0\xa2\x04\x46\x2d\xed\xc6\x50\xaf\x80\xd3\x81\xee\x74\x86\xa3\xbc\xb8\xad\xa0\x80\x9b\x4f\x95\x18\x45\x5f\x44\x6f\x98\x1d\xd4\xf5\x3e\xef\x3f\xf7\x35\xf0\x6b\xb5\xc7\x37\x2a\x7b\x07\x0f\xdd\x1f\xe4\x93\xdc\xab\x0a\x2d\x5e\x6c\x52\x70\xed\xf1\x6d\x72\x99\x51\xda\x78\xf5\x14\xbe\x4a\xc9\x9e\x4e\x6d\xcd\xff\x01\x00\x00\xff\xff\x8f\x96\xc0\xdf\x19\x07\x00\x00") func formats20150701Ftp_simple_blockingMarBytes() ([]byte, error) { return bindataRead( @@ -226,7 +226,7 @@ func formats20150701Ftp_simple_blockingMar() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "formats/20150701/ftp_simple_blocking.mar", size: 1823, mode: os.FileMode(493), modTime: time.Unix(1518734649, 0)} + info := bindataFileInfo{name: "formats/20150701/ftp_simple_blocking.mar", size: 1817, mode: os.FileMode(493), modTime: time.Unix(1518735661, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/plugins/fte/send.go b/plugins/fte/send.go index 110400d..1d9bd35 100644 --- a/plugins/fte/send.go +++ b/plugins/fte/send.go @@ -65,13 +65,13 @@ func send(fsm marionette.FSM, args []interface{}, blocking bool) error { cell = fsm.StreamSet().Dequeue(capacity) if cell != nil { break - } else if !blocking { + } else if blocking { logger.Debug("no cell, sending empty cell") cell = marionette.NewCell(0, 0, 0, marionette.NORMAL) break } - // Wait until new data is available if blocking. + // Wait until new data is available unless blocking. <-notify }