Skip to content

Add new DLT_ and LINKTYPE_ for Silabs Debug Channel. #1081

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.

Sign up for GitHub

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

Closed
tecimovic wants to merge 1 commit into from
Closed

Add new DLT_ and LINKTYPE_ for Silabs Debug Channel. #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pcap-common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,8 +1240,12 @@
*/
#define LINKTYPE_AUERSWALD_LOG 296

#define LINKTYPE_MATCHING_MAX 296 /* highest value in the "matching" range */
/*
* Silicon Labs Debug Channel.
*/
#define LINKTYPE_SILABS_DEBUG_CHANNEL 297

#define LINKTYPE_MATCHING_MAX 297 /* highest value in the "matching" range */

/*
* The DLT_ and LINKTYPE_ values in the "matching" range should be the
Expand Down
1 change: 1 addition & 0 deletions pcap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3330,6 +3330,7 @@ static struct dlt_choice dlt_choices[] = {
DLT_CHOICE(USB_2_0_LOW_SPEED, "Low-Speed USB 2.0/1.1/1.0 as transmitted over the cable"),
DLT_CHOICE(USB_2_0_FULL_SPEED, "Full-Speed USB 2.0/1.1/1.0 as transmitted over the cable"),
DLT_CHOICE(USB_2_0_HIGH_SPEED, "High-Speed USB 2.0 as transmitted over the cable"),
DLT_CHOICE(SILABS_DEBUG_CHANNEL, "Silicon Labs Debug Channel"),
DLT_CHOICE_SENTINEL
};

Expand Down
16 changes: 14 additions & 2 deletions pcap/dlt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,6 +1596,19 @@
*/
#define DLT_AUERSWALD_LOG 296

/*
* Silicon Labs Debug Channel protocol, for communication between Silabs debug adapters and PC.
* This carries packet data for any mesh networking protocols (Zigbee, Bluetooth, Matter, Wi-Fi, etc)
* depending on what application you run on the hardware. It can also carry other payloads, not
* mesh-network related.
*
* Specification can be found at:
* https://github.com/SiliconLabs/java_packet_trace_library/blob/master/doc/debug-channel.md
*
* Requested by Timotej Ecimovic <[email protected]>
*/
#define DLT_SILABS_DEBUG_CHANNEL 297

/*
* In case the code that includes this file (directly or indirectly)
* has also included OS files that happen to define DLT_MATCHING_MAX,
Expand All @@ -1606,7 +1619,6 @@
#ifdef DLT_MATCHING_MAX
#undef DLT_MATCHING_MAX
#endif

#define DLT_MATCHING_MAX 296 /* highest value in the "matching" range */
#define DLT_MATCHING_MAX 297 /* highest value in the "matching" range */

#endif /* !defined(lib_pcap_dlt_h) */