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: implemented can.obd2 builtin parser

Browse source
This commit is contained in:
Simone Margaritelli 2024-08-31 14:01:40 +02:00
commit c3999d6bb5
11 changed files with 520 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/can/can_recon.go
View file

@ -3,7 +3,6 @@ package can
import (
"errors"
"github.com/bettercap/bettercap/v2/network"
"github.com/bettercap/bettercap/v2/session"
"github.com/evilsocket/islazy/tui"
"github.com/hashicorp/go-bexpr"
@ -11,15 +10,9 @@ import (
"go.einride.tech/can/pkg/socketcan"
)
type Message struct {
Frame can.Frame
Name string
Source *network.CANDevice
Signals map[string]string
}
func (mod *CANModule) Configure() error {
var err error
var parseOBD bool
if mod.Running() {
return session.ErrAlreadyStarted(mod.Name())
@ -29,6 +22,8 @@ func (mod *CANModule) Configure() error {
return err
} else if err, mod.dumpInject = mod.BoolParam("can.dump.inject"); err != nil {
return err
} else if err, parseOBD = mod.BoolParam("can.parse.obd2"); err != nil {
return err
} else if err, mod.transport = mod.StringParam("can.transport"); err != nil {
return err
} else if mod.transport != "can" && mod.transport != "udp" {
@ -37,6 +32,8 @@ func (mod *CANModule) Configure() error {
return err
}
mod.obd2.Enable(parseOBD)
if mod.filter != "" {
if mod.filterExpr, err = bexpr.CreateEvaluator(mod.filter); err != nil {
return err
@ -77,12 +74,13 @@ func (mod *CANModule) isFilteredOut(frame can.Frame, msg Message) bool {
}
func (mod *CANModule) onFrame(frame can.Frame) {
msg := Message{
Frame: frame,
}
msg := NewCanMessage(frame)
// try to parse with DBC if we have any
mod.dbc.Parse(mod, frame, &msg)
if !mod.dbc.Parse(mod, &msg) {
// not parsed, if enabled try ODB2
mod.obd2.Parse(mod, &msg)
}
if !mod.isFilteredOut(frame, msg) {
mod.Session.Events.Add("can.message", msg)