Commit 2dddaca0 authored by anonym's avatar anonym
Browse files

We have migrated from netstat to ss in Stretch.

parent dd24d777
......@@ -51,7 +51,7 @@ i2p_reseed_status() {
}
i2p_built_a_tunnel() {
netstat -nlp | grep -qwF "$(i2p_eep_proxy_address)"
ss -nlp | grep -qwF "$(i2p_eep_proxy_address)"
}
i2p_router_console_address() {
......@@ -59,7 +59,7 @@ i2p_router_console_address() {
}
i2p_router_console_is_ready() {
netstat -nlp | grep -qwF "$(i2p_router_console_address)"
ss -nlp | grep -qwF "$(i2p_router_console_address)"
}
set_best_i2p_router_console_lang() {
......
......@@ -69,9 +69,9 @@ Then /^the live user owns its home dir and it has normal permissions$/ do
end
Then /^no unexpected services are listening for network connections$/ do
netstat_cmd = $vm.execute("netstat -ltupn")
assert netstat_cmd.success?
for line in netstat_cmd.stdout.chomp.split("\n") do
ss_cmd = $vm.execute("ss -ltupn")
assert ss_cmd.success?
for line in ss_cmd.stdout.chomp.split("\n") do
splitted = line.split(/[[:blank:]]+/)
proto = splitted[0]
if proto == "tcp"
......
......@@ -280,10 +280,10 @@ def stream_isolation_info(application)
end
When /^I monitor the network connections of (.*)$/ do |application|
@process_monitor_log = "/tmp/netstat.log"
@process_monitor_log = "/tmp/ss.log"
info = stream_isolation_info(application)
$vm.spawn("while true; do " +
" netstat -taupen | grep \"#{info[:grep_monitor_expr]}\"; " +
" ss -taupen | grep \"#{info[:grep_monitor_expr]}\"; " +
" sleep 0.1; " +
"done > #{@process_monitor_log}")
end
......
......@@ -135,7 +135,7 @@ tracked by tickets prefixed with `todo/test_suite:`.
SMTP servers (both clearnet and hidden services) by monitoring the
output of this command:
sudo watch -n 0.1 'netstat -taupen | grep icedove'
sudo watch -n 0.1 'ss -taupen | grep icedove'
# Tor
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment