Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding interface for setting kernel filter #9

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions bus.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package can
import (
"io"
"net"

"golang.org/x/sys/unix"
)

// Bus represents the CAN bus.
Expand Down Expand Up @@ -82,6 +84,16 @@ func (b *Bus) Publish(frame Frame) error {
return b.rwc.WriteFrame(frame)
}

// SetFilter sets CAN filter on kernel level.
func (b *Bus) SetFilter(filter []unix.CanFilter) error {
return b.rwc.setFilter(filter)
}

// DeleteFilter deltes all kernel filter.
func (b *Bus) DeleteFilter() error {
return b.rwc.deleteFilter()
}

func (b *Bus) contains(handler Handler) bool {
for _, h := range b.handler {
if h == handler {
Expand Down
17 changes: 16 additions & 1 deletion cmd/candump.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@ package main
import (
"flag"
"fmt"
"github.com/brutella/can"
"log"
"net"
"os"
"os/signal"

"github.com/sitec-systems/can"
"golang.org/x/sys/unix"
)

var i = flag.String("if", "", "network interface name")
var filterFlag = flag.Int("filter", 0, "filter for id")

func main() {
flag.Parse()
Expand All @@ -35,6 +38,18 @@ func main() {
}

bus := can.NewBus(conn)

if *filterFlag != 0 {
filter := make([]unix.CanFilter, 1)
filter[0].Id = uint32(*filterFlag)
filter[0].Mask = 0x7ff
err := bus.SetFilter(filter)
if err != nil {
fmt.Fprintf(os.Stderr, "Can't set kernel filter: %s/n", err.Error())
os.Exit(1)
}
}

bus.SubscribeFunc(logCANFrame)

c := make(chan os.Signal)
Expand Down
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
module github.com/brutella/can
module github.com/sitec-systems/can

require golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06
go 1.12

require golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFnE+74kEmuHZ46F6KHsMr5Gx2gUQPuNz28iQZM=
golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
34 changes: 32 additions & 2 deletions readwritecloser.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package can

import (
"errors"
"io"

"golang.org/x/sys/unix"
)

// The Reader interface extends the `io.Reader` interface by method
Expand All @@ -25,15 +28,18 @@ type ReadWriteCloser interface {
Writer

io.Closer
setFilter(filter []unix.CanFilter) error
deleteFilter() error
}

type readWriteCloser struct {
rwc io.ReadWriteCloser
rwc io.ReadWriteCloser
socket int
}

// NewReadWriteCloser returns a ReadWriteCloser for an `io.ReadWriteCloser`.
func NewReadWriteCloser(rwc io.ReadWriteCloser) ReadWriteCloser {
return &readWriteCloser{rwc}
return &readWriteCloser{rwc: rwc, socket: 0}
}

func (rwc *readWriteCloser) ReadFrame(frame *Frame) error {
Expand Down Expand Up @@ -70,5 +76,29 @@ func (rwc *readWriteCloser) Write(b []byte) (n int, err error) {
}

func (rwc *readWriteCloser) Close() error {
rwc.socket = 0
return rwc.rwc.Close()
}

const (
solCANRaw = 101 // filter level for setsockopt call
canRawFilter = 1 // filter option for setsockopt call
)

// ErrorKernelFilterNotSupported is returned if the socket attribute is 0. Then the method
// setsockopt can't be called.
var ErrorKernelFilterNotSupported = errors.New("Not possible to set kernel filter.")

func (rwc *readWriteCloser) setFilter(filter []unix.CanFilter) error {
if rwc.socket == 0 {
return ErrorKernelFilterNotSupported
}
return unix.SetsockoptCanRawFilter(rwc.socket, solCANRaw, canRawFilter, filter)
}

func (rwc *readWriteCloser) deleteFilter() error {
if rwc.socket == 0 {
return ErrorKernelFilterNotSupported
}
return unix.SetsockoptCanRawFilter(rwc.socket, solCANRaw, canRawFilter, nil)
}
5 changes: 3 additions & 2 deletions readwritecloser_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package can

import (
"fmt"
"golang.org/x/sys/unix"
"net"
"os"
"syscall"

"golang.org/x/sys/unix"
)

func NewReadWriteCloserForInterface(i *net.Interface) (ReadWriteCloser, error) {
Expand All @@ -17,5 +18,5 @@ func NewReadWriteCloserForInterface(i *net.Interface) (ReadWriteCloser, error) {

f := os.NewFile(uintptr(s), fmt.Sprintf("fd %d", s))

return &readWriteCloser{f}, nil
return &readWriteCloser{rwc: f, socket: s}, nil
}
3 changes: 3 additions & 0 deletions vendor/golang.org/x/sys/AUTHORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/golang.org/x/sys/CONTRIBUTORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions vendor/golang.org/x/sys/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/golang.org/x/sys/PATENTS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/golang.org/x/sys/unix/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

173 changes: 173 additions & 0 deletions vendor/golang.org/x/sys/unix/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading