From: Fabian Reinartz Date: Sat, 5 Sep 2015 23:41:46 +0000 (+0200) Subject: Format code X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1f6b5afa0eb90efad91b59fa2aa5bff584bed310;p=blackbox_exporter.git Format code --- diff --git a/icmp.go b/icmp.go index 04c40d3..93a7a3a 100644 --- a/icmp.go +++ b/icmp.go @@ -1,48 +1,47 @@ package main import ( + "golang.org/x/net/icmp" + "golang.org/x/net/internal/iana" + "golang.org/x/net/ipv4" "net" "net/http" "os" "sync" - "time" - "golang.org/x/net/internal/iana" - "golang.org/x/net/icmp" - "golang.org/x/net/ipv4" + "time" - "github.com/prometheus/log" + "github.com/prometheus/log" ) var ( - icmpSequence uint16 - icmpSequenceMutex sync.Mutex - + icmpSequence uint16 + icmpSequenceMutex sync.Mutex ) func getICMPSequence() uint16 { - icmpSequenceMutex.Lock() - defer icmpSequenceMutex.Unlock() - icmpSequence+=1 - return icmpSequence + icmpSequenceMutex.Lock() + defer icmpSequenceMutex.Unlock() + icmpSequence += 1 + return icmpSequence } func probeICMP(target string, w http.ResponseWriter, module Module) (success bool) { - deadline := time.Now().Add(module.Timeout) + deadline := time.Now().Add(module.Timeout) socket, err := icmp.ListenPacket("ip4:icmp", "0.0.0.0") if err != nil { - log.Errorf("Error listening to socket: %s", err) + log.Errorf("Error listening to socket: %s", err) return } defer socket.Close() - ip, err := net.ResolveIPAddr("ip4", target) - if err != nil { - log.Errorf("Error resolving address %s: %s", target, err) + ip, err := net.ResolveIPAddr("ip4", target) + if err != nil { + log.Errorf("Error resolving address %s: %s", target, err) return } - seq := getICMPSequence() - pid := os.Getpid() & 0xffff + seq := getICMPSequence() + pid := os.Getpid() & 0xffff wm := icmp.Message{ Type: ipv4.ICMPTypeEcho, Code: 0, @@ -52,44 +51,44 @@ func probeICMP(target string, w http.ResponseWriter, module Module) (success boo }, } wb, err := wm.Marshal(nil) - if err != nil { - log.Errorf("Error marshalling packet for %s: %s", target, err) + if err != nil { + log.Errorf("Error marshalling packet for %s: %s", target, err) + return + } + if _, err := socket.WriteTo(wb, ip); err != nil { + log.Errorf("Error writing to socker for %s: %s", target, err) return } - if _, err := socket.WriteTo(wb, ip); err != nil { - log.Errorf("Error writing to socker for %s: %s", target, err) - return - } - rb := make([]byte, 1500) - if err := socket.SetReadDeadline(deadline); err != nil { - log.Errorf("Error setting socket deadline for %s: %s", target, err) - return - } - for { - n, peer, err := socket.ReadFrom(rb) - if err != nil { - if nerr, ok := err.(net.Error); ok && nerr.Timeout() { - log.Infof("Timeout reading from socket for %s: %s", target, err) - return - } - log.Errorf("Error reading from socket for %s: %s", target, err) - continue - } - if peer.String() != ip.String() { - continue - } - rm, err := icmp.ParseMessage(iana.ProtocolICMP, rb[:n]) - if err != nil { - log.Warnf("Error parsing ICMP message for %s: %s", target, err) - continue - } - if rm.Type == ipv4.ICMPTypeEchoReply { - // The ICMP package does not support unmarshalling - // messages, so assume this is the right sequence number. - success = true - return - } - } + rb := make([]byte, 1500) + if err := socket.SetReadDeadline(deadline); err != nil { + log.Errorf("Error setting socket deadline for %s: %s", target, err) + return + } + for { + n, peer, err := socket.ReadFrom(rb) + if err != nil { + if nerr, ok := err.(net.Error); ok && nerr.Timeout() { + log.Infof("Timeout reading from socket for %s: %s", target, err) + return + } + log.Errorf("Error reading from socket for %s: %s", target, err) + continue + } + if peer.String() != ip.String() { + continue + } + rm, err := icmp.ParseMessage(iana.ProtocolICMP, rb[:n]) + if err != nil { + log.Warnf("Error parsing ICMP message for %s: %s", target, err) + continue + } + if rm.Type == ipv4.ICMPTypeEchoReply { + // The ICMP package does not support unmarshalling + // messages, so assume this is the right sequence number. + success = true + return + } + } return } diff --git a/main.go b/main.go index 6d96a1f..8bdb529 100644 --- a/main.go +++ b/main.go @@ -44,7 +44,7 @@ type ICMPProbe struct { var Probers = map[string]func(string, http.ResponseWriter, Module) bool{ "http": probeHTTP, "tcp": probeTCP, - "icmp": probeICMP, + "icmp": probeICMP, } func probeHandler(w http.ResponseWriter, r *http.Request, config *Config) {