]> rtime.felk.cvut.cz Git - can-eth-gw.git/commitdiff
switch to new config utility cegw
authorRadek Matejka <radek.matejka@gmail.com>
Fri, 20 Jul 2012 15:32:55 +0000 (17:32 +0200)
committerRadek Matejka <radek.matejka@gmail.com>
Fri, 20 Jul 2012 15:32:55 +0000 (17:32 +0200)
kernel/canethgw.c
utils/cangw/Makefile
utils/cangw/cangw.c [deleted file]
utils/cangw/cegw.c [new file with mode: 0644]

index 6b8c3fdd6527dc5bafd6a51f2b5e6202b0331ee3..6c02f15d1ea608b4209b6a77e2174bc6e19030b9 100644 (file)
@@ -21,6 +21,54 @@ static struct socket* udp_sock;
 static struct socket* can_sock;
 static struct net_device* can_dev;
 
+struct can_can_gw {
+       struct can_filter filter;
+       int src_idx;
+       int dst_idx;
+};
+
+struct can_eth_gw
+{
+       int src_if_index;
+       struct in_addr dst_addr;
+       unsigned short dst_port;
+};
+
+struct eth_can_gw
+{
+       int dst_if;
+};
+
+struct cegw_setting
+{
+       struct can_filter filter;
+       int src_idx;
+       /* bind on if */
+       struct in_addr dst_addr;
+       unsigned short dst_port;
+};
+
+/* list entry for CAN gateways jobs */
+struct cgw_job {
+       struct hlist_node list;
+       struct rcu_head rcu;
+       u32 handled_frames;
+       u32 dropped_frames;
+       union {
+               /* CAN frame data source */
+               struct net_device *dev;
+       } src;
+       union {
+               /* CAN frame data destination */
+               struct net_device *dev;
+       } dst;
+       union {
+               struct can_can_gw ccgw;
+               /* tbc */
+       };
+       u8 gwtype;
+       u16 flags;
+};
 /***********************
  *   UDP
  ***********************/
