]> rtime.felk.cvut.cz Git - can-eth-gw.git/blobdiff - kernel/canethgw.c
set udp listening address
[can-eth-gw.git] / kernel / canethgw.c
index 0beb89f2d30ba15c867bffbd79d32376c27f2e8e..992ded96ff50ba235af17fa47c7a03537026e4ca 100644 (file)
@@ -1,5 +1,3 @@
-#include "gw.h" /* override */
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <net/rtnetlink.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;
-static struct socket* can_sock;
-static struct net_device* can_dev;
+static struct socket* udp_sock = NULL;
+static struct socket* can_sock = NULL;
+static int gw_state = CEGW_STOPPED;
 
 struct can_eth_gw
 {
@@ -58,6 +71,7 @@ static int gw_udp_recv( void* data )
        struct msghdr mh;
        struct eth_can_gw* job;
        struct hlist_node* pos;
+       int can_ifidx;
 
        vec.iov_base = &cf;
        vec.iov_len = sizeof(cf);
@@ -76,13 +90,14 @@ static int gw_udp_recv( void* data )
                        break;
                kernel_recvmsg( udp_sock, &mh, &vec, 1, sizeof(cf), 0 ); /* todo: handle error */
                printk( "received udp msg_id:%d\n", cf.can_id );
-               rcu_read_lock();
                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, job->dst_if_idx );
+                       gw_can_send( &cf, can_ifidx );
                }
-               rcu_read_unlock();
        }
 
        return 0;
@@ -122,6 +137,8 @@ static int gw_can_recv( void* data )
        struct sockaddr_can ca;
        struct can_eth_gw* job;
        struct hlist_node* pos;
+       struct in_addr eth_addr;
+       u16 eth_port;
        
        mh.msg_name = &ca;
        mh.msg_namelen = sizeof( ca );
@@ -138,14 +155,16 @@ static int gw_can_recv( void* data )
                        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 );
-               rcu_read_lock();
                hlist_for_each_entry_rcu( job, pos, &can_eth_job, list )
                {
-                       printk( KERN_INFO "%x\n", job->dst_addr );
+                       rcu_read_lock();
+                       eth_addr = job->dst_addr;
+                       eth_port = job->dst_port;
+                       rcu_read_unlock();
+                       printk( KERN_INFO "%x\n", eth_addr );
                        if( job->src_if_idx == ca.can_ifindex )
-                               gw_udp_send( &cf, job->dst_addr, job->dst_port );
+                               gw_udp_send( &cf, eth_addr, eth_port );
                }
-               rcu_read_unlock();
        }
        
        return 0;
@@ -180,7 +199,6 @@ static int cgw_create_job( struct sk_buff* skb, struct nlmsghdr* nlh,
 {
        struct nlattr* tb[ CGW_MAX+1 ];
        struct rtcanmsg *r;
-       struct cgw_job *gwj;
        struct can_eth_gw* cethgw = NULL;
        struct eth_can_gw* ecangw = NULL;
        int err = 0;
@@ -199,9 +217,12 @@ static int cgw_create_job( struct sk_buff* skb, struct nlmsghdr* nlh,
                return err;
        }
 
-       /* so far we only support CAN -> CAN routings */
        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] ) );
@@ -230,6 +251,7 @@ static int cgw_create_job( struct sk_buff* skb, struct nlmsghdr* nlh,
                        hlist_add_head_rcu( &ecangw->list, &eth_can_job );
                        break;
                default:
+                       printk( "default" );
                        /* ToDo undef operation */
                        break;
        }
@@ -237,34 +259,22 @@ static int cgw_create_job( struct sk_buff* skb, struct nlmsghdr* nlh,
        return 0;
 }
 
