Test example: improve logging, choice of ports

* Turn up the logging in test-example/common.conf, to "all".

* Change the udp port numbers we use to 16900 and 16910, which
  conveniently have a "0" for "outside" and a "1" for "inside".

* Swap the order of the inside and outside sites in the sites file, so
  that the consistentliy-lower-numbered "outside" comes first.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/test-example/common.conf b/test-example/common.conf
index 6f2fef1..64bfc81 100644 (file)
--- a/test-example/common.conf
+++ b/test-example/common.conf
@@ -6,8 +6,7 @@ system {
 };
 resolver adns {
 };
-log-events "setup-init","setup-timeout","activate-key","timeout-key","errors",
-        "security";
+log-events "all";
 random randomfile("/dev/urandom",no);
 transform serpent256-cbc {
         max-sequence-skew 10;

diff --git a/test-example/inside.conf b/test-example/inside.conf
index 775d593..4d41f30 100644 (file)
--- a/test-example/inside.conf
+++ b/test-example/inside.conf
@@ -8,7 +8,7 @@ netlink tun {
        interface "secnet-test-i";
 };
 comm udp {
-       port 16097;
+       port 16910;
        buffer sysbuffer(4096);
 };
 local-name "test-example/inside/inside";

diff --git a/test-example/outside.conf b/test-example/outside.conf
index f1a5228..db78b7b 100644 (file)
--- a/test-example/outside.conf
+++ b/test-example/outside.conf
@@ -8,7 +8,7 @@ netlink tun {
        interface "secnet-test-o";
 };
 comm udp {
-       port 16096;
+       port 16900;
        buffer sysbuffer(4096);
 };
 local-name "test-example/outside/outside";

diff --git a/test-example/sites b/test-example/sites
index 5aee3d8..470357b 100644 (file)
--- a/test-example/sites
+++ b/test-example/sites
@@ -7,19 +7,16 @@ restrict-nets 172.18.232.0/28
 setup-timeout 2000
 setup-retries 5
 
-location inside root
-site inside
-  networks 172.18.232.8/29
-  peer 172.18.232.9
-  address [127.0.0.1] 16097
-  pubkey 1024 65537 130064631890186713927887504218626486455931306300999583387009075747001546036643522074275473238061323169592347601185592753550279410171535737146240085267000508853176463710554801101055212967131924064664249613912656320653505750073021702169423354903540699008756137338575553686987244488914481168225136440872431691669 inside@example.com
-
 location outside root
 site outside
   networks 172.18.232.0/29
   peer 172.18.232.1
-  address [127.0.0.1] 16096
+  address [127.0.0.1] 16900
   pubkey 1024 65537 129251483458784900555621175262818292872587807329014927540074484804119474262261383244074013537736576331652560727149001626325243856012659665194546933097292703586821422085819615124517093786704646988649444946154384037948502112302285511195679291084694375811092516151263088200304199780052361048758446082354317801941 outside@example.com
 
-
-
+location inside root
+site inside
+  networks 172.18.232.8/29
+  peer 172.18.232.9
+  address [127.0.0.1] 16910
+  pubkey 1024 65537 130064631890186713927887504218626486455931306300999583387009075747001546036643522074275473238061323169592347601185592753550279410171535737146240085267000508853176463710554801101055212967131924064664249613912656320653505750073021702169423354903540699008756137338575553686987244488914481168225136440872431691669 inside@example.com