Hi Neal, the API change has been added to these kernels so far:
3.16 3.15.10 3.14.17 3.10.53 3.4.103 The attached patch fixes the build for me. CC'ed to libreswan as they are also affected. Thomas Am 15.08.2014 um 09:03 schrieb Thomas Geulig:
Hi Neal, 3.4.102 is still building fine for me, I haven't tried 3.4.103 yet. But I took a look at the changelog: commit 509a15a5d6b0cfd3e4e396844615df6335ff4c62 Author: Eric Dumazet <[email protected]> Date: Sat Jul 26 08:58:10 2014 +0200 ip: make IP identifiers less predictable They changed the __ip_select_ident() interface. I'll try to come up with a patch. Thomas Am 15.08.2014 um 08:05 schrieb Neal Murphy:This is for a fresh build of Smoothwall 3.1 RC6. Building openswan 2.6.41 for linux 3.4.103: --------------- /build/sources/openswan/openswan-2.6.41/modobj26/ipsec_xmit.c: In function 'ipsec_xmit_ipip': /build/sources/openswan/openswan-2.6.41/modobj26/ipsec_xmit.c:1172:3: warning: passing argument 2 of '__ip_select_ident' makes integer from pointer without a cast [enabled by default] In file included from include/net/tcp.h:42:0, from /build/sources/openswan/openswan-2.6.41/modobj26/ipsec_xmit.c:46: include/net/ip.h:268:6: note: expected 'int' but argument is of type 'struct dst_entry *' /build/sources/openswan/openswan-2.6.41/modobj26/ipsec_xmit.c:1172:3: error: too many arguments to function '__ip_select_ident' In file included from include/net/tcp.h:42:0, from /build/sources/openswan/openswan-2.6.41/modobj26/ipsec_xmit.c:46: include/net/ip.h:268:6: note: declared here make[4]: *** [/build/sources/openswan/openswan-2.6.41/modobj26/ipsec_xmit.o] Error 1 --------------- Happens with 'make -j 1' and 'make -j 8'. It was building OK up to linux 3.4.98. Did something in the kernel change? Thanks, N _______________________________________________ [email protected] https://lists.openswan.org/mailman/listinfo/users Micropayments: https://flattr.com/thing/38387/IPsec-for-Linux-made-easy Building and Integrating Virtual Private Networks with Openswan: http://www.amazon.com/gp/product/1904811256/104-3099591-2946327?n=283155_______________________________________________ [email protected] https://lists.openswan.org/mailman/listinfo/users Micropayments: https://flattr.com/thing/38387/IPsec-for-Linux-made-easy Building and Integrating Virtual Private Networks with Openswan: http://www.amazon.com/gp/product/1904811256/104-3099591-2946327?n=283155
--- linux/include/openswan/ipsec_kversion.h.orig 2014-08-15 11:35:03.619598180 +0200 +++ linux/include/openswan/ipsec_kversion.h 2014-08-15 10:32:29.693841060 +0200 @@ -477,6 +477,15 @@ # define DEFINE_RWLOCK(x) rwlock_t x = RW_LOCK_UNLOCKED #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,10) +# define IP_SELECT_IDENT_NEW +#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,17) +# define IP_SELECT_IDENT_NEW +#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,53) +# define IP_SELECT_IDENT_NEW +#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,103) +# define IP_SELECT_IDENT_NEW +#endif #endif /* _OPENSWAN_KVERSIONS_H */ --- linux/include/openswan/ipsec_param2.h.orig 2014-08-15 11:34:50.670847969 +0200 +++ linux/include/openswan/ipsec_param2.h 2014-08-15 10:06:43.950228239 +0200 @@ -23,7 +23,11 @@ #define netdev_priv(dev) (dev->priv) #endif +#if defined(IP_SELECT_IDENT_NEW) +#define KLIPS_IP_SELECT_IDENT(iph, skb) __ip_select_ident(iph, 1) +#else #define KLIPS_IP_SELECT_IDENT(iph, skb) __ip_select_ident(iph, skb_dst(skb), 0) +#endif #if !defined(HAVE_CURRENT_UID) #define current_uid() (current->uid)
smime.p7s
Description: S/MIME Cryptographic Signature
_______________________________________________ Swan-dev mailing list [email protected] https://lists.libreswan.org/mailman/listinfo/swan-dev
