valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 01:55:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add country_code to wifi_status and wifi_survey tables. (#2940)

Browse Source
This commit is contained in:
Samuel Keeley 2017-01-26 02:20:39 +08:00 committed by Mitchell Grenier
parent c6e5662a12
commit 743580f208
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osquery/tables/networking/darwin/wifi_status.mm
View File

@ -39,6 +39,10 @@ QueryData genWifiStatus(QueryContext& context) {
if (strptr != nil) {
r["network_name"] = std::string([strptr UTF8String]);
}
NSString* country_code = [interface countryCode];
if (country_code != nil) {
r["country_code"] = std::string([country_code UTF8String]);
}
r["rssi"] = INTEGER([interface rssiValue]);
r["noise"] = INTEGER([interface noiseMeasurement]);
r["security_type"] = getSecurityName([interface security]);

4
osquery/tables/networking/darwin/wifi_survey.mm
View File

@ -36,6 +36,10 @@ QueryData genWifiScan(QueryContext& context) {
r["ssid"] = extractSsid((__bridge CFDataRef)[network ssidData]);
r["bssid"] = std::string([[network bssid] UTF8String]);
r["network_name"] = std::string([[network ssid] UTF8String]);
NSString* country_code = [network countryCode];
if (country_code != nil) {
r["country_code"] = std::string([country_code UTF8String]);
}
r["rssi"] = INTEGER([network rssiValue]);
r["noise"] = INTEGER([network noiseMeasurement]);
CWChannel* cwc = [network wlanChannel];

1
specs/darwin/wifi_scan.table
View File

@ -5,6 +5,7 @@ schema([
Column("ssid", TEXT, "SSID octets of the network"),
Column("bssid", TEXT, "The current basic service set identifier"),
Column("network_name", TEXT, "Name of the network"),
Column("country_code", TEXT, "The country code (ISO/IEC 3166-1:1997) for the network"),
Column("rssi", INTEGER, "The current received signal strength indication (dbm)"),
Column("noise", INTEGER, "The current noise measurement (dBm)"),
Column("channel_width", INTEGER, "Channel width"),

1
specs/darwin/wifi_status.table
View File

@ -5,6 +5,7 @@ schema([
Column("ssid", TEXT, "SSID octets of the network"),
Column("bssid", TEXT, "The current basic service set identifier"),
Column("network_name", TEXT, "Name of the network"),
Column("country_code", TEXT, "The country code (ISO/IEC 3166-1:1997) for the network"),
Column("security_type", TEXT, "Type of security on this network"),
Column("rssi", INTEGER, "The current received signal strength indication (dbm)"),
Column("noise", INTEGER, "The current noise measurement (dBm)"),