removes indent, nano 3339 time for files...

master 0.1
Jean-Louis Huynen 2019-03-18 11:32:57 +01:00
parent c533aa7f58
commit 864fc59d02
No known key found for this signature in database
GPG Key ID: 4CDEBABACE9A5DC9
1 changed files with 3 additions and 3 deletions

View File

@ -379,7 +379,7 @@ func main() {
} }
assembler.AssembleWithContext(packet.NetworkLayer().NetworkFlow(), tcp, &c) assembler.AssembleWithContext(packet.NetworkLayer().NetworkFlow(), tcp, &c)
} }
if count%*flushEvery == 0{ if count%*flushEvery == 0 {
ref := packet.Metadata().CaptureInfo.Timestamp ref := packet.Metadata().CaptureInfo.Timestamp
flushed, closed := assembler.FlushWithOptions(reassembly.FlushOptions{T: ref.Add(-*flushTf), TC: ref.Add(-*flushTc)}) flushed, closed := assembler.FlushWithOptions(reassembly.FlushOptions{T: ref.Add(-*flushTf), TC: ref.Add(-*flushTc)})
Debug("Forced flush: %d flushed, %d closed (%s)", flushed, closed, ref) Debug("Forced flush: %d flushed, %d closed (%s)", flushed, closed, ref)
@ -445,7 +445,7 @@ func processCompletedSession(cancelC <-chan string, jobQ <-chan d4tls.TLSSession
} }
func output(t d4tls.TLSSession) { func output(t d4tls.TLSSession) {
jsonRecord, _ := json.MarshalIndent(t.Record, "", " ") jsonRecord, _ := json.Marshal(t.Record)
// If an output folder was specified for certificates // If an output folder was specified for certificates
if *outCerts != "" { if *outCerts != "" {
@ -464,7 +464,7 @@ func output(t d4tls.TLSSession) {
// If an output folder was specified for json files // If an output folder was specified for json files
if *outJSON != "" { if *outJSON != "" {
if _, err := os.Stat(fmt.Sprintf("./%s", *outJSON)); !os.IsNotExist(err) { if _, err := os.Stat(fmt.Sprintf("./%s", *outJSON)); !os.IsNotExist(err) {
err := ioutil.WriteFile(fmt.Sprintf("./%s/%s.json", *outJSON, t.Record.Timestamp.Format(time.RFC3339)), jsonRecord, 0644) err := ioutil.WriteFile(fmt.Sprintf("./%s/%s.json", *outJSON, t.Record.Timestamp.Format(time.RFC3339Nano)), jsonRecord, 0644)
if err != nil { if err != nil {
panic("Could not write to file.") panic("Could not write to file.")
} }