remcmp kann nun IPv4/6 erzwingen

4 files changed, 67 insertions, 60 deletions

diff --git a/komponenten.pas b/komponenten.pas
index b0915f2..5f32aa0 100644
--- a/komponenten.pas
+++ b/komponenten.pas
@@ -102,6 +102,7 @@ type
   public
     vergleichAuffrischen:  boolean;
     quelle,vergleich,cert: string;
+    ipVer:                 char;
     constructor create(besitzer: tTestAufgabe);
     procedure ausfuehren; override;
   end;
@@ -458,6 +459,7 @@ begin
   setlength(vergleich,0);
   fillchar(cert,sizeof(cert),#0);
   setlength(cert,0);
+  ipVer:=#0;
 end;
 
 procedure tRfcThread.ausfuehren;
@@ -466,14 +468,16 @@ var
   ausgabe,buf: string;
   f:           file;
 begin
-  setlength(argumente,3+2*byte(cert<>''));
+  setlength(argumente,3+byte(ipVer in ['4','6'])+2*byte(cert<>''));
   argumente[0]:='-o';
   argumente[1]:='-';
+  if ipVer in ['4','6'] then
+    argumente[2]:='-'+ipVer;
   if cert<>'' then begin
-    argumente[2]:='--cacert';
-    argumente[3]:=cert;
+    argumente[2+byte(ipVer in ['4','6'])]:='--cacert';
+    argumente[3+byte(ipVer in ['4','6'])]:=cert;
   end;
-  argumente[2+2*byte(cert<>'')]:=quelle;
+  argumente[2+byte(ipVer in ['4','6'])+2*byte(cert<>'')]:=quelle;
   ausgabe:='';
   if not runCommand('curl',argumente,ausgabe) then begin
     status:=0;
@@ -508,6 +512,10 @@ begin
     vergleichAuffrischen:=startetMit('*',s);
     if pos(';',s)=0 then exit;
     vergleich:=erstesArgument(s,';');
+    if startetMit('4',s) then
+      ipVer:='4'
+    else if startetMit('6',s) then
+      ipVer:='6';
     if pos(';',s)=0 then cert:=''
     else cert:=erstesArgument(s,';');
     quelle:=s;
diff --git a/status.txt b/status.txt
index 6c40e5b..00982d4 100644
--- a/status.txt
+++ b/status.txt
@@ -71,14 +71,14 @@
   offset:  4096 sectors
   size:    3907025072 sectors
   mode:    read/write
-/dev/mapper/leg12 is active and is in use.
+/dev/mapper/leg12 is active.
   type:    LUKS1
   cipher:  aes-xts-plain64
   keysize: 256 bits
   offset:  4096 sectors
   size:    7814033072 sectors
   mode:    read/write
-/dev/mapper/leg13 is active and is in use.
+/dev/mapper/leg13 is active.
   type:    LUKS1
   cipher:  aes-xts-plain64
   keysize: 256 bits
diff --git a/tests.konf b/tests.konf
index 600c8fd..d37fe7a 100644
--- a/tests.konf
+++ b/tests.konf
@@ -9,4 +9,4 @@ ping	0_1_&	600	50	eckner.net (ping)	eckner.net
 remcmp	0_3_&	600	50	Festplatte	status.txt;ftp://erich:erichmitgrossemE@192.168.0.15/tmp/ftpstatus

 remdate	0_3_&0_7_&	60000	60000	Festplattenjob	90;ftp://erich:erichmitgrossemE@192.168.0.15/tmp/ftpstatus.time

 remcmp	0_4_&	600	50	Musik-Crypto	musikStatus.txt;https://192.168.0.18/status.php

-remcmp	0_2_&0_6_&	600	100	dns	dnsStatus.txt;https://eckner.net/iptest.php

+remcmp	0_2_&0_6_&	600	100	dns	dnsStatus.txt;4https://eckner.net/iptest.php

diff --git a/watchdog.lps b/watchdog.lps
index a53ce01..9937fc0 100644
--- a/watchdog.lps
+++ b/watchdog.lps
@@ -27,8 +27,8 @@
         <IsPartOfProject Value="True"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="488"/>
-        <CursorPos X="40" Y="516"/>
+        <TopLine Value="487"/>
+        <CursorPos X="18" Y="518"/>
         <UsageCount Value="28"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -49,7 +49,7 @@
       <Unit5>
         <Filename Value="tests.konf"/>
         <EditorIndex Value="1"/>
-        <CursorPos X="92" Y="12"/>
+        <CursorPos X="74" Y="12"/>
         <UsageCount Value="13"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="None"/>
@@ -57,123 +57,122 @@
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="komponenten.pas"/>
-        <Caret Line="291" Column="39" TopLine="161"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="116" Column="88" TopLine="98"/>
       </Position1>
       <Position2>
-        <Filename Value="komponenten.pas"/>
-        <Caret Line="526" Column="9" TopLine="505"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="58" TopLine="50"/>
       </Position2>
       <Position3>
         <Filename Value="unit1.pas"/>
-        <Caret Line="116" Column="88" TopLine="98"/>
+        <Caret Line="85" TopLine="75"/>
       </Position3>
       <Position4>
-        <Filename Value="komponenten.pas"/>
-        <Caret Line="539" Column="21" TopLine="503"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="58" Column="14" TopLine="47"/>
       </Position4>
       <Position5>
-        <Filename Value="komponenten.pas"/>
-        <Caret Line="537" TopLine="529"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="37" Column="30" TopLine="15"/>
       </Position5>
       <Position6>
-        <Filename Value="komponenten.pas"/>
-        <Caret Line="120" Column="18" TopLine="91"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="58" Column="18" TopLine="22"/>
       </Position6>
       <Position7>
-        <Filename Value="komponenten.pas"/>
-        <Caret Line="89" TopLine="43"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="137" Column="77" TopLine="102"/>
       </Position7>
       <Position8>
-        <Filename Value="komponenten.pas"/>
-        <Caret Line="563" Column="16" TopLine="501"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="142" Column="33" TopLine="136"/>
       </Position8>
       <Position9>
-        <Filename Value="komponenten.pas"/>
-        <Caret Line="45" TopLine="45"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="78" TopLine="70"/>
       </Position9>
       <Position10>
-        <Filename Value="komponenten.pas"/>
-        <Caret Line="584" Column="46" TopLine="542"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="79" TopLine="70"/>
       </Position10>
       <Position11>
-        <Filename Value="komponenten.pas"/>
-        <Caret Line="613" TopLine="572"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="124" TopLine="103"/>
       </Position11>
       <Position12>
         <Filename Value="komponenten.pas"/>
-        <Caret Line="592" Column="35" TopLine="570"/>
+        <Caret Line="573" Column="29" TopLine="535"/>
       </Position12>
       <Position13>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="116" Column="88" TopLine="98"/>
+        <Filename Value="komponenten.pas"/>
+        <Caret Line="563" Column="17" TopLine="520"/>
       </Position13>
       <Position14>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="58" TopLine="50"/>
+        <Filename Value="komponenten.pas"/>
       </Position14>
       <Position15>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="85" TopLine="75"/>
+        <Filename Value="komponenten.pas"/>
+        <Caret Line="109" Column="21" TopLine="100"/>
       </Position15>
       <Position16>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="58" Column="14" TopLine="47"/>
+        <Filename Value="komponenten.pas"/>
+        <Caret Line="294" Column="34" TopLine="258"/>
       </Position16>
       <Position17>
         <Filename Value="unit1.pas"/>
-        <Caret Line="37" Column="30" TopLine="15"/>
+        <Caret Line="123" Column="25" TopLine="101"/>
       </Position17>
       <Position18>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="58" Column="18" TopLine="22"/>
+        <Filename Value="komponenten.pas"/>
+        <Caret Line="481" Column="42" TopLine="460"/>
       </Position18>
       <Position19>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="137" Column="77" TopLine="102"/>
+        <Filename Value="komponenten.pas"/>
+        <Caret Line="104" Column="35" TopLine="73"/>
       </Position19>
       <Position20>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="142" Column="33" TopLine="136"/>
+        <Filename Value="komponenten.pas"/>
+        <Caret Line="100" Column="13" TopLine="73"/>
       </Position20>
       <Position21>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="78" TopLine="70"/>
+        <Filename Value="komponenten.pas"/>
+        <Caret Line="449" Column="14" TopLine="425"/>
       </Position21>
       <Position22>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="79" TopLine="70"/>
+        <Filename Value="komponenten.pas"/>
+        <Caret Line="451" Column="23" TopLine="425"/>
       </Position22>
       <Position23>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="124" TopLine="103"/>
+        <Filename Value="komponenten.pas"/>
+        <Caret Line="463" Column="21" TopLine="454"/>
       </Position23>
       <Position24>
         <Filename Value="komponenten.pas"/>
-        <Caret Line="573" Column="29" TopLine="535"/>
+        <Caret Line="507" Column="29" TopLine="486"/>
       </Position24>
       <Position25>
         <Filename Value="komponenten.pas"/>
-        <Caret Line="563" Column="17" TopLine="520"/>
+        <Caret Line="506" Column="30" TopLine="491"/>
       </Position25>
       <Position26>
         <Filename Value="komponenten.pas"/>
       </Position26>
       <Position27>
         <Filename Value="komponenten.pas"/>
-        <Caret Line="109" Column="21" TopLine="100"/>
+        <Caret Line="105" Column="33" TopLine="64"/>
       </Position27>
       <Position28>
         <Filename Value="komponenten.pas"/>
-        <Caret Line="294" Column="34" TopLine="258"/>
+        <Caret Line="450" Column="14" TopLine="414"/>
       </Position28>
       <Position29>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="123" Column="25" TopLine="101"/>
+        <Filename Value="komponenten.pas"/>
+        <Caret Line="462" Column="13" TopLine="422"/>
       </Position29>
       <Position30>
         <Filename Value="komponenten.pas"/>
-        <Caret Line="481" Column="42" TopLine="460"/>
+        <Caret Line="475" Column="29" TopLine="444"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>