Mirrors
/
OpenModem
mirror of https://github.com/markqvist/OpenModem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implemented PCAP format packet capture to SD

This commit is contained in:
Mark Qvist 2019-11-04 11:00:31 +01:00
parent 8e60c1e52c
commit f5a2aafeb8
3 changed files with 87 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hardware/AFSK.c
View File

@ -7,6 +7,8 @@
#include "util/Config.h" #include "util/Config.h"
extern volatile ticks_t _clock; extern volatile ticks_t _clock;
extern volatile uint32_t _rtc_seconds;
extern volatile uint16_t _rtc_seconds_accu;
bool hw_afsk_dac_isr = false; bool hw_afsk_dac_isr = false;
bool hw_5v_ref = false; bool hw_5v_ref = false;
@ -51,6 +53,10 @@ void AFSK_dac_init(void) {
} }
void AFSK_adc_init(void) { void AFSK_adc_init(void) {
_clock = 0;
_rtc_seconds = 0;
_rtc_seconds_accu = 0;
// Set Timer1 to normal operation // Set Timer1 to normal operation
TCCR1A = 0; TCCR1A = 0;
@ -579,4 +585,8 @@ ISR(ADC_vect) {
update_led_status(); update_led_status();
++_clock; ++_clock;
if (++_rtc_seconds_accu >= CLOCK_TICKS_PER_SEC) {
_rtc_seconds++;
_rtc_seconds_accu = 0;
}
} }

73
protocol/KISS.c
View File

@ -135,21 +135,6 @@ void kiss_messageCallback(AX25Ctx *ctx) {
} }
if (integrity_ok) { if (integrity_ok) {
bool log_write_ok = false;
if (config_log_packets && sd_mounted()) {
if (log_ready || log_init()) {
// TODO: Assertion here on max path length
memset(log_filename, 0x00, sizeof(log_filename));
snprintf(log_filename, sizeof(log_filename), "%s/%lu.pkt", PATH_LOG, log_index);
// Open file descriptor
log_fr = f_open(&log_fp, log_filename, FA_CREATE_NEW | FA_WRITE);
if (log_fr == FR_OK) {
log_write_ok = true;
}
}
}
fputc(FEND, &serial->uart0); fputc(FEND, &serial->uart0);
fputc(0x00, &serial->uart0); fputc(0x00, &serial->uart0);
for (unsigned i = 0; i < ctx->frame_len-2; i++) { for (unsigned i = 0; i < ctx->frame_len-2; i++) {
@ -163,16 +148,31 @@ void kiss_messageCallback(AX25Ctx *ctx) {
} else { } else {
fputc(b, &serial->uart0); fputc(b, &serial->uart0);
} }
if (log_write_ok) {
UINT written = 0;
log_fr = f_write(&log_fp, &b, 1, &written);
}
} }
fputc(FEND, &serial->uart0); fputc(FEND, &serial->uart0);
if (config_log_packets && sd_mounted() && log_ready) { ticks_t start_t = timer_clock();
if (config_log_packets && sd_mounted()) {
if (log_ready || log_init()) {
log_fr = f_open(&log_fp, log_filename, FA_OPEN_APPEND | FA_WRITE);
if (log_fr == FR_OK) {
// Write PCAP segment to file
UINT written = 0;
uint32_t pcap_ts_sec = rtc_seconds();
uint32_t pcap_ts_usec = (rtc_milliseconds()*(uint32_t)1000);
uint32_t pcap_incl_len = ctx->frame_len;
uint32_t pcap_orig_len = ctx->frame_len;
f_write(&log_fp, &pcap_ts_sec, sizeof(pcap_ts_sec), &written);
f_write(&log_fp, &pcap_ts_usec, sizeof(pcap_ts_usec), &written);
f_write(&log_fp, &pcap_incl_len, sizeof(pcap_incl_len), &written);
f_write(&log_fp, &pcap_orig_len, sizeof(pcap_orig_len), &written);
f_write(&log_fp, ctx->buf, ctx->frame_len, &written);
// Close handle and flush to disk
f_close(&log_fp); f_close(&log_fp);
update_log_index(); }
}
} }
} }
#endif #endif
@ -200,11 +200,41 @@ bool log_init(void) {
} }
if (load_log_index()) { if (load_log_index()) {
memset(log_filename, 0x00, sizeof(log_filename));
snprintf(log_filename, sizeof(log_filename), "%s/%lu.pcap", PATH_LOG, log_index);
update_log_index();
log_fr = f_open(&log_fp, log_filename, FA_CREATE_NEW | FA_WRITE);
if (log_fr == FR_OK) {
uint32_t pcap_magic_number = 0xa1b2c3d4;
uint16_t pcap_maj_version = 0x0002;
uint16_t pcap_min_version = 0x0004;
int32_t pcap_thiszone = 0;
uint32_t pcap_sigfigs = 0;
uint32_t pcap_snaplen = AX25_MAX_FRAME_LEN;
uint32_t pcap_network = 0x00000003;
// Write PCAP header
UINT written = 0;
f_write(&log_fp, &pcap_magic_number, sizeof(pcap_magic_number), &written);
f_write(&log_fp, &pcap_maj_version, sizeof(pcap_maj_version), &written);
f_write(&log_fp, &pcap_min_version, sizeof(pcap_min_version), &written);
f_write(&log_fp, &pcap_thiszone, sizeof(pcap_thiszone), &written);
f_write(&log_fp, &pcap_sigfigs, sizeof(pcap_sigfigs), &written);
f_write(&log_fp, &pcap_snaplen, sizeof(pcap_snaplen), &written);
f_write(&log_fp, &pcap_network, sizeof(pcap_network), &written);
// Close handle
f_close(&log_fp);
log_ready = true; log_ready = true;
return true; return true;
} else { } else {
return false; return false;
} }
} else {
return false;
}
} else { } else {
return false; return false;
@ -552,7 +582,6 @@ void kiss_serialCallback(uint8_t sbyte) {
kiss_output_modem_mode(); kiss_output_modem_mode();
} }
} }
} }
} }

22
util/time.h
View File

@ -12,6 +12,9 @@ typedef int32_t ticks_t;
typedef int32_t mtime_t; typedef int32_t mtime_t;
volatile ticks_t _clock; volatile ticks_t _clock;
volatile uint32_t _rtc_seconds;
volatile uint16_t _rtc_seconds_accu;
static inline ticks_t timer_clock(void) { static inline ticks_t timer_clock(void) {
ticks_t result; ticks_t result;
@ -22,11 +25,28 @@ static inline ticks_t timer_clock(void) {
return result; return result;
} }
inline ticks_t ms_to_ticks(mtime_t ms) { inline ticks_t ms_to_ticks(mtime_t ms) {
return ms * DIV_ROUND(CLOCK_TICKS_PER_SEC, 1000); return ms * DIV_ROUND(CLOCK_TICKS_PER_SEC, 1000);
} }
inline mtime_t ticks_to_ms(ticks_t ticks) {
return DIV_ROUND(ticks, DIV_ROUND(CLOCK_TICKS_PER_SEC, 1000));
}
static inline uint32_t rtc_seconds(void) {
uint32_t result;
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
result = _rtc_seconds;
}
return result;
}
static inline mtime_t rtc_milliseconds(void) {
return ticks_to_ms(timer_clock() % CLOCK_TICKS_PER_SEC);
}
inline void cpu_relax(void) { inline void cpu_relax(void) {
// Do nothing! // Do nothing!
} }