candump: check for joined filter support at runtime

[can-utils.git] / cangw.c

diff --git a/cangw.c b/cangw.c
index 4b4595c63fb3464987e3ac161f6e49e162d34fb0..b908fe45ddb59b0fbb59fb75c84c8d9bd7491588 100644 (file)
--- a/cangw.c
+++ b/cangw.c
@@ -98,7 +98,10 @@ void printfilter(const void *data)
 {
        struct can_filter *filter = (struct can_filter *)data;
 
-       printf("-f %03X:%X ", filter->can_id, filter->can_mask);
+       if (filter->can_id & CAN_INV_FILTER)
+               printf("-f %03X~%X ", (filter->can_id & ~CAN_INV_FILTER), filter->can_mask);
+       else
+               printf("-f %03X:%X ", filter->can_id, filter->can_mask);
 }
 
 void printmod(const char *type, const void *data)
@@ -193,6 +196,7 @@ void print_usage(char *prg)
        fprintf(stderr, "Options:   -t (preserve src_dev rx timestamp)\n");
        fprintf(stderr, "           -e (echo sent frames - recommended on vcanx)\n");
        fprintf(stderr, "           -i (allow to route to incoming interface)\n");
+       fprintf(stderr, "           -l <hops> (limit the number of frame hops / routings)\n");
        fprintf(stderr, "           -f <filter> (set CAN filter)\n");
        fprintf(stderr, "           -m <mod> (set frame modifications)\n");
        fprintf(stderr, "           -x <from_idx>:<to_idx>:<result_idx>:<init_xor_val> (XOR checksum)\n");
@@ -414,6 +418,7 @@ int parse_rtlist(char *prgname, unsigned char *rxbuf, int len)
                        case CGW_MOD_OR:
                        case CGW_MOD_XOR:
                        case CGW_MOD_SET:
+                       case CGW_LIM_HOPS:
                        case CGW_CS_XOR:
                        case CGW_CS_CRC8:
                                break;
@@ -486,6 +491,10 @@ int parse_rtlist(char *prgname, unsigned char *rxbuf, int len)
                                printmod("SET", RTA_DATA(rta));
                                break;
 
+                       case CGW_LIM_HOPS:
+                               printf("-l %d ", *(__u8 *)RTA_DATA(rta));
+                               break;
+
                        case CGW_CS_XOR:
                                print_cs_xor((struct cgw_csum_xor *)RTA_DATA(rta));
                                break;
@@ -542,6 +551,7 @@ int main(int argc, char **argv)
        struct nlmsgerr *rte;
        unsigned int src_ifindex = 0;
        unsigned int dst_ifindex = 0;
+       __u8 limit_hops = 0;
        __u16 flags = 0;
        int len;
 
@@ -560,7 +570,7 @@ int main(int argc, char **argv)
        memset(&cs_xor, 0, sizeof(cs_xor));
        memset(&cs_crc8, 0, sizeof(cs_crc8));
 
-       while ((opt = getopt(argc, argv, "ADFLs:d:teif:c:p:x:m:?")) != -1) {
+       while ((opt = getopt(argc, argv, "ADFLs:d:teil:f:c:p:x:m:?")) != -1) {
                switch (opt) {
 
                case 'A':
@@ -603,6 +613,13 @@ int main(int argc, char **argv)
                        flags |= CGW_FLAGS_CAN_IIF_TX_OK;
                        break;
 
+               case 'l':
+                       if (sscanf(optarg, "%hhd", &limit_hops) != 1 || !(limit_hops)) {
+                               printf("Bad hop limit definition '%s'.\n", optarg);
+                               exit(1);
+                       }
+                       break;
+
                case 'f':
                        if (sscanf(optarg, "%x:%x", &filter.can_id,
                                   &filter.can_mask) == 2) {
@@ -740,6 +757,9 @@ int main(int argc, char **argv)
        if (have_cs_xor)
                addattr_l(&req.nh, sizeof(req), CGW_CS_XOR, &cs_xor, sizeof(cs_xor));
 
+       if (limit_hops)
+               addattr_l(&req.nh, sizeof(req), CGW_LIM_HOPS, &limit_hops, sizeof(__u8));
+
        /*
         * a better example code
         * modmsg.modtype = CGW_MOD_ID;