wok view busybox/stuff/busybox-1.12.0-iptunnel.u @ 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 | |
| children |
line source
1 --- busybox-1.12.0/networking/libiproute/iptunnel.c
2 +++ busybox-1.12.0/networking/libiproute/iptunnel.c
3 @@ -21,7 +21,47 @@
4 #ifndef __constant_htons
5 #define __constant_htons htons
6 #endif
7 -#include <linux/if_tunnel.h>
8 +// FYI: #define SIOCDEVPRIVATE 0x89F0
9 +
10 +/* From linux/if_tunnel.h. #including it proved troublesome
11 + * (redefiniton errors due to name collisions in linux/ and net[inet]/) */
12 +#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)
13 +#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1)
14 +#define SIOCDELTUNNEL (SIOCDEVPRIVATE + 2)
15 +#define SIOCCHGTUNNEL (SIOCDEVPRIVATE + 3)
16 +//#define SIOCGETPRL (SIOCDEVPRIVATE + 4)
17 +//#define SIOCADDPRL (SIOCDEVPRIVATE + 5)
18 +//#define SIOCDELPRL (SIOCDEVPRIVATE + 6)
19 +//#define SIOCCHGPRL (SIOCDEVPRIVATE + 7)
20 +#define GRE_CSUM __constant_htons(0x8000)
21 +//#define GRE_ROUTING __constant_htons(0x4000)
22 +#define GRE_KEY __constant_htons(0x2000)
23 +#define GRE_SEQ __constant_htons(0x1000)
24 +//#define GRE_STRICT __constant_htons(0x0800)
25 +//#define GRE_REC __constant_htons(0x0700)
26 +//#define GRE_FLAGS __constant_htons(0x00F8)
27 +//#define GRE_VERSION __constant_htons(0x0007)
28 +struct ip_tunnel_parm {
29 + char name[IFNAMSIZ];
30 + int link;
31 + uint16_t i_flags;
32 + uint16_t o_flags;
33 + uint32_t i_key;
34 + uint32_t o_key;
35 + struct iphdr iph;
36 +};
37 +/* SIT-mode i_flags */
38 +//#define SIT_ISATAP 0x0001
39 +//struct ip_tunnel_prl {
40 +// uint32_t addr;
41 +// uint16_t flags;
42 +// uint16_t __reserved;
43 +// uint32_t datalen;
44 +// uint32_t __reserved2;
45 +// /* data follows */
46 +//};
47 +///* PRL flags */
48 +//#define PRL_DEFAULT 0x0001
50 #include "ip_common.h" /* #include "libbb.h" is inside */
51 #include "rt_names.h"