wok-4.x rev 3880
Busybox: do not use linux/if_tunnel.h anymore
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Aug 11 10:57:12 2009 +0200 (2009-08-11) |
parents | 22410fa562c7 |
children | e0ab48bc2f28 |
files | busybox-pam/receipt busybox/receipt busybox/stuff/busybox-1.12.0-iptunnel.u |
line diff
1.1 --- a/busybox-pam/receipt Mon Aug 10 23:39:19 2009 +0200 1.2 +++ b/busybox-pam/receipt Tue Aug 11 10:57:12 2009 +0200 1.3 @@ -42,6 +42,7 @@ 1.4 dpkg_deb.u 1.5 ionice.u 1.6 syslogd.u 1.7 +iptunnel.u 1.8 EOT 1.9 cp $WOK/$SOURCE/stuff/$SOURCE-$VERSION.config .config 1.10 sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config
2.1 --- a/busybox/receipt Mon Aug 10 23:39:19 2009 +0200 2.2 +++ b/busybox/receipt Tue Aug 11 10:57:12 2009 +0200 2.3 @@ -40,6 +40,7 @@ 2.4 dpkg_deb.u 2.5 ionice.u 2.6 syslogd.u 2.7 +iptunnel.u 2.8 EOT 2.9 cp ../stuff/$PACKAGE-$VERSION.config .config 2.10 make oldconfig
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/busybox/stuff/busybox-1.12.0-iptunnel.u Tue Aug 11 10:57:12 2009 +0200 3.3 @@ -0,0 +1,51 @@ 3.4 +--- busybox-1.12.0/networking/libiproute/iptunnel.c 3.5 ++++ busybox-1.12.0/networking/libiproute/iptunnel.c 3.6 +@@ -21,7 +21,47 @@ 3.7 + #ifndef __constant_htons 3.8 + #define __constant_htons htons 3.9 + #endif 3.10 +-#include <linux/if_tunnel.h> 3.11 ++// FYI: #define SIOCDEVPRIVATE 0x89F0 3.12 ++ 3.13 ++/* From linux/if_tunnel.h. #including it proved troublesome 3.14 ++ * (redefiniton errors due to name collisions in linux/ and net[inet]/) */ 3.15 ++#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0) 3.16 ++#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1) 3.17 ++#define SIOCDELTUNNEL (SIOCDEVPRIVATE + 2) 3.18 ++#define SIOCCHGTUNNEL (SIOCDEVPRIVATE + 3) 3.19 ++//#define SIOCGETPRL (SIOCDEVPRIVATE + 4) 3.20 ++//#define SIOCADDPRL (SIOCDEVPRIVATE + 5) 3.21 ++//#define SIOCDELPRL (SIOCDEVPRIVATE + 6) 3.22 ++//#define SIOCCHGPRL (SIOCDEVPRIVATE + 7) 3.23 ++#define GRE_CSUM __constant_htons(0x8000) 3.24 ++//#define GRE_ROUTING __constant_htons(0x4000) 3.25 ++#define GRE_KEY __constant_htons(0x2000) 3.26 ++#define GRE_SEQ __constant_htons(0x1000) 3.27 ++//#define GRE_STRICT __constant_htons(0x0800) 3.28 ++//#define GRE_REC __constant_htons(0x0700) 3.29 ++//#define GRE_FLAGS __constant_htons(0x00F8) 3.30 ++//#define GRE_VERSION __constant_htons(0x0007) 3.31 ++struct ip_tunnel_parm { 3.32 ++ char name[IFNAMSIZ]; 3.33 ++ int link; 3.34 ++ uint16_t i_flags; 3.35 ++ uint16_t o_flags; 3.36 ++ uint32_t i_key; 3.37 ++ uint32_t o_key; 3.38 ++ struct iphdr iph; 3.39 ++}; 3.40 ++/* SIT-mode i_flags */ 3.41 ++//#define SIT_ISATAP 0x0001 3.42 ++//struct ip_tunnel_prl { 3.43 ++// uint32_t addr; 3.44 ++// uint16_t flags; 3.45 ++// uint16_t __reserved; 3.46 ++// uint32_t datalen; 3.47 ++// uint32_t __reserved2; 3.48 ++// /* data follows */ 3.49 ++//}; 3.50 ++///* PRL flags */ 3.51 ++//#define PRL_DEFAULT 0x0001 3.52 + 3.53 + #include "ip_common.h" /* #include "libbb.h" is inside */ 3.54 + #include "rt_names.h"