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

(Windows) New table: connectivity #5500

Merged
merged 15 commits into from Oct 4, 2019
+142 −1
Merged

(Windows) New table: connectivity #5500

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
00fbfb6
[WIP] networking/windows: connectivity table
woodruffw Feb 27, 2019
048656a
windows/connectivity: Release instance
woodruffw Feb 27, 2019
e87cb8e
windows/connectivity: Fix constants
woodruffw Feb 27, 2019
cbb2450
windows/connectivity: clang-format, add cast
woodruffw Feb 27, 2019
f81d542
windows/connectivity: Fix cast, don't assign enum
woodruffw Feb 27, 2019
b5a4aee
windows/connectivity: Add missing return
woodruffw Feb 27, 2019
1909894
windows/connectivity: Flatten masks down to 1 or 0
woodruffw Feb 27, 2019
49eff42
windows/connectivity: Use bool() instead of double-bang
woodruffw Mar 6, 2019
a37e7a2
windows/connectivity: Add explicit INTEGER()s
woodruffw Mar 6, 2019
f66b417
windows/connectivity: clang-format
woodruffw Mar 6, 2019
7743b61
tests: Add connectivity integration test
woodruffw Mar 6, 2019
d1cefa7
osquery, specs, tests: Update CMake files
woodruffw Sep 27, 2019
5426db0
tests/integration: ValidatioMap -> ValidationMap
woodruffw Sep 27, 2019
ca33794
tests/integration: Another typo fix
woodruffw Sep 30, 2019
5243b38
windows/connectivity: Relocate variable, release mgr
woodruffw Oct 3, 2019
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
Prev Previous commit
Next Next commit
windows/connectivity: Fix constants
@woodruffw
woodruffw committed Oct 4, 2019

Verified

This commit was signed with the committer’s verified signature. The key has expired.
woodruffw William Woodruff
GPG key ID: 70F70A3979DDCED3
Expired
Verified
Learn about vigilant mode
commit e87cb8e028701dd4a0986baab10507c9115d71c7
6 changes: 3 additions & 3 deletions osquery/tables/networking/windows/connectivity.cpp
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ QueryData genConnectivity(QueryContext& context) {
Row r;

INetworkListManager *mgr = nullptr;
HRESULT res = CoCreateInstance(CLSID_NetworkListManager, NULL, CLSCTX_ALL, IID_NetworkListManager, &mgr);
HRESULT res = CoCreateInstance(CLSID_NetworkListManager, NULL, CLSCTX_ALL, IID_INetworkListManager, &mgr);

if (res != S_OK) {
TLOG << "Failed to instantiate INetworkListManager";
@@ -43,10 +43,10 @@ QueryData genConnectivity(QueryContext& context) {
r["ipv4_no_traffic"] = INTEGER(connectivity & NLM_CONNECTIVITY_IPV4_NOTRAFFIC);
r["ipv6_no_traffic"] = INTEGER(connectivity & NLM_CONNECTIVITY_IPV6_NOTRAFFIC);
r["ipv4_subnet"] = INTEGER(connectivity & NLM_CONNECTIVITY_IPV4_SUBNET);
r["ipv4_local_network"] = INTEGER(connectivity & NLM_CONNECTIVITY_IPV4_LOCAL_NETWORK);
r["ipv4_local_network"] = INTEGER(connectivity & NLM_CONNECTIVITY_IPV4_LOCALNETWORK);
r["ipv4_internet"] = INTEGER(connectivity & NLM_CONNECTIVITY_IPV4_INTERNET);
r["ipv6_subnet"] = INTEGER(connectivity & NLM_CONNECTIVITY_IPV6_SUBNET);
r["ipv6_local_network"] = INTEGER(connectivity & NLM_CONNECTIVITY_IPV6_LOCAL_NETWORK);
r["ipv6_local_network"] = INTEGER(connectivity & NLM_CONNECTIVITY_IPV6_LOCALNETWORK);
r["ipv6_internet"] = INTEGER(connectivity & NLM_CONNECTIVITY_IPV6_INTERNET);

mgr->Release();