@@ -142,7 +190,7 @@ static int cgw_create_job( struct sk_buff* skb, struct nlmsghdr* nlh,
                return -EPFNOSUPPORT;
  
        /* so far we only support CAN -> CAN routings */
-       if (r->gwtype == CGW_TYPE_CAN_ETH)
+       if (r->gwtype == CGW_TYPE_CAN_ETH_UDP)
                printk( KERN_INFO "canethgw: TYPE_CAN_ETH" );
        else
                return -1;
@@ -151,8 +199,9 @@ static int cgw_create_job( struct sk_buff* skb, struct nlmsghdr* nlh,
        if( err < 0 )
                return err;
 
-       printk( KERN_INFO "src port:%u\n", *(u16*)nla_data( tb[CGW_SRC_PORT] ) );
-       printk( KERN_INFO "dest port:%u\n", *(u16*)nla_data( tb[CGW_DST_PORT] ) );
+       printk( KERN_INFO "can:%d\n", *(u16*)nla_data( tb[CGW_CAN_IF] ) );
+       printk( KERN_INFO "eth addr:%x\n", *(u16*)nla_data( tb[CGW_ETH_IP] ) );
+       printk( KERN_INFO "eth port:%hu\n", *(u16*)nla_data( tb[CGW_ETH_PORT] ) );
 
        return 0;
 }
index 7c02fefa3e9603af70e46e74e0ca151da5960152..b6001c99449c8251fc90f22b27d5b8a42ee67997 100644 (file)
@@ -1,3 +1,3 @@
 all:
-       gcc -Wall -ocangwcfg -I../../kernel cangw.c
+       gcc -Wall -ggdb -ocegw -I../../kernel cegw.c -lnetlink
 
diff --git a/utils/cangw/cangw.c b/utils/cangw/cangw.c
deleted file mode 100644 (file)
index f3a5723..0000000
+++ /dev/null
@@ -1,848 +0,0 @@
-/*
- *  $Id: cangw.c 1197 2010-09-25 10:24:37Z hartkopp $
- */
-
-/*
- * cangw.c - manage PF_CAN netlink gateway
- *
- * Copyright (c) 2010 Volkswagen Group Electronic Research
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Volkswagen nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * Alternatively, provided that this notice is retained in full, this
- * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2, in which case the provisions of the
- * GPL apply INSTEAD OF those given above.
- *
- * The provided data structures and external interfaces from this code
- * are not restricted to be used by modules with a GPL compatible license.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <libgen.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <arpa/inet.h>
-#include <gw.h>
-
-enum {
-       UNSPEC,
-       ADD,
-       DEL,
-       FLUSH,
-       LIST
-};
-
-struct modattr {
-       struct can_frame cf;
-       __u8 modtype;
-       __u8 instruction;
-} __attribute__((packed));
-
-
-#define RTCAN_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct rtcanmsg))))
-#define RTCAN_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtcanmsg))
-
-/* some netlink helpers stolen from iproute2 package */
-#define NLMSG_TAIL(nmsg) \
-        ((struct rtattr *)(((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
-
-int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
-             int alen)
-{
-       int len = RTA_LENGTH(alen);
-       struct rtattr *rta;
-
-       if (NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len) > maxlen) {
-               fprintf(stderr, "addattr_l: message exceeded bound of %d\n",
-                       maxlen);
-               return -1;
-       }
-       rta = NLMSG_TAIL(n);
-       rta->rta_type = type;
-       rta->rta_len = len;
-       memcpy(RTA_DATA(rta), data, alen);
-       n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
-       return 0;
-}
-
-void printfilter(const void *data)
-{
-       struct can_filter *filter = (struct can_filter *)data;
-
-       printf("-f %03X:%X ", filter->can_id, filter->can_mask);
-}
-
-void printmod(const char *type, const void *data)
-{
-       struct modattr mod;
-       int i;
-
-       memcpy (&mod, data, CGW_MODATTR_LEN);
-
-       printf("-m %s:", type);
-
-       if (mod.modtype & CGW_MOD_ID)
-               printf("I");
-
-       if (mod.modtype & CGW_MOD_DLC)
-               printf("L");
-
-       if (mod.modtype & CGW_MOD_DATA)
-               printf("D");
-
-       printf(":%03X.%X.", mod.cf.can_id, mod.cf.can_dlc);
-
-       for (i = 0; i < 8; i++)
-               printf("%02X", mod.cf.data[i]);
-
-       printf(" ");
-}
-
-void print_cs_xor(struct cgw_csum_xor *cs_xor)
-{
-       printf("-x %d:%d:%d:%02X ",
-              cs_xor->from_idx, cs_xor->to_idx,
-              cs_xor->result_idx, cs_xor->init_xor_val);
-}
-
-void print_cs_crc8_profile(struct cgw_csum_crc8 *cs_crc8)
-{
-       int i;
-
-       printf("-p %d:", cs_crc8->profile);
-
-       switch (cs_crc8->profile) {
-
-       case  CGW_CRC8PRF_1U8:
-
-               printf("%02X", cs_crc8->profile_data[0]);
-               break;
-
-       case  CGW_CRC8PRF_16U8:
-
-               for (i = 0; i < 16; i++)
-                       printf("%02X", cs_crc8->profile_data[i]);
-               break;
-
-       case  CGW_CRC8PRF_SFFID_XOR:
-               break;
-
-       default:
-               printf("<unknown profile #%d>", cs_crc8->profile);
-       }
-
-       printf(" ");
-}
-
-void print_cs_crc8(struct cgw_csum_crc8 *cs_crc8)
-{
-       int i;
-
-       printf("-c %d:%d:%d:%02X:%02X:",
-              cs_crc8->from_idx, cs_crc8->to_idx,
-              cs_crc8->result_idx, cs_crc8->init_crc_val,
-              cs_crc8->final_xor_val);
-
-       for (i = 0; i < 256; i++)
-               printf("%02X", cs_crc8->crctab[i]);
-
-       printf(" ");
-
-       if (cs_crc8->profile != CGW_CRC8PRF_UNSPEC)
-               print_cs_crc8_profile(cs_crc8);
-}
-
-void print_usage(char *prg)
-{
-       fprintf(stderr, "\nUsage: %s [options]\n\n", prg);
-       fprintf(stderr, "Commands:  -A (add a new rule)\n");
-       fprintf(stderr, "           -D (delete a rule)\n");
-       fprintf(stderr, "           -F (flush / delete all rules)\n");
-       fprintf(stderr, "           -L (list all rules)\n");
-       fprintf(stderr, "Mandatory: -s <src_dev>  (source netdevice)\n");
-       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, "           -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");
-       fprintf(stderr, "           -c <from>:<to>:<result>:<init_val>:<xor_val>:<crctab[256]> (CRC8 cs)\n");
-       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, "   <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");
-       fprintf(stderr, " - <instruction> is one of 'AND' 'OR' 'XOR' 'SET'\n");
-       fprintf(stderr, " - <can_frame-elements> is _one_ or _more_ of 'I'dentifier 'L'ength 'D'ata\n");
-       fprintf(stderr, " - <can_id> is an u32 value containing the CAN Identifier\n");
-       fprintf(stderr, " - <can_dlc> is an u8 value containing the data length code (0 .. 8)\n");
-       fprintf(stderr, " - <can_data> is always eight(!) u8 values containing the CAN frames data\n");
-       fprintf(stderr, "The max. four modifications are performed in the order AND -> OR -> XOR -> SET\n");
-       fprintf(stderr, "\n");
-       fprintf(stderr, "Example:\n");
-       fprintf(stderr, "%s -A -s can0 -d vcan3 -e -f 123:C00007FF -m SET:IL:333.4.1122334455667788\n", prg);
-       fprintf(stderr, "\n");
-       fprintf(stderr, "Supported CRC 8 profiles:\n");
-       fprintf(stderr, "Profile '%d' (1U8)       - add one additional u8 value\n", CGW_CRC8PRF_1U8);
-       fprintf(stderr, "Profile '%d' (16U8)      - add u8 value from table[16] indexed by (data[1] & 0xF)\n", CGW_CRC8PRF_16U8);
-       fprintf(stderr, "Profile '%d' (SFFID_XOR) - add u8 value (can_id & 0xFF) ^ (can_id >> 8 & 0xFF)\n", CGW_CRC8PRF_SFFID_XOR);
-       fprintf(stderr, "\n");
-}
-
-int b64hex(char *asc, unsigned char *bin, int len)
-{
-       int i;
-
-       for (i = 0; i < len; i++) {
-               if (!sscanf(asc+(i*2), "%2hhx", bin+i))
-                       return 1;       
-       }
-       return 0;
-}
-
-int parse_crc8_profile(char *optarg, struct cgw_csum_crc8 *crc8)
-{
-       int ret = 1;
-       char *ptr;
-
-       if (sscanf(optarg, "%hhd:", &crc8->profile) != 1)
-               return ret;
-
-       switch (crc8->profile) {
-
-       case  CGW_CRC8PRF_1U8:
-
-               if (sscanf(optarg, "%hhd:%2hhx", &crc8->profile, &crc8->profile_data[0]) == 2)
-                       ret = 0;
-
-               break;
-
-       case  CGW_CRC8PRF_16U8:
-
-               ptr = strchr(optarg, ':');
-
-               /* check if length contains 16 base64 hex values */
-               if (ptr != NULL &&
-                   strlen(ptr) == strlen(":00112233445566778899AABBCCDDEEFF") &&
-                   b64hex(ptr+1, (unsigned char *)&crc8->profile_data[0], 16) == 0)
-                       ret = 0;
-
-               break;
-
-       case  CGW_CRC8PRF_SFFID_XOR:
-
-               /* no additional parameters needed */
-               ret = 0;
-               break;
-       }
-
-       return ret;
-}
-
-int parse_mod(char *optarg, struct modattr *modmsg)
-{
-       char *ptr, *nptr;
-       char hexdata[17] = {0};
-
-       ptr = optarg;
-       nptr = strchr(ptr, ':');
-
-       if ((nptr - ptr > 3) || (nptr - ptr == 0))
-               return 1;
-
-       if (!strncmp(ptr, "AND", 3))
-               modmsg->instruction = CGW_MOD_AND;
-       else if (!strncmp(ptr, "OR", 2))
-               modmsg->instruction = CGW_MOD_OR;
-       else if (!strncmp(ptr, "XOR", 3))
-               modmsg->instruction = CGW_MOD_XOR;
-       else if (!strncmp(ptr, "SET", 3))
-               modmsg->instruction = CGW_MOD_SET;
-       else
-               return 2;
-
-       ptr = nptr+1;
-       nptr = strchr(ptr, ':');
-
-       if ((nptr - ptr > 3) || (nptr - ptr == 0))
-               return 3;
-
-       modmsg->modtype = 0;
-
-       while (*ptr != ':') {
-
-               switch (*ptr) {
-
-               case 'I':
-                       modmsg->modtype |= CGW_MOD_ID;
-                       break;
-
-               case 'L':
-                       modmsg->modtype |= CGW_MOD_DLC;
-                       break;
-
-               case 'D':
-                       modmsg->modtype |= CGW_MOD_DATA;
-                       break;
-
-               default:
-                       return 4;
-               }
-               ptr++;
-       }
-
-       if (sscanf(++ptr, "%x.%hhx.%16s", &modmsg->cf.can_id,
-                  (unsigned char *)&modmsg->cf.can_dlc, hexdata) != 3)
-               return 5;
-
-       /* 4-bit masks can have values from 0 to 0xF */ 
-       if (modmsg->cf.can_dlc > 0xF)
-               return 6;
-
-       /* but when setting CAN_DLC the value has to be limited to 8 */
-       if (modmsg->instruction == CGW_MOD_SET && modmsg->cf.can_dlc > 8)
-               return 7;
-
-       if (strlen(hexdata) != 16)
-               return 8;
-
-       if (b64hex(hexdata, &modmsg->cf.data[0], 8))
-               return 9;
-
-       return 0; /* ok */
-}
-
-int parse_rtlist(char *prgname, unsigned char *rxbuf, int len)
-{
-       char ifname[IF_NAMESIZE]; /* internface name for if_indextoname() */
-       struct rtcanmsg *rtc;
-       struct rtattr *rta;
-       struct nlmsghdr *nlh;
-       unsigned int src_ifindex = 0;
-       unsigned int dst_ifindex = 0;
-       __u32 handled, dropped;
-       int rtlen;
-
-
-       nlh = (struct nlmsghdr *)rxbuf;
-
-       while (1) {
-               if (!NLMSG_OK(nlh, len))
-                       return 0;
-
-               if (nlh->nlmsg_type == NLMSG_ERROR) {
-                       printf("NLMSG_ERROR\n");
-                       return 1;
-               }
-
-               if (nlh->nlmsg_type == NLMSG_DONE) {
-                       //printf("NLMSG_DONE\n");
-                       return 1;
-               }
-
-               rtc = (struct rtcanmsg *)NLMSG_DATA(nlh);
-               if (rtc->can_family != AF_CAN) {
-                       printf("received msg from unknown family %d\n", rtc->can_family);
-                       return -EINVAL;
-               }
-
-               if (rtc->gwtype != CGW_TYPE_CAN_CAN) {
-                       printf("received msg with unknown gwtype %d\n", rtc->gwtype);
-                       return -EINVAL;
-               }
-
-               /*
-                * print list in a representation that
-                * can be used directly for start scripts.
-                *
-                * To order the mandatory and optional parameters in the
-                * output string, the NLMSG is parsed twice.
-                */
-
-               handled = 0;
-               dropped = 0;
-               src_ifindex = 0;
-               dst_ifindex = 0;
-
-               printf("%s -A ", basename(prgname));
-
-               /* first parse for mandatory options */
-               rta = (struct rtattr *) RTCAN_RTA(rtc);
-               rtlen = RTCAN_PAYLOAD(nlh);
-               for(;RTA_OK(rta, rtlen);rta=RTA_NEXT(rta,rtlen))
-               {
-                       //printf("(A-%d)", rta->rta_type);
-                       switch(rta->rta_type) {
-
-                       case CGW_FILTER:
-                       case CGW_MOD_AND:
-                       case CGW_MOD_OR:
-                       case CGW_MOD_XOR:
-                       case CGW_MOD_SET:
-                       case CGW_CS_XOR:
-                       case CGW_CS_CRC8:
-                               break;
-
-                       case CGW_SRC_IF:
-                               src_ifindex = *(__u32 *)RTA_DATA(rta);
-                               break;
-
-                       case CGW_DST_IF:
-                               dst_ifindex = *(__u32 *)RTA_DATA(rta);
-                               break;
-
-                       case CGW_HANDLED:
-                               handled = *(__u32 *)RTA_DATA(rta);
-                               break;
-
-                       case CGW_DROPPED:
-                               dropped = *(__u32 *)RTA_DATA(rta);
-                               break;
-
-                       default:
-                               printf("Unknown attribute %d!", rta->rta_type);
-                               return -EINVAL;
-                               break;
-                       }
-               }
-
-
-               printf("-s %s ", if_indextoname(src_ifindex, ifname));
-               printf("-d %s ", if_indextoname(dst_ifindex, ifname));
-
-               if (rtc->flags & CGW_FLAGS_CAN_ECHO)
-                       printf("-e ");
-
-               if (rtc->flags & CGW_FLAGS_CAN_SRC_TSTAMP)
-                       printf("-t ");
-
-               /* second parse for mod attributes */
-               rta = (struct rtattr *) RTCAN_RTA(rtc);
-               rtlen = RTCAN_PAYLOAD(nlh);
-               for(;RTA_OK(rta, rtlen);rta=RTA_NEXT(rta,rtlen))
-               {
-                       //printf("(B-%d)", rta->rta_type);
-                       switch(rta->rta_type) {
-
-                       case CGW_FILTER:
-                               printfilter(RTA_DATA(rta));
-                               break;
-
-                       case CGW_MOD_AND:
-                               printmod("AND", RTA_DATA(rta));
-                               break;
-
-                       case CGW_MOD_OR:
-                               printmod("OR", RTA_DATA(rta));
-                               break;
-
-                       case CGW_MOD_XOR:
-                               printmod("XOR", RTA_DATA(rta));
-                               break;
-
-                       case CGW_MOD_SET:
-                               printmod("SET", RTA_DATA(rta));
-                               break;
-
-                       case CGW_CS_XOR:
-                               print_cs_xor((struct cgw_csum_xor *)RTA_DATA(rta));
-                               break;
-
-                       case CGW_CS_CRC8:
-                               print_cs_crc8((struct cgw_csum_crc8 *)RTA_DATA(rta));
-                               break;
-
-                       case CGW_SRC_IF:
-                       case CGW_DST_IF:
-                       case CGW_HANDLED:
-                       case CGW_DROPPED:
-                               break;
-
-                       default:
-                               printf("Unknown attribute %d!", rta->rta_type);
-                               return -EINVAL;
-                               break;
-                       }
-               }
-
-               printf("# %d handled %d dropped\n", handled, dropped); /* end of entry */
-
-               /* jump to next NLMSG in the given buffer */
-               nlh = NLMSG_NEXT(nlh, len);
-       }
-}
-
-int read_addr_port( char* in, struct in_addr* addr, unsigned short* port )
-{
-       char* delim = NULL;
-       char addrstr[16];
-       int addrlen;
-       
-       if( (delim = strchr( in, ':' )) == NULL )
-       {
-               fprintf( stderr, "error: ':'\n" );
-               return -1;
-       }
-
-       /* get address */
-       addrlen = delim - in;
-       memcpy( addrstr, in, addrlen );
-       addrstr[addrlen] = '\0';
-       if( inet_aton( addrstr, addr ) == 0 )
-       {
-               fprintf( stderr, "error: aton\n" );
-               return -1;
-       }
-
-       /* get port */
-       if( sscanf( delim, ":%hu", port ) != 1 ) /* todo: handle overflow */
-       {
-               fprintf( stderr, "error: port\n" );
-               return -1;
-       }
-
-       return 0;
-}
-
-int main(int argc, char **argv)
-{
-       int s;
-       int err = 0;
-
-       int opt;
-       extern int optind, opterr, optopt;
-
-       int cmd = UNSPEC;
-       int have_filter = 0;
-       int have_cs_xor = 0;
-       int have_cs_crc8 = 0;
-
-       struct {
-               struct nlmsghdr nh;
-               struct rtcanmsg rtcan;
-               char buf[600]; /* enough? */
-
-       } req;
-
-       unsigned char rxbuf[8192]; /* netlink receive buffer */
-       struct nlmsghdr *nlh;
-       struct nlmsgerr *rte;
-       unsigned int src_ifindex = 0;
-       unsigned int dst_ifindex = 0;
-       /**/
-       struct in_addr src_addr, dst_addr;
-       unsigned short src_port, dst_port;
-
-       __u16 flags = 0;
-       int len;
-
-       struct can_filter filter;
-       struct sockaddr_nl nladdr;
-
-       struct cgw_csum_xor cs_xor;
-       struct cgw_csum_crc8 cs_crc8;
-       char crc8tab[513] = {0};
-
-       struct modattr modmsg[CGW_MOD_FUNCS];
-       int modidx = 0;
-       int i;
-
-       memset(&req, 0, sizeof(req));
-       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) {
-               switch (opt) {
-
-               case 'A':
-                       if (cmd == UNSPEC)
-                               cmd = ADD;
-                       break;
-
-               case 'D':
-                       if (cmd == UNSPEC)
-                               cmd = DEL;
-                       break;
-
-               case 'F':
-                       if (cmd == UNSPEC)
-                               cmd = FLUSH;
-                       break;
-
-               case 'L':
-                       if (cmd == UNSPEC)
-                               cmd = LIST;
-                       break;
-
-               case 's':
-                       //src_ifindex = if_nametoindex(optarg);
-                       read_addr_port( optarg, &src_addr, &src_port );
-                       break;
-
-               case 'd':
-                       //dst_ifindex = if_nametoindex(optarg);
-                       read_addr_port( optarg, &dst_addr, &dst_port );
-                       break;
-
-               case 't':
-                       flags |= CGW_FLAGS_CAN_SRC_TSTAMP;
-                       break;
-
-               case 'e':
-                       flags |= CGW_FLAGS_CAN_ECHO;
-                       break;
-
-               case 'f':
-                       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);
-                               exit(1);
-                       }
-                       break;
-
-               case 'x':
-                       if (sscanf(optarg, "%hhd:%hhd:%hhd:%hhx",
-                                  &cs_xor.from_idx, &cs_xor.to_idx,
-                                  &cs_xor.result_idx, &cs_xor.init_xor_val) == 4) {
-                               have_cs_xor = 1;
-                       } else {
-                               printf("Bad XOR checksum definition '%s'.\n", optarg);
-                               exit(1);
-                       }
-                       break;
-
-               case 'c':
-                       if ((sscanf(optarg, "%hhd:%hhd:%hhd:%hhx:%hhx:%512s",
-                                   &cs_crc8.from_idx, &cs_crc8.to_idx,
-                                   &cs_crc8.result_idx, &cs_crc8.init_crc_val,
-                                   &cs_crc8.final_xor_val, crc8tab) == 6) &&
-                           (strlen(crc8tab) == 512) &&
-                           (b64hex(crc8tab, (unsigned char *)&cs_crc8.crctab, 256) == 0)) {
-                               have_cs_crc8 = 1;
-                       } else {
-                               printf("Bad CRC8 checksum definition '%s'.\n", optarg);
-                               exit(1);
-                       }
-                       break;
-
-               case 'p':
-                       if (parse_crc8_profile(optarg, &cs_crc8)) {
-                               printf("Bad CRC8 profile definition '%s'.\n", optarg);
-                               exit(1);
-                       }
-                       break;
-
-               case 'm':
-                       /* may be triggered by each of the CGW_MOD_FUNCS functions */
-                       if ((modidx < CGW_MOD_FUNCS) && (err = parse_mod(optarg, &modmsg[modidx++]))) {
-                               printf("Problem %d with modification definition '%s'.\n", err, optarg);
-                               exit(1);
-                       }
-                       break;
-
-               case '?':
-                       print_usage(basename(argv[0]));
-                       exit(0);
-                       break;
-
-               default:
-                       fprintf(stderr, "Unknown option %c\n", opt);
-                       print_usage(basename(argv[0]));
-                       exit(1);
-                       break;
-               }
-       }
-
-       if ((argc - optind != 0) || (cmd == UNSPEC)) {
-               print_usage(basename(argv[0]));
-               exit(1);
-       }
-
-       /* uncomment
-       if ((cmd == ADD || cmd == DEL) &&
-           ((!src_ifindex) || (!dst_ifindex))) {
-               print_usage(basename(argv[0]));
-               exit(1);
-       }
-       */
-
-       s = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-
-       switch (cmd) {
-
-       case ADD:
-               req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
-               req.nh.nlmsg_type  = RTM_NEWROUTE;
-               break;
-
-       case DEL:
-               req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
-               req.nh.nlmsg_type  = RTM_DELROUTE;
-               break;
-
-       case FLUSH:
-               req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
-               req.nh.nlmsg_type  = RTM_DELROUTE;
-               /* if_index set to 0 => remove all entries */
-               src_ifindex  = 0;
-               dst_ifindex  = 0;
-               break;
-
-       case LIST:
-               req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
-               req.nh.nlmsg_type  = RTM_GETROUTE;
-               break;
-
-       default:
-               printf("This function is not yet implemented.\n");
-               exit(1);
-               break;
-       }
-
-       req.nh.nlmsg_len   = NLMSG_LENGTH(sizeof(struct rtcanmsg));
-       req.nh.nlmsg_seq   = 0;
-
-       req.rtcan.can_family  = AF_CAN;
-       //req.rtcan.gwtype = CGW_TYPE_CAN_CAN;
-       req.rtcan.gwtype = CGW_TYPE_CAN_ETH;
-       req.rtcan.flags = flags;
-
-       //addattr_l(&req.nh, sizeof(req), CGW_SRC_IF, &src_ifindex, sizeof(src_ifindex));
-       //addattr_l(&req.nh, sizeof(req), CGW_DST_IF, &dst_ifindex, sizeof(dst_ifindex));
-
-       addattr_l( &req.nh, sizeof(req), CGW_SRC_IP  , &src_addr, sizeof(src_addr) );
-       addattr_l( &req.nh, sizeof(req), CGW_SRC_PORT, &src_port, sizeof(src_port) );
-       addattr_l( &req.nh, sizeof(req), CGW_DST_IP  , &dst_addr, sizeof(dst_addr) );
-       addattr_l( &req.nh, sizeof(req), CGW_DST_PORT, &dst_port, sizeof(dst_port) );
-
-       /* add new attributes here */
-
-       if (have_filter)
-               addattr_l(&req.nh, sizeof(req), CGW_FILTER, &filter, sizeof(filter));
-
-       if (have_cs_crc8)
-               addattr_l(&req.nh, sizeof(req), CGW_CS_CRC8, &cs_crc8, sizeof(cs_crc8));
-
-       if (have_cs_xor)
-               addattr_l(&req.nh, sizeof(req), CGW_CS_XOR, &cs_xor, sizeof(cs_xor));
-
-       /*
-        * a better example code
-        * modmsg.modtype = CGW_MOD_ID;
-        * addattr_l(&req.n, sizeof(req), CGW_MOD_SET, &modmsg, CGW_MODATTR_LEN);
-        */
-
-       /* add up to CGW_MOD_FUNCS modification definitions */
-       for (i = 0; i < modidx; i++)
-               addattr_l(&req.nh, sizeof(req), modmsg[i].instruction, &modmsg[i], CGW_MODATTR_LEN);
-
-       memset(&nladdr, 0, sizeof(nladdr));
-       nladdr.nl_family = AF_NETLINK;
-       nladdr.nl_pid    = 0;
-       nladdr.nl_groups = 0;
-
-       err = sendto(s, &req, req.nh.nlmsg_len, 0,
-                    (struct sockaddr*)&nladdr, sizeof(nladdr));
-       if (err < 0) {
-               perror("netlink sendto");
-               return err;
-       }
-
-       /* clean netlink receive buffer */
-       memset(rxbuf, 0x0, sizeof(rxbuf));
-
-       if (cmd != LIST) {
-
-               /*
-                * cmd == ADD || cmd == DEL || cmd == FLUSH
-                *
-                * Parse the requested netlink acknowledge return values.
-                */
-
-               err = recv(s, &rxbuf, sizeof(rxbuf), 0);
-               if (err < 0) {
-                       perror("netlink recv");
-                       return err;
-               }
-               nlh = (struct nlmsghdr *)rxbuf;
-               if (nlh->nlmsg_type != NLMSG_ERROR) {
-                       fprintf(stderr, "unexpected netlink answer of type %d\n", nlh->nlmsg_type);
-                       return -EINVAL;
-               }
-               rte = (struct nlmsgerr *)NLMSG_DATA(nlh);
-               err = rte->error;
-               if (err < 0)
-                       fprintf(stderr, "netlink error %d (%s)\n", err, strerror(abs(err)));
-
-       } else {
-
-               /* cmd == LIST */
-
-               while (1) {
-                       len = recv(s, &rxbuf, sizeof(rxbuf), 0);
-                       if (len < 0) {
-                               perror("netlink recv");
-                               return len;
-                       }
-#if 0
-                       printf("received msg len %d\n", len);
-
-                       for (i = 0; i < len; i++)
-                               printf("%02X ", rxbuf[i]);
-
-                       printf("\n");
-#endif
-                       /* leave on errors or NLMSG_DONE */
-                       if (parse_rtlist(argv[0], rxbuf, len))
-                               break;
-               }
-       }
-
-       close(s);
-
-       return err;
-}
diff --git a/utils/cangw/cegw.c b/utils/cangw/cegw.c
new file mode 100644 (file)
index 0000000..5233627
--- /dev/null
@@ -0,0 +1,234 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <libgen.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <libnetlink.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <arpa/inet.h>
+#include <gw.h>
+
+/**
+ * ToDo
+ * - refactor error messages
+ * */
+
+enum {
+       IF_UNDEF,
+       IF_CAN,
+       IF_ETH_UDP
+};
+
+int read_addr_port( char* in, struct in_addr* addr, unsigned short* port )
+{
+       char* delim = NULL;
+       char addrstr[16];
+       int addrlen;
+       
+       if( (delim = strchr( in, ':' )) == NULL )
+       {
+               fprintf( stderr, "error: ':'\n" );
+               return -1;
+       }
+
+       /* get address */
+       addrlen = delim - in;
+       memcpy( addrstr, in, addrlen );
+       addrstr[addrlen] = '\0';
+       if( inet_aton( addrstr, addr ) == 0 )
+       {
+               fprintf( stderr, "error: aton\n" );
+               return -1;
+       }
+
+       /* get port */
+       if( sscanf( delim, ":%hu", port ) != 1 ) /* todo: handle overflow */
+       {
+               fprintf( stderr, "error: port\n" );
+               return -1;
+       }
+
+       return 0;
+}
+
+char* read_iftype( char* in, int* iftype )
+{
+       char* ret = in+4;
+       
+       if( strncmp( "udp@", optarg, 4 ) == 0 )
+       {
+               *iftype = IF_ETH_UDP;
+               return ret;
+       }
+       else if( strncmp( "tcp@", optarg, 4 ) == 0 )
+       {
+               return NULL;
+       }
+       else if( strncmp( "can@", optarg, 4 ) == 0 )
+       {
+               *iftype = IF_CAN;
+               return ret;
+       }
+       
+       return NULL;
+}
+
+int main( int argc, char* argv[] )
+{
+       int s;
+       int src_if = 0, dst_if = 0;
+       int can_ifidx = 0;
+       int tmp = 0;
+       int have_listen = 0;
+       struct in_addr eth_addr;
+       unsigned short eth_port;
+       struct in_addr eth_listen_addr;
+       unsigned short eth_listen_port;
+       char* optstr;
+       char opt;
+       struct sockaddr_nl nladdr;
+       int err = 0;
+       
+       struct {
+               struct nlmsghdr nh;
+               struct rtcanmsg rtcan;
+               char buf[600]; /* enough? */
+       } req;
+       
+       while( (opt = getopt( argc, argv, "As:d:l:" )) != -1 )
+       {
+               switch( opt )
+               {
+                       case 's':
+                               if( (optstr = read_iftype( optarg, &src_if )) == NULL )
+                               {
+                                       fprintf( stderr, "error: bad input format\n" );
+                                       goto syntax_error;
+                                       break;
+                               }
+                               
+                               switch( src_if )
+                               {
+                                       case IF_CAN:
+                                               can_ifidx = if_nametoindex( optstr );
+                                               break;
+                                       case IF_ETH_UDP:
+                                               read_addr_port( optstr, &eth_addr, &eth_port );
+                                               break;
+                                       default:
+                                               fprintf( stderr, "error: unrecognized interface" );
+                                               goto syntax_error;
+                                               break;
+                               }
+                               break;
+                       case 'd':
+                               if( (optstr = read_iftype( optarg, &dst_if )) == NULL )
+                               {
+                                       fprintf( stderr, "error: bad input format\n" );
+                                       goto syntax_error;
+                                       break;
+                               }
+                               
+                               switch( dst_if )
+                               {
+                                       case IF_CAN:
+                                               can_ifidx = if_nametoindex( optstr ); /*chk*/
+                                               break;
+                                       case IF_ETH_UDP:
+                                               read_addr_port( optstr, &eth_addr, &eth_port ); /*chk*/
+                                               break;
+                                       default:
+                                               fprintf( stderr, "error: unrecognized interface" );
+                                               break;
+                               }
+                               break;
+                       case 'l':
+                               if( (optstr = read_iftype( optarg, &tmp )) == NULL )
+                               {
+                                       fprintf( stderr, "error: -l bad input format\n" );
+                                       goto syntax_error;
+                                       break;
+                               }
+                               
+                               if( tmp != IF_ETH_UDP )
+                               {
+                                       fprintf( stderr, "error: -l bad input format\n" );
+                                       goto syntax_error;
+                                       break;
+                               }
+                                       
+                               read_addr_port( optstr, &eth_listen_addr, &eth_listen_port ); /*chk*/
+                       default:
+                               fprintf( stderr, "error: unknown option\n" );
+                       break;
+               }                               
+       }
+
+       /* 2. do check on arguments */
+       if( (src_if == 0 || dst_if == 0) || (src_if == dst_if) )
+       {
+               fprintf( stderr, "error: source or destination not specified\n" );
+               return -1;
+       }
+       
+       if( src_if == dst_if )
+       {
+               fprintf( stderr, "error: source and destination same interface type\n" );
+       }
+       
+       /* 3. prepare netlink message */
+       req.nh.nlmsg_len   = NLMSG_LENGTH( sizeof(struct rtcanmsg) );
+       req.nh.nlmsg_type  = RTM_NEWROUTE;
+       req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
+       req.nh.nlmsg_seq   = 0;
+       req.nh.nlmsg_pid   = 0; /* ? */
+       
+       req.rtcan.can_family = AF_CAN;
+       req.rtcan.gwtype = (src_if == IF_CAN) ? CGW_TYPE_CAN_ETH_UDP : CGW_TYPE_ETH_CAN_UDP;
+       req.rtcan.flags = 0;
+       
+       addattr_l( &req.nh, sizeof(req), CGW_CAN_IF, &can_ifidx, sizeof(can_ifidx) );
+       switch( req.rtcan.gwtype )
+       {
+               case CGW_TYPE_CAN_ETH_UDP:
+                       addattr_l( &req.nh, sizeof(req), CGW_ETH_IP, &eth_addr, sizeof(eth_addr) );
+                       addattr_l( &req.nh, sizeof(req), CGW_ETH_PORT, &eth_port, sizeof(eth_port) );
+                       break;
+               case CGW_TYPE_ETH_CAN_UDP:
+                       break;
+               default:
+                       break;
+       }
+       
+       if( have_listen )
+       {
+               addattr_l( &req.nh, sizeof(req), CGW_LISTEN_IP, &eth_listen_addr, sizeof(eth_listen_addr) );
+               addattr_l( &req.nh, sizeof(req), CGW_LISTEN_PORT, &eth_listen_port, sizeof(eth_listen_port) );
+       }
+       
+       /* 4. send over netlink socket */
+       s = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE); /* chck */
+       
+       memset(&nladdr, 0, sizeof(nladdr));
+       nladdr.nl_family = AF_NETLINK;
+       nladdr.nl_pid    = 0;
+       nladdr.nl_groups = 0;
+
+       err = sendto( s, &req, req.nh.nlmsg_len, 0, 
+                     (struct sockaddr*)&nladdr, sizeof(nladdr));
+       if (err < 0)
+       {
+               perror( "netlink sendto" );
+               return err;
+       }
+       
+       /* ack? */
+       
+       return 0;
+syntax_error:
+       return -1;
+}