Flushing and Closing connections - see #3
parent
8fdae4a7d1
commit
65f173dc93
18
d4-tlsf.go
18
d4-tlsf.go
|
@ -47,8 +47,12 @@ var outCerts = flag.String("w", "", "Folder to write certificates into")
|
||||||
var outJSON = flag.String("j", "", "Folder to write certificates into, stdin if not set")
|
var outJSON = flag.String("j", "", "Folder to write certificates into, stdin if not set")
|
||||||
var jobQ chan d4tls.TLSSession
|
var jobQ chan d4tls.TLSSession
|
||||||
|
|
||||||
const closeTimeout time.Duration = time.Hour * 24 // Closing inactive: TODO: from CLI
|
// flushing
|
||||||
const timeout time.Duration = time.Minute * 5 // Pending bytes: TODO: from CLI
|
var flushEvery = flag.Int("flush", 5000, "Flush every N packets")
|
||||||
|
var dtf, _ = time.ParseDuration("5m")
|
||||||
|
var dtc, _ = time.ParseDuration("48h")
|
||||||
|
var flushTf = flag.Duration("flushtf", dtf, "Flush older than t")
|
||||||
|
var flushTc = flag.Duration("flushtc", dtc, "Close older that t")
|
||||||
|
|
||||||
var assemblerOptions = reassembly.AssemblerOptions{
|
var assemblerOptions = reassembly.AssemblerOptions{
|
||||||
MaxBufferedPagesPerConnection: 16,
|
MaxBufferedPagesPerConnection: 16,
|
||||||
|
@ -227,11 +231,9 @@ func (t *tcpStream) ReassembledSG(sg reassembly.ScatterGather, ac reassembly.Ass
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the handshake is considered finished and we have not yet outputted it we ship it to output.
|
|
||||||
if t.tlsSession.HandshakeComplete() && !t.queued {
|
if t.tlsSession.HandshakeComplete() && !t.queued {
|
||||||
t.queueSession()
|
t.queueSession()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -373,9 +375,11 @@ func main() {
|
||||||
}
|
}
|
||||||
assembler.AssembleWithContext(packet.NetworkLayer().NetworkFlow(), tcp, &c)
|
assembler.AssembleWithContext(packet.NetworkLayer().NetworkFlow(), tcp, &c)
|
||||||
}
|
}
|
||||||
//ref := packet.Metadata().CaptureInfo.Timestamp
|
if count%*flushEvery == 0{
|
||||||
//flushed, closed := assembler.FlushWithOptions(reassembly.FlushOptions{T: ref.Add(time.Minute * 30), TC: ref.Add(time.Minute * 5)})
|
ref := packet.Metadata().CaptureInfo.Timestamp
|
||||||
//Debug("Forced flush: %d flushed, %d closed (%s)", flushed, closed, ref)
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue