diff --git a/windows/log/sindan_datalink_channel1441240445.38089.json b/windows/log/sindan_datalink_channel1441240445.38089.json deleted file mode 100644 index 812a9a8..0000000 Binary files a/windows/log/sindan_datalink_channel1441240445.38089.json and /dev/null differ diff --git a/windows/log/sindan_datalink_ifmtu1441240445.02764.json b/windows/log/sindan_datalink_ifmtu1441240445.02764.json deleted file mode 100644 index e900076..0000000 Binary files a/windows/log/sindan_datalink_ifmtu1441240445.02764.json and /dev/null differ diff --git a/windows/log/sindan_datalink_ifstatus1441240445.02364.json b/windows/log/sindan_datalink_ifstatus1441240445.02364.json deleted file mode 100644 index 8a5dc81..0000000 Binary files a/windows/log/sindan_datalink_ifstatus1441240445.02364.json and /dev/null differ diff --git a/windows/log/sindan_datalink_iftype1441240445.02563.json b/windows/log/sindan_datalink_iftype1441240445.02563.json deleted file mode 100644 index c416e34..0000000 Binary files a/windows/log/sindan_datalink_iftype1441240445.02563.json and /dev/null differ diff --git a/windows/log/sindan_datalink_noise1441240445.2558.json b/windows/log/sindan_datalink_noise1441240445.2558.json deleted file mode 100644 index 5abbd70..0000000 Binary files a/windows/log/sindan_datalink_noise1441240445.2558.json and /dev/null differ diff --git a/windows/log/sindan_datalink_rate1441240445.2588.json b/windows/log/sindan_datalink_rate1441240445.2588.json deleted file mode 100644 index a9d0f53..0000000 Binary files a/windows/log/sindan_datalink_rate1441240445.2588.json and /dev/null differ diff --git a/windows/log/sindan_datalink_rssi1441240445.2528.json b/windows/log/sindan_datalink_rssi1441240445.2528.json deleted file mode 100644 index bafb463..0000000 Binary files a/windows/log/sindan_datalink_rssi1441240445.2528.json and /dev/null differ diff --git a/windows/log/sindan_datalink_ssid1441240445.12871.json b/windows/log/sindan_datalink_ssid1441240445.12871.json deleted file mode 100644 index 562cb9f..0000000 Binary files a/windows/log/sindan_datalink_ssid1441240445.12871.json and /dev/null differ diff --git a/windows/log/sindan_globalnet_v4alive_srv1441240466.19364.json b/windows/log/sindan_globalnet_v4alive_srv1441240466.19364.json deleted file mode 100644 index b92ab7e..0000000 Binary files a/windows/log/sindan_globalnet_v4alive_srv1441240466.19364.json and /dev/null differ diff --git a/windows/log/sindan_globalnet_v4alive_srv1441240469.45795.json b/windows/log/sindan_globalnet_v4alive_srv1441240469.45795.json deleted file mode 100644 index 4a62914..0000000 Binary files a/windows/log/sindan_globalnet_v4alive_srv1441240469.45795.json and /dev/null differ diff --git a/windows/log/sindan_globalnet_v6alive_srv1441240469.48597.json b/windows/log/sindan_globalnet_v6alive_srv1441240469.48597.json deleted file mode 100644 index 6752032..0000000 Binary files a/windows/log/sindan_globalnet_v6alive_srv1441240469.48597.json and /dev/null differ diff --git a/windows/log/sindan_globalnet_v6alive_srv1441240469.50599.json b/windows/log/sindan_globalnet_v6alive_srv1441240469.50599.json deleted file mode 100644 index b8f501d..0000000 Binary files a/windows/log/sindan_globalnet_v6alive_srv1441240469.50599.json and /dev/null differ diff --git a/windows/log/sindan_interface_netmask1441240447.18416.json b/windows/log/sindan_interface_netmask1441240447.18416.json deleted file mode 100644 index d9d7d5a..0000000 Binary files a/windows/log/sindan_interface_netmask1441240447.18416.json and /dev/null differ diff --git a/windows/log/sindan_interface_v4addr1441240447.17816.json b/windows/log/sindan_interface_v4addr1441240447.17816.json deleted file mode 100644 index 540571c..0000000 Binary files a/windows/log/sindan_interface_v4addr1441240447.17816.json and /dev/null differ diff --git a/windows/log/sindan_interface_v4ifconf1441240447.17516.json b/windows/log/sindan_interface_v4ifconf1441240447.17516.json deleted file mode 100644 index 3235cf3..0000000 Binary files a/windows/log/sindan_interface_v4ifconf1441240447.17516.json and /dev/null differ diff --git a/windows/log/sindan_interface_v4nameservers1441240448.06479.json b/windows/log/sindan_interface_v4nameservers1441240448.06479.json deleted file mode 100644 index 0fdcae0..0000000 Binary files a/windows/log/sindan_interface_v4nameservers1441240448.06479.json and /dev/null differ diff --git a/windows/log/sindan_interface_v4routers1441240447.19117.json b/windows/log/sindan_interface_v4routers1441240447.19117.json deleted file mode 100644 index 929d1ef..0000000 Binary files a/windows/log/sindan_interface_v4routers1441240447.19117.json and /dev/null differ diff --git a/windows/log/sindan_interface_v6lladdr1441240448.27694.json b/windows/log/sindan_interface_v6lladdr1441240448.27694.json deleted file mode 100644 index 4fd869a..0000000 Binary files a/windows/log/sindan_interface_v6lladdr1441240448.27694.json and /dev/null differ diff --git a/windows/log/sindan_interface_v6routers1441240448.28294.json b/windows/log/sindan_interface_v6routers1441240448.28294.json deleted file mode 100644 index fc71aef..0000000 Binary files a/windows/log/sindan_interface_v6routers1441240448.28294.json and /dev/null differ diff --git a/windows/log/sindan_localnet_v4alive_namesrv1441240460.95793.json b/windows/log/sindan_localnet_v4alive_namesrv1441240460.95793.json deleted file mode 100644 index 9ff14bb..0000000 Binary files a/windows/log/sindan_localnet_v4alive_namesrv1441240460.95793.json and /dev/null differ diff --git a/windows/log/sindan_localnet_v4alive_router1441240453.61672.json b/windows/log/sindan_localnet_v4alive_router1441240453.61672.json deleted file mode 100644 index 39bddb4..0000000 Binary files a/windows/log/sindan_localnet_v4alive_router1441240453.61672.json and /dev/null differ diff --git a/windows/sindan.ps1 b/windows/sindan.ps1 index 3cd51ff..e39a195 100644 --- a/windows/sindan.ps1 +++ b/windows/sindan.ps1 @@ -1,11 +1,14 @@ -$params = @{ } +# change to english locale +chcp 437 + +$params = @{ } $body = @{ } function read_conf($filename) { $lines = get-content $filename foreach($line in $lines){ - # コメントと空行を除外する + # Remove comments and blank lines. if($line -match "^$"){ continue } if($line -match "^\s*;"){ continue } @@ -141,7 +144,7 @@ $destructive=1 # Set lock file function GetCurrentSSID() { - return (netsh wlan show interfaces) -Match 'プロファイル' -NotMatch '接続モード' -Replace "^\s+プロファイル\s+:\s+", "" -Replace "\s+$", "" + return (netsh wlan show interfaces) -Match 'Profile' -NotMatch 'Connection mode' -Replace "^\s+Profile\s+:\s+", "" -Replace "\s+$", "" <# $WifiGUID = (Get-NetAdapter -Name $params["IFTYPE"]).interfaceGUID @@ -262,7 +265,7 @@ if ($params["IFTYPE"] -eq 'Wi-Fi') { write_json $layer "Wi-Fi" ssid $params['INFO'] $ssid # Get Wi-Fi RSSI - $rssi = (netsh wlan show interfaces) -Match 'シグナル' -Replace "^\s+シグナル\s+:\s+", "" -Replace "\s+$", "" -Replace "%", "" + $rssi = (netsh wlan show interfaces) -Match 'Signal' -Replace "^\s+Signal\s+:\s+", "" -Replace "\s+$", "" -Replace "%", "" write_json $layer "Wi-Fi" rssi $params['INFO'] $rssi # Get Wi-Fi noise @@ -272,7 +275,7 @@ if ($params["IFTYPE"] -eq 'Wi-Fi') { write_json $layer 'Wi-Fi' rate $params['INFO'] (($netadapter.speed)/1000000) # Get Wi-Fi channel - $channel = (netsh wlan show interfaces) -Match 'チャネル' -Replace "^\s+チャネル\s+:\s+", "" -Replace "\s+$", "" -Replace "%", "" + $channel = (netsh wlan show interfaces) -Match 'Channel' -Replace "^\s+Channel\s+:\s+", "" -Replace "\s+$", "" -Replace "%", "" write_json $layer "Wi-Fi" channel $params['INFO'] $channel } else {