mtest/t-userv: Test that output conf file is correct

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

diff --git a/mtest/e-userv.conf b/mtest/e-userv.conf
new file mode 100644 (file)
index 0000000..26efc18
--- /dev/null
+++ b/mtest/e-userv.conf
@@ -0,0 +1,37 @@
+# secnet sites file autogenerated by make-secnet-sites version 0.1.18
+# Tue Mar 10 17:51:56 2020
+# Command line: ./make-secnet-sites
+
+vpn-data {
+  Vtest-example {
+    # Contact email address: <header@example.com>
+    dh diffie-hellman("8db5f2c15ac96d9f3382d1ef4688fba14dc7908ae7dfd71a9cfe7f479a75d506dc53f159aeaf488bde073fe544bc91c099f101fcf60074f30c06e36263c03ca9e07931ce3fc235fe1171dc6d9316fb097bd4362891e2c36e234e7c16b038fd97b1f165c710e90537de66ee4f54001f5712b050d4e07de3fba07607b19b64f6c3","2");
+    hash sha1;
+    key-lifetime 72000000;
+    # restrict-nets "10.0.0.0/8","172.16.0.0/12","192.168.0.0/16"
+    setup-retries 5;
+    setup-timeout 2000;
+
+    Linside {
+      # restrict-nets "172.18.232.8/29"
+      Sinside {
+        name "test-example/inside/inside";
+        key rsa-public("65537","130064631890186713927887504218626486455931306300999583387009075747001546036643522074275473238061323169592347601185592753550279410171535737146240085267000508853176463710554801101055212967131924064664249613912656320653505750073021702169423354903540699008756137338575553686987244488914481168225136440872431691669");
+        address "[127.0.0.1]"; port 16910;
+        mobile True;
+        link netlink {
+          routes "172.18.232.8/30";
+          ptp-address "172.18.232.9";
+        };
+      };
+    };
+  };
+};
+vpn {
+  Vtest-example {
+    Linside vpn-data/Vtest-example/Linside/Sinside;
+
+    all-sites Linside;
+  };
+};
+all-sites vpn/Vtest-example/all-sites;

diff --git a/mtest/t-userv b/mtest/t-userv
index 90eeb3d2aeb5bdcd17f22dafcbc8f0a6151829ff..a3843e08f00f08bfa6d94a85185e4e24c4b8f4d7 100755 (executable)
--- a/mtest/t-userv
+++ b/mtest/t-userv
@@ -53,3 +53,5 @@ if {![catch {
 #----- resulting sites file is processable -----
 
 eval run-mss $tmp/out.sites >$tmp/out.conf
 #----- resulting sites file is processable -----
 
 eval run-mss $tmp/out.sites >$tmp/out.conf

+
+diff-mss-sites-conf mtest/e-userv.conf $tmp/out.conf