Changeset 9e573a2

Timestamp:

01/19/22 12:56:25 (3 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master

Children:

ffaaf60

Parents:

892871d

Message:

fix network checks and log issue when hostname has -

Location:

npl

Files:

• overig/mozilla_nss/mozilla-nss.SlackBuild.orig (modified) (1 diff)
• syn3/webint/src/log/syslog.php (modified) (1 diff)
• syn3/webint/src/network/check.php (modified) (3 diffs)

npl/overig/mozilla_nss/mozilla-nss.SlackBuild.orig

@@ -27 +27 @@
 PKGNAM=mozilla-nss
 SRCNAM=nss
-VERSION=${VERSION:-3.60}
-NSPR=${NSPR:-4.29}
+VERSION=${VERSION:-3.50}
+NSPR=${NSPR:-4.25}
 BUILD=${BUILD:-1}
 

npl/syn3/webint/src/log/syslog.php

@@ -47 +47 @@
                         {
                                 //if it doens't match its probably a 'repeat message'
-                                if (!preg_match("/(\w*) *(\w*) (..:..:..) (\w*) ([^ ]*): (\w*) (.*)/",$line,$matches))
-                                        preg_match("/(\w*) *(\w*) (..:..:..) (\w*) (\w*) (.*)/",$line,$matches);
+                                if (!preg_match("/(\w*) *(\w*) (..:..:..) ([-\w]*) ([^ ]*): (\w*) (.*)/",$line,$matches))
+                                        preg_match("/(\w*) *(\w*) (..:..:..) ([-\w]*) (\w*) (.*)/",$line,$matches);
 
                                 list($bagger,$month,$day,$time,$host, $user,$prio, $message)=$matches;

npl/syn3/webint/src/network/check.php

@@ -69 +69 @@
 
 //check gateway ping routing
-$testip="77.74.48.182"; //datux webserver
+$testip="8.8.8.8"; //google dns
 PrintCheckStart(_CheckingGatewayPing($testip));
-if (!Cmd("ping -c 3 -n -w 3 $testip"))
+if (!Cmd("fping $testip"))
         PrintCheckResult("ping","OK");
 else
         PrintCheckResult("ping","ERROR");
 
+//check gateway ping routing
+$testip="1.1.1.1"; //cloudflare
+PrintCheckStart(_CheckingGatewayPing($testip));
+if (!Cmd("fping $testip"))
+        PrintCheckResult("ping","OK");
+else
+        PrintCheckResult("ping","ERROR");
 
-//check gateway http update server routing
-PrintCheckStart(_CheckingGatewayHttpUpdateserver($testip));
-if (!Cmd("lynx -dump -connect_timeout 10 $testip | grep DatuX"))
-        PrintCheckResult("http","OK");
-else
-        PrintCheckResult("http","ERROR");
-
-
+        
 //check dns servers 
 $dnss=getDNS();
@@ -96 +96 @@
 }
 
+//check http via google
+PrintCheckStart(_CheckingGatewayHttpUpdateserver("www.google.com"));
+if (!Cmd("lynx -dump -connect_timeout 10 www.google.com"))
+        PrintCheckResult("http","OK");
+else
+        PrintCheckResult("http","ERROR");
+
 
 //check uitgaande mail connectie naar 25
 //veel providers zetten dit dicht.
 
-$testmail="77.74.48.185";
+$testmail="smtp.google.com";
 PrintCheckStart(_CheckingGatewayMail($testmail));
 if (!Cmd("nc $testmail 25 -w 1 -q 1 -z"))
@@ -112 +119 @@
         PrintCheckStart(_CheckingIpsecPort("500"));
         
-        $port500=SafeExec("grep '77.74.48.182:.*not enough room' /var/log/secure |tail -1");
-        $port4500=SafeExec("grep '77.74.48.182:.*too small packet' /var/log/secure |tail -1");
+        $port500=SafeExec("grep ':.*not enough room' /var/log/secure |tail -1");
+        $port4500=SafeExec("grep ':.*too small packet' /var/log/secure |tail -1");
         
         rpc("TestIpsec");
         
-        $port500tested=SafeExec("grep '77.74.48.182:.*not enough room' /var/log/secure |tail -1");
-        $port4500tested=SafeExec("grep '77.74.48.182:.*too small packet' /var/log/secure |tail -1");
+        $port500tested=SafeExec("grep ':.*not enough room' /var/log/secure |tail -1");
+        $port4500tested=SafeExec("grep ':.*too small packet' /var/log/secure |tail -1");
         
         if ($port500[0]!=$port500tested[0])