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

Jump to bottom

socketmon: extend Windows builds support for Win10 1909 #1817

Merged
merged 1 commit into from
Nov 22, 2024
Merged

socketmon: extend Windows builds support for Win10 1909 #1817

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
10 changes: 10 additions & 0 deletions src/plugins/socketmon/private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,16 @@ static const uint16_t winserv_2019_tcp_offsets[__TCP_ARRAY_MAX] =
[REMOTE_ADDR_OFF1] = 0xC0,
};

static const uint16_t win10_1909_tcp_offsets[__TCP_ARRAY_MAX] =
{
[IP_FAMILY_OFF0] = 0x10,
[IP_FAMILY_OFF1] = 0x18,
[LOCAL_PORT] = 0x70,
[REMOTE_PORT] = 0x72,
[REMOTE_ADDR_OFF0] = 0x18,
[REMOTE_ADDR_OFF1] = 0xb8,
};

static const uint16_t win10_21h2_23h2_tcp_offsets[__TCP_ARRAY_MAX] =
{
[IP_FAMILY_OFF0] = 0x10,
Expand Down
13 changes: 13 additions & 0 deletions src/plugins/socketmon/socketmon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ static constexpr uint16_t win_8_1_ver = 9600;
static constexpr uint16_t win_serv_2016_ver = 14393;
static constexpr uint16_t win_10_1803_ver = 17134;
static constexpr uint16_t win_serv_2019_ver = 17763;
static constexpr uint16_t win_10_1909_ver = 18362;
static constexpr uint16_t win_10_21h2_ver = 19044;
static constexpr uint16_t win_10_22h2_ver = 19045;
static constexpr uint16_t win_10_23h2_ver = 22631;
Expand Down Expand Up @@ -224,6 +225,16 @@ static const std::unordered_map<uint16_t, udp_offsets_t> udp_offsets_x64 =
.remote_addr = 0xF0
}
},
{
win_10_1909_ver,
{
.family_1 = 0x20,
.family_2 = 0x18,
.local_port = 0x78,
.remote_port = 0xE8,
.remote_addr = 0xF0
}
},
{
win_10_21h2_ver,
{
Expand Down Expand Up @@ -262,6 +273,8 @@ static const uint16_t* get_tcp_offsets(uint16_t buildnumber)
return win7_sp1_tcp_offsets;
if (buildnumber == win_10_1803_ver)
return win10_1803_tcp_offsets;
if (buildnumber == win_10_1909_ver)
return win10_1909_tcp_offsets;
if (buildnumber == win_serv_2019_ver)
return winserv_2019_tcp_offsets;
if (buildnumber >= win_10_21h2_ver && buildnumber <= win_10_23h2_ver)
Expand Down