github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 13:09:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refact: target -> endpoint

Browse source
This commit is contained in:
evilsocket 2018-02-05 21:57:16 +01:00
commit 36352311fb
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
caplets/ap.cap
View file

@ -7,7 +7,7 @@ set net.sniff.filter not arp and not udp port 53
events.stream off events.stream off
events.clear events.clear
set events.stream.filter target. set events.stream.filter endpoint.
events.stream on events.stream on
api.rest on api.rest on

6
modules/events_view.go
View file

@ -20,7 +20,7 @@ func (s EventsStream) viewLogEvent(e session.Event) {
e.Data.(session.LogMessage).Message) e.Data.(session.LogMessage).Message)
} }
func (s EventsStream) viewTargetEvent(e session.Event) { func (s EventsStream) viewEndpointEvent(e session.Event) {
t := e.Data.(*net.Endpoint) t := e.Data.(*net.Endpoint)
fmt.Printf("[%s] [%s] %s\n", fmt.Printf("[%s] [%s] %s\n",
e.Time.Format(eventTimeFormat), e.Time.Format(eventTimeFormat),
@ -47,8 +47,8 @@ func (s *EventsStream) View(e session.Event, refresh bool) {
if s.filter == "" || strings.Contains(e.Tag, s.filter) { if s.filter == "" || strings.Contains(e.Tag, s.filter) {
if e.Tag == "sys.log" { if e.Tag == "sys.log" {
s.viewLogEvent(e) s.viewLogEvent(e)
} else if strings.HasPrefix(e.Tag, "target.") { } else if strings.HasPrefix(e.Tag, "endpoint.") {
s.viewTargetEvent(e) s.viewEndpointEvent(e)
} else if strings.HasPrefix(e.Tag, "mod.") { } else if strings.HasPrefix(e.Tag, "mod.") {
s.viewModuleEvent(e) s.viewModuleEvent(e)
} else if strings.HasPrefix(e.Tag, "net.sniff.") { } else if strings.HasPrefix(e.Tag, "net.sniff.") {

6
session/targets.go
View file

@ -128,7 +128,7 @@ func (tp *Targets) Remove(ip, mac string) {
if e, found := tp.Targets[mac]; found { if e, found := tp.Targets[mac]; found {
tp.TTL[mac]-- tp.TTL[mac]--
if tp.TTL[mac] == 0 { if tp.TTL[mac] == 0 {
tp.Session.Events.Add("target.lost", e) tp.Session.Events.Add("endpoint.lost", e)
delete(tp.Targets, mac) delete(tp.Targets, mac)
delete(tp.TTL, mac) delete(tp.TTL, mac)
} }
@ -171,7 +171,7 @@ func (tp *Targets) AddIfNew(ip, mac string) *net.Endpoint {
e := net.NewEndpoint(ip, mac) e := net.NewEndpoint(ip, mac)
e.ResolvedCallback = func(e *net.Endpoint) { e.ResolvedCallback = func(e *net.Endpoint) {
tp.Session.Events.Add("target.resolved", e) tp.Session.Events.Add("endpoint.resolved", e)
} }
if alias, found := tp.Aliases[mac]; found { if alias, found := tp.Aliases[mac]; found {
@ -181,7 +181,7 @@ func (tp *Targets) AddIfNew(ip, mac string) *net.Endpoint {
tp.Targets[mac] = e tp.Targets[mac] = e
tp.TTL[mac] = TargetsDefaultTTL tp.TTL[mac] = TargetsDefaultTTL
tp.Session.Events.Add("target.new", e) tp.Session.Events.Add("endpoint.new", e)
return nil return nil
} }