73 lines
2.1 KiB
Diff
73 lines
2.1 KiB
Diff
diff -Naur orig/canlogserver.c new/canlogserver.c
|
|
--- orig/canlogserver.c 2020-06-16 11:06:57.633786948 +0300
|
|
+++ new/canlogserver.c 2020-06-16 11:07:25.677648420 +0300
|
|
@@ -64,6 +64,8 @@
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
|
|
+#include <linux/sockios.h>
|
|
+
|
|
#include "lib.h"
|
|
|
|
#define MAXDEV 6 /* change sscanf()'s manually if changed here */
|
|
diff -Naur orig/cansniffer.c new/cansniffer.c
|
|
--- orig/cansniffer.c 2020-06-16 11:11:55.970313188 +0300
|
|
+++ new/cansniffer.c 2020-06-16 11:12:11.428236823 +0300
|
|
@@ -62,6 +62,8 @@
|
|
#include <linux/can.h>
|
|
#include <linux/can/bcm.h>
|
|
|
|
+#include <linux/sockios.h>
|
|
+
|
|
#include "terminal.h"
|
|
|
|
#define SETFNAME "sniffset."
|
|
diff -Naur orig/isotpdump.c new/isotpdump.c
|
|
--- orig/isotpdump.c 2020-06-16 11:16:44.411888160 +0300
|
|
+++ new/isotpdump.c 2020-06-16 11:19:03.545200730 +0300
|
|
@@ -57,6 +57,8 @@
|
|
#include <linux/can/raw.h>
|
|
#include "terminal.h"
|
|
|
|
+#include <linux/sockios.h>
|
|
+
|
|
#define NO_CAN_ID 0xFFFFFFFFU
|
|
|
|
const char fc_info [4][9] = { "CTS", "WT", "OVFLW", "reserved" };
|
|
diff -Naur orig/isotpperf.c new/isotpperf.c
|
|
--- orig/isotpperf.c 2020-06-16 11:14:46.894468764 +0300
|
|
+++ new/isotpperf.c 2020-06-16 11:15:15.010329858 +0300
|
|
@@ -57,6 +57,8 @@
|
|
#include <linux/can.h>
|
|
#include <linux/can/raw.h>
|
|
|
|
+#include <linux/sockios.h>
|
|
+
|
|
#define NO_CAN_ID 0xFFFFFFFFU
|
|
#define PERCENTRES 2 /* resolution in percent for bargraph */
|
|
#define NUMBAR (100/PERCENTRES) /* number of bargraph elements */
|
|
diff -Naur orig/isotpsniffer.c new/isotpsniffer.c
|
|
--- orig/isotpsniffer.c 2020-06-16 11:16:28.809965243 +0300
|
|
+++ new/isotpsniffer.c 2020-06-16 11:18:54.999242955 +0300
|
|
@@ -57,6 +57,8 @@
|
|
#include <linux/can/isotp.h>
|
|
#include "terminal.h"
|
|
|
|
+#include <linux/sockios.h>
|
|
+
|
|
#define NO_CAN_ID 0xFFFFFFFFU
|
|
|
|
#define FORMAT_HEX 1
|
|
diff -Naur orig/slcanpty.c new/slcanpty.c
|
|
--- orig/slcanpty.c 2020-06-16 11:16:12.317046729 +0300
|
|
+++ new/slcanpty.c 2020-06-16 11:17:13.039746718 +0300
|
|
@@ -41,6 +41,8 @@
|
|
#include <linux/can.h>
|
|
#include <linux/can/raw.h>
|
|
|
|
+#include <linux/sockios.h>
|
|
+
|
|
/* maximum rx buffer len: extended CAN frame with timestamp */
|
|
#define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1)
|
|
#define DEVICE_NAME_PTMX "/dev/ptmx"
|