diff --git a/checker/checker.go b/checker/checker.go index 08ba965..4cae4aa 100644 --- a/checker/checker.go +++ b/checker/checker.go @@ -46,7 +46,7 @@ func check_ping(ip string, cb func(pkt *ping.Packet)) (err error) { pinger.Count = 1 pinger.OnRecv = cb pinger.SetPrivileged(true) - err = pinger.Run() + pinger.Run() return } @@ -336,7 +336,7 @@ func check_dnssec(domain, ip string) (err error) { if !found { if err == nil { - return fmt.Errorf("Unable to find a valid DS record in parent zone (if you use your own domain (ie. not given by maatma), this can be due to a previously cached response, you should wait).") + return fmt.Errorf("Unable to find a valid DS record in parent zone.") } else { return err } @@ -560,23 +560,13 @@ func minTunnelVersion(std *adlin.Student, suffixip int) (int, error) { return minversion, nil } -func studentChecker(std *adlin.Student, also_check_matrix bool, offline bool) { +func studentChecker(std *adlin.Student, also_check_matrix bool) { tuns, err := std.GetActivesTunnels() if err != nil { - if offline { - tuns, err = std.GetDefaultTunnels() - if err != nil { - if verbose { - log.Printf("SKip %s as I'm unable to generate default tunnels: %s", std.Login, err.Error()) - } - return - } - } else { - if verbose2 { - log.Printf("SKip %s due to error when getting active tunnels: %s", std.Login, err.Error()) - } - return + if verbose2 { + log.Printf("SKip %s due to error when getting active tunnels: %s", std.Login, err.Error()) } + return } if verbose2 && len(tuns) == 0 { log.Printf("%s has no active tunnels: %s", std.Login, err.Error()) @@ -588,14 +578,14 @@ func studentChecker(std *adlin.Student, also_check_matrix bool, offline bool) { log.Printf("Tests %s on %s...", std.Login, stdIP) } // Check ping - err = check_ping(stdIP, func(pkt *ping.Packet) { + check_ping(stdIP, func(pkt *ping.Packet) { tunnel_version, err := minTunnelVersion(std, tun.SuffixIP) if verbose { log.Printf("%s PONG (on %x); version=%d (%v)\n", std.Login, tun.SuffixIP, tunnel_version, err) } std.OnPong(true) - if !offline && (tunnel_version == 2147483647 || tunnel_version == 0) { + if tunnel_version == 2147483647 || tunnel_version == 0 { log.Printf("%s unknown tunnel version: %d skipping tests (%v)", std.Login, tunnel_version, err) return } @@ -813,13 +803,11 @@ func studentChecker(std *adlin.Student, also_check_matrix bool, offline bool) { return }) - if err != nil && verbose { - log.Printf("%s: Unable to perform ping to %s: %s", std.Login, stdIP, err.Error()) - } } + } -func studentsChecker(offline bool) { +func studentsChecker() { students, err := adlin.GetStudents() if err != nil { log.Println("Unable to check students:", err) @@ -831,6 +819,6 @@ func studentsChecker(offline bool) { for istd, s := range students { time.Sleep(250 * time.Millisecond) - go studentChecker(s, istd%10 == check_matrix_for, offline) + go studentChecker(s, istd%10 == check_matrix_for) } } diff --git a/checker/main.go b/checker/main.go index 95fda64..5663cc2 100644 --- a/checker/main.go +++ b/checker/main.go @@ -12,12 +12,9 @@ import ( ) func main() { - offline := false - var dsn = flag.String("dsn", adlin.DSNGenerator(), "DSN to connect to the MySQL server") flag.BoolVar(&verbose, "verbose", verbose, "Enable verbose mode") flag.BoolVar(&verbose2, "verbose2", verbose2, "Enable more verbose mode") - flag.BoolVar(&offline, "offline", offline, "Enable offline mode (doesn't check what wg report)") flag.Parse() if verbose2 && !verbose { @@ -47,7 +44,7 @@ func main() { log.Printf("%s: %s", std_login, err.Error()) } else { log.Printf("Checking %s...", std.Login) - studentChecker(std, true, offline) + studentChecker(std, true) } } @@ -62,14 +59,14 @@ func main() { defer ticker.Stop() // Launch checker - studentsChecker(offline) + studentsChecker() loop: for { select { case <-interrupt: break loop case <-ticker.C: - studentsChecker(offline) + studentsChecker() } } } diff --git a/libadlin/tunnel.go b/libadlin/tunnel.go index 58a31fa..c4fa99c 100644 --- a/libadlin/tunnel.go +++ b/libadlin/tunnel.go @@ -225,13 +225,6 @@ func (student *Student) GetActivesTunnels() (ts []*TunnelToken, err error) { } } -func (student *Student) GetDefaultTunnels() (ts []*TunnelToken, err error) { - t := &TunnelToken{IdStudent: student.Id} - ts = append(ts, t) - - return -} - func (student *Student) GetActivesTunnelsPubKey() (ts []ed25519.PublicKey, err error) { var activeTuns []*TunnelToken activeTuns, err = student.GetActivesTunnels()