]> rtime.felk.cvut.cz Git - can-eth-gw.git/blobdiff - kernel/canethgw.c
source code formatted to comply with Linux code style
[can-eth-gw.git] / kernel / canethgw.c
index 88f2614e935f251fc2669c20f45e5c147ee61f17..27f752516a41f7c8db854f5a58e78a2d05193ae6 100644 (file)
@@ -1,3 +1,5 @@
+#define DEBUG
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <linux/wait.h>
 #include <linux/netdevice.h>
 #include <linux/socket.h>
+#include <linux/if_arp.h>
 #include <linux/net.h>
+#include <linux/netdevice.h>
 #include <linux/can/core.h>
 #include <linux/can.h>
 #include <net/rtnetlink.h>
+#include <net/sock.h>
 #include "canethgw.h"
-
-/**
- * ToDo
- *  [ ] check every input
- *  [ ] refactor
- */
-
-MODULE_LICENSE( "GPL" );
-
-static int  gw_udp_recv( void* data );
-static void gw_udp_send( struct can_frame* cf, struct in_addr ipaddr, u16 port );
-static int  gw_can_recv( void* data );
-static void gw_can_send( struct can_frame* cf, int ifidx );
-static int listen( int can_ifidx, struct in_addr eth_addr, u16 eth_port );
-
-#define CEGW_STOPPED 0
-#define CEGW_RUNNING 1
-
-static struct task_struct* eth_to_can, * can_to_eth;
-static struct socket* udp_sock = NULL;
-static struct socket* can_sock = NULL;
-static int gw_state = CEGW_STOPPED;
-
-struct can_eth_gw
+#include <linux/completion.h>
+#include <linux/mutex.h>
+#include <net/inet_common.h>
+
+MODULE_LICENSE("GPL");
+
+static int  cegw_udp_can(void *data);
+static void cegw_udp_send(struct socket *udp_sock, struct can_frame *cf,
+               struct in_addr ipaddr, u16 port);
+static int  cegw_can_udp(void *data);
+static void cegw_can_send(struct socket *can_sock, struct can_frame *cf,
+               int ifindex);
+static int cegw_thread_start(void *data);
+static int cegw_thread_stop(void);
+
+enum __cegw_state
 {
-       int src_if_idx;
-       struct in_addr dst_addr;
-       unsigned short dst_port;
-       struct hlist_node list;
+       CEGW_RUN,
+       CEGW_STOP,
+       CEGW_EXIT
 };
 
-struct eth_can_gw
+struct cegw_rule
 {
-       int dst_if_idx;
+       int can_ifindex;
+       struct in_addr eth_ip;
+       unsigned short eth_port;
        struct hlist_node list;
 };
 
-HLIST_HEAD( can_eth_job );
-HLIST_HEAD( eth_can_job );
-
 struct cegw_setting
 {
-       struct can_filter filter;
-       int src_idx;
-       /* bind on if */
-       struct in_addr dst_addr;
-       unsigned short dst_port;
+       struct in_addr eth_ip;
+       unsigned short eth_port;
 };
 
-/***********************
- *   UDP
- ***********************/
+static int cegw_state = CEGW_STOP;
+static struct socket *can_sock = NULL, *udp_sock = NULL;
+static struct task_struct *eth_to_can = NULL, *can_to_eth = NULL;
+static struct notifier_block notifier;
+
+HLIST_HEAD(rule_can_eth);
+HLIST_HEAD(rule_eth_can);
+DEFINE_MUTEX(cegw_mutex);
 
