Merge pull request #8 from Nequo/support-writing-nanosecond-pcaps

add flag -p for timestamp precision for micros or nanos

README.md

@@ -32,13 +32,14 @@ Usage:
   joincap [OPTIONS] InFiles...
 
 Application Options:
-  -v, --verbose  Explain when skipping packets or entire input files
-  -V, --version  Print the version and exit
-  -w=            Sets the output filename. If the name is '-', stdout will be used (default: -)
-  -c=            An integer argument for limiting the pcap size (default: 9223372036854775807)
+  -v, --verbose        Explain when skipping packets or entire input files
+  -V, --version        Print the version and exit
+  -w=                  Sets the output filename. If the name is '-', stdout will be used (default: -)
+  -c=                  An integer argument for limiting the pcap size (default: 9223372036854775807)
+  -p=[micros|nanos]    Sets timestamp precision (default: micros)
 
 Help Options:
-  -h, --help     Show this help message
+  -h, --help            Show this help message
 ```
 
 ## Why?

go.mod

@@ -4,6 +4,6 @@ go 1.14
 
 require (
 	github.com/dustin/go-humanize v1.0.0
-	github.com/google/gopacket v1.1.17
+	github.com/google/gopacket v1.1.19
 	github.com/jessevdk/go-flags v1.4.0
 )

go.sum

@@ -1,13 +1,20 @@
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/google/gopacket v1.1.17 h1:rMrlX2ZY2UbvT+sdz3+6J+pp2z+msCq9MxTU6ymxbBY=
-github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
+github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
+github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67 h1:1Fzlr8kkDLQwqMP8GxrhptBLqZG/EDpiATneiZHY998=
-golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

main.go

@@ -30,7 +30,7 @@ import (
 	flags "github.com/jessevdk/go-flags"
 )
 
-const version = "0.10.2"
+const version = "0.11.0"
 const maxSnaplen uint32 = 262144
 
 // previousTimestamp is the timestamp of the previous packet popped from the heap.
@@ -52,6 +52,7 @@ func joincap(args []string) error {
 	var cmdFlags struct {
 		Verbose        bool   `short:"v" long:"verbose" description:"Explain when skipping packets or input files"`
 		Version        bool   `short:"V" long:"version" description:"Print the version and exit"`
+		Precision      string `short:"p" choice:"micros" choice:"nanos" default:"micros" description:"Sets timestamp precision"`
 		OutputFilePath string `short:"w" default:"-" description:"Sets the output filename. If the name is '-', stdout will be used"`
 		Count          int    `short:"c" description:"A positive integer argument for limiting the number of packets"`
 		Rest           struct {
@@ -125,7 +126,13 @@ func joincap(args []string) error {
 		log.Printf("writing to %s\n", outputFile.Name())
 	}
 
-	writer := pcapgo.NewWriter(bufferedFileWriter)
+	var writer *pcapgo.Writer
+
+	if cmdFlags.Precision == "nanos" {
+		writer = pcapgo.NewWriterNanos(bufferedFileWriter)
+	} else {
+		writer = pcapgo.NewWriter(bufferedFileWriter)
+	}
 	writer.WriteFileHeader(maxSnaplen, linkType)
 
 	// Main loop