do-tests now lists strongswan.conf and ip xfrm policy|state

diff --git a/testing/do-tests.in b/testing/do-tests.in
index 56a3b7d..da4a6d6 100755 (executable)
--- a/testing/do-tests.in
+++ b/testing/do-tests.in
@@ -473,36 +473,46 @@ do
                then
                        scp $HOSTLOGIN:/etc/ipsec.d/ipsec.sql \
                        $TESTRESULTDIR/${host}.ipsec.sql  > /dev/null 2>&1
                then
                        scp $HOSTLOGIN:/etc/ipsec.d/ipsec.sql \
                        $TESTRESULTDIR/${host}.ipsec.sql  > /dev/null 2>&1

+                       scp $HOSTLOGIN:/etc/ipsec.d/strongswan.conf \
+                       $TESTRESULTDIR/${host}.strongswan.conf > /dev/null 2>&1

                else
                        touch $TESTRESULTDIR/${host}.ipsec.sql
                else
                        touch $TESTRESULTDIR/${host}.ipsec.sql

+                       touch $TESTRESULTDIR/${host}.strongswan.conf

                fi
                fi

+           ssh $HOSTLOGIN ip xfrm policy \
+                   > $TESTRESULTDIR/${host}.ip.policy 2>/dev/null
+           ssh $HOSTLOGIN ip xfrm state \
+                   > $TESTRESULTDIR/${host}.ip.state 2>/dev/null

            ssh $HOSTLOGIN ip route list table $SOURCEIP_ROUTING_TABLE \
            ssh $HOSTLOGIN ip route list table $SOURCEIP_ROUTING_TABLE \

-                   > $TESTRESULTDIR/${host}.iproute 2>/dev/null
+                   > $TESTRESULTDIR/${host}.ip.route 2>/dev/null

            ssh $HOSTLOGIN $IPTABLES -v -n -L \
                    > $TESTRESULTDIR/${host}.iptables 2>/dev/null
            cat >> $TESTRESULTDIR/index.html <<@EOF
     <h3>$host</h3>
       <table border="0" cellspacing="0" width="600">
       <tr>
            ssh $HOSTLOGIN $IPTABLES -v -n -L \
                    > $TESTRESULTDIR/${host}.iptables 2>/dev/null
            cat >> $TESTRESULTDIR/index.html <<@EOF
     <h3>$host</h3>
       <table border="0" cellspacing="0" width="600">
       <tr>

-       <td>
+       <td valign="top">

          <ul>
            <li><a href="$host.ipsec.conf">ipsec.conf</a></li>
            <li><a href="$host.ipsec.secrets">ipsec.secrets</a></li>
          <ul>
            <li><a href="$host.ipsec.conf">ipsec.conf</a></li>
            <li><a href="$host.ipsec.secrets">ipsec.secrets</a></li>

-           <li><a href="$host.statusall">ipsec statusall</a></li>
-           <li><a href="$host.listall">ipsec listall</a></li>
+           <li><a href="$host.ipsec.sql">ipsec.sql</a></li>
+           <li><a href="$host.strongswan.conf">strongswan.conf</a></li>

          </ul>
        </td>
          </ul>
        </td>

-       <td>
+       <td valign="top">

          <ul>
          <ul>

+           <li><a href="$host.statusall">ipsec statusall</a></li>
+           <li><a href="$host.listall">ipsec listall</a></li>

            <li><a href="$host.auth.log">auth.log</a></li>
            <li><a href="$host.daemon.log">daemon.log</a></li>
            <li><a href="$host.auth.log">auth.log</a></li>
            <li><a href="$host.daemon.log">daemon.log</a></li>

-           <li><a href="$host.iproute">ip route list table $SOURCEIP_ROUTING_TABLE</a></li>
-           <li><a href="$host.iptables">$IPTABLES -L</a></li>

          </ul>
       </td>
        <td valign="top">
          <ul>
          </ul>
       </td>
        <td valign="top">
          <ul>

-           <li><a href="$host.ipsec.sql">ipsec.sql</a></li>
+           <li><a href="$host.ip.policy">ip xfrm policy</a></li>
+           <li><a href="$host.ip.state">ip xfrm state</a></li>
+           <li><a href="$host.ip.route">ip route list table $SOURCEIP_ROUTING_TABLE</a></li>
+           <li><a href="$host.iptables">$IPTABLES -L</a></li>

          </ul>
       </td>
     </tr>
          </ul>
       </td>
     </tr>