packages: cisco-vpnclient/cisco-vpnclient-interceptor.patch (NEW) - buildfi...

[pawelz]

Author: pawelz                       Date: Thu Sep 10 16:03:40 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- buildfix for kernel 2.6.31

---- Files affected:
packages/cisco-vpnclient:
   cisco-vpnclient-interceptor.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cisco-vpnclient/cisco-vpnclient-interceptor.patch
diff -u /dev/null packages/cisco-vpnclient/cisco-vpnclient-interceptor.patch:1.1
--- /dev/null	Thu Sep 10 18:03:40 2009
+++ packages/cisco-vpnclient/cisco-vpnclient-interceptor.patch	Thu Sep 10 18:03:35 2009
@@ -0,0 +1,109 @@
+http://ilapstech.blogspot.com/2009/09/cisco-vpn-client-on-karmic-koala.html
+
+  /opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori/interceptor.c: In function ‘interceptor_init’:
+  /opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori/interceptor.c:132: error: ‘struct net_device’ has no member named ‘hard_start_xmit’
+  /opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori/interceptor.c:133: error: ‘struct net_device’ has no member named ‘get_stats’
+  /opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori/interceptor.c:134: error: ‘struct net_device’ has no member named ‘do_ioctl’
+  /opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori/interceptor.c: In function ‘add_netdev’:
+  /opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori/interceptor.c:271: error: ‘struct net_device’ has no member named ‘hard_start_xmit’
+  /opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori/interceptor.c:272: error: ‘struct net_device’ has no member named ‘hard_start_xmit’
+  /opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori/interceptor.c: In function ‘remove_netdev’:
+  /opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori/interceptor.c:294: error: ‘struct net_device’ has no member named ‘hard_start_xmit’
+  make[2]: *** [/opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori/interceptor.o] Error 1
+  make[1]: *** [_module_/opt/Devel/CiscoVPNClient/4.8.02/vpnclient.ori] Error 2
+  make[1]: Leaving directory `/usr/src/linux-headers-2.6.31-9-generic'
+  make: *** [default] Error 2
+  Failed to make module "cisco_ipsec.ko".
+  
+  Oooops, so it's failed. I tried to find any solution on the Net but I
+  couldn't get any.  I looked at the source code and seemed that the Linux
+  kernel 2.6.31 replaced the old net_device structure with a new one and is
+  using that new structure for the net_device operations. This structure
+  called net_device_ops (const struct net_device_ops *netdev_ops).
+  
+  I think this new netdevice feature is available from the 2.6.29 kernel and
+  it was coexisted with the old method too.  I got some info about this on the
+  following link: http://cateee.net/lkddb/web-lkddb/COMPAT_NET_DEV_OPS.html
+  
+  Unfortunately, this option is disappeared from the 2.6.31 so there was no
+  option anymore to get the vpnclient to work with a COMPAT_NET_DEV_OPS=y
+  built 2.6.31 kernel.
+
+--- vpnclient.ori/interceptor.c	2009-05-21 01:16:34.000000000 +1200
++++ vpnclient/interceptor.c	2009-09-06 22:02:39.000000000 +1200
+@@ -116,6 +116,14 @@
+ };
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++static struct net_device_ops interceptor_netdev_ops = {
++    .ndo_start_xmit = interceptor_tx,
++    .ndo_do_ioctl   = interceptor_ioctl,
++    .ndo_get_stats  = interceptor_stats,
++};
++#endif
++
+ static struct notifier_block interceptor_notifier = {
+     .notifier_call = handle_netdev_event,
+ };
+@@ -129,9 +137,13 @@
+ {
+     ether_setup(dev);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++    dev->netdev_ops = &interceptor_netdev_ops;
++#else
+     dev->hard_start_xmit = interceptor_tx;
+     dev->get_stats = interceptor_stats;
+     dev->do_ioctl = interceptor_ioctl;
++#endif
+ 
+     dev->mtu = ETH_DATA_LEN-MTU_REDUCTION;
+     kernel_memcpy(dev->dev_addr, interceptor_eth_addr,ETH_ALEN);
+@@ -242,6 +254,9 @@
+ {
+     int rc = -1;
+     int i = 0;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++    struct net_device_ops * tmp_ops;
++#endif
+ 
+     if (!supported_device(dev))
+     {
+@@ -268,8 +283,14 @@
+     Bindings[i].original_mtu = dev->mtu;
+ 
+     /*replace the original send function with our send function */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++    Bindings[i].InjectSend = dev->netdev_ops->ndo_start_xmit;
++    tmp_ops = (struct net_device_ops *) dev->netdev_ops;
++    tmp_ops->ndo_start_xmit = replacement_dev_xmit;
++#else
+     Bindings[i].InjectSend = dev->hard_start_xmit;
+     dev->hard_start_xmit = replacement_dev_xmit;
++#endif
+ 
+     /*copy in the ip packet handler function and packet type struct */
+     Bindings[i].InjectReceive = original_ip_handler.orig_handler_func;
+@@ -285,13 +306,21 @@
+ {
+     int rc = -1;
+     BINDING *b;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++    struct net_device_ops * tmp_ops;
++#endif
+ 
+     b = getbindingbydev(dev);
+ 
+     if (b)
+     {   
+         rc = 0;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++        tmp_ops = (struct net_device_ops *) dev->netdev_ops;
++        tmp_ops->ndo_start_xmit = b->InjectSend;
++#else
+         dev->hard_start_xmit = b->InjectSend;
++#endif
+         kernel_memset(b, 0, sizeof(BINDING));
+     }
+     else
================================================================