mirror of
https://github.com/maride/afl-transmit.git
synced 2024-11-23 07:44:24 +00:00
Add statistics
This commit is contained in:
parent
69de9ba8da
commit
10e940126d
2
go.mod
2
go.mod
@ -1,3 +1,5 @@
|
|||||||
module github.com/maride/afl-transmit
|
module github.com/maride/afl-transmit
|
||||||
|
|
||||||
go 1.13
|
go 1.13
|
||||||
|
|
||||||
|
require github.com/dustin/go-humanize v1.0.0
|
||||||
|
2
go.sum
Normal file
2
go.sum
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
|
||||||
|
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
4
main.go
4
main.go
@ -4,6 +4,7 @@ import (
|
|||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/maride/afl-transmit/net"
|
"github.com/maride/afl-transmit/net"
|
||||||
|
"github.com/maride/afl-transmit/stats"
|
||||||
"github.com/maride/afl-transmit/watchdog"
|
"github.com/maride/afl-transmit/watchdog"
|
||||||
"log"
|
"log"
|
||||||
)
|
)
|
||||||
@ -32,6 +33,9 @@ func main() {
|
|||||||
// Start watchdog for local afl instances
|
// Start watchdog for local afl instances
|
||||||
go watchdog.WatchFuzzers(outputDirectory)
|
go watchdog.WatchFuzzers(outputDirectory)
|
||||||
|
|
||||||
|
// Start stat printer
|
||||||
|
go stats.PrintStats()
|
||||||
|
|
||||||
// Listen for incoming connections
|
// Listen for incoming connections
|
||||||
listenErr := net.Listen(outputDirectory)
|
listenErr := net.Listen(outputDirectory)
|
||||||
if listenErr != nil {
|
if listenErr != nil {
|
||||||
|
@ -4,6 +4,7 @@ import (
|
|||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/maride/afl-transmit/logistic"
|
"github.com/maride/afl-transmit/logistic"
|
||||||
|
"github.com/maride/afl-transmit/stats"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
@ -82,6 +83,9 @@ func handle(conn net.Conn, outputDirectory string) {
|
|||||||
log.Printf("Encountered error processing packet from %s: %s", conn.RemoteAddr().String(), unpackErr)
|
log.Printf("Encountered error processing packet from %s: %s", conn.RemoteAddr().String(), unpackErr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Push read bytes to stats
|
||||||
|
stats.PushStat(stats.Stat{ReceivedBytes: uint64(len(cont))})
|
||||||
|
|
||||||
return
|
return
|
||||||
} else {
|
} else {
|
||||||
// We encountered an error on that connection
|
// We encountered an error on that connection
|
||||||
|
@ -2,6 +2,7 @@ package net
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/maride/afl-transmit/stats"
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
"regexp"
|
"regexp"
|
||||||
@ -44,12 +45,15 @@ func (p *Peer) SendToPeer(content []byte) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Send
|
// Send
|
||||||
_, writeErr := tcpConn.Write(content)
|
written, writeErr := tcpConn.Write(content)
|
||||||
if writeErr != nil {
|
if writeErr != nil {
|
||||||
log.Printf("Unable to write to peer %s: %s", tcpConn.RemoteAddr().String(), writeErr)
|
log.Printf("Unable to write to peer %s: %s", tcpConn.RemoteAddr().String(), writeErr)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Push written bytes to stats
|
||||||
|
stats.PushStat(stats.Stat{SentBytes: uint64(written)})
|
||||||
|
|
||||||
// Close connection
|
// Close connection
|
||||||
tcpConn.Close()
|
tcpConn.Close()
|
||||||
}
|
}
|
||||||
|
38
stats/stats.go
Normal file
38
stats/stats.go
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
package stats
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"github.com/dustin/go-humanize"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Stat bundles the metrics we collect into a single struct
|
||||||
|
type Stat struct {
|
||||||
|
SentBytes uint64
|
||||||
|
ReceivedBytes uint64
|
||||||
|
}
|
||||||
|
|
||||||
|
// statPipe is a channel used to
|
||||||
|
var stats Stat
|
||||||
|
|
||||||
|
// PushStat pushes the given stat
|
||||||
|
func PushStat(s Stat) {
|
||||||
|
stats.SentBytes += s.SentBytes
|
||||||
|
stats.ReceivedBytes += s.ReceivedBytes
|
||||||
|
}
|
||||||
|
|
||||||
|
// PrintStats periodically prints the collected statistics
|
||||||
|
func PrintStats() {
|
||||||
|
t := time.NewTicker(2 * time.Second)
|
||||||
|
|
||||||
|
for {
|
||||||
|
// Wait until we get a tick
|
||||||
|
<-t.C
|
||||||
|
|
||||||
|
// Format numbers and write them out
|
||||||
|
bIn := humanize.Bytes(stats.ReceivedBytes)
|
||||||
|
bOut := humanize.Bytes(stats.SentBytes)
|
||||||
|
|
||||||
|
fmt.Printf("%s in / %s out\r", bIn, bOut)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user