can-utils: AOSP build clean up

[sojka/can-utils.git] / cangw.c

diff --git a/cangw.c b/cangw.c
index ee063e9c15ff6c6471fa2f54cae8719057418a1e..802aa8627d145d6e2e88251282130bda1e15db14 100644 (file)
--- a/cangw.c
+++ b/cangw.c
@@ -1,7 +1,3 @@
-/*
- *  $Id$
- */
-
 /*
  * cangw.c - manage PF_CAN netlink gateway
  *
@@ -41,7 +37,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
+ * Send feedback to <linux-can@vger.kernel.org>
  *
  */
 
@@ -102,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)
@@ -196,6 +195,7 @@ void print_usage(char *prg)
        fprintf(stderr, "           -d <dst_dev>  (destination netdevice)\n");
        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, "           -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");
@@ -203,7 +203,9 @@ void print_usage(char *prg)
        fprintf(stderr, "           -p <profile>:[<profile_data>] (CRC8 checksum profile & parameters)\n");
        fprintf(stderr, "\nValues are given and expected in hexadecimal values. Leading 0s can be omitted.\n");
        fprintf(stderr, "\n");
-       fprintf(stderr, "<filter> is a <value>:<mask> CAN identifier filter\n");
+       fprintf(stderr, "<filter> is a <value><mask> CAN identifier filter\n");
+       fprintf(stderr, "   <can_id>:<can_mask> (matches when <received_can_id> & mask == can_id & mask)\n");
+       fprintf(stderr, "   <can_id>~<can_mask> (matches when <received_can_id> & mask != can_id & mask)\n");
        fprintf(stderr, "\n");
        fprintf(stderr, "<mod> is a CAN frame modification instruction consisting of\n");
        fprintf(stderr, "<instruction>:<can_frame-elements>:<can_id>.<can_dlc>.<can_data>\n");
@@ -326,8 +328,7 @@ int parse_mod(char *optarg, struct modattr *modmsg)
                ptr++;
        }
 
-       if (sscanf(++ptr, "%lx.%hhx.%16s",
-                  (long unsigned int *)&modmsg->cf.can_id,
+       if (sscanf(++ptr, "%x.%hhx.%16s", &modmsg->cf.can_id,
                   (unsigned char *)&modmsg->cf.can_dlc, hexdata) != 3)
                return 5;
 
@@ -356,7 +357,7 @@ int parse_rtlist(char *prgname, unsigned char *rxbuf, int len)
        struct nlmsghdr *nlh;
        unsigned int src_ifindex = 0;
        unsigned int dst_ifindex = 0;
-       __u32 handled, dropped;
+       __u32 handled, dropped, deleted;
        int rtlen;
 
 
@@ -397,6 +398,7 @@ int parse_rtlist(char *prgname, unsigned char *rxbuf, int len)
 
                handled = 0;
                dropped = 0;
+               deleted = 0;
                src_ifindex = 0;
                dst_ifindex = 0;
 
@@ -435,6 +437,10 @@ int parse_rtlist(char *prgname, unsigned char *rxbuf, int len)
                                dropped = *(__u32 *)RTA_DATA(rta);
                                break;
 
+                       case CGW_DELETED:
+                               deleted = *(__u32 *)RTA_DATA(rta);
+                               break;
+
                        default:
                                printf("Unknown attribute %d!", rta->rta_type);
                                return -EINVAL;
@@ -452,6 +458,9 @@ int parse_rtlist(char *prgname, unsigned char *rxbuf, int len)
                if (rtc->flags & CGW_FLAGS_CAN_SRC_TSTAMP)
                        printf("-t ");
 
+               if (rtc->flags & CGW_FLAGS_CAN_IIF_TX_OK)
+                       printf("-i ");
+
                /* second parse for mod attributes */
                rta = (struct rtattr *) RTCAN_RTA(rtc);
                rtlen = RTCAN_PAYLOAD(nlh);
@@ -492,6 +501,7 @@ int parse_rtlist(char *prgname, unsigned char *rxbuf, int len)
                        case CGW_DST_IF:
                        case CGW_HANDLED:
                        case CGW_DROPPED:
+                       case CGW_DELETED:
                                break;
 
                        default:
@@ -501,7 +511,9 @@ int parse_rtlist(char *prgname, unsigned char *rxbuf, int len)
                        }
                }
 
-               printf("# %d handled %d dropped\n", handled, dropped); /* end of entry */
+               /* end of entry */
+               printf("# %d handled %d dropped %d deleted\n",
+                      handled, dropped, deleted);
 
                /* jump to next NLMSG in the given buffer */
                nlh = NLMSG_NEXT(nlh, len);
@@ -551,7 +563,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:tef:c:p:x:m:?")) != -1) {
+       while ((opt = getopt(argc, argv, "ADFLs:d:teif:c:p:x:m:?")) != -1) {
                switch (opt) {
 
                case 'A':
@@ -590,10 +602,17 @@ int main(int argc, char **argv)
                        flags |= CGW_FLAGS_CAN_ECHO;
                        break;
 
+               case 'i':
+                       flags |= CGW_FLAGS_CAN_IIF_TX_OK;
+                       break;
+
                case 'f':
-                       if (sscanf(optarg, "%lx:%lx",
-                                  (long unsigned int *)&filter.can_id, 
-                                  (long unsigned int *)&filter.can_mask) == 2) {
+                       if (sscanf(optarg, "%x:%x", &filter.can_id,
+                                  &filter.can_mask) == 2) {
+                               have_filter = 1;
+                       } else if (sscanf(optarg, "%x~%x", &filter.can_id,
+                                         &filter.can_mask) == 2) {
+                               filter.can_id |= CAN_INV_FILTER;
                                have_filter = 1;
                        } else {
                                printf("Bad filter definition '%s'.\n", optarg);
@@ -665,6 +684,11 @@ int main(int argc, char **argv)
                exit(1);
        }
 
+       if (!modidx && (have_cs_crc8 || have_cs_xor)) {
+               printf("-c or -x can only be used in conjunction with -m\n");
+               exit(1);
+       }
+
        s = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
 
        switch (cmd) {