-static int gw_udp_recv( void* data )
+static void cegw_udp_send(struct socket *udp_sock, struct can_frame *cf,
+               struct in_addr ipaddr, u16 port)
 {
-       struct can_frame cf;
-       struct kvec vec;
        struct msghdr mh;
-       struct eth_can_gw* job;
-       struct hlist_node* pos;
-       int can_ifidx;
+       struct sockaddr_in addr;
+       struct kvec vec;
 
-       vec.iov_base = &cf;
-       vec.iov_len = sizeof(cf);
+       addr.sin_family = AF_INET;
+       addr.sin_port = htons(port);
+       addr.sin_addr = ipaddr;
 
-       mh.msg_name = NULL;
-       mh.msg_namelen = 0;
-       mh.msg_iov = NULL;
-       mh.msg_iovlen = 0;
+       mh.msg_name = &addr;
+       mh.msg_namelen = sizeof(addr);
        mh.msg_control = NULL;
        mh.msg_controllen = 0;
        mh.msg_flags = 0;
 
-       while( 1 )
-       {
-               if( kthread_should_stop() ) /* up() ?, recv is blocking */
-                       break;
-               kernel_recvmsg( udp_sock, &mh, &vec, 1, sizeof(cf), 0 ); /* todo: handle error */
-               printk( "received udp msg_id:%d\n", cf.can_id );
-               hlist_for_each_entry_rcu( job, pos, &eth_can_job, list )
-               {
-                       rcu_read_lock(); /**/
-                       can_ifidx = job->dst_if_idx;
-                       rcu_read_unlock();
-                       /* ToDo from filter */
-                       gw_can_send( &cf, can_ifidx );
-               }
-       }
+       vec.iov_base = cf;
+       vec.iov_len = sizeof(*cf);
 
-       return 0;
+       kernel_sendmsg(udp_sock, &mh, &vec, 1, sizeof(*cf));
 }
 
-inline static void gw_udp_send( struct can_frame* cf, struct in_addr ipaddr, u16 port )
+static void cegw_can_send(struct socket* can_sock, struct can_frame* cf,
+               int ifindex)
 {
        struct msghdr mh;
-       struct sockaddr_in addr;
        struct kvec vec;
-       
-       addr.sin_family = AF_INET;
-       addr.sin_port = htons( port );
-       addr.sin_addr = ipaddr;
-       
+       struct sockaddr_can addr;
+
+       addr.can_family = AF_CAN;
+       addr.can_ifindex = ifindex;
+
        mh.msg_name = &addr;
-       mh.msg_namelen = sizeof( addr );
+       mh.msg_namelen = sizeof(addr);
        mh.msg_control = NULL;
        mh.msg_controllen = 0;
        mh.msg_flags = 0;
-       
+
        vec.iov_base = cf;
-       vec.iov_len = sizeof( *cf );
-       
-       kernel_sendmsg( udp_sock, &mh, &vec, 1, sizeof( *cf ) );
-}
+       vec.iov_len = sizeof(*cf);
 
-/***********************
- *   CAN
- ***********************/
+       kernel_sendmsg(can_sock, &mh, &vec, 1, sizeof(*cf));
+}
 
