Resolve comments

2020-11-04 20:05:32 +02:00
parent 8c52c707e1
commit c232f2344c
2 changed files with 179 additions and 151 deletions
--- a/examples/nfct_test.rs
+++ b/examples/nfct_test.rs
@@ -5,34 +5,47 @@ extern crate lang_items;
 extern crate libtock_drivers;

 use core::fmt::Write;
-use libtock_core::result::CommandError;
 use libtock_drivers::console::Console;
-use libtock_drivers::nfc::NfcTag;
-use libtock_drivers::nfc::RecvOp;
-use libtock_drivers::result::FlexUnwrap;
-use libtock_drivers::result::TockError;
-use libtock_drivers::timer;
-use libtock_drivers::timer::Timer;
-use libtock_drivers::timer::Timestamp;

-#[allow(dead_code)]
-/// Helper function to write on console the received packet.
-fn print_rx_buffer(buf: &mut [u8], amount: usize) {
-    if amount < 1 || amount > buf.len() {
-        return;
+#[cfg(not(feature = "with_nfc"))]
+mod example {
+    use super::Console;
+    use super::Write;
+
+    pub fn nfc(console: &mut Console) {
+        writeln!(console, "NFC feature flag is missing!").unwrap();
    }
-    let mut console = Console::new();
-    write!(console, "RX:").unwrap();
-    for byte in buf.iter().take(amount - 1) {
-        write!(console, " {:02x?}", byte).unwrap();
-    }
-    writeln!(console, " {:02x?}", buf[amount - 1]).unwrap();
-    console.flush();
 }

-#[allow(dead_code)]
-/// Function to identify the time elapsed for a transmission request.
-fn bench_transmit(console: &mut Console, timer: &Timer, title: &str, mut buf: &mut [u8]) {
+#[cfg(feature = "with_nfc")]
+mod example {
+
+    use super::Console;
+    use super::Write;
+    use libtock_core::result::CommandError;
+    use libtock_drivers::nfc::NfcTag;
+    use libtock_drivers::nfc::RecvOp;
+    use libtock_drivers::result::FlexUnwrap;
+    use libtock_drivers::result::TockError;
+    use libtock_drivers::timer;
+    use libtock_drivers::timer::Timer;
+    use libtock_drivers::timer::Timestamp;
+
+    /// Helper function to write on console the received packet.
+    fn print_rx_buffer(buf: &mut [u8]) {
+        let mut console = Console::new();
+        write!(console, "RX:").unwrap();
+        if let Some((last, bytes)) = buf.split_last() {
+            for byte in bytes {
+                write!(console, " {:02x?}", byte).unwrap();
+            }
+            writeln!(console, " {:02x?}", last).unwrap();
+        }
+        console.flush();
+    }
+
+    /// Function to identify the time elapsed for a transmission request.
+    fn bench_transmit(console: &mut Console, timer: &Timer, title: &str, mut buf: &mut [u8]) {
        let amount = buf.len();
        let start = Timestamp::<f64>::from_clock_value(timer.get_current_clock().flex_unwrap());
        match NfcTag::transmit(&mut buf, amount) {
@@ -51,44 +64,18 @@ fn bench_transmit(console: &mut Console, timer: &Timer, title: &str, mut buf: &m
        )
        .unwrap();
        console.flush();
-}
+    }

-#[derive(PartialEq, Eq)]
-/// enum for reserving the NFC tag state.
-enum State {
-    Enabled,
-    Disabled,
-}
-
-fn main() {
-    let mut console = Console::new();
-    // Setup the timer with a dummy callback (we only care about reading the current time, but the
-    // API forces us to set an alarm callback too).
-    let mut with_callback = timer::with_callback(|_, _| {});
-    let timer = with_callback.init().flex_unwrap();
-
-    writeln!(console, "****************************************").unwrap();
-    writeln!(console, "nfct_test application is installed").unwrap();
-    writeln!(
-        console,
-        "Clock frequency: {} Hz",
-        timer.clock_frequency().hz()
-    )
-    .unwrap();
-
-    let mut state = State::Disabled;
-    // Variable to count the change in the tag's state
-    let mut state_change_cntr = 0;
-    loop {
-        match state {
-            State::Enabled => {
-                let mut rx_buf = [0; 256];
-                loop {
-                    match NfcTag::receive(&mut rx_buf) {
+    fn receive_packet(console: &mut Console, mut buf: &mut [u8; 256]) {
+        match NfcTag::receive(&mut buf) {
            Ok(RecvOp {
                recv_amount: amount,
                ..
-                        }) => print_rx_buffer(&mut rx_buf, amount),
+            }) => {
+                if amount > 0 && amount <= buf.len() {
+                    print_rx_buffer(&mut buf[..amount]);
+                }
+            }
            Err(TockError::Command(CommandError {
                return_code: -4, /* EOFF: Not Ready */
                ..
@@ -98,8 +85,10 @@ fn main() {
            })) => writeln!(console, " -- Err({})!", value).unwrap(),
            Err(_) => writeln!(console, " -- RX Err").unwrap(),
        }
+    }

-                    match rx_buf[0] {
+    fn transmit_reply(mut console: &mut Console, timer: &Timer, buf: &[u8]) -> bool {
+        match buf[0] {
            0xe0 /* RATS */=> {
                let mut answer_to_select = [0x05, 0x78, 0x80, 0xB1, 0x00];
                bench_transmit(&mut console, &timer, "TX: ATS", &mut answer_to_select);
@@ -109,62 +98,101 @@ fn main() {
                let mut command_error = [0x6A, 0x81];
                bench_transmit(&mut console, &timer, "TX: DESELECT", &mut command_error);
            }
-                        0x02 | 0x03 /* APDU Prefix */ => match rx_buf[2] {
+            0x02 | 0x03 /* APDU Prefix */ => match buf[2] {
                // If the received packet is applet selection command (FIDO 2)
-                            0xa4 /* SELECT */ => if rx_buf[3] == 0x04 && rx_buf[5] == 0x08 && rx_buf[6] == 0xa0 {
+                0xa4 /* SELECT */ => if buf[3] == 0x04 && buf[5] == 0x08 && buf[6] == 0xa0 {
                        // Vesion: "FIDO_2_0"
-                                    let mut reply = [rx_buf[0], 0x46, 0x49, 0x44, 0x4f, 0x5f, 0x32, 0x5f, 0x30, 0x90, 0x00,];
+                        let mut reply = [buf[0], 0x46, 0x49, 0x44, 0x4f, 0x5f, 0x32, 0x5f, 0x30, 0x90, 0x00,];
                        bench_transmit(&mut console, &timer, "TX: Version Str", &mut reply);
                    } else {
-                                    let mut reply = [rx_buf[0], 0x90, 0x00];
+                        let mut reply = [buf[0], 0x90, 0x00];
                        bench_transmit(&mut console, &timer, "TX: 0x9000", &mut reply);
                    }
-                            0xb0 /* READ */ =>  match rx_buf[5] {
+                0xb0 /* READ */ =>  match buf[5] {
                        0x02 => {
-                                    let mut reply = [rx_buf[0], 0x12, 0x90, 0x00,];
+                        let mut reply = [buf[0], 0x12, 0x90, 0x00,];
                        bench_transmit(&mut console, &timer, "TX: File Size", &mut reply);
                    }
                    0x12 => {
-                                    let mut reply = [rx_buf[0], 0xd1, 0x01, 0x0e, 0x55, 0x77, 0x77, 0x77, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x73, 0x6b, 0x2e, 0x64, 0x65, 0x76, 0x90, 0x00,];
+                        let mut reply = [buf[0], 0xd1, 0x01, 0x0e, 0x55, 0x77, 0x77, 0x77, 0x2e, 0x6f, 0x70, 0x65,
+                        0x6e, 0x73, 0x6b, 0x2e, 0x64, 0x65, 0x76, 0x90, 0x00,];
                        bench_transmit(&mut console, &timer, "TX: NDEF", &mut reply);
                    }
                    0x0f => {
-                                    let mut reply = [rx_buf[0], 0x00, 0x0f, 0x20, 0x00, 0x7f, 0x00, 0x7f, 0x04, 0x06, 0xe1, 0x04, 0x00, 0x7f, 0x00, 0x00, 0x90, 0x00,];
+                        let mut reply = [buf[0], 0x00, 0x0f, 0x20, 0x00, 0x7f, 0x00, 0x7f, 0x04, 0x06, 0xe1, 0x04,
+                        0x00, 0x7f, 0x00, 0x00, 0x90, 0x00,];
                        bench_transmit(&mut console, &timer, "TX: CC", &mut reply);
                    }
                    _ => {
-                                    let mut reply = [rx_buf[0], 0x90, 0x00];
+                        let mut reply = [buf[0], 0x90, 0x00];
                        bench_transmit(&mut console, &timer, "TX: 0x9000", &mut reply);
                    }
                }
                _ => {
-                                let mut reply = [rx_buf[0], 0x90, 0x00];
+                    let mut reply = [buf[0], 0x90, 0x00];
                    bench_transmit(&mut console, &timer, "TX: 0x9000", &mut reply);
                }
            }
-                        0x52 | 0x50 /* WUPA | Halt */ => {
+            0x26 | 0x52 | 0x50 /* REQA | WUPA | Halt */ => {
                if NfcTag::disable_emulation() {
                    writeln!(console, " -- TAG DISABLED").unwrap();
                }
-                            state = State::Disabled;
-                            break;
+                return false;
            }
            _ => (),
        }
+        true
    }
-            }
-            State::Disabled => {
-                NfcTag::enable_emulation();
-                // Configure Type 4 tag
-                if NfcTag::configure(4) {
-                    state = State::Enabled;
-                }
-            }
-        }
-        state_change_cntr += 1;
-        if state_change_cntr > 100 && state == State::Disabled {
+
+    pub fn nfc(mut console: &mut Console) {
+        // Setup the timer with a dummy callback (we only care about reading the current time, but the
+        // API forces us to set an alarm callback too).
+        let mut with_callback = timer::with_callback(|_, _| {});
+        let timer = with_callback.init().flex_unwrap();
+
+        writeln!(
+            console,
+            "Clock frequency: {} Hz",
+            timer.clock_frequency().hz()
+        )
+        .unwrap();
+
+        let mut is_enabled = false;
+        let mut state_change_counter = 0;
+        loop {
+            match is_enabled {
+                true => {
+                    let mut rx_buf = [0; 256];
+                    loop {
+                        receive_packet(&mut console, &mut rx_buf);
+                        // If the reader restarts the communication and we can't
+                        // reply to the received packet, then disable the tag.
+                        if !transmit_reply(&mut console, &timer, &rx_buf) {
+                            is_enabled = false;
                            break;
                        }
                    }
+                }
+                false => {
+                    NfcTag::enable_emulation();
+                    // Configure Type 4 tag
+                    if NfcTag::configure(4) {
+                        is_enabled = true;
+                    }
+                }
+            }
+            state_change_counter += 1;
+            if state_change_counter > 100 && is_enabled == false {
+                break;
+            }
+        }
+    }
+}
+
+fn main() {
+    let mut console = Console::new();
+    writeln!(console, "****************************************").unwrap();
+    writeln!(console, "nfct_test application is installed").unwrap();
+    example::nfc(&mut console);
    writeln!(console, "****************************************").unwrap();
 }
--- a/run_desktop_tests.sh
+++ b/run_desktop_tests.sh
@@ -31,7 +31,7 @@ cargo fmt --all -- --check
 cd ../..

 echo "Running Clippy lints..."
-cargo clippy --all-targets --features std --features with_nfc -- -A clippy::new_without_default -D warnings
+cargo clippy --all-targets --features std -- -A clippy::new_without_default -D warnings

 echo "Building sha256sum tool..."
 cargo build --manifest-path third_party/tock/tools/sha256sum/Cargo.toml
@@ -53,7 +53,7 @@ cargo check --release --target=thumbv7em-none-eabi --features debug_ctap,with_ct
 cargo check --release --target=thumbv7em-none-eabi --features debug_ctap,with_ctap1,panic_console,debug_allocations,verbose

 echo "Checking that examples build properly..."
-cargo check --release --target=thumbv7em-none-eabi --examples --features with_nfc
+cargo check --release --target=thumbv7em-none-eabi --examples

 echo "Checking that fuzz targets build properly..."
 cargo fuzz build