github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-14 02:36:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

new: syn.scan now exposes progress via api.rest

Browse source
This commit is contained in:
evilsocket 2019-03-19 11:21:45 +01:00
commit e7606589f3
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/syn_scan/syn_scan.go
View file

@ -45,6 +45,9 @@ func NewSynScanner(s *session.Session) *SynScanner {
progressEvery: time.Duration(1) * time.Second,
}
mod.State.Store("scanning", &mod.addresses)
mod.State.Store("progress", 0.0)
mod.AddParam(session.NewIntParameter("syn.scan.show-progress-every",
"1",
"Period in seconds for the scanning progress reporting."))
@ -155,6 +158,7 @@ func plural(n uint64) string {
func (mod *SynScanner) showProgress() error {
progress := 100.0 * (float64(mod.stats.doneProbes) / float64(mod.stats.totProbes))
mod.State.Store("progress", progress)
mod.Info("[%.2f%%] found %d open port%s for %d address%s, sent %d/%d packets in %s",
progress,
mod.stats.openPorts,
@ -172,12 +176,17 @@ func (mod *SynScanner) Stop() error {
return mod.SetRunning(false, func() {
mod.waitGroup.Wait()
mod.showProgress()
mod.addresses = []net.IP{}
mod.State.Store("progress", 0.0)
})
}
func (mod *SynScanner) synScan() error {
mod.SetRunning(true, func() {
defer mod.SetRunning(false, nil)
defer mod.SetRunning(false, func() {
mod.addresses = []net.IP{}
mod.State.Store("progress", 0.0)
})
mod.waitGroup.Add(1)
defer mod.waitGroup.Done()
@ -199,6 +208,8 @@ func (mod *SynScanner) synScan() error {
mod.Info("scanning %d address%s on port %d ...", mod.stats.numAddresses, plural, mod.startPort)
}
mod.State.Store("progress", 0.0)
// set the collector
mod.Session.Queue.OnPacket(mod.onPacket)
defer mod.Session.Queue.OnPacket(nil)