-static int gw_can_recv( void* data )
+/**
+ * cegw_udp_can - performs udp->can routing
+ *
+ * This function is run as a thread.
+ */
+static int cegw_udp_can(void *data)
 {
-       struct msghdr mh;
-       struct kvec vec;
        struct can_frame cf;
-       struct sockaddr_can ca;
-       struct can_eth_gw* job;
+       struct kvec vec;
+       struct msghdr mh;
+       struct cegw_rule* rule;
        struct hlist_node* pos;
-       struct in_addr eth_addr;
-       u16 eth_port;
-       
-       mh.msg_name = &ca;
-       mh.msg_namelen = sizeof( ca );
+       int can_ifidx;
+       int recv_size;
+
+       mh.msg_name = NULL;
+       mh.msg_namelen = 0;
+       mh.msg_iov = NULL;
+       mh.msg_iovlen = 0;
        mh.msg_control = NULL;
        mh.msg_controllen = 0;
        mh.msg_flags = 0;
-       
-       vec.iov_base = &cf;
-       vec.iov_len = sizeof( cf );
 
-       while( 1 )
-       {
-               if( kthread_should_stop() ) /**/
+       while (1) {
+               if (cegw_state == CEGW_STOP)
                        break;
-               kernel_recvmsg( can_sock, &mh, &vec, 1, sizeof( cf ), 0 );
-               printk( "received can msg_id:%d, from:%d\n", cf.can_id, ca.can_ifindex );
-               hlist_for_each_entry_rcu( job, pos, &can_eth_job, list )
-               {
+               vec.iov_base = &cf;
+               vec.iov_len = sizeof(cf);
+               recv_size = kernel_recvmsg(udp_sock, &mh, &vec, 1, 
+                               sizeof(cf), 0);
+               /* recv_size == 0 when shutting down */
+               if (recv_size != sizeof(cf) || recv_size == 0)
+                       continue;
+               else if (recv_size < 0)
+                       return -1;
+
+               hlist_for_each_entry_rcu(rule, pos, &rule_eth_can, list) {
                        rcu_read_lock();
-                       eth_addr = job->dst_addr;
-                       eth_port = job->dst_port;
+                       can_ifidx = rule->can_ifindex;
                        rcu_read_unlock();
-                       printk( KERN_INFO "%x\n", eth_addr );
-                       if( job->src_if_idx == ca.can_ifindex )
-                               gw_udp_send( &cf, eth_addr, eth_port );
+                       /* ToDo: from filter */
+                       cegw_can_send(can_sock, &cf, can_ifidx);
                }
        }
-       
+
        return 0;
 }
 
-inline static void gw_can_send( struct can_frame* cf, int ifidx )
+/**
+ * cegw_can_udp - performs can->udp routing
+ */
+static int cegw_can_udp(void* data)
 {
        struct msghdr mh;
        struct kvec vec;
-       struct sockaddr_can ca =
-       {
-               .can_family = AF_CAN,
-               .can_ifindex = ifidx
-       };
-       
+       struct can_frame cf;
+       struct sockaddr_can ca;
+       struct cegw_rule* rule;
+       struct hlist_node* pos;
+       struct in_addr eth_ip;
+       u16 eth_port;
+       int recv_size;
+
        mh.msg_name = &ca;
-       mh.msg_namelen = sizeof( ca );
+       mh.msg_namelen = sizeof(ca);
        mh.msg_control = NULL;
        mh.msg_controllen = 0;
        mh.msg_flags = 0;
-       
-       vec.iov_base = cf;
-       vec.iov_len = sizeof( *cf );
-       
-       kernel_sendmsg( can_sock, &mh, &vec, 1, sizeof( *cf ) );
-}
 
-/* NetLink */
+       while (1) {
+               if (cegw_state == CEGW_STOP)
+                       break;
+               vec.iov_base = &cf;
+               vec.iov_len = sizeof(cf);
+
+               recv_size = kernel_recvmsg(can_sock, &mh, &vec, 1,
+                                          sizeof(cf), 0);
+               if (recv_size != sizeof(cf) || recv_size == 0)
+                       continue;
+               else if (recv_size < 0)
+                       return -1;
+
+               hlist_for_each_entry_rcu(rule, pos, &rule_can_eth, list) {
+                       rcu_read_lock();
+                       eth_ip = rule->eth_ip;
+                       eth_port = rule->eth_port;
+                       rcu_read_unlock();
+                       if (rule->can_ifindex == ca.can_ifindex)
+                               cegw_udp_send(udp_sock, &cf, eth_ip, eth_port);
+               }
+       }
+
+       return 0;
+}
 
-static int cegw_create_job( struct sk_buff* skb, struct nlmsghdr* nlh, void* arg )
+static int cegw_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 {
-       struct nlattr* tb[ CGW_MAX+1 ];
-       struct rtcanmsg *r;
-       struct can_eth_gw* cethgw = NULL;
-       struct eth_can_gw* ecangw = NULL;
+       struct nlattr* tb[ CEGW_MAX+1 ];
+       struct cegw_rule* rule = NULL;
+       int ifindex;
+       struct rtmsg* r;
+       struct in_addr ip;
+       unsigned short port;
+       struct cegw_setting* set;
        int err = 0;
-       
+
        if (nlmsg_len(nlh) < sizeof(*r))
                return -EINVAL;
 
        r = nlmsg_data(nlh);
-       if (r->can_family != AF_CAN)
+
+       if (r->rtm_family != AF_CAN)
                return -EPFNOSUPPORT;
-       err = nlmsg_parse( nlh, sizeof( struct rtcanmsg ), tb, CGW_MAX, NULL );
-       if( err < 0 )
-       {
-               printk( KERN_ERR "error: nlmsg_parse\n" );
+
+       err = nlmsg_parse(nlh, sizeof(*r), tb, CEGW_MAX, NULL);
+       if (err < 0) {
+               pr_devel("canethgw: nlmsg_parse error\n");
                return err;
        }
 
-       switch( r->gwtype )
-       {
-               case CGW_TYPE_CONFIG:
-                       listen( 0,  *(struct in_addr*)nla_data( tb[CGW_LISTEN_IP] ), 
-                                   *(u16*)nla_data( tb[CGW_LISTEN_PORT] ) );
-                       break;
-               case CGW_TYPE_CAN_ETH_UDP:
-                       printk( KERN_INFO "can:%d\n", *(int*)nla_data( tb[CGW_CAN_IF] ) );
-                       printk( KERN_INFO "eth addr:%x\n", *(u32*)nla_data( tb[CGW_ETH_IP] ) );
-                       printk( KERN_INFO "eth port:%hu\n", *(u16*)nla_data( tb[CGW_ETH_PORT] ) );
-                       cethgw = kmalloc( sizeof(struct can_eth_gw), GFP_KERNEL );
-                       if( cethgw == NULL )
-                       {
-                               printk( KERN_ERR "error: kmalloc\n" );
-                               break;
-                       }
-                       cethgw->src_if_idx = *(int*)nla_data( tb[CGW_CAN_IF] );
-                       cethgw->dst_addr = *(struct in_addr*)nla_data( tb[CGW_ETH_IP] );
-                       cethgw->dst_port = *(u16*)nla_data( tb[CGW_ETH_PORT] );
-                       
-                       hlist_add_head_rcu( &cethgw->list, &can_eth_job );
-                       break;
-               case CGW_TYPE_ETH_CAN_UDP:
-                       printk( KERN_INFO "can:%d\n", *(int*)nla_data( tb[CGW_CAN_IF] ) );
-                       ecangw = kmalloc( sizeof(struct eth_can_gw), GFP_KERNEL );
-                       if( ecangw == NULL )
-                       {
-                               printk( KERN_ERR "error: kmalloc\n" );
-                               break;
-                       }
-                       ecangw->dst_if_idx = *(int*)nla_data( tb[CGW_CAN_IF] );
-                       hlist_add_head_rcu( &ecangw->list, &eth_can_job );
-                       break;
-               default:
-                       printk( "default" );
-                       /* ToDo undef operation */
-                       break;
+       if (tb[CEGW_CMD_INFO] == NULL) {
+               pr_devel("canethgw: CEGW_CMD_INFO is missing in rtmsg\n");
+               return -EINVAL;
+       }
+
+       switch (*(int*)nla_data(tb[CEGW_CMD_INFO])) {
+       case CEGW_LISTEN:
+               if (!tb[CEGW_ETH_IP] || !tb[CEGW_ETH_PORT]) {
+                       pr_devel("canethgw: missing attribute for CEGW_LISTEN\n");
+                       return -EINVAL;
+               }
+
+               /* ToDo: valid listen address */
+               set = kmalloc(sizeof(*set), GFP_KERNEL);
+               if (set == NULL)
+                       return -ENOMEM;
+               set->eth_ip   = *(struct in_addr*)nla_data(tb[CEGW_ETH_IP]);
+               set->eth_port = *(unsigned short*)nla_data(tb[CEGW_ETH_PORT]);
+               kthread_run(cegw_thread_start, set, "canethgw");
+               break;
+       case CEGW_RULE_CAN_ETH:
+               if (!tb[CEGW_ETH_IP] || !tb[CEGW_ETH_PORT] || 
+                   !tb[CEGW_CAN_IFINDEX]) {
+                       pr_devel("canethgw: missing attribute for "
+                                "CEGW_RULE_CAN_ETH\n");
+                       return -EINVAL;
+               }
+
+               ifindex = *(int*)nla_data(tb[CEGW_CAN_IFINDEX]);
+               ip = *(struct in_addr*)nla_data(tb[CEGW_ETH_IP]);
+               port = *(unsigned short*)nla_data(tb[CEGW_ETH_PORT]);
+               pr_devel("canethgw: new can->eth rule - (%d)->(%x:%hu)\n",
+                        ifindex, ip.s_addr, port);
+
+               rule = kmalloc(sizeof(struct cegw_rule), GFP_KERNEL);
+               if (rule == NULL)
+                       return -ENOMEM;
+
+               rule->can_ifindex = ifindex;
+               rule->eth_ip = ip;
+               rule->eth_port = port;
+
+               hlist_add_head_rcu(&rule->list, &rule_can_eth);
+               break;
+       case CEGW_RULE_ETH_CAN:
+               if (!tb[CEGW_ETH_IP] || !tb[CEGW_ETH_PORT] || 
+                   !tb[CEGW_CAN_IFINDEX]) {
+                       pr_devel("canethgw: missing attribute for"
+                                "CEGW_RULE_ETH_CAN\n");
+                       return -EINVAL;
+               }
+
+               ifindex = *(int*)nla_data(tb[CEGW_CAN_IFINDEX]);
+               ip = *(struct in_addr*)nla_data(tb[CEGW_ETH_IP]);
+               port = *(unsigned short*)nla_data(tb[CEGW_ETH_PORT]);
+               pr_devel("canethgw: new eth->can rule - (%x:%hu)->(%d)\n",
+                        ip.s_addr, port, ifindex);
+
+               rule = kmalloc(sizeof(struct cegw_rule), GFP_KERNEL);
+               if (rule == NULL)
+                       return -ENOMEM;
+
+               rule->can_ifindex = ifindex;
+               rule->eth_ip = ip;
+               rule->eth_port = port;
+
+               hlist_add_head_rcu(&rule->list, &rule_eth_can);
+               break;
+       default:
+               pr_devel("canethgw: unknown CEGW_CMD_INFO\n");
+               break;
        }
 
        return 0;
 }
 
-static int cegw_remove_job( struct sk_buff* skb, struct nlmsghdr* nlh, void* arg )
+static void cegw_flush(void)
 {
-       struct rtcanmsg* r;
-       struct nlattr* tb[ CGW_MAX+1 ];
+       struct cegw_rule *rule;
+       struct hlist_node *pos, *n;
 
-       if( nlmsg_len(nlh) < sizeof(*r) )
+       hlist_for_each_entry_safe(rule, pos, n, &rule_can_eth, list) {
+               hlist_del(&rule->list);
+               kfree(rule);
+       }
+       hlist_for_each_entry_safe(rule, pos, n, &rule_eth_can, list) {
+               hlist_del(&rule->list);
+               kfree(rule);
+       }
+}
+
+static int cegw_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
+{
+       struct rtmsg *r;
+       struct nlattr *tb[CEGW_MAX+1];
+       int err = 0;
+
+       if (nlmsg_len(nlh) < sizeof(*r))
                return -EINVAL;
-       
-       r = nlmsg_data( nlh );
 
-       if( r->can_family != AF_CAN )
+       r = nlmsg_data(nlh);
+
+       if (r->rtm_family != AF_CAN)
                return -EPFNOSUPPORT;
 
-       if( r->gwtype != CGW_TYPE_CAN_ETH_UDP )
+       err = nlmsg_parse(nlh, sizeof(struct rtmsg), tb, CEGW_MAX, NULL);
+       if (err != 0)
                return -EINVAL;
 
-       printk( "flags:%x",r->flags );
-       //nlmsg_parse( nlh, sizeof(*r), tb, CGW_MAX, NULL );
+       if (tb[CEGW_CMD_INFO] == NULL) {
+               pr_devel("canethgw: CEGW_CMD_INFO is missing in rtmsg\n");
+               return -EINVAL;
+       }
+
+       if (*(int*)nla_data(tb[CEGW_CMD_INFO]) != CEGW_FLUSH) {
+               return -EINVAL;
+       }
+
+       cegw_flush();
 
-       //      tb[]
        return 0;
 }
 
-static int listen( int can_ifidx, struct in_addr eth_addr, u16 eth_port )
+static int cegw_put_rule(struct sk_buff *skb, int type, struct cegw_rule *rule)
+{
+       int ifindex;
+       struct in_addr ip;
+       unsigned short port;
+       struct nlmsghdr *nlh;
+
+       ifindex = rule->can_ifindex;
+       ip = rule->eth_ip;
+       port = rule->eth_port;
+
+       nlh = nlmsg_put(skb, 0, 0, 0, 0, 0);
+       if (nlh == NULL)
+               return -EMSGSIZE;
+
+       /* type */
+       if (nla_put(skb, CEGW_TYPE, sizeof(type), &type) < 0)
+               goto cancel;
+       else
+               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN(sizeof(type));
+
+       /* can ifindex */
+       if (nla_put(skb, CEGW_CAN_IFINDEX, sizeof(ifindex), &ifindex) < 0)
+               goto cancel;
+       else
+               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN(sizeof(ifindex));
+
+       /* ip adress */
+       if (nla_put(skb, CEGW_ETH_IP, sizeof(ip), &ip) < 0)
+               goto cancel;
+       else
+               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN(sizeof(ip));
+
+       /* port */
+       if (nla_put(skb, CEGW_ETH_PORT, sizeof(port), &port) < 0)
+               goto cancel;
+       else
+               nlh->nlmsg_len += NLA_HDRLEN + NLA_ALIGN(sizeof(port));
+
+       return skb->len;
+
+cancel:
+       nlmsg_cancel(skb, nlh);
+       return -EMSGSIZE;
+}
+
+static int cegw_getroute(struct sk_buff *skb, struct netlink_callback *cb)
+{
+       struct cegw_rule *rule;
+       struct hlist_node *pos;
+       int idx = 0;
+       int s_idx = cb->args[0];
+
+       rcu_read_lock();
+       hlist_for_each_entry_rcu(rule, pos, &rule_eth_can, list) {
+               if (idx < s_idx)
+                       goto cont1;
+
+               if (cegw_put_rule(skb, CEGW_RULE_ETH_CAN, rule) < 0)
+                       goto brk;
+cont1:
+               idx++;
+       }
+
+       hlist_for_each_entry_rcu(rule, pos, &rule_can_eth, list) {
+               if (idx < s_idx)
+                       goto cont2;
+
+               if (cegw_put_rule(skb, CEGW_RULE_CAN_ETH, rule) < 0)
+                       goto brk;
+cont2:
+               idx++;
+       }
+
+brk:
+       rcu_read_unlock();
+       cb->args[0] = idx;
+
+       return skb->len;
+}
+
+static int cegw_notifier(struct notifier_block *nb, unsigned long msg, void *data)
+{
+       struct net_device *dev = (struct net_device *)data;
+       struct cegw_rule *rule;
+       struct hlist_node *pos, *n;
+
+       if (!net_eq(dev_net(dev), &init_net))
+               return NOTIFY_DONE;
+       if (dev->type != ARPHRD_CAN)
+               return NOTIFY_DONE;
+
+       if (msg == NETDEV_UNREGISTER) {
+               hlist_for_each_entry_safe(rule, pos, n, &rule_eth_can, list) {
+                       if (rule->can_ifindex == dev->ifindex) {
+                               hlist_del(&rule->list);
+                               kfree(rule);
+                       }
+               }
+
+               hlist_for_each_entry_safe(rule, pos, n, &rule_can_eth, list) {
+                       if (rule->can_ifindex == dev->ifindex) {
+                               hlist_del(&rule->list);
+                               kfree(rule);
+                       }
+               }
+       }
+
+       return NOTIFY_DONE;
+}
+
+/**
+ * cegw_thread_start - start working threads
+ * @data: (struct cegw_setting *) with new listening address
+ *
+ * Two threads are started. One is serving udp->can routing and the other
+ * can->udp.
+ */
+static int cegw_thread_start(void *data)
 {
        struct sockaddr_in udp_addr;
        struct sockaddr_can can_addr;
-       struct socket* tmp;
+       struct cegw_setting *set;
 
-       printk( KERN_INFO "listen called\n" );
+       set = (struct cegw_setting *)data;
 
-       if( sock_create_kern( PF_INET, SOCK_DGRAM, IPPROTO_UDP, &tmp) != 0 )
-       {
-               printk( KERN_ERR "error: can_sock creation failed\n" );
+       can_addr.can_family = AF_CAN;
+       can_addr.can_ifindex = 0;
+
+       udp_addr.sin_family = AF_INET;
+       udp_addr.sin_port = htons(set->eth_port);
+       udp_addr.sin_addr = set->eth_ip;
+
+       kfree(data);
+       mutex_lock(&cegw_mutex);
+       if (cegw_state == CEGW_EXIT)
+               return -1;
+       /* stops threads if exist */
+       cegw_thread_stop();
+
+       /* create and bind sockets */
+       if (sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &udp_sock)
+           != 0) {
+               printk(KERN_ERR "canethgw: udp socket creation failed\n");
                return -1;
        }
 
-       can_addr.can_family = AF_CAN;
-       can_addr.can_ifindex = can_ifidx;
-       
-       if( can_sock->ops->bind( can_sock, (struct sockaddr*) &can_addr, sizeof(can_addr) ) != 0 )
-       {
-               printk( KERN_ERR "can_sock bind failed\n" );
+       if (sock_create_kern(PF_CAN, SOCK_RAW, CAN_RAW, &can_sock) != 0) {
+               printk(KERN_ERR "canethgw: can socket creation failed\n");
                return -1;
        }
-       
-       printk( KERN_INFO "can socket success\n" );
 
-       udp_addr.sin_family = AF_INET;
-       udp_addr.sin_port = htons( eth_port );
-       udp_addr.sin_addr = eth_addr;
-
-       printk( KERN_INFO "trying to bind\n" );
-       if( udp_sock->ops->bind( udp_sock, (struct sockaddr*)&udp_addr, sizeof( udp_addr ) ) != 0 ) /* ref impl ?!? */
-       {
-               printk( "error: binding failed\n" );
-               sock_release( udp_sock );
-               sock_release( can_sock );
+       if (kernel_bind(udp_sock, (struct sockaddr*)&udp_addr,
+                       sizeof(udp_addr)) != 0) {
+               printk(KERN_ERR "canethgw: udp socket binding failed\n");
+               sock_release(udp_sock);
+               sock_release(can_sock);
                return -1;
        }
 
-       printk( KERN_INFO "socket established\n" );
-       
-       /* run threads */
-       eth_to_can = kthread_run( gw_udp_recv, NULL, "ethcangw" );
-       can_to_eth = kthread_run( gw_can_recv, NULL, "canethgw" );
+       if (kernel_bind(can_sock, (struct sockaddr*) &can_addr,
+                       sizeof(can_addr)) != 0) {
+               printk(KERN_ERR "canethgw: can socket binding failed\n");
+               kernel_sock_shutdown(udp_sock, SHUT_RDWR);
+               sock_release(udp_sock);
+               sock_release(can_sock);
+               return -1;
+       }
 
-       printk( KERN_INFO "threads are running\n" );
+       /* start threads */
+       cegw_state = CEGW_RUN;
 
-       gw_state = CEGW_RUNNING;
+       eth_to_can = kthread_create(cegw_udp_can, NULL, "canethgw");
+       if (IS_ERR(eth_to_can)) {
+               cegw_state = CEGW_STOP;
+               sock_release(udp_sock);
+               sock_release(can_sock);
+               return -1;
+       }
+       get_task_struct(eth_to_can);
+       wake_up_process(eth_to_can);
+
+       can_to_eth = kthread_create(cegw_can_udp, NULL, "canethgw");
+       if (IS_ERR(can_to_eth)) {
+               cegw_state = CEGW_STOP;
+               kernel_sock_shutdown(udp_sock, SHUT_RDWR);
+               kthread_stop(eth_to_can);
+               sock_release(udp_sock);
+               sock_release(can_sock);
+               return -1;
+       }
+       get_task_struct(can_to_eth);
+       wake_up_process(can_to_eth);
 
+       mutex_unlock(&cegw_mutex);
+       pr_devel("threads are running\n");
        return 0;
 }
 
-/***********************
- *   module init/exit
- ***********************/
+/**
+ * cegw_thread_stop - stops threads and wait for exit
+ *
+ * Waits for threads to stop. Does nothing if cegw_state == CEGW_STOP.
+ */
+static int cegw_thread_stop(void)
+{
+       int how = SHUT_RDWR;
+       struct sock *sk = NULL;
+
+       if (cegw_state == CEGW_STOP)
+               return 0;
+
+       cegw_state = CEGW_STOP;
+       /* shut down socket */
+       sk = can_sock->sk;
+       how++;
+       lock_sock(sk);
+       sk->sk_shutdown |= how;
+       sk->sk_state_change(sk);
+       release_sock(sk);
+
+       kernel_sock_shutdown(udp_sock, SHUT_RDWR);
+
+       /* wait for return to reuse port if restart */
+       kthread_stop(eth_to_can);
+       kthread_stop(can_to_eth);
+       sock_release(udp_sock);
+       sock_release(can_sock);
+       can_to_eth = NULL;
+       eth_to_can = NULL;
 
-static int __init cangw_init( void )
-{      
-       if( sock_create_kern( PF_CAN, SOCK_RAW, CAN_RAW, &can_sock) != 0 )
-       {
-               printk( KERN_ERR "error: can_sock creation failed\n" );
-               return -1;
-       }
+       return 0;
+}
+
+static int __init cegw_init(void)
+{
+       notifier.notifier_call = cegw_notifier;
+       register_netdevice_notifier(&notifier);
 
-       if( sock_create_kern( PF_INET, SOCK_DGRAM, IPPROTO_UDP, &udp_sock ) != 0 )
-       {
-               printk( KERN_ERR "error: udp_sock creation failed\n" );
-               sock_release( can_sock );
-               return -1;
-       }
-       
        /* subscribe to netlink */
-       //if( __rtnl_register( PF_CAN, RTM_GETROUTE,  ) != 0 )
-       __rtnl_register( PF_CAN, RTM_NEWROUTE, cegw_create_job, NULL, NULL );
-       __rtnl_register( PF_CAN, RTM_DELROUTE, cegw_remove_job, NULL, NULL );
-       //__rtnl_register( PF_CAN, RTM_DELROUTE,  )     
-       
-       /*
-       if( sock_create_kern( AF_CAN, SOCK_RAW, CAN_RAW, &can_sock ) != 0 )
-       {s
-               printk( "error: can_sock creation failed\n" );
-       }
-       */
-       
+       rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cegw_getroute, NULL);
+       rtnl_register(PF_CAN, RTM_NEWROUTE, cegw_newroute, NULL, NULL);
+       rtnl_register(PF_CAN, RTM_DELROUTE, cegw_delroute, NULL, NULL);
+
        return 0;
 }
 
-static void __exit cangw_exit( void )
+static void __exit cegw_exit(void)
 {
-       if( gw_state == CEGW_RUNNING )
-       {
-               sock_release( udp_sock );
-               sock_release( can_sock );
-               /* ToDo: stop threads */
-       }
+       /* ToDo: effect on cangw? */
+       rtnl_unregister_all(PF_CAN);
+
+       /* wait for rtnl callbacks */
+       rtnl_lock();
+       rtnl_unlock();
+
+       mutex_lock(&cegw_mutex);
+       cegw_thread_stop();
+       cegw_state = CEGW_EXIT;
+       mutex_unlock(&cegw_mutex);
 
-       /* ToDo: unregister netlink */
-       printk( "cangw: exit\n" );
-       //kthread_stop( ts );
+       unregister_netdevice_notifier(&notifier);
+       cegw_flush();
 }
 
-module_init( cangw_init );
-module_exit( cangw_exit );
+module_init(cegw_init);
+module_exit(cegw_exit);