-/***********************
- *   module init/exit
- ***********************/
-
-static int __init cangw_init( void )
-{      
+static int listen( int can_ifidx, struct in_addr eth_addr, u16 eth_port )
+{
        struct sockaddr_in udp_addr;
        struct sockaddr_can can_addr;
-       int ifidx = 0;
-       
-       /* 1. create can socket and bind to it */
-       can_dev = dev_get_by_name( &init_net, "vcan0" ); /* net ns?, release counter! */
-       if( can_dev == NULL )
-       {
-               printk( KERN_ERR "error: vcan0 not found\n" );
-               return -1;
-       }
-       ifidx = can_dev->ifindex;
-       dev_put( can_dev );
-       
-       if( sock_create_kern( PF_CAN, SOCK_RAW, CAN_RAW, &can_sock) != 0 )
+       struct socket* tmp;
+
+       printk( KERN_INFO "listen called\n" );
+
+       if( sock_create_kern( PF_INET, SOCK_DGRAM, IPPROTO_UDP, &tmp) != 0 )
        {
                printk( KERN_ERR "error: can_sock creation failed\n" );
                return -1;
        }
-       
+
        can_addr.can_family = AF_CAN;
-       can_addr.can_ifindex = ifidx;
+       can_addr.can_ifindex = can_ifidx;
        
        if( can_sock->ops->bind( can_sock, (struct sockaddr*) &can_addr, sizeof(can_addr) ) != 0 )
        {
@@ -272,35 +282,58 @@ static int __init cangw_init( void )
                return -1;
        }
        
-       /* 2. create udp socket and bind to it */
-       if( sock_create_kern( PF_INET, SOCK_DGRAM, IPPROTO_UDP, &udp_sock ) != 0 )
+       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: udp_sock creation failed\n" );
+               printk( "error: binding failed\n" );
+               sock_release( udp_sock );
                sock_release( can_sock );
                return -1;
        }
+
+       printk( KERN_INFO "socket established\n" );
        
-       udp_addr.sin_family = AF_INET;
-       udp_addr.sin_port = htons( 10501 );
-       udp_addr.sin_addr.s_addr = INADDR_ANY;
+       /* run threads */
+       eth_to_can = kthread_run( gw_udp_recv, NULL, "ethcangw" );
+       can_to_eth = kthread_run( gw_can_recv, NULL, "canethgw" );
 
-       if( udp_sock->ops->bind( udp_sock, (struct sockaddr*)&udp_addr, sizeof( udp_addr ) ) != 0 ) /* ref impl ?!? */
+       printk( KERN_INFO "threads are running\n" );
+
+       gw_state = CEGW_RUNNING;
+
+       return 0;
+}
+
+/***********************
+ *   module init/exit
+ ***********************/
+
+static int __init cangw_init( void )
+{      
+       if( sock_create_kern( PF_CAN, SOCK_RAW, CAN_RAW, &can_sock) != 0 )
        {
-               printk( "error: binding failed\n" );
-               sock_release( udp_sock );
+               printk( KERN_ERR "error: can_sock creation failed\n" );
+               return -1;
+       }
+
+       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;
        }
        
-       /* 3. subscribe to netlink */
+       /* subscribe to netlink */
        //if( __rtnl_register( PF_CAN, RTM_GETROUTE,  ) != 0 )
        __rtnl_register( PF_CAN, RTM_NEWROUTE, cgw_create_job, NULL, NULL );
        //__rtnl_register( PF_CAN, RTM_DELROUTE,  )     
        
-       /* 4. run threads */
-       eth_to_can = kthread_run( gw_udp_recv, NULL, "cangw" );
-       can_to_eth = kthread_run( gw_can_recv, NULL, "cangw" );
-
        /*
        if( sock_create_kern( AF_CAN, SOCK_RAW, CAN_RAW, &can_sock ) != 0 )
        {s
@@ -313,9 +346,13 @@ static int __init cangw_init( void )
 
 static void __exit cangw_exit( void )
 {
-       sock_release( udp_sock );
-       sock_release( can_sock );
-       
+       if( gw_state == CEGW_RUNNING )
+       {
+               sock_release( udp_sock );
+               sock_release( can_sock );
+               /* ToDo: stop threads */
+       }
+
        printk( "cangw: exit\n" );
        //kthread_stop( ts );
 }