From 4422bea6a4d14734d8f9c483c7df7309523e2689 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Sun, 20 Jun 2021 15:22:32 -0500
Subject: [PATCH] Update tests

---
 .github/workflows/cron.yml | 20 ++++++++++++--------
 .github/workflows/main.yml | 20 ++++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index b9a4948..2de124f 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -152,10 +152,12 @@ jobs:
 
           netstat -anpu | grep pluto
           netstat -anpu | grep xl2tpd
-          iptables -nL
-          iptables -nL | grep -q '192\.168\.42\.0/24'
-          iptables -nL -t nat
-          iptables -nL -t nat | grep -q '192\.168\.43\.0/24'
+          iptables -nvL
+          iptables -nvL | grep -q 'ppp+'
+          iptables -nvL | grep -q '192\.168\.43\.0/24'
+          iptables -nvL -t nat
+          iptables -nvL -t nat | grep -q '192\.168\.42\.0/24'
+          iptables -nvL -t nat | grep -q '192\.168\.43\.0/24'
           grep pluto "$log1"
           grep xl2tpd "$log2"
           ipsec status
@@ -448,10 +450,12 @@ jobs:
 
           netstat -anpu | grep pluto
           netstat -anpu | grep xl2tpd
-          iptables -nL
-          iptables -nL | grep -q '192\.168\.42\.0/24'
-          iptables -nL -t nat
-          iptables -nL -t nat | grep -q '192\.168\.43\.0/24'
+          iptables -nvL
+          iptables -nvL | grep -q 'ppp+'
+          iptables -nvL | grep -q '192\.168\.43\.0/24'
+          iptables -nvL -t nat
+          iptables -nvL -t nat | grep -q '192\.168\.42\.0/24'
+          iptables -nvL -t nat | grep -q '192\.168\.43\.0/24'
           grep pluto "$log1"
           grep xl2tpd "$log2"
           ipsec status
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2254d41..d679b5a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -181,10 +181,12 @@ jobs:
 
           netstat -anpu | grep pluto
           netstat -anpu | grep xl2tpd
-          iptables -nL
-          iptables -nL | grep -q '192\.168\.42\.0/24'
-          iptables -nL -t nat
-          iptables -nL -t nat | grep -q '192\.168\.43\.0/24'
+          iptables -nvL
+          iptables -nvL | grep -q 'ppp+'
+          iptables -nvL | grep -q '192\.168\.43\.0/24'
+          iptables -nvL -t nat
+          iptables -nvL -t nat | grep -q '192\.168\.42\.0/24'
+          iptables -nvL -t nat | grep -q '192\.168\.43\.0/24'
           grep pluto "$log1"
           grep xl2tpd "$log2"
           ipsec status
@@ -477,10 +479,12 @@ jobs:
 
           netstat -anpu | grep pluto
           netstat -anpu | grep xl2tpd
-          iptables -nL
-          iptables -nL | grep -q '192\.168\.42\.0/24'
-          iptables -nL -t nat
-          iptables -nL -t nat | grep -q '192\.168\.43\.0/24'
+          iptables -nvL
+          iptables -nvL | grep -q 'ppp+'
+          iptables -nvL | grep -q '192\.168\.43\.0/24'
+          iptables -nvL -t nat
+          iptables -nvL -t nat | grep -q '192\.168\.42\.0/24'
+          iptables -nvL -t nat | grep -q '192\.168\.43\.0/24'
           grep pluto "$log1"
           grep xl2tpd "$log2"
           ipsec status