mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2026-08-29 03:18:17 +00:00
Philippe Teuwen
7fb8927523
Bug triggered with: lf read -s 50000 hw ping ReadLF_realtime() in lfsampling.c never knew how many samples the client wanted — for the realtime path, lf_sample_payload_t.samples was never populated on the client side, and the ARM handler in appmain.c (CMD_LF_ACQ_RAW_ADC/CMD_LF_SNIFF_RAW_ADC) ignored it anyway. So the device just streamed samples indefinitely, only checking for a stop request roughly once per 64-sample USB burst, and even after noticing it, flushed one more trailing partial burst via async_usb_write_stop(). Meanwhile the client (WaitForRawDataTimeout in comms.c) stops listening in raw mode the instant it has collected exactly the number of bytes it asked for (e.g. 50000), then switches back to normal framed-packet parsing. Since the device kept sending more bytes past that point, those extra bytes sat unread in the pipe and got misinterpreted as a PacketResponseNGPreamble/OLD-frame header, corrupting every subsequent USB exchange (hw ping, etc.) — reproducible even with a plain lf read -s 50000, no trigger/COTAG needed. Moreover, we make sure the client doesn't stop listening, even briefly, during stream reception.
132 lines
4.5 KiB
C
132 lines
4.5 KiB
C
//-----------------------------------------------------------------------------
|
|
// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// See LICENSE.txt for the text of the license.
|
|
//-----------------------------------------------------------------------------
|
|
#ifndef __LFSAMPLING_H
|
|
#define __LFSAMPLING_H
|
|
|
|
#include "common.h"
|
|
#include "pm3_cmd.h"
|
|
|
|
typedef struct {
|
|
uint8_t *buffer;
|
|
uint32_t numbits;
|
|
uint32_t position;
|
|
} BitstreamOut_t;
|
|
|
|
typedef struct {
|
|
int dec_counter;
|
|
uint32_t sum;
|
|
uint32_t counter;
|
|
uint32_t total_saved;
|
|
} sampling_t;
|
|
|
|
/**
|
|
* acquisition of Cotag LF signal. Similar to other LF, since the Cotag has such long datarate RF/384
|
|
* and is Manchester?, we directly gather the manchester data into bigbuff
|
|
**/
|
|
void doCotagAcquisition(void);
|
|
uint16_t doCotagAcquisitionManchester(uint8_t *dest, uint16_t destlen);
|
|
|
|
/**
|
|
* acquisition of T55x7 LF signal. Similar to other LF, but adjusted with @marshmellows thresholds
|
|
* the data is collected in BigBuf.
|
|
**/
|
|
void doT55x7Acquisition(size_t sample_size, bool ledcontrol);
|
|
|
|
/**
|
|
* Initializes the FPGA for reader-mode (field on), and acquires the samples.
|
|
* @return number of bits sampled
|
|
**/
|
|
uint32_t SampleLF(bool verbose, uint32_t sample_size, bool ledcontrol, bool cotag);
|
|
|
|
/**
|
|
* Do LF sampling and send samples to the USB
|
|
*
|
|
* Uses parameters in config. Only bits_per_sample = 8 is working now
|
|
*
|
|
* @param reader_field - true for reading tags, false for sniffing
|
|
* @param sample_limit - stop once this many samples have been streamed, 0 = unlimited
|
|
* @return sampling result
|
|
**/
|
|
int ReadLF_realtime(bool reader_field, bool cotag, uint32_t sample_limit);
|
|
|
|
/**
|
|
* Initializes the FPGA for sniff-mode (field off), and acquires the samples.
|
|
* @return number of bits sampled
|
|
**/
|
|
uint32_t SniffLF(bool verbose, uint32_t sample_size, bool ledcontrol);
|
|
|
|
uint32_t DoAcquisition(uint8_t decimation, uint8_t bits_per_sample, bool avg, int16_t trigger_threshold,
|
|
bool verbose, uint32_t sample_size, uint32_t cancel_after, int32_t samples_to_skip, bool ledcontrol);
|
|
|
|
// adds sample size to default options
|
|
uint32_t DoPartialAcquisition(int trigger_threshold, bool verbose, uint32_t sample_size, uint32_t cancel_after, bool ledcontrol);
|
|
|
|
/**
|
|
* @brief Does sample acquisition, ignoring the config values set in the sample_config.
|
|
* This method is typically used by tag-specific readers who just wants to read the samples
|
|
* the normal way
|
|
* @param trigger_threshold
|
|
* @param verbose
|
|
* @return number of bits sampled
|
|
*/
|
|
uint32_t DoAcquisition_default(int trigger_threshold, bool verbose, bool ledcontrol);
|
|
/**
|
|
* @brief Does sample acquisition, using the config values set in the sample_config.
|
|
* @param trigger_threshold
|
|
* @param verbose
|
|
* @return number of bits sampled
|
|
*/
|
|
|
|
uint32_t DoAcquisition_config(bool verbose, uint32_t sample_size, bool ledcontrol);
|
|
|
|
/**
|
|
* Refactoring of lf sampling buffer
|
|
*/
|
|
void initSampleBuffer(uint32_t *sample_size);
|
|
void initSampleBufferEx(uint32_t *sample_size, bool use_malloc);
|
|
void logSampleSimple(uint8_t sample);
|
|
void logSample(uint8_t sample, uint8_t decimation, uint8_t bits_per_sample, bool avg);
|
|
uint32_t getSampleCounter(void);
|
|
|
|
/**
|
|
* Setup the FPGA to listen for samples. This method downloads the FPGA bitstream
|
|
* if not already loaded, sets divisor and starts up the antenna.
|
|
* @param divisor : 1, 88> 255 or negative ==> 134.8 kHz
|
|
* 0 or 95 ==> 125 kHz
|
|
*
|
|
**/
|
|
void LFSetupFPGAForADC(int divisor, bool reader_field);
|
|
|
|
/**
|
|
* Called from the USB-handler to set the sampling configuration
|
|
* The sampling config is used for std reading and sniffing.
|
|
*
|
|
* Other functions may read samples and ignore the sampling config,
|
|
* such as functions to read the UID from a prox tag or similar.
|
|
*
|
|
* Values set to '0' implies no change (except for averaging)
|
|
* @brief setSamplingConfig
|
|
* @param sc
|
|
*/
|
|
void setSamplingConfig(const sample_config *sc);
|
|
void setDefaultSamplingConfig(void);
|
|
sample_config *getSamplingConfig(void);
|
|
|
|
void printLFConfig(void);
|
|
void printSamples(void);
|
|
|
|
#endif // __LFSAMPLING_H
|