Skip to content
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

[ANDI-8996/AnAm]: Added prototype to parse VLAN encapsulated TECMP pa… #6

Merged
merged 10 commits into from
Sep 19, 2022
Merged

[ANDI-8996/AnAm]: Added prototype to parse VLAN encapsulated TECMP pa… #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a7a2692
[ANDI-8996/AnAm]: Added prototype to parse VLAN encapsulated TECMP pa…
aamereller Aug 30, 2022
4411828
[ANDI-8996/AnAm]: Changed ethertype to respect all VLAN tags.
aamereller Aug 31, 2022
85dd8b8
[ANDI-8996/AnAm]: Corrected typo.
aamereller Sep 1, 2022
f69f97e
[ANDI-8996/AnAm]: Corrected invalid variable name and updated version.
aamereller Sep 2, 2022
0517586
Update CMakeLists.txt
kayoub5 Sep 2, 2022
acdf93c
[ANDI-8996/AnAm]: Merging recent changes.
aamereller Sep 8, 2022
796c6e8
Added some debug information.
aamereller Sep 9, 2022
ab4e6d6
VLAN frames now only skip 4 bytwa.
aamereller Sep 9, 2022
99f2ab9
Removed unnecessary and erronous line.
aamereller Sep 9, 2022
917608e
Merge remote-tracking branch 'origin/master' into issue/ANDI-8996
aamereller Sep 12, 2022
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.17)

# Project name and a few useful settings. Other commands can pick up the results
project(LIBTECMP
VERSION 0.1
VERSION 0.2
DESCRIPTION "TECMP Library"
)

# Only do these if this is the main project, and not if it is included through add_subdirectory
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)#

include(conanbuildinfo.cmake)
conan_basic_setup(TARGETS)
Expand Down
2 changes: 1 addition & 1 deletion src/tecmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ int tecmp_next(
uint16_t ether = ntoh16(*((uint16_t*)(raw_frame + 12)));

// VLAN ethertypes
if ((ether == 0x8100) || (ethertype == 0x88A8) || (ethertype == 0x9100)) {
if ((ether == 0x8100) || (ether == 0x88A8) || (ether == 0x9100)) {
uint32_t skip = ETH_SIZE + 2;
return tecmp_next(raw_frame + skip, raw_frame_size - skip, iterator, header, data);
}
Expand Down