sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-08-05 06:20:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

cangw: add new command line option '-X' to handle CAN FD rules

Browse Source 
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
This commit is contained in:
Oliver Hartkopp
2019-08-16 15:26:50 +02:00
parent 0669215a4b
commit 24923df749
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cangw.c
+10 -2
View File
@@ -194,7 +194,8 @@ void print_usage(char *prg)
fprintf(stderr, " -L (list all rules)\n"); fprintf(stderr, " -L (list all rules)\n");
fprintf(stderr, "Mandatory: -s <src_dev> (source netdevice)\n"); fprintf(stderr, "Mandatory: -s <src_dev> (source netdevice)\n");
fprintf(stderr, " -d <dst_dev> (destination netdevice)\n"); fprintf(stderr, " -d <dst_dev> (destination netdevice)\n");
fprintf(stderr, "Options: -t (preserve src_dev rx timestamp)\n"); fprintf(stderr, "Options: -X (this is a CAN FD rule)\n");
fprintf(stderr, " -t (preserve src_dev rx timestamp)\n");
fprintf(stderr, " -e (echo sent frames - recommended on vcanx)\n"); fprintf(stderr, " -e (echo sent frames - recommended on vcanx)\n");
fprintf(stderr, " -i (allow to route to incoming interface)\n"); fprintf(stderr, " -i (allow to route to incoming interface)\n");
fprintf(stderr, " -u <uid> (user defined modification identifier)\n"); fprintf(stderr, " -u <uid> (user defined modification identifier)\n");
@@ -459,6 +460,9 @@ int parse_rtlist(char *prgname, unsigned char *rxbuf, int len)
printf("-s %s ", if_indextoname(src_ifindex, ifname)); printf("-s %s ", if_indextoname(src_ifindex, ifname));
printf("-d %s ", if_indextoname(dst_ifindex, ifname)); printf("-d %s ", if_indextoname(dst_ifindex, ifname));
if (rtc->flags & CGW_FLAGS_CAN_FD)
printf("-X ");
if (rtc->flags & CGW_FLAGS_CAN_ECHO) if (rtc->flags & CGW_FLAGS_CAN_ECHO)
printf("-e "); printf("-e ");
@@ -580,7 +584,7 @@ int main(int argc, char **argv)
memset(&cs_xor, 0, sizeof(cs_xor)); memset(&cs_xor, 0, sizeof(cs_xor));
memset(&cs_crc8, 0, sizeof(cs_crc8)); memset(&cs_crc8, 0, sizeof(cs_crc8));
while ((opt = getopt(argc, argv, "ADFLs:d:teiu:l:f:c:p:x:m:?")) != -1) { while ((opt = getopt(argc, argv, "ADFLs:d:Xteiu:l:f:c:p:x:m:?")) != -1) {
switch (opt) { switch (opt) {
case 'A': case 'A':
@@ -611,6 +615,10 @@ int main(int argc, char **argv)
dst_ifindex = if_nametoindex(optarg); dst_ifindex = if_nametoindex(optarg);
break; break;
case 'X':
flags |= CGW_FLAGS_CAN_FD;
break;
case 't': case 't':
flags |= CGW_FLAGS_CAN_SRC_TSTAMP; flags |= CGW_FLAGS_CAN_SRC_TSTAMP;
break; break;