File tree 2 files changed +3
-35
lines changed
2 files changed +3
-35
lines changed Original file line number Diff line number Diff line change @@ -3,10 +3,11 @@ GOBUILD=$(GOCMD) build
3
3
GOCLEAN =$(GOCMD ) clean
4
4
GOTEST =$(GOCMD ) test
5
5
GOGET =$(GOCMD ) get
6
+
6
7
BINARY_NAME =candump
8
+ VERSION =$(shell git describe --exact-match --tags 2>/dev/null)
7
9
BUILD_DIR =build
8
10
BUILD_SRC =cmd/candump.go
9
- PACKAGE_RPI =$(BINARY_NAME ) _linux_armhf
10
11
11
12
all : test build
12
13
build :
20
21
rm -rf $(BINARY_NAME )
21
22
22
23
package-rpi : build-rpi
23
- tar -cvzf $(PACKAGE_RPI ) .tar.gz -C $(BUILD_DIR ) $(BINARY_NAME )
24
+ tar -cvzf $(BINARY_NAME ) - $( VERSION ) _linux_armhf .tar.gz -C $(BUILD_DIR ) $(BINARY_NAME )
24
25
25
26
build-rpi :
26
27
GOOS=linux GOARCH=arm GOARM=6 $(GOBUILD ) -o $(BUILD_DIR ) /$(BINARY_NAME ) -i $(BUILD_SRC )
Original file line number Diff line number Diff line change 1
1
package can
2
2
3
3
import (
4
- "fmt"
5
4
"io"
6
- "net"
7
- "os"
8
- "syscall"
9
5
)
10
6
11
7
// The Reader interface extends the `io.Reader` interface by method
@@ -31,39 +27,10 @@ type ReadWriteCloser interface {
31
27
io.Closer
32
28
}
33
29
34
- // Socket protocols
35
- const (
36
- Raw uint8 = 1 // CAN_RAW
37
- Bcm uint8 = 2 // CAN_BCM
38
- TP16 uint8 = 3
39
- TP20 uint8 = 4
40
- MCNet uint8 = 5
41
- ISOTp uint8 = 6
42
- )
43
-
44
30
type readWriteCloser struct {
45
31
rwc io.ReadWriteCloser
46
32
}
47
33
48
- // NewReadWriteCloserForInterface returns a ReadWriteCloser for a network interface.
49
- func NewReadWriteCloserForInterface (i * net.Interface ) (ReadWriteCloser , error ) {
50
- proto := Raw
51
- s , err := syscall .Socket (AF_CAN , syscall .SOCK_RAW , int (proto ) /* 0? */ )
52
- if err != nil {
53
- return nil , err
54
- }
55
-
56
- addr := NewSockaddr (uint16 (proto ) /* can.AF_CAN? */ , i .Index /* 0 for all interfaces? */ )
57
-
58
- if err := syscall .Bind (s , addr ); err != nil {
59
- return nil , err
60
- }
61
-
62
- f := os .NewFile (uintptr (s ), fmt .Sprintf ("fd %d" , s ))
63
-
64
- return & readWriteCloser {f }, nil
65
- }
66
-
67
34
// NewReadWriteCloser returns a ReadWriteCloser for an `io.ReadWriteCloser`.
68
35
func NewReadWriteCloser (rwc io.ReadWriteCloser ) ReadWriteCloser {
69
36
return & readWriteCloser {rwc }
You can’t perform that action at this time.
0 commit comments