-
-
Notifications
You must be signed in to change notification settings - Fork 673
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Unified serial PCAPs #452
Unified serial PCAPs #452
Conversation
Actually just thought that the pcapAdd and logAdd can be simplified into a single append() function that works with overloads... I'll do that super quick, and also merge develop branch |
Made the worklow run on pull request synchronize too (pull_request event does opened, synchronize, reopened by default) so new builds are made when PR is updated (was not building after I pushed my new changes) |
@Willy-JL been super busy but I will start testing this with my devices soon. Before I do that, would you mind resolving the MR conflicts? I had added some GPS module stuff to make sure the user has control over the power of the GPS module |
…uder into unified-serial-pcaps
that should do it |
@Willy-JL Thank you for the very comprehensive write-up. I will start testing this and I look forward to merging this once complete. Really awesome work here! Edit: Also really good job navigating my source. It's mostly duct-tape and toothpicks at this point. You have a very high level of patience, that's clear. |
@justcallmekoko any rumors on when the next release might roughly be? Just to have an idea of when the app and tutorials would need to be updated for this change |
Unified serial PCAPs
Main objectives:
[BUF/BEGIN]
and[BUF/CLOSE]
markers-serial
option, no need for separate .bin's anymore-serial
flag everything behaves as before, users won't notice a differenceTechnical details:
do_save
was used to toggle the calls toaddLog()
, while here it was set butaddLog()
was always called, fixed itdo_save
onSDInterface
was a remnant from 4 years ago, set to true and never toggled, removed since it was redundantbuffer_obj
, supporting both sd and serial together:[BUF/BEGIN]
and[BUF/CLOSE]
markers, removesWRITE_PACKETS_SERIAL
restrictions in the whole project since second serial is not an issue anymore, and also the relatedconfigs.h
variables that are left unusedWRITE_PACKETS_SERIAL
config with a-serial
commandline option for all scan/attack commands, no need for a second bin anymoreExample:
What happens:
What the user sees with companion app filtering the markers:
What the companion app saves into the pcap:
Notes:
I had already implemented this about a month ago but with no CLI toggle, it always dumped into serial. That is currently bundled with the latest (v52) release of Xtreme Flipper Zero firmware, along with a modified companion app that handles the markers and dumps to pcap file (see here).
The big concensus is that this is the easiest and most hassle free way to handle serial PCAPs, since it works for all boards and doesnt require fiddling with bins and UARTs. Safe to say this marker method works well and so I decided to improve it and make it easily togglable, which required a deep rework of the
buffer_obj
and capture system, although it's probably for the best since the previous setup was a bit spaghetti-sh.I already verified the serial part to be working as intended, PCAPs land into Flipper storage with no problems. I don't have a board with SD card at hand at the moment to double check this new rework, but I am confident that it should be working as intended, saving to SD card when possible and to serial when set as commandline option.
I will be making a pull request to @0xchocolate 's official companion app to add support for this very